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

mi: simplify miDCDeviceCleanup()

Browse Source 
Return out earlier and scope the index variable.
Also a preparation for upcoming screen walk macros.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-09-03 12:04:13 +02:00
committed by Enrico Weigelt
parent 553f13fdca
commit edc5cfa711
1 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mi/midispcur.c
View File

@@ -484,33 +484,32 @@ failure:
void
miDCDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
int i;
if (!DevHasCursor(pDev))
return;
if (DevHasCursor(pDev)) {
for (i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
miDCBufferPtr pBuffer = miGetDCDevice(pDev, walkScreen);
for (int i = 0; i < screenInfo.numScreens; i++) {
ScreenPtr walkScreen = screenInfo.screens[i];
miDCBufferPtr pBuffer = miGetDCDevice(pDev, walkScreen);
if (pBuffer) {
if (pBuffer->pSourceGC)
FreeGC(pBuffer->pSourceGC, (GContext) 0);
if (pBuffer->pMaskGC)
FreeGC(pBuffer->pMaskGC, (GContext) 0);
if (pBuffer->pSaveGC)
FreeGC(pBuffer->pSaveGC, (GContext) 0);
if (pBuffer->pRestoreGC)
FreeGC(pBuffer->pRestoreGC, (GContext) 0);
if (pBuffer) {
if (pBuffer->pSourceGC)
FreeGC(pBuffer->pSourceGC, (GContext) 0);
if (pBuffer->pMaskGC)
FreeGC(pBuffer->pMaskGC, (GContext) 0);
if (pBuffer->pSaveGC)
FreeGC(pBuffer->pSaveGC, (GContext) 0);
if (pBuffer->pRestoreGC)
FreeGC(pBuffer->pRestoreGC, (GContext) 0);
/* If a pRootPicture was allocated for a root window, it
* is freed when that root window is destroyed, so don't
* free it again here. */
/* If a pRootPicture was allocated for a root window, it
* is freed when that root window is destroyed, so don't
* free it again here. */
dixDestroyPixmap(pBuffer->pSave, 0);
dixDestroyPixmap(pBuffer->pSave, 0);
free(pBuffer);
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, walkScreen,
NULL);
}
free(pBuffer);
dixSetScreenPrivate(&pDev->devPrivates, miDCDeviceKey, walkScreen,
NULL);
}
}
}