XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-23 23:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbe: replace dbeScreenPrivKey and dbeWindowPrivKey macros

Browse Source 
No need for the extra macros, we can just use the corresponding
structs directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-22 15:54:53 +02:00
committed by Enrico Weigelt
parent 16c0f1dfb8
commit 3ddf48f3c6
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbe/dbe.c
View File

@@ -236,7 +236,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
pDbeWindowPriv->IDs[i] = DBE_FREE_ID_ELEMENT;
/* Actually connect the window priv to the window. */
dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, pDbeWindowPriv);
dixSetPrivate(&pWin->devPrivates, &dbeWindowPrivKeyRec, pDbeWindowPriv);
} else {
/* A buffer is already associated with the window.
* Add the new buffer ID to the array, reallocating the array memory
@@ -327,7 +327,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
return status;
out_free:
dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, NULL);
dixSetPrivate(&pWin->devPrivates, &dbeWindowPrivKeyRec, NULL);
free(pDbeWindowPriv);
return status;
@@ -919,7 +919,7 @@ DbeWindowPrivDelete(void *pDbeWinPriv, XID id)
if (pDbeWindowPriv->nBufferIDs == 0) {
/* Reset the DBE window priv pointer. */
dixSetPrivate(&pDbeWindowPriv->pWindow->devPrivates, dbeWindowPrivKey,
dixSetPrivate(&pDbeWindowPriv->pWindow->devPrivates, &dbeWindowPrivKeyRec,
NULL);
/* We are done with the window priv. */
@@ -1039,13 +1039,13 @@ DbeExtensionInit(void)
for (int j = 0; j < walkScreenIdx; j++) {
ScreenPtr pScreen = screenInfo.screens[j];
free(dixLookupPrivate(&pScreen->devPrivates, dbeScreenPrivKey));
dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, NULL);
free(dixLookupPrivate(&pScreen->devPrivates, &dbeScreenPrivKeyRec));
dixSetPrivate(&pScreen->devPrivates, &dbeScreenPrivKeyRec, NULL);
}
return;
}
dixSetPrivate(&walkScreen->devPrivates, dbeScreenPrivKey, pDbeScreenPriv);
dixSetPrivate(&walkScreen->devPrivates, &dbeScreenPrivKeyRec, pDbeScreenPriv);
{
/* We don't have DDX support for DBE anymore */
@@ -1085,8 +1085,8 @@ DbeExtensionInit(void)
for (int i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
free(dixLookupPrivate(&walkScreen->devPrivates, dbeScreenPrivKey));
dixSetPrivate(&walkScreen->devPrivates, dbeScreenPrivKey, NULL);
free(dixLookupPrivate(&walkScreen->devPrivates, &dbeScreenPrivKeyRec));
dixSetPrivate(&walkScreen->devPrivates, &dbeScreenPrivKeyRec, NULL);
}
return;
}

4
dbe/dbestruct.h
View File

@@ -53,7 +53,7 @@ typedef struct {
/* DEFINES */
#define DBE_SCREEN_PRIV(pScreen) ((DbeScreenPrivPtr) \
dixLookupPrivate(&(pScreen)->devPrivates, dbeScreenPrivKey))
dixLookupPrivate(&(pScreen)->devPrivates, &dbeScreenPrivKeyRec))
#define DBE_SCREEN_PRIV_FROM_DRAWABLE(pDrawable) \
DBE_SCREEN_PRIV((pDrawable)->pScreen)
@@ -71,7 +71,7 @@ typedef struct {
DBE_SCREEN_PRIV((pGC)->pScreen)
#define DBE_WINDOW_PRIV(pWin) ((DbeWindowPrivPtr) \
dixLookupPrivate(&(pWin)->devPrivates, dbeWindowPrivKey))
dixLookupPrivate(&(pWin)->devPrivates, &dbeWindowPrivKeyRec))
/* Initial size of the buffer ID array in the window priv. */
#define DBE_INIT_MAX_IDS 2

5
dbe/midbe.h
View File

@@ -39,13 +39,8 @@
extern Bool miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv);
extern DevPrivateKeyRec dbeScreenPrivKeyRec;
#define dbeScreenPrivKey (&dbeScreenPrivKeyRec)
extern DevPrivateKeyRec dbeWindowPrivKeyRec;
#define dbeWindowPrivKey (&dbeWindowPrivKeyRec)
extern RESTYPE dbeDrawableResType;
extern RESTYPE dbeWindowPrivResType;