From ad8439e401adf4bec5b7b60d2702cfb7e5d2c5c7 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 28 Feb 2024 16:20:54 +0100 Subject: [PATCH] dix: drop now obsolete cursorScreenDevPriv Since the two DDX'es which had used this key (xnest and xfree86) now using their own ones, this global key is obsolete and can be removed. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: (cherry picked from commit d84fd3bf19a7a0666190250eba9f1abd1f4492a1) --- dix/cursor.c | 2 -- dix/dispatch.c | 13 ------------- include/cursor.h | 4 ---- 3 files changed, 19 deletions(-) diff --git a/dix/cursor.c b/dix/cursor.c index a9ad34467..0d252b0f0 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -69,8 +69,6 @@ typedef struct _GlyphShare { static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL; -DevScreenPrivateKeyRec cursorScreenDevPriv; - static CARD32 cursorSerial; static void diff --git a/dix/dispatch.c b/dix/dispatch.c index eaac39b7c..81a160e11 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -3996,9 +3996,6 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , update_desktop_dimensions(); - dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR, - 0); - return i; } @@ -4046,16 +4043,6 @@ AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , update_desktop_dimensions(); - /* - * We cannot register the Screen PRIVATE_CURSOR key if cursors are already - * created, because dix/privates.c does not have relocation code for - * PRIVATE_CURSOR. Once this is fixed the if() can be removed and we can - * register the Screen PRIVATE_CURSOR key unconditionally. - */ - if (!dixPrivatesCreated(PRIVATE_CURSOR)) - dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, - PRIVATE_CURSOR, 0); - return i; } diff --git a/include/cursor.h b/include/cursor.h index 281d88ba0..d198f711d 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -62,10 +62,6 @@ struct _DeviceIntRec; typedef struct _Cursor *CursorPtr; typedef struct _CursorMetric *CursorMetricPtr; -extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv; - -#define CursorScreenKey (&cursorScreenDevPriv) - extern _X_EXPORT CursorPtr rootCursor; extern _X_EXPORT int FreeCursor(void *pCurs,