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

Change 'remap' to 'map' in saveset functions/macros

Browse Source 
Now that the code has been fixed so that Unmap means unmap and not "don't
remap", 'remap' was confusing to have in the function names/parameters, so
change it to simple 'map'.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Owen Taylor 2008-09-22 12:42:41 -07:00 committed by Keith Packard
parent ad14239a35
commit ca9fae0079
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/dixutils.c
View File

@ -278,7 +278,7 @@ bad:
int
AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
Bool toRoot, Bool remap)
Bool toRoot, Bool map)
{
int numnow;
SaveSetElt *pTmp = NULL;
@ -304,7 +304,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
client->numSaved = numnow;
SaveSetAssignWindow(client->saveSet[numnow - 1], pWin);
SaveSetAssignToRoot(client->saveSet[numnow - 1], toRoot);
SaveSetAssignRemap(client->saveSet[numnow - 1], remap);
SaveSetAssignMap(client->saveSet[numnow - 1], map);
return(Success);
}
else if ((mode == SetModeDelete) && (j < numnow))

4
dix/window.c
View File

@ -3028,7 +3028,7 @@ HandleSaveSet(ClientPtr client)
{
#ifdef XFIXES
/* unmap first so that ReparentWindow doesn't remap */
if (!SaveSetRemap (client->saveSet[j]))
if (!SaveSetMap (client->saveSet[j]))
UnmapWindow(pWin, FALSE);
#endif
ReparentWindow(pWin, pParent,
@ -3039,7 +3039,7 @@ HandleSaveSet(ClientPtr client)
pWin->mapped = FALSE;
}
#ifdef XFIXES
if (SaveSetRemap (client->saveSet[j]))
if (SaveSetMap (client->saveSet[j]))
#endif
MapWindow(pWin, client);
}

2
include/dix.h
View File

@ -218,7 +218,7 @@ extern int AlterSaveSetForClient(
WindowPtr /*pWin*/,
unsigned /*mode*/,
Bool /*toRoot*/,
Bool /*remap*/);
Bool /*map*/);
extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/);

10
include/dixstruct.h
View File

@ -71,22 +71,22 @@ typedef enum {ClientStateInitial,
typedef struct _saveSet {
struct _Window *windowPtr;
Bool toRoot;
Bool remap;
Bool map;
} SaveSetElt;
#define SaveSetWindow(ss) ((ss).windowPtr)
#define SaveSetToRoot(ss) ((ss).toRoot)
#define SaveSetRemap(ss) ((ss).remap)
#define SaveSetMap(ss) ((ss).map)
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
#define SaveSetAssignRemap(ss,rm) ((ss).remap = (rm))
#define SaveSetAssignMap(ss,m) ((ss).map = (m))
#else
typedef struct _Window *SaveSetElt;
#define SaveSetWindow(ss) (ss)
#define SaveSetToRoot(ss) FALSE
#define SaveSetRemap(ss) TRUE
#define SaveSetMap(ss) TRUE
#define SaveSetAssignWindow(ss,w) ((ss) = (w))
#define SaveSetAssignToRoot(ss,tr)
#define SaveSetAssignRemap(ss,rm)
#define SaveSetAssignMap(ss,m)
#endif
typedef struct _Client {

6
xfixes/saveset.c
View File

@ -29,7 +29,7 @@
int
ProcXFixesChangeSaveSet(ClientPtr client)
{
Bool toRoot, remap;
Bool toRoot, map;
int result;
WindowPtr pWin;
REQUEST(xXFixesChangeSaveSetReq);
@ -56,8 +56,8 @@ ProcXFixesChangeSaveSet(ClientPtr client)
return( BadValue );
}
toRoot = (stuff->target == SaveSetRoot);
remap = (stuff->map == SaveSetMap);
result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, remap);
map = (stuff->map == SaveSetMap);
result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map);
if (client->noClientException != Success)
return(client->noClientException);
else