[client] move remaining code in core.c into the SDL backend

client/displayservers/SDL/sdl.c

@@ -163,6 +163,11 @@ static bool sdlEventFilter(SDL_Event * event)
   return false;
 }
 
+static void sdlShowPointer(bool show)
+{
+  SDL_ShowCursor(show ? SDL_ENABLE : SDL_DISABLE);
+}
+
 static void sdlGrabPointer(void)
 {
   SDL_SetWindowGrab(app_getWindow(), SDL_TRUE);
@@ -222,6 +227,20 @@ static void sdlRealignPointer(void)
   app_handleMouseNormal(0, 0);
 }
 
+static bool sdlIsValidPointerPos(int x, int y)
+{
+  const int displays = SDL_GetNumVideoDisplays();
+  for(int i = 0; i < displays; ++i)
+  {
+    SDL_Rect r;
+    SDL_GetDisplayBounds(i, &r);
+    if ((x >= r.x && x < r.x + r.w) &&
+        (y >= r.y && y < r.y + r.h))
+      return true;
+  }
+  return false;
+}
+
 static void sdlInhibitIdle(void)
 {
   SDL_DisableScreenSaver();
@@ -234,22 +253,24 @@ static void sdlUninhibitIdle(void)
 
 struct LG_DisplayServerOps LGDS_SDL =
 {
-  .subsystem      = SDL_SYSWM_UNKNOWN,
+  .subsystem         = SDL_SYSWM_UNKNOWN,
-  .earlyInit      = sdlEarlyInit,
+  .earlyInit         = sdlEarlyInit,
-  .init           = sdlInit,
+  .init              = sdlInit,
-  .startup        = sdlStartup,
+  .startup           = sdlStartup,
-  .shutdown       = sdlShutdown,
+  .shutdown          = sdlShutdown,
-  .free           = sdlFree,
+  .free              = sdlFree,
-  .getProp        = sdlGetProp,
+  .getProp           = sdlGetProp,
-  .eventFilter    = sdlEventFilter,
+  .eventFilter       = sdlEventFilter,
-  .grabPointer    = sdlGrabPointer,
+  .showPointer       = sdlShowPointer,
-  .ungrabPointer  = sdlUngrabPointer,
+  .grabPointer       = sdlGrabPointer,
-  .grabKeyboard   = sdlGrabKeyboard,
+  .ungrabPointer     = sdlUngrabPointer,
-  .ungrabKeyboard = sdlUngrabKeyboard,
+  .grabKeyboard      = sdlGrabKeyboard,
-  .warpPointer    = sdlWarpPointer,
+  .ungrabKeyboard    = sdlUngrabKeyboard,
-  .realignPointer = sdlRealignPointer,
+  .warpPointer       = sdlWarpPointer,
-  .inhibitIdle    = sdlInhibitIdle,
+  .realignPointer    = sdlRealignPointer,
-  .uninhibitIdle  = sdlUninhibitIdle,
+  .isValidPointerPos = sdlIsValidPointerPos,
+  .inhibitIdle       = sdlInhibitIdle,
+  .uninhibitIdle     = sdlUninhibitIdle,
 
   /* SDL does not have clipboard support */
   .cbInit    = NULL,

client/include/interface/displayserver.h

@@ -87,6 +87,7 @@ struct LG_DisplayServerOps
   bool (*eventFilter)(SDL_Event * event);
 
   /* dm specific cursor implementations */
+  void (*showPointer)(bool show);
   void (*grabPointer)();
   void (*ungrabPointer)();
   void (*grabKeyboard)();
@@ -100,6 +101,9 @@ struct LG_DisplayServerOps
    * deltas */
   void (*realignPointer)();
 
+  /* returns true if the position specified is actually valid */
+  bool (*isValidPointerPos)(int x, int y);
+
   /* called to disable/enable the screensaver */
   void (*inhibitIdle)();
   void (*uninhibitIdle)();

client/include/util.h

@@ -32,6 +32,5 @@ void util_cursorToInt(double ex, double ey, int *x, int *y);
 bool util_guestCurToLocal(struct DoublePoint *local);
 void util_localCurToGuest(struct DoublePoint *guest);
 void util_rotatePoint(struct DoublePoint *point);
-bool util_isValidCursorLocation(int x, int y);
 
 #endif

client/src/app.c

@@ -457,7 +457,7 @@ void app_handleMouseNormal(double ex, double ey)
       const int tx = (local.x <= 0.0) ? floor(local.x) : ceil(local.x);
       const int ty = (local.y <= 0.0) ? floor(local.y) : ceil(local.y);
 
-      if (util_isValidCursorLocation(
+      if (core_isValidPointerPos(
             g_state.windowPos.x + g_state.border.x + tx,
             g_state.windowPos.y + g_state.border.y + ty))
       {

client/src/core.c

@@ -57,7 +57,7 @@ void core_setCursorInView(bool enable)
   if (enable)
   {
     if (g_params.hideMouse)
-      SDL_ShowCursor(SDL_DISABLE);
+      g_state.ds->showPointer(false);
 
     if (warpSupport && !g_params.captureInputOnly)
       g_state.ds->grabPointer();
@@ -65,7 +65,7 @@ void core_setCursorInView(bool enable)
   else
   {
     if (g_params.hideMouse)
-      SDL_ShowCursor(SDL_ENABLE);
+      g_state.ds->showPointer(true);
 
     if (warpSupport)
       g_state.ds->ungrabPointer();
@@ -90,7 +90,7 @@ void core_setGrabQuiet(bool enable)
 {
   /* we always do this so that at init the cursor is in the right state */
   if (g_params.captureInputOnly && g_params.hideMouse)
-    SDL_ShowCursor(enable ? SDL_DISABLE : SDL_ENABLE);
+    g_state.ds->showPointer(!enable);
 
   if (g_cursor.grab == enable)
     return;
@@ -260,3 +260,8 @@ void core_alignToGuest(void)
     if (core_warpPointer(round(local.x), round(local.y), false))
       core_setCursorInView(true);
 }
+
+bool core_isValidPointerPos(int x, int y)
+{
+  return g_state.ds->isValidPointerPos(x, y);
+}

client/src/core.h

@@ -28,5 +28,6 @@ void core_setGrabQuiet(bool enable);
 bool core_warpPointer(int x, int y, bool exiting);
 void core_updatePositionInfo(void);
 void core_alignToGuest(void);
+bool core_isValidPointerPos(int x, int y);
 
 #endif

client/src/main.c

@@ -831,10 +831,12 @@ static int lg_run(void)
   SET_FALLBACK(shutdown);
   SET_FALLBACK(free);
   SET_FALLBACK(eventFilter);
+  SET_FALLBACK(showPointer);
   SET_FALLBACK(grabPointer);
   SET_FALLBACK(ungrabKeyboard);
   SET_FALLBACK(warpPointer);
   SET_FALLBACK(realignPointer);
+  SET_FALLBACK(isValidPointerPos);
   SET_FALLBACK(inhibitIdle);
   SET_FALLBACK(uninhibitIdle);
   SET_FALLBACK(cbInit);

client/src/util.c

@@ -206,17 +206,3 @@ void util_rotatePoint(struct DoublePoint *point)
       break;
   }
 }
-
-bool util_isValidCursorLocation(int x, int y)
-{
-  const int displays = SDL_GetNumVideoDisplays();
-  for(int i = 0; i < displays; ++i)
-  {
-    SDL_Rect r;
-    SDL_GetDisplayBounds(i, &r);
-    if ((x >= r.x && x < r.x + r.w) &&
-        (y >= r.y && y < r.y + r.h))
-      return true;
-  }
-  return false;
-}