Revert "Added InputRoot to all raw input events."

This reverts commit ae747c6dc753a95566c15793c58c14771568d794.

src/Gtk/Perspex.Gtk/WindowImpl.cs

@@ -264,8 +264,8 @@ namespace Perspex.Gtk
 
             var e = new RawMouseEventArgs(
                 GtkMouseDevice.Instance,
-                _inputRoot,
                 evnt.Time,
+                _inputRoot,
                 evnt.Button == 1
                     ? RawMouseEventType.LeftButtonDown
                     : evnt.Button == 3 ? RawMouseEventType.RightButtonDown : RawMouseEventType.MiddleButtonDown,
@@ -286,7 +286,7 @@ namespace Perspex.Gtk
                 delta = new Vector(-step, 0);
             if (evnt.Direction == ScrollDirection.Left)
                 delta = new Vector(step, 0);
-            var e = new RawMouseWheelEventArgs(GtkMouseDevice.Instance, _inputRoot, evnt.Time, new Point(evnt.X, evnt.Y), delta, GetModifierKeys(evnt.State));
+            var e = new RawMouseWheelEventArgs(GtkMouseDevice.Instance, evnt.Time, _inputRoot, new Point(evnt.X, evnt.Y), delta, GetModifierKeys(evnt.State));
             Input(e);
             return base.OnScrollEvent(evnt);
         }
@@ -295,8 +295,8 @@ namespace Perspex.Gtk
         {
             var e = new RawMouseEventArgs(
                 GtkMouseDevice.Instance,
-                _inputRoot,
                 evnt.Time,
+                _inputRoot,
                 evnt.Button == 1
                     ? RawMouseEventType.LeftButtonUp
                     : evnt.Button == 3 ? RawMouseEventType.RightButtonUp : RawMouseEventType.MiddleButtonUp,
@@ -329,7 +329,6 @@ namespace Perspex.Gtk
                 return true;
             var e = new RawKeyEventArgs(
                 GtkKeyboardDevice.Instance,
-                _inputRoot,
                 evnt.Time,
                 evnt.Type == EventType.KeyPress ? RawKeyEventType.KeyDown : RawKeyEventType.KeyUp,
                 GtkKeyboardDevice.ConvertKey(evnt.Key), GetModifierKeys(evnt.State));
@@ -343,7 +342,7 @@ namespace Perspex.Gtk
 
         private void ImContext_Commit(object o, Gtk.CommitArgs args)
         {
-            Input(new RawTextInputEventArgs(GtkKeyboardDevice.Instance, _inputRoot, _lastKeyEventTimestamp, args.Str));
+            Input(new RawTextInputEventArgs(GtkKeyboardDevice.Instance, _lastKeyEventTimestamp, args.Str));
         }
 
         protected override bool OnExposeEvent(EventExpose evnt)
@@ -365,8 +364,8 @@ namespace Perspex.Gtk
 
             var e = new RawMouseEventArgs(
                 GtkMouseDevice.Instance,
-                _inputRoot,
                 evnt.Time,
+                _inputRoot,
                 RawMouseEventType.Move,
                 position, GetModifierKeys(evnt.State));
             Input(e);

src/Perspex.Input/Raw/RawInputEventArgs.cs

@@ -7,23 +7,16 @@ namespace Perspex.Input.Raw
 {
     public class RawInputEventArgs : EventArgs
     {
-        public RawInputEventArgs(
-            IInputDevice device,
-            IInputRoot root,
-            uint timestamp)
+        public RawInputEventArgs(IInputDevice device, uint timestamp)
         {
             Contract.Requires<ArgumentNullException>(device != null);
-            Contract.Requires<ArgumentNullException>(root != null);
 
             Device = device;
-            Root = root;
             Timestamp = timestamp;
         }
 
-        public IInputDevice Device { get; }
+        public IInputDevice Device { get; private set; }
 
-        public IInputRoot Root { get; }
-
-        public uint Timestamp { get; }
+        public uint Timestamp { get; private set; }
     }
 }

src/Perspex.Input/Raw/RawKeyEventArgs.cs

@@ -13,11 +13,10 @@ namespace Perspex.Input.Raw
     {
         public RawKeyEventArgs(
             IKeyboardDevice device,
-            IInputRoot root,
             uint timestamp,
             RawKeyEventType type,
             Key key, InputModifiers modifiers)
-            : base(device, root, timestamp)
+            : base(device, timestamp)
         {
             Key = key;
             Type = type;

src/Perspex.Input/Raw/RawMouseEventArgs.cs

@@ -22,11 +22,11 @@ namespace Perspex.Input.Raw
     {
         public RawMouseEventArgs(
             IInputDevice device,
-            IInputRoot root,
             uint timestamp,
+            IInputRoot root,
             RawMouseEventType type,
             Point position, InputModifiers inputModifiers)
-            : base(device, root, timestamp)
+            : base(device, timestamp)
         {
             Contract.Requires<ArgumentNullException>(device != null);
             Contract.Requires<ArgumentNullException>(root != null);

src/Perspex.Input/Raw/RawMouseWheelEventArgs.cs

@@ -10,11 +10,11 @@ namespace Perspex.Input.Raw
     {
         public RawMouseWheelEventArgs(
             IInputDevice device,
-            IInputRoot root,
             uint timestamp,
+            IInputRoot root,
             Point position,
             Vector delta, InputModifiers inputModifiers)
-            : base(device, root, timestamp, RawMouseEventType.Wheel, position, inputModifiers)
+            : base(device, timestamp, root, RawMouseEventType.Wheel, position, inputModifiers)
         {
             Delta = delta;
         }

src/Perspex.Input/Raw/RawTextInputEventArgs.cs

@@ -5,16 +5,11 @@ namespace Perspex.Input.Raw
 {
     public class RawTextInputEventArgs : RawInputEventArgs
     {
-        public RawTextInputEventArgs(
-            IKeyboardDevice device,
-            IInputRoot root,
-            uint timestamp, 
-            string text) 
-            : base(device, root, timestamp)
+        public string Text { get; set; }
+
+        public RawTextInputEventArgs(IKeyboardDevice device, uint timestamp, string text) : base(device, timestamp)
         {
             Text = text;
         }
-
-        public string Text { get; set; }
     }
 }

src/Windows/Perspex.Win32/WindowImpl.cs

@@ -407,7 +407,6 @@ namespace Perspex.Win32
                 case UnmanagedMethods.WindowsMessage.WM_SYSKEYDOWN:
                     e = new RawKeyEventArgs(
                             WindowsKeyboardDevice.Instance,
-                            _owner,
                             timestamp,
                             RawKeyEventType.KeyDown,
                             KeyInterop.KeyFromVirtualKey((int)wParam), WindowsKeyboardDevice.Instance.Modifiers);
@@ -417,7 +416,6 @@ namespace Perspex.Win32
                 case UnmanagedMethods.WindowsMessage.WM_SYSKEYUP:
                     e = new RawKeyEventArgs(
                             WindowsKeyboardDevice.Instance,
-                            _owner,
                             timestamp,
                             RawKeyEventType.KeyUp,
                             KeyInterop.KeyFromVirtualKey((int)wParam), WindowsKeyboardDevice.Instance.Modifiers);
@@ -426,7 +424,7 @@ namespace Perspex.Win32
                     // Ignore control chars
                     if (wParam.ToInt32() >= 32)
                     {
-                        e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, _owner, timestamp,
+                        e = new RawTextInputEventArgs(WindowsKeyboardDevice.Instance, timestamp,
                             new string((char)wParam.ToInt32(), 1));
                     }
 
@@ -451,8 +449,8 @@ namespace Perspex.Win32
                 case UnmanagedMethods.WindowsMessage.WM_MBUTTONDOWN:
                     e = new RawMouseEventArgs(
                         WindowsMouseDevice.Instance,
-                        _owner,
                         timestamp,
+                        _owner,
                         msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONDOWN
                             ? RawMouseEventType.LeftButtonDown
                             : msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONDOWN
@@ -466,8 +464,8 @@ namespace Perspex.Win32
                 case UnmanagedMethods.WindowsMessage.WM_MBUTTONUP:
                     e = new RawMouseEventArgs(
                         WindowsMouseDevice.Instance,
-                        _owner,
                         timestamp,
+                        _owner,
                         msg == (int) UnmanagedMethods.WindowsMessage.WM_LBUTTONUP
                             ? RawMouseEventType.LeftButtonUp
                             : msg == (int) UnmanagedMethods.WindowsMessage.WM_RBUTTONUP
@@ -492,8 +490,8 @@ namespace Perspex.Win32
 
                     e = new RawMouseEventArgs(
                         WindowsMouseDevice.Instance,
-                        _owner,
                         timestamp,
+                        _owner,
                         RawMouseEventType.Move,
                         PointFromLParam(lParam), GetMouseModifiers(wParam));
 
@@ -502,8 +500,8 @@ namespace Perspex.Win32
                 case UnmanagedMethods.WindowsMessage.WM_MOUSEWHEEL:
                     e = new RawMouseWheelEventArgs(
                         WindowsMouseDevice.Instance,
-                        _owner,
                         timestamp,
+                        _owner,
                         ScreenToClient(PointFromLParam(lParam)),
                         new Vector(0, ((int)wParam >> 16) / wheelDelta), GetMouseModifiers(wParam));
                     break;
@@ -512,8 +510,8 @@ namespace Perspex.Win32
                     _trackingMouse = false;
                     e = new RawMouseEventArgs(
                         WindowsMouseDevice.Instance,
-                        _owner,
                         timestamp,
+                        _owner,
                         RawMouseEventType.LeaveWindow,
                         new Point(), WindowsKeyboardDevice.Instance.Modifiers);
                     break;

tests/Perspex.Controls.UnitTests/TopLevelTests.cs

@@ -266,7 +266,6 @@ namespace Perspex.Controls.UnitTests
 
                 var input = new RawKeyEventArgs(
                     new Mock<IKeyboardDevice>().Object,
-                    new Mock<IInputRoot>().Object,
                     0,
                     RawKeyEventType.KeyDown,
                     Key.A, InputModifiers.None);