[Fix] Event server code for remote mouse with event client protocol

xbmc · Oct 26, 2013 · 0c233ac · 0c233ac
1 parent 90aa523
commit 0c233ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3254,7 +3254,18 @@ bool CApplication::ProcessEventServer(float frameTime)
   {
     CPoint pos;
     if (es->GetMousePos(pos.x, pos.y) && g_Mouse.IsEnabled())
+    {
+      XBMC_Event newEvent;
+      newEvent.type = XBMC_MOUSEMOTION;
+      newEvent.motion.xrel = 0;
+      newEvent.motion.yrel = 0;
+      newEvent.motion.state = 0;
+      newEvent.motion.which = 0x10;  // just a different value to distinguish between mouse and event client device.
+      newEvent.motion.x = pos.x;
+      newEvent.motion.y = pos.y;
+      OnEvent(newEvent);  // had to call this to update g_Mouse position
       return OnAction(CAction(ACTION_MOUSE_MOVE, pos.x, pos.y));
+    }
   }
 #endif
   return false;

diff --git a/xbmc/network/EventClient.cpp b/xbmc/network/EventClient.cpp
@@ -794,12 +794,8 @@ bool CEventClient::GetMousePos(float& x, float& y)
   CSingleLock lock(m_critSection);
   if (m_bMouseMoved)
   {
-    x = (float)((m_iMouseX / 65535.0f) *
-                (g_graphicsContext.GetViewWindow().x2
-                 -g_graphicsContext.GetViewWindow().x1));
-    y = (float)((m_iMouseY / 65535.0f) *
-                (g_graphicsContext.GetViewWindow().y2
-                 -g_graphicsContext.GetViewWindow().y1));
+    x = (float)((m_iMouseX / 65535.0f) * g_graphicsContext.GetWidth());
+    y = (float)((m_iMouseY / 65535.0f) * g_graphicsContext.GetHeight());
     m_bMouseMoved = false;
     return true;
   }