Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

5 files changed, 40 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseEventType.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseEventType.cs
index 2c9f84e03..ca8945dda 100644
--- a/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseEventType.cs
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseEventType.cs
@@ -11,6 +11,7 @@ namespace Tango.RemoteDesktop.Network
         Down,
         Up,
         Move,
-        DoubleClick
+        DoubleClick,
+        Scroll,
     }
 }
diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseStateRequest.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseStateRequest.cs
index 36e98351f..67076c211 100644
--- a/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseStateRequest.cs
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Network/MouseStateRequest.cs
@@ -13,5 +13,6 @@ namespace Tango.RemoteDesktop.Network
         public MouseButton Button { get; set; }
         public MouseEventType EventType { get; set; }
         public Point Location { get; set; }
+        public int ScrollDelta { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Network/RemoteDesktopPacket.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Network/RemoteDesktopPacket.cs
index 28f890a9a..f0186e94f 100644
--- a/Software/Visual_Studio/Tango.RemoteDesktop/Network/RemoteDesktopPacket.cs
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Network/RemoteDesktopPacket.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Tango.RemoteDesktop.Network
 {
@@ -22,5 +23,15 @@ namespace Tango.RemoteDesktop.Network
         /// Gets or sets the region on the previous bitmap that needs to be applied with this packet bitmap.
         /// </summary>
         public CaptureRegion PartialRegion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the mouse position.
+        /// </summary>
+        public Point MousePosition { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the frame includes the remote cursor.
+        /// </summary>
+        public bool CursorVisible { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityRequest.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityRequest.cs
new file mode 100644
index 000000000..f8b832f36
--- /dev/null
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityRequest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.RemoteDesktop.Network
+{
+    public class SetCursorVisibilityRequest
+    {
+        public bool Visible { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityResponse.cs b/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityResponse.cs
new file mode 100644
index 000000000..d333cb134
--- /dev/null
+++ b/Software/Visual_Studio/Tango.RemoteDesktop/Network/SetCursorVisibilityResponse.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.RemoteDesktop.Network
+{
+    public class SetCursorVisibilityResponse
+    {
+
+    }
+}