diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 09:10:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 09:10:28 +0200 |
| commit | bf08b99603f1c6b5cf9c0f005e4a7c4b02b66ca4 (patch) | |
| tree | 31d29fe44149a431af70d22afb8e3b73db31d8a0 /nx-X11/programs/Xserver/Xext/shape.c | |
| parent | 320a8cc0c7fa472970bc3698c7e77b6406ca343b (diff) | |
| parent | cb0089bad114e79d5c6e4577da59fa8911d0ee8d (diff) | |
| download | nx-libs-bf08b99603f1c6b5cf9c0f005e4a7c4b02b66ca4.tar.gz nx-libs-bf08b99603f1c6b5cf9c0f005e4a7c4b02b66ca4.tar.bz2 nx-libs-bf08b99603f1c6b5cf9c0f005e4a7c4b02b66ca4.zip | |
Merge branch 'sunweaver-pr/writeeventstoclients-no-sequencenumber' into 3.6.x
Attributes GH PR #177: https://github.com/ArcticaProject/nx-libs/pull/177
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Tue, 05 Jul 2016 00:02:17 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/shape.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shape.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 76d1fdd77..a4aa5bece 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -915,7 +915,6 @@ SendShapeNotify (pWin, which) int which; { ShapeEventPtr *pHead, pShapeEvent; - ClientPtr client; xShapeNotifyEvent se; BoxRec extents; RegionPtr region; @@ -968,20 +967,16 @@ SendShapeNotify (pWin, which) return; } for (pShapeEvent = *pHead; pShapeEvent; pShapeEvent = pShapeEvent->next) { - client = pShapeEvent->client; - if (client == serverClient || client->clientGone) - continue; se.type = ShapeNotify + ShapeEventBase; se.kind = which; se.window = pWin->drawable.id; - se.sequenceNumber = client->sequence; se.x = extents.x1; se.y = extents.y1; se.width = extents.x2 - extents.x1; se.height = extents.y2 - extents.y1; se.time = currentTime.milliseconds; se.shaped = shaped; - WriteEventsToClient (client, 1, (xEvent *) &se); + WriteEventsToClient (pShapeEvent->client, 1, (xEvent *) &se); } } |