summaryrefslogtreecommitdiff
path: root/Xext/shape.c
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-15 13:12:44 -0700
committerJamey Sharp <jamey@minilop.net>2010-05-19 12:32:34 -0700
commit8033fb6c9792820a82fbdff6a14ff8a7a141ba74 (patch)
tree8e9d073e08028f46e5b8c725a029bc8f41c216fc /Xext/shape.c
parent4b9600a4167427a8fe88bca9b738c9a99cac9469 (diff)
Set event sequence number in WriteEventsToClient instead of at callers.
TryClientEvents already did this; this commit just moves the assignment one level down so that no event source has to worry about sequence numbers. ...No event source, that is, except XKB, which inexplicably calls WriteToClient directly for several events. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'Xext/shape.c')
-rw-r--r--Xext/shape.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/Xext/shape.c b/Xext/shape.c
index 10437f496..10ac2839c 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -885,7 +885,6 @@ void
SendShapeNotify (WindowPtr pWin, int which)
{
ShapeEventPtr *pHead, pShapeEvent;
- ClientPtr client;
xShapeNotifyEvent se;
BoxRec extents;
RegionPtr region;
@@ -940,18 +939,16 @@ SendShapeNotify (WindowPtr pWin, int which)
return;
}
for (pShapeEvent = *pHead; pShapeEvent; pShapeEvent = pShapeEvent->next) {
- client = pShapeEvent->client;
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);
}
}