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

xnest: drop superfluous xnestCursorScreenKey define 

We can just write &xnestCursorScreenKeyRec instead, which makes the code
a bit more clear.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1342>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-28 13:04:02 +01:00 committed by Marge Bot
parent 7f13fc7d2f
commit 22306f16b6
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xnest/Cursor.c
View File

@ -156,7 +156,7 @@ xnestDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
xnestCursorFuncPtr pScreenPriv; xnestCursorFuncPtr pScreenPriv;
pScreenPriv = (xnestCursorFuncPtr) pScreenPriv = (xnestCursorFuncPtr)
dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey); dixLookupPrivate(&pScreen->devPrivates, &xnestCursorScreenKeyRec);
return pScreenPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen); return pScreenPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
} }
@ -167,7 +167,7 @@ xnestDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
xnestCursorFuncPtr pScreenPriv; xnestCursorFuncPtr pScreenPriv;
pScreenPriv = (xnestCursorFuncPtr) pScreenPriv = (xnestCursorFuncPtr)
dixLookupPrivate(&pScreen->devPrivates, xnestCursorScreenKey); dixLookupPrivate(&pScreen->devPrivates, &xnestCursorScreenKeyRec);
pScreenPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen); pScreenPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);
} }

2
hw/xnest/Screen.c
View File

@ -312,7 +312,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
miDCInitialize(pScreen, &xnestPointerCursorFuncs); /* init SW rendering */ miDCInitialize(pScreen, &xnestPointerCursorFuncs); /* init SW rendering */
PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey); PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
xnestCursorFuncs.spriteFuncs = PointPriv->spriteFuncs; xnestCursorFuncs.spriteFuncs = PointPriv->spriteFuncs;
dixSetPrivate(&pScreen->devPrivates, xnestCursorScreenKey, dixSetPrivate(&pScreen->devPrivates, &xnestCursorScreenKeyRec,
&xnestCursorFuncs); &xnestCursorFuncs);
PointPriv->spriteFuncs = &xnestPointerSpriteFuncs; PointPriv->spriteFuncs = &xnestPointerSpriteFuncs;

2
hw/xnest/XNCursor.h
View File

@ -22,8 +22,6 @@ typedef struct {
} xnestCursorFuncRec, *xnestCursorFuncPtr; } xnestCursorFuncRec, *xnestCursorFuncPtr;
extern DevPrivateKeyRec xnestCursorScreenKeyRec; extern DevPrivateKeyRec xnestCursorScreenKeyRec;
#define xnestCursorScreenKey (&xnestCursorScreenKeyRec)
extern xnestCursorFuncRec xnestCursorFuncs; extern xnestCursorFuncRec xnestCursorFuncs;
typedef struct { typedef struct {