From 0b3fb187543839095835d4d7323278522e7c965b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 26 Sep 2025 15:42:08 +0200 Subject: [PATCH] xfree86: drop xf86CursorScreenKey macro Use the actual field directly. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/modes/xf86Cursors.c | 2 +- hw/xfree86/ramdac/xf86CursorPriv.h | 2 -- hw/xfree86/ramdac/xf86CursorRD.c | 36 +++++++++++++++--------------- hw/xfree86/ramdac/xf86HWCurs.c | 14 ++++++------ 4 files changed, 26 insertions(+), 28 deletions(-) diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 8202ad5f73..d02eedccc3 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -379,7 +379,7 @@ xf86_crtc_transform_cursor_position(xf86CrtcPtr crtc, int *x, int *y) xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&screen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); int dx, dy, t; Bool swap_reflection = FALSE; diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 268ccc5a90..12978871e5 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -45,8 +45,6 @@ Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr); Bool xf86CheckHWCursor(ScreenPtr pScreen, CursorPtr cursor, xf86CursorInfoPtr infoPtr); extern _X_EXPORT DevPrivateKeyRec xf86CursorScreenKeyRec; -#define xf86CursorScreenKey (&xf86CursorScreenKeyRec) - extern DevScreenPrivateKeyRec xf86ScreenCursorBitsKeyRec; #endif /* _XF86CURSORPRIV_H */ diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c index ae880cfca1..df9d0a1809 100644 --- a/hw/xfree86/ramdac/xf86CursorRD.c +++ b/hw/xfree86/ramdac/xf86CursorRD.c @@ -77,7 +77,7 @@ xf86InitCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr) PRIVATE_CURSOR, 0)) return FALSE; - dixSetPrivate(&pScreen->devPrivates, xf86CursorScreenKey, ScreenPriv); + dixSetPrivate(&pScreen->devPrivates, &xf86CursorScreenKeyRec, ScreenPriv); ScreenPriv->SWCursor = TRUE; ScreenPriv->isUp = FALSE; @@ -138,7 +138,7 @@ static void xf86CursorCloseScreen(CallbackListPtr *pcbl, miPointerScreenKey); xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (ScreenPriv->isUp && pScrn->vtSema) xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y); @@ -159,7 +159,7 @@ static void xf86CursorCloseScreen(CallbackListPtr *pcbl, free(ScreenPriv->transparentData); free(ScreenPriv); - dixSetPrivate(&pScreen->devPrivates, xf86CursorScreenKey, NULL); + dixSetPrivate(&pScreen->devPrivates, &xf86CursorScreenKeyRec, NULL); } static void @@ -169,7 +169,7 @@ xf86CursorQueryBestSize(int class, { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (class == CursorShape) { if (*width > ScreenPriv->CursorInfoPtr->MaxWidth) @@ -186,7 +186,7 @@ xf86CursorInstallColormap(ColormapPtr pMap) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pMap->pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); ScreenPriv->pInstalledMap = pMap; @@ -199,7 +199,7 @@ xf86CursorRecolorCursor(DeviceIntPtr pDev, { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (!displayed) return; @@ -220,7 +220,7 @@ xf86CursorEnableDisableFBAccess(ScrnInfoPtr pScrn, Bool enable) ScreenPtr pScreen = xf86ScrnToScreen(pScrn); xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (!enable && ScreenPriv->CurrentCursor != NullCursor) { CursorPtr currentCursor = RefCursor(ScreenPriv->CurrentCursor); @@ -254,7 +254,7 @@ xf86CursorSwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode) ScreenPtr pScreen = xf86ScrnToScreen(pScrn); xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (ScreenPriv->isUp) { xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y); @@ -281,7 +281,7 @@ xf86CursorRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (CursorRefCount(pCurs) <= 1) dixSetScreenPrivate(&pCurs->devPrivates, &xf86ScreenCursorBitsKeyRec, @@ -295,7 +295,7 @@ xf86CursorUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (CursorRefCount(pCurs) <= 1) { free(dixLookupScreenPrivate @@ -313,7 +313,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr; if (pCurs == NullCursor) { /* means we're supposed to remove the cursor */ @@ -405,11 +405,11 @@ xf86CursorResetCursor(ScreenPtr pScreen) if (!inputInfo.pointer) return; - if (!dixPrivateKeyRegistered(xf86CursorScreenKey)) + if (!dixPrivateKeyRegistered(&xf86CursorScreenKeyRec)) return; ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (!ScreenPriv) return; @@ -422,7 +422,7 @@ xf86CursorMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); /* only update coordinate state for first sprite, otherwise we get jumps when removing a sprite. The second sprite is never HW rendered anyway */ @@ -448,7 +448,7 @@ xf86ForceHWCursor(ScreenPtr pScreen, Bool on) DeviceIntPtr pDev = inputInfo.pointer; xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); if (on) { if (ScreenPriv->ForceHWCursorCount++ == 0) { @@ -478,7 +478,7 @@ xf86CurrentCursor(ScreenPtr pScreen) if (pScreen->is_output_secondary) pScreen = pScreen->current_primary; - ScreenPriv = dixLookupPrivate(&pScreen->devPrivates, xf86CursorScreenKey); + ScreenPriv = dixLookupPrivate(&pScreen->devPrivates, &xf86CursorScreenKeyRec); return ScreenPriv->CurrentCursor; } @@ -503,7 +503,7 @@ xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) int ret; xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); /* Init SW cursor */ ret = (*ScreenPriv->spriteFuncs->DeviceCursorInitialize) (pDev, pScreen); @@ -519,7 +519,7 @@ xf86DeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); /* Clean up SW cursor */ (*ScreenPriv->spriteFuncs->DeviceCursorCleanup) (pDev, pScreen); diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 7ee4887f17..4b58e02ed1 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -156,7 +156,7 @@ xf86CheckHWCursor(ScreenPtr pScreen, CursorPtr cursor, xf86CursorInfoPtr infoPtr if (!RRHasScanoutPixmap(pSlave)) continue; - sPriv = dixLookupPrivate(&pSlave->devPrivates, xf86CursorScreenKey); + sPriv = dixLookupPrivate(&pSlave->devPrivates, &xf86CursorScreenKeyRec); if (!sPriv) { /* NULL if Option "SWCursor", possibly other conditions */ use_hw_cursor = FALSE; break; @@ -180,7 +180,7 @@ xf86ScreenSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); xf86CursorInfoPtr infoPtr; unsigned char *bits; @@ -240,7 +240,7 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); ScreenPtr pSlave; Bool ret = FALSE; @@ -278,7 +278,7 @@ xf86SetTransparentCursor(ScreenPtr pScreen) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr; input_lock(); @@ -304,7 +304,7 @@ xf86ScreenMoveCursor(ScreenPtr pScreen, int x, int y) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr; x -= infoPtr->pScrn->frameX0; @@ -318,7 +318,7 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); ScreenPtr pSlave; input_lock(); @@ -386,7 +386,7 @@ xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed) { xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr) dixLookupPrivate(&pScreen->devPrivates, - xf86CursorScreenKey); + &xf86CursorScreenKeyRec); input_lock(); xf86RecolorCursor_locked (ScreenPriv, pCurs);