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 9e3f38285..41dffd631 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -4000,9 +4000,6 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , update_desktop_dimensions(); - dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR, - 0); - return i; } @@ -4050,16 +4047,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,