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

dix: unexport, rename and document GetSpriteCursor() 

* not used by any external drivers, so no need to keep it exported
* choose better fitting name: InputDevGetSpriteCursor()

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-22 13:17:03 +02:00
parent 0f522fa893
commit 3fd183f637
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/xtest.c
View File

@ -132,7 +132,7 @@ ProcXTestCompareCursor(ClientPtr client)
if (stuff->cursor == None) if (stuff->cursor == None)
pCursor = NullCursor; pCursor = NullCursor;
else if (stuff->cursor == XTestCurrentCursor) else if (stuff->cursor == XTestCurrentCursor)
pCursor = GetSpriteCursor(ptr); pCursor = InputDevGetSpriteCursor(ptr);
else { else {
rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor, rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
X11_RESTYPE_CURSOR, client, DixReadAccess); X11_RESTYPE_CURSOR, client, DixReadAccess);

2
dix/events.c
View File

@ -1039,7 +1039,7 @@ GetSpriteWindow(DeviceIntPtr pDev)
* @return current sprite cursor. * @return current sprite cursor.
*/ */
CursorPtr CursorPtr
GetSpriteCursor(DeviceIntPtr pDev) InputDevGetSpriteCursor(DeviceIntPtr pDev)
{ {
return pDev->spriteInfo->sprite->current; return pDev->spriteInfo->sprite->current;
} }

12
dix/input_priv.h
View File

@ -51,7 +51,8 @@ SOFTWARE.
#ifndef _XSERVER_INPUT_PRIV_H #ifndef _XSERVER_INPUT_PRIV_H
#define _XSERVER_INPUT_PRIV_H #define _XSERVER_INPUT_PRIV_H
#include "input.h" #include "include/cursor.h"
#include "include/input.h"
void InitCoreDevices(void); void InitCoreDevices(void);
void InitXTestDevices(void); void InitXTestDevices(void);
@ -361,4 +362,13 @@ int InputThreadRegisterDev(int fd,
int InputThreadUnregisterDev(int fd); int InputThreadUnregisterDev(int fd);
/*
* @brief get current sprite cursor for input device
*
* @param pDev pointer to device structure
* @return pointer to device cursor
*/
CursorPtr InputDevGetSpriteCursor(DeviceIntPtr pDev)
_X_ATTRIBUTE_NONNULL_ARG(1);
#endif /* _XSERVER_INPUT_PRIV_H */ #endif /* _XSERVER_INPUT_PRIV_H */

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

@ -38,6 +38,7 @@
#include "darwinEvents.h" #include "darwinEvents.h"
#include <Xplugin.h> #include <Xplugin.h>
#include "dix/input_priv.h"
#include "mi/mipointer_priv.h" #include "mi/mipointer_priv.h"
#include "mi.h" #include "mi.h"
@ -400,7 +401,7 @@ QuartzResumeXCursor(ScreenPtr pScreen)
if (pWin->drawable.pScreen != pScreen) if (pWin->drawable.pScreen != pScreen)
return; return;
pCursor = GetSpriteCursor(darwinPointer); pCursor = InputDevGetSpriteCursor(darwinPointer);
if (pCursor == NULL) if (pCursor == NULL)
return; return;

2
include/dixevents.h
View File

@ -26,8 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DIXEVENTS_H #ifndef DIXEVENTS_H
#define DIXEVENTS_H #define DIXEVENTS_H
extern _X_EXPORT CursorPtr GetSpriteCursor(DeviceIntPtr /*pDev */ );
extern _X_EXPORT int MaybeDeliverEventsToClient(WindowPtr /* pWin */ , extern _X_EXPORT int MaybeDeliverEventsToClient(WindowPtr /* pWin */ ,
xEvent * /* pEvents */ , xEvent * /* pEvents */ ,
int /* count */ , int /* count */ ,