andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: Lower backStorage to a bit instead of a pointer 

Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-09-15 12:10:55 -04:00
parent 322ba42c23
commit 81d76a835b
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composite/compinit.c
View File

@ -119,12 +119,12 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
pScreen->backingStoreSupport != NotUseful) { pScreen->backingStoreSupport != NotUseful) {
if (pWin->backingStore != NotUseful && !pWin->backStorage) { if (pWin->backingStore != NotUseful && !pWin->backStorage) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic); compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
pWin->backStorage = (void *) (intptr_t) 1; pWin->backStorage = TRUE;
} }
else if (pWin->backingStore == NotUseful && pWin->backStorage) { else if (pWin->backingStore == NotUseful && pWin->backStorage) {
compUnredirectWindow(serverClient, pWin, compUnredirectWindow(serverClient, pWin,
CompositeRedirectAutomatic); CompositeRedirectAutomatic);
pWin->backStorage = NULL; pWin->backStorage = FALSE;
} }
} }

2
dix/window.c
View File

@ -362,7 +362,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->cursorIsNone = TRUE; pWin->cursorIsNone = TRUE;
pWin->backingStore = NotUseful; pWin->backingStore = NotUseful;
pWin->backStorage = (void *) NULL; pWin->backStorage = 0;
pWin->mapped = FALSE; /* off */ pWin->mapped = FALSE; /* off */
pWin->realized = FALSE; /* off */ pWin->realized = FALSE; /* off */

2
include/windowstr.h
View File

@ -144,12 +144,12 @@ typedef struct _Window {
Mask eventMask; /* mask from the creating client */ Mask eventMask; /* mask from the creating client */
PixUnion background; PixUnion background;
PixUnion border; PixUnion border;
void *backStorage; /* null when BS disabled */
WindowOptPtr optional; WindowOptPtr optional;
unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */ unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */
unsigned borderIsPixel:1; unsigned borderIsPixel:1;
unsigned cursorIsNone:1; /* else real cursor (might inherit) */ unsigned cursorIsNone:1; /* else real cursor (might inherit) */
unsigned backingStore:2; unsigned backingStore:2;
unsigned backStorage:1; /* if bs is allocated */
unsigned saveUnder:1; unsigned saveUnder:1;
unsigned bitGravity:4; unsigned bitGravity:4;
unsigned winGravity:4; unsigned winGravity:4;

2
mi/miexpose.c
View File

@ -143,7 +143,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,
if (!pGC->graphicsExposures && if (!pGC->graphicsExposures &&
(pDstDrawable->type == DRAWABLE_PIXMAP) && (pDstDrawable->type == DRAWABLE_PIXMAP) &&
((pSrcDrawable->type == DRAWABLE_PIXMAP) || ((pSrcDrawable->type == DRAWABLE_PIXMAP) ||
(((WindowPtr) pSrcDrawable)->backStorage == NULL))) (((WindowPtr) pSrcDrawable)->backStorage == 0)))
return NULL; return NULL;
srcBox.x1 = srcx; srcBox.x1 = srcx;