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

Rename SaveSetMap() to SaveSetShouldMap().

Browse Source 
Avoids preprocessor collision with xfixeswire.h
This commit is contained in:
Adam Jackson 2008-09-23 10:22:22 -04:00
parent ca9fae0079
commit 991ed2949b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/window.c
View File

@ -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);
}

4
include/dixstruct.h
View File

@ -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)