fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-02-15 06:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dix: drop now obsolete cursorScreenDevPriv

Browse source 
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>
(cherry picked from commit d84fd3bf19)
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-28 16:20:54 +01:00 • committed by Alan Coopersmith
parent 4765454bc3
commit ad8439e401
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;
DevScreenPrivateKeyRec cursorScreenDevPriv;
static CARD32 cursorSerial;
static void

13
dix/dispatch.c
View file

@ -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;
}

4
include/cursor.h
View file

@ -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,