dix: unexport, document and rename GetSpriteWindow()

Not used by any drivers, so no need to keep it exported.
Also spending it for a better fitter name.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xi/exevents.c

@@ -1946,9 +1946,9 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
                                 deactivateDeviceGrab);
         else if (device->focus && !IsPointerEvent(ev))
             DeliverFocusedEvent(device, (InternalEvent *) event,
-                                GetSpriteWindow(device));
+                                InputDevSpriteWindow(device));
         else
-            DeliverDeviceEvents(GetSpriteWindow(device), (InternalEvent *) event,
+            DeliverDeviceEvents(InputDevSpriteWindow(device), (InternalEvent *) event,
                                 NullGrab, NullWindow, device);
     }
 
@@ -2907,7 +2907,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
 {
     WindowPtr pWin;
     WindowPtr effectiveFocus = NullWindow;      /* only set if dest==InputFocus */
-    WindowPtr spriteWin = GetSpriteWindow(d);
+    WindowPtr spriteWin = InputDevSpriteWindow(d);
 
     if (dest == PointerWindow)
         pWin = spriteWin;

dix/events.c

@@ -1029,7 +1029,7 @@ InputDevCurrentRootWindow(DeviceIntPtr dev)
  * @return window underneath the cursor sprite.
  */
 WindowPtr
-GetSpriteWindow(DeviceIntPtr pDev)
+InputDevSpriteWindow(DeviceIntPtr pDev)
 {
     return pDev->spriteInfo->sprite->win;
 }

dix/input_priv.h

@@ -394,4 +394,13 @@ void ConfineToShape(RegionPtr region, int *px, int *py)
 WindowPtr InputDevCurrentRootWindow(DeviceIntPtr pDev)
     _X_ATTRIBUTE_NONNULL_ARG(1);
 
+/*
+ * @brief return Window underneath the input device's cursor sprite
+ *
+ * @param pDev  pointer to input device structure
+ * @return pointer to window the cursor is currently above
+ */
+WindowPtr InputDevSpriteWindow(DeviceIntPtr pDev)
+    _X_ATTRIBUTE_NONNULL_ARG(1);
+
 #endif /* _XSERVER_INPUT_PRIV_H */

hw/xquartz/xpr/xprCursor.c

@@ -396,7 +396,7 @@ QuartzResumeXCursor(ScreenPtr pScreen)
 
     /* TODO: Tablet? */
 
-    pWin = GetSpriteWindow(darwinPointer);
+    pWin = InputDevSpriteWindow(darwinPointer);
     if (pWin->drawable.pScreen != pScreen)
         return;
 

include/dix.h

@@ -235,9 +235,6 @@ extern _X_EXPORT Bool
 IsParent(WindowPtr /* maybeparent */ ,
          WindowPtr /* child */ );
 
-extern _X_EXPORT WindowPtr
-GetSpriteWindow(DeviceIntPtr pDev);
-
 extern _X_EXPORT void
 NoticeTime(const DeviceIntPtr dev,
            TimeStamp time);