xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Mon Sep 22 12:43:43 PDT 2008
dix/dixutils.c | 4 ++--
dix/window.c | 4 ++--
include/dix.h | 2 +-
include/dixstruct.h | 10 +++++-----
xfixes/saveset.c | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit ca9fae00795a114bca4397c32b543d6326a4c547
Author: Owen Taylor <otaylor at redhat.com>
Date: Mon Sep 22 12:42:41 2008 -0700
Change 'remap' to 'map' in saveset functions/macros
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 at keithp.com>
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 22935ce..340564e 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -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))
diff --git a/dix/window.c b/dix/window.c
index 116c1e5..32eb801 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 (!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);
}
diff --git a/include/dix.h b/include/dix.h
index 476ec2e..76ddbb5 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -218,7 +218,7 @@ extern int AlterSaveSetForClient(
WindowPtr /*pWin*/,
unsigned /*mode*/,
Bool /*toRoot*/,
- Bool /*remap*/);
+ Bool /*map*/);
extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/);
diff --git a/include/dixstruct.h b/include/dixstruct.h
index aae2dbd..4877cb0 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -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 {
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 31664ab..29de0d8 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -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
More information about the xorg-commit
mailing list