frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-23 15:13:12 +02:00
parent 32a0109615
commit 1dd10193a9
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xi/exevents.c
View File

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

2
dix/events.c
View File

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

9
dix/input_priv.h
View File

@ -394,4 +394,13 @@ void ConfineToShape(RegionPtr region, int *px, int *py)
WindowPtr InputDevCurrentRootWindow(DeviceIntPtr pDev) WindowPtr InputDevCurrentRootWindow(DeviceIntPtr pDev)
_X_ATTRIBUTE_NONNULL_ARG(1); _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 */ #endif /* _XSERVER_INPUT_PRIV_H */

2
hw/xquartz/xpr/xprCursor.c
View File

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

3
include/dix.h
View File

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