From ca9fae00795a114bca4397c32b543d6326a4c547 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 22 Sep 2008 12:42:41 -0700 Subject: 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 --- include/dixstruct.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/dixstruct.h') diff --git a/include/dixstruct.h b/include/dixstruct.h index aae2dbd77..4877cb017 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 { -- cgit v1.2.3