diff options
-rw-r--r-- | dix/window.c | 4 | ||||
-rw-r--r-- | include/dixstruct.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dix/window.c b/dix/window.c index 32eb801ab..8f6384bb7 100644 --- a/dix/window.c +++ b/dix/window.c @@ -3028,7 +3028,7 @@ HandleSaveSet(ClientPtr client) { #ifdef XFIXES /* unmap first so that ReparentWindow doesn't remap */ - if (!SaveSetMap (client->saveSet[j])) + if (!SaveSetShouldMap (client->saveSet[j])) UnmapWindow(pWin, FALSE); #endif ReparentWindow(pWin, pParent, @@ -3039,7 +3039,7 @@ HandleSaveSet(ClientPtr client) pWin->mapped = FALSE; } #ifdef XFIXES - if (SaveSetMap (client->saveSet[j])) + if (SaveSetShouldMap (client->saveSet[j])) #endif MapWindow(pWin, client); } diff --git a/include/dixstruct.h b/include/dixstruct.h index 4877cb017..4bfe3713c 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -75,7 +75,7 @@ typedef struct _saveSet { } SaveSetElt; #define SaveSetWindow(ss) ((ss).windowPtr) #define SaveSetToRoot(ss) ((ss).toRoot) -#define SaveSetMap(ss) ((ss).map) +#define SaveSetShouldMap(ss) ((ss).map) #define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w)) #define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr)) #define SaveSetAssignMap(ss,m) ((ss).map = (m)) @@ -83,7 +83,7 @@ typedef struct _saveSet { typedef struct _Window *SaveSetElt; #define SaveSetWindow(ss) (ss) #define SaveSetToRoot(ss) FALSE -#define SaveSetMap(ss) TRUE +#define SaveSetShouldMap(ss) TRUE #define SaveSetAssignWindow(ss,w) ((ss) = (w)) #define SaveSetAssignToRoot(ss,tr) #define SaveSetAssignMap(ss,m) |