diff options
| author | Jamey Sharp <jamey@minilop.net> | 2016-07-03 22:52:13 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-05 08:38:36 +0200 |
| commit | cb0089bad114e79d5c6e4577da59fa8911d0ee8d (patch) | |
| tree | 31d29fe44149a431af70d22afb8e3b73db31d8a0 /nx-X11/programs/Xserver/randr | |
| parent | 9ea88717db376b54b2c821ab67e846918acc616a (diff) | |
| download | nx-libs-cb0089bad114e79d5c6e4577da59fa8911d0ee8d.tar.gz nx-libs-cb0089bad114e79d5c6e4577da59fa8911d0ee8d.tar.bz2 nx-libs-cb0089bad114e79d5c6e4577da59fa8911d0ee8d.zip | |
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>
Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/randr')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrcrtc.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rroutput.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrproperty.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrscreen.c | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index 072046e14..f1cc8c5e9 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -274,9 +274,6 @@ RRDeliverCrtcEvent(ClientPtr client, WindowPtr pWin, RRCrtcPtr crtc) xRRCrtcChangeNotifyEvent ce = { .type = RRNotify + RREventBase, .subCode = RRNotify_CrtcChange, -#ifdef NXAGENT_SERVER - .sequenceNumber = client->sequence, -#endif .timestamp = pScrPriv->lastSetTime.milliseconds, .window = pWin->drawable.id, .crtc = crtc->id, diff --git a/nx-X11/programs/Xserver/randr/rroutput.c b/nx-X11/programs/Xserver/randr/rroutput.c index c245de874..3a276e34a 100644 --- a/nx-X11/programs/Xserver/randr/rroutput.c +++ b/nx-X11/programs/Xserver/randr/rroutput.c @@ -351,9 +351,6 @@ RRDeliverOutputEvent(ClientPtr client, WindowPtr pWin, RROutputPtr output) xRROutputChangeNotifyEvent oe = { .type = RRNotify + RREventBase, .subCode = RRNotify_OutputChange, -#ifdef NXAGENT_SERVER - .sequenceNumber = client->sequence, -#endif .timestamp = pScrPriv->lastSetTime.milliseconds, .configTimestamp = pScrPriv->lastConfigTime.milliseconds, .window = pWin->drawable.id, diff --git a/nx-X11/programs/Xserver/randr/rrproperty.c b/nx-X11/programs/Xserver/randr/rrproperty.c index 334fd4720..b97f85b38 100644 --- a/nx-X11/programs/Xserver/randr/rrproperty.c +++ b/nx-X11/programs/Xserver/randr/rrproperty.c @@ -43,9 +43,6 @@ DeliverPropertyEvent(WindowPtr pWin, void *value) if (!(pRREvent->mask & RROutputPropertyNotifyMask)) continue; -#ifdef NXAGENT_SERVER - event->sequenceNumber = pRREvent->client->sequence; -#endif event->window = pRREvent->window->drawable.id; WriteEventsToClient(pRREvent->client, 1, (xEvent *) event); } diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index 81ae5b741..9a6af7f39 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -111,9 +111,6 @@ RRDeliverScreenEvent(ClientPtr client, WindowPtr pWin, ScreenPtr pScreen) xRRScreenChangeNotifyEvent se = { .type = RRScreenChangeNotify + RREventBase, -#ifdef NXAGENT_SERVER - .sequenceNumber = client->sequence, -#endif .rotation = (CARD8) (crtc ? crtc->rotation : RR_Rotate_0), .timestamp = pScrPriv->lastSetTime.milliseconds, .configTimestamp = pScrPriv->lastConfigTime.milliseconds, |