hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-31 02:50:00 +00:00
Code Issues Projects Releases Wiki Activity

xfixes: move cursor count priv data into ScreenRec

Browse source 
First step of untwisting xfixes: move the small private data structure
directly into ScreenRec - this is just the head pointer for the (per
client) cursor hide counters and the wrapped DisplayCursor() vector.

This functionality is planned to be moved into DIX later.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-05-08 13:25:55 +02:00 • committed by Enrico Weigelt
commit d3969dc792
2 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Xext/xfixes/cursor.c
View file

@ -67,10 +67,6 @@ static RESTYPE CursorClientType;
static RESTYPE CursorHideCountType;
static RESTYPE CursorWindowType;
static DevPrivateKeyRec CursorScreenPrivateKeyRec;
#define CursorScreenPrivateKey (&CursorScreenPrivateKeyRec)
static void deleteCursorHideCountsForScreen(ScreenPtr pScreen);
#define VERIFY_CURSOR(pCursor, cursor, client, access) \
@ -120,12 +116,6 @@ typedef struct _CursorHideCountRec {
* Wrap DisplayCursor to catch cursor change events
*/
typedef struct _CursorScreen {
DisplayCursorProcPtr DisplayCursor;
CursorHideCountPtr pCursorHideCounts;
} CursorScreenRec, *CursorScreenPtr;
#define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey))
#define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
#define Unwrap(as,s,elt,backup) (((backup) = (s)->elt), (s)->elt = (as)->elt)
@ -154,16 +144,15 @@ CursorForClient(ClientPtr client)
static Bool
CursorDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
CursorPtr pOldCursor = CursorForDevice(pDev);
Bool ret;
DisplayCursorProcPtr backupProc;
Unwrap(cs, pScreen, DisplayCursor, backupProc);
Unwrap(&(pScreen->xfixes), pScreen, DisplayCursor, backupProc);
CursorVisible = CursorVisible && EnableCursor;
if (cs->pCursorHideCounts != NULL || !CursorVisible) {
if (pScreen->xfixes.pCursorHideCounts != NULL || !CursorVisible) {
ret = (*pScreen->DisplayCursor) (pDev, pScreen, NullCursor);
}
else {
@ -188,19 +177,17 @@ CursorDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
}
}
}
Wrap(cs, pScreen, DisplayCursor, backupProc);
Wrap(&(pScreen->xfixes), pScreen, DisplayCursor, backupProc);
return ret;
}
static void CursorScreenClose(CallbackListPtr *pcbl, ScreenPtr pScreen, void *unused)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
_X_UNUSED DisplayCursorProcPtr display_proc;
dixScreenUnhookClose(pScreen, CursorScreenClose);
Unwrap(cs, pScreen, DisplayCursor, display_proc);
Unwrap(&(pScreen->xfixes), pScreen, DisplayCursor, display_proc);
deleteCursorHideCountsForScreen(pScreen);
}
@ -655,10 +642,9 @@ ProcXFixesChangeCursorByName(ClientPtr client)
static CursorHideCountPtr
findCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
CursorHideCountPtr pChc;
for (pChc = cs->pCursorHideCounts; pChc != NULL; pChc = pChc->pNext) {
for (pChc = pScreen->xfixes.pCursorHideCounts; pChc != NULL; pChc = pChc->pNext) {
if (pChc->pClient == pClient) {
return pChc;
}
@ -670,7 +656,6 @@ findCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
static int
createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
CursorHideCountPtr pChc = calloc(1, sizeof(CursorHideCountRec));
if (pChc == NULL) {
return BadAlloc;
@ -679,8 +664,8 @@ createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
pChc->pScreen = pScreen;
pChc->hideCount = 1;
pChc->resource = FakeClientID(pClient->index);
pChc->pNext = cs->pCursorHideCounts;
cs->pCursorHideCounts = pChc;
pChc->pNext = pScreen->xfixes.pCursorHideCounts;
pScreen->xfixes.pCursorHideCounts = pChc;
/*
* Create a resource for this element so it can be deleted
@ -698,17 +683,16 @@ createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
static void
deleteCursorHideCount(CursorHideCountPtr pChcToDel, ScreenPtr pScreen)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
CursorHideCountPtr pChc, pNext;
CursorHideCountPtr pChcLast = NULL;
pChc = cs->pCursorHideCounts;
pChc = pScreen->xfixes.pCursorHideCounts;
while (pChc != NULL) {
pNext = pChc->pNext;
if (pChc == pChcToDel) {
free(pChc);
if (pChcLast == NULL) {
cs->pCursorHideCounts = pNext;
pScreen->xfixes.pCursorHideCounts = pNext;
}
else {
pChcLast->pNext = pNext;
@ -726,16 +710,15 @@ deleteCursorHideCount(CursorHideCountPtr pChcToDel, ScreenPtr pScreen)
static void
deleteCursorHideCountsForScreen(ScreenPtr pScreen)
{
CursorScreenPtr cs = GetCursorScreen(pScreen);
CursorHideCountPtr pChc, pTmp;
pChc = cs->pCursorHideCounts;
pChc = pScreen->xfixes.pCursorHideCounts;
while (pChc != NULL) {
pTmp = pChc->pNext;
FreeResource(pChc->resource, 0);
pChc = pTmp;
}
cs->pCursorHideCounts = NULL;
pScreen->xfixes.pCursorHideCounts = NULL;
}
int
@ -910,14 +893,10 @@ XFixesCursorInit(void)
else
CursorVisible = FALSE;
if (!dixRegisterPrivateKey(&CursorScreenPrivateKeyRec, PRIVATE_SCREEN, sizeof(CursorScreenRec)))
return FALSE;
DIX_FOR_EACH_SCREEN({
CursorScreenPtr cs = GetCursorScreen(walkScreen);
dixScreenHookClose(walkScreen, CursorScreenClose);
Wrap(cs, walkScreen, DisplayCursor, CursorDisplayCursor);
cs->pCursorHideCounts = NULL;
Wrap(&(walkScreen->xfixes), walkScreen, DisplayCursor, CursorDisplayCursor);
walkScreen->xfixes.pCursorHideCounts = NULL;
});
CursorClientType = CreateNewResourceType(CursorFreeClient,

6
include/scrnintstr.h
View file

@ -708,6 +708,12 @@ typedef struct _Screen {
/* additional screen post-close notify hooks (replaces wrapping CloseScreen)
should NOT be touched outside of DIX core */
CallbackListPtr hookPostClose;
/* xfixes cursor hiding -- this might deserve further optimization */
struct {
DisplayCursorProcPtr DisplayCursor; /* original proc (for wrapping) */
struct _CursorHideCountRec *pCursorHideCounts;
} xfixes;
} ScreenRec;
static inline RegionPtr