diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-07 14:34:01 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-07 14:34:01 +0000 |
| commit | 9941d1bb9c10232b83e86c4c5df5092e81a12c1b (patch) | |
| tree | e8ce3d9af12c74753a8d03707bde27ae16a1e5da /xorg-server | |
| parent | c002a3759f837a569c1c47241923fd03087f0ce7 (diff) | |
| parent | 4e3f3e7b8cc2c617187bdf23a9948bfd5121074e (diff) | |
| download | vcxsrv-9941d1bb9c10232b83e86c4c5df5092e81a12c1b.tar.gz vcxsrv-9941d1bb9c10232b83e86c4c5df5092e81a12c1b.tar.bz2 vcxsrv-9941d1bb9c10232b83e86c4c5df5092e81a12c1b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/damageext/damageext.c | 1 | ||||
| -rw-r--r-- | xorg-server/os/connection.c | 3 | ||||
| -rw-r--r-- | xorg-server/os/io.c | 4 |
3 files changed, 8 insertions, 0 deletions
diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c index fb60e7f72..d4301f10b 100644 --- a/xorg-server/damageext/damageext.c +++ b/xorg-server/damageext/damageext.c @@ -217,6 +217,7 @@ ProcDamageCreate (ClientPtr client) if (!AddResource (stuff->damage, DamageExtType, (pointer) pDamageExt))
return BadAlloc;
+ DamageSetReportAfterOp (pDamageExt->pDamage, TRUE);
DamageRegister (pDamageExt->pDrawable, pDamageExt->pDamage);
if (pDrawable->type == DRAWABLE_WINDOW)
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index bec7b1b23..58bc87bf1 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -1057,6 +1057,9 @@ CloseDownConnection(ClientPtr client) {
OsCommPtr oc = (OsCommPtr)client->osPrivate;
+ if (FlushCallback)
+ CallCallbacks(&FlushCallback, NULL);
+
#ifdef DEBUG
ErrorF("CloseDownConnection: client index = %d, socket fd = %d\n",
client->index, oc->fd);
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c index 8cd25398b..c9019357b 100644 --- a/xorg-server/os/io.c +++ b/xorg-server/os/io.c @@ -819,6 +819,10 @@ WriteToClient (ClientPtr who, int count, const void *__buf) CriticalOutputPending = FALSE;
NewOutputPending = FALSE;
}
+
+ if (FlushCallback)
+ CallCallbacks(&FlushCallback, NULL);
+
return FlushClient(who, oc, buf, count);
}
|