diff options
| author | Owen Taylor <otaylor@redhat.com> | 2008-09-22 12:42:41 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-09-22 12:43:30 -0700 |
| commit | ca9fae00795a114bca4397c32b543d6326a4c547 (patch) | |
| tree | 5467c53cb04fb3e574d188171553ca7be700b526 /dix | |
| parent | ad14239a358cf65e5702ec7d054aa1db4f1cdd68 (diff) | |
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@keithp.com>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dixutils.c | 4 | ||||
| -rw-r--r-- | dix/window.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index 22935cead..340564ecd 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 116c1e554..32eb801ab 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); } |