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

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 <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 16:20:54 +01:00 committed by Marge Bot
parent 6557286084
commit d84fd3bf19
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/cursor.c
View File

@ -69,8 +69,6 @@ typedef struct _GlyphShare {
static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL; static GlyphSharePtr sharedGlyphs = (GlyphSharePtr) NULL;
DevScreenPrivateKeyRec cursorScreenDevPriv;
static CARD32 cursorSerial; static CARD32 cursorSerial;
static void static void

13
dix/dispatch.c
View File

@ -4000,9 +4000,6 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
update_desktop_dimensions(); update_desktop_dimensions();
dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR,
0);
return i; return i;
} }
@ -4050,16 +4047,6 @@ AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
update_desktop_dimensions(); 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; return i;
} }

4
include/cursor.h
View File

@ -62,10 +62,6 @@ struct _DeviceIntRec;
typedef struct _Cursor *CursorPtr; typedef struct _Cursor *CursorPtr;
typedef struct _CursorMetric *CursorMetricPtr; typedef struct _CursorMetric *CursorMetricPtr;
extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
#define CursorScreenKey (&cursorScreenDevPriv)
extern _X_EXPORT CursorPtr rootCursor; extern _X_EXPORT CursorPtr rootCursor;
extern _X_EXPORT int FreeCursor(void *pCurs, extern _X_EXPORT int FreeCursor(void *pCurs,