aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix/dispatch.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-24 12:23:51 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-24 12:23:51 +0100
commit31426a3d27ffccacfcd8b0130b65b39a8c9a5522 (patch)
treed24fcf630f3e50c8c12fe3bbfe7b16e4ced02f6e /nx-X11/programs/Xserver/dix/dispatch.c
parent3c322ffbb911b70415c47cb8ba1c3559241819f6 (diff)
parent3d8575c2114ed98e525c422bba88e04f0af7f029 (diff)
downloadnx-libs-31426a3d27ffccacfcd8b0130b65b39a8c9a5522.tar.gz
nx-libs-31426a3d27ffccacfcd8b0130b65b39a8c9a5522.tar.bz2
nx-libs-31426a3d27ffccacfcd8b0130b65b39a8c9a5522.zip
Merge branch 'uli42-fix_#306_#322' into 3.6.x
Attributes GH PR #338: https://github.com/ArcticaProject/nx-libs/pull/338
Diffstat (limited to 'nx-X11/programs/Xserver/dix/dispatch.c')
-rw-r--r--nx-X11/programs/Xserver/dix/dispatch.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 02d5170fb..044ba1c4b 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -216,33 +216,6 @@ InitSelections()
}
#endif /* NXAGENT_SERVER */
-void
-FlushClientCaches(XID id)
-{
- int i;
- register ClientPtr client;
-
- client = clients[CLIENT_ID(id)];
- if (client == NullClient)
- return ;
- for (i=0; i<currentMaxClients; i++)
- {
- client = clients[i];
- if (client != NullClient)
- {
- if (client->lastDrawableID == id)
- {
- client->lastDrawableID = screenInfo.screens[0]->root->drawable.id;
- client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root;
- }
- else if (client->lastGCID == id)
- {
- client->lastGCID = INVALID;
- client->lastGC = (GCPtr)NULL;
- }
- }
- }
-}
#undef SMART_DEBUG
#define SMART_SCHEDULE_DEFAULT_INTERVAL 20 /* ms */
@@ -3629,20 +3602,7 @@ void InitClient(ClientPtr client, int i, void * ospriv)
client->sequence = 0;
client->clientAsMask = ((Mask)i) << CLIENTOFFSET;
client->clientGone = FALSE;
- if (i)
- {
- client->closeDownMode = DestroyAll;
- client->lastDrawable = (DrawablePtr)screenInfo.screens[0]->root;
- client->lastDrawableID = screenInfo.screens[0]->root->drawable.id;
- }
- else
- {
- client->closeDownMode = RetainPermanent;
- client->lastDrawable = (DrawablePtr)NULL;
- client->lastDrawableID = INVALID;
- }
- client->lastGC = (GCPtr) NULL;
- client->lastGCID = INVALID;
+ client->closeDownMode = i ? DestroyAll : RetainPermanent;
client->numSaved = 0;
client->saveSet = (SaveSetElt *)NULL;
client->noClientException = Success;