1 files changed, 26 insertions, 0 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/RemoteDesktopViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/RemoteDesktopViewVM.cs
index b4a0b07ea..bedcf9b7a 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/RemoteDesktopViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/ViewModels/RemoteDesktopViewVM.cs
@@ -57,6 +57,13 @@ namespace Tango.FSE.PPCConsole.ViewModels
             set { _recordingTime = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _cursorVisible;
+        public bool CursorVisible
+        {
+            get { return _cursorVisible; }
+            set { _cursorVisible = value; RaisePropertyChangedAuto(); SetCursorVisibility(); }
+        }
+
         #endregion
 
         #region Commands
@@ -127,6 +134,7 @@ namespace Tango.FSE.PPCConsole.ViewModels
             base.OnApplicationStarted();
 
             RemoteDesktopProvider.FrameReceived += RemoteDesktopProvider_FrameReceived;
+            RemoteDesktopProvider.SessionStopped += RemoteDesktopProvider_SessionStopped;
             MachineProvider.MachineConnected += MachineProvider_MachineConnected;
         }
 
@@ -162,6 +170,14 @@ namespace Tango.FSE.PPCConsole.ViewModels
         private void RemoteDesktopProvider_FrameReceived(object sender, DesktopFrameReceivedEventArgs e)
         {
             Source = e.Source;
+            _cursorVisible = e.CursorVisible;
+            RaisePropertyChanged(nameof(CursorVisible));
+        }
+
+        private void RemoteDesktopProvider_SessionStopped(object sender, EventArgs e)
+        {
+            _cursorVisible = false;
+            RaisePropertyChanged(nameof(CursorVisible));
         }
 
         #endregion
@@ -216,6 +232,11 @@ namespace Tango.FSE.PPCConsole.ViewModels
             RemoteDesktopProvider.MouseDoubleClick(changedButton, point, size);
         }
 
+        public void OnMouseScroll(int delta, System.Windows.Point point, System.Windows.Size size)
+        {
+            RemoteDesktopProvider.MouseScroll(delta, point, size);
+        }
+
         public void OnKeyboardDown(Key key, bool ctrlDown, bool shitDown, bool altDown)
         {
             RemoteDesktopProvider.KeyboardDown(key, ctrlDown, shitDown, altDown);
@@ -226,6 +247,11 @@ namespace Tango.FSE.PPCConsole.ViewModels
             RemoteDesktopProvider.KeyboardUp(key, ctrlDown, shitDown, altDown);
         }
 
+        private void SetCursorVisibility()
+        {
+            RemoteDesktopProvider.SetRemoteCursorVisibility(CursorVisible);
+        }
+
         #endregion
 
         #region Snapshot