From a86ade072d4db86e2111d825a45c6526f6710893 Mon Sep 17 00:00:00 2001
From: d3agle <sellout89@gmail.com>
Date: Thu, 30 Jul 2015 10:40:51 -0500
Subject: [PATCH] RDP Mono fixes

---
 Server/Forms/FrmRemoteDesktop.cs | 38 +++++++++++++++-----------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Server/Forms/FrmRemoteDesktop.cs b/Server/Forms/FrmRemoteDesktop.cs
index 95c34356..ebb477cd 100644
--- a/Server/Forms/FrmRemoteDesktop.cs
+++ b/Server/Forms/FrmRemoteDesktop.cs
@@ -25,11 +25,11 @@ public FrmRemoteDesktop(Client c)
             _connectClient = c;
             _connectClient.Value.FrmRdp = this;
 
-            if (!PlatformHelper.RunningOnMono)
-                SubscribeWindowsHookEvents(Hook.GlobalEvents());
-            else
+            if (PlatformHelper.RunningOnMono)
                 SubscribeMonoEvents();
-
+            else
+                SubscribeWindowsHookEvents(Hook.GlobalEvents());
+                
             InitializeComponent();
         }
 
@@ -54,28 +54,28 @@ private void SubscribeWindowsHookEvents(IKeyboardMouseEvents events)
         {
             _mEvents = events;
             _mEvents.MouseWheel += MouseWheelEvent;
-            _mEvents.KeyDown += OnKeyDown;
-            _mEvents.KeyUp += OnKeyUp;
+            _mEvents.KeyDown += Windows_OnKeyDown;
+            _mEvents.KeyUp += Windows_OnKeyUp;
         }
 
         private void SubscribeMonoEvents()
         {
-            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmRemoteDesktop_KeyDown);
-            this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.FrmRemoteDesktop_KeyUp);
+            this.KeyDown += new KeyEventHandler(this.Mono_KeyDown);
+            this.KeyUp += new KeyEventHandler(this.Mono_KeyUp);
         }
 
         private void UnsubscribeWindowsHookEvents()
         {
             if (_mEvents == null) return;
             _mEvents.MouseWheel -= MouseWheelEvent;
-            _mEvents.KeyDown -= OnKeyDown;
-            _mEvents.KeyUp -= OnKeyUp;
+            _mEvents.KeyDown -= Windows_OnKeyDown;
+            _mEvents.KeyUp -= Windows_OnKeyUp;
         }
 
         private void UnsubscribeMonoEvents()
         {
-            this.KeyDown -= new System.Windows.Forms.KeyEventHandler(this.FrmRemoteDesktop_KeyDown);
-            this.KeyUp -= new System.Windows.Forms.KeyEventHandler(this.FrmRemoteDesktop_KeyUp);
+            this.KeyDown -= this.Mono_KeyDown;
+            this.KeyUp -= this.Mono_KeyUp;
         }
 
         public void AddMonitors(int monitors)
@@ -137,10 +137,8 @@ private void FrmRemoteDesktop_FormClosing(object sender, FormClosingEventArgs e)
             if (_connectClient.Value != null)
                 _connectClient.Value.FrmRdp = null;
 
-            if (!PlatformHelper.RunningOnMono)
-                UnsubscribeWindowsHookEvents();
-            else
-                UnsubscribeMonoEvents();
+            UnsubscribeWindowsHookEvents();
+            UnsubscribeMonoEvents();
         }
 
         private void FrmRemoteDesktop_Resize(object sender, EventArgs e)
@@ -321,7 +319,7 @@ private void MouseWheelEvent(object sender, MouseEventArgs e)
             }
         }
 
-        private void OnKeyDown(object sender, KeyEventArgs e)
+        private void Windows_OnKeyDown(object sender, KeyEventArgs e)
         {
             if (picDesktop.Image != null && _enableKeyboardInput && IsStarted && this.ContainsFocus)
             {
@@ -337,7 +335,7 @@ private void OnKeyDown(object sender, KeyEventArgs e)
             }
         }
 
-        private void OnKeyUp(object sender, KeyEventArgs e)
+        private void Windows_OnKeyUp(object sender, KeyEventArgs e)
         {
             if (picDesktop.Image != null && _enableKeyboardInput && IsStarted && this.ContainsFocus)
             {
@@ -350,7 +348,7 @@ private void OnKeyUp(object sender, KeyEventArgs e)
             }
         }
 
-        private void FrmRemoteDesktop_KeyDown(object sender, KeyEventArgs e)
+        private void Mono_KeyDown(object sender, KeyEventArgs e)
         {
             if (picDesktop.Image != null && _enableKeyboardInput && IsStarted && this.ContainsFocus)
             {
@@ -366,7 +364,7 @@ private void FrmRemoteDesktop_KeyDown(object sender, KeyEventArgs e)
             }
         }
 
-        private void FrmRemoteDesktop_KeyUp(object sender, KeyEventArgs e)
+        private void Mono_KeyUp(object sender, KeyEventArgs e)
         {
             if (picDesktop.Image != null && _enableKeyboardInput && IsStarted && this.ContainsFocus)
             {