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/Xext/saver.c | |
| 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/Xext/saver.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/saver.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 0c5d28eb2..ab1096351 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -447,7 +447,6 @@ SendScreenSaverNotify (pScreen, state, forced) ScreenSaverEventPtr pEv; unsigned long mask; xScreenSaverNotifyEvent ev; - ClientPtr client; int kind; UpdateCurrentTimeIf (); @@ -466,18 +465,16 @@ SendScreenSaverNotify (pScreen, state, forced) kind = ScreenSaverInternal; for (pEv = pPriv->events; pEv; pEv = pEv->next) { - client = pEv->client; if (!(pEv->mask & mask)) continue; ev.type = ScreenSaverNotify + ScreenSaverEventBase; ev.state = state; - ev.sequenceNumber = client->sequence; ev.timestamp = currentTime.milliseconds; ev.root = pScreen->root->drawable.id; ev.window = savedScreenInfo[pScreen->myNum].wid; ev.kind = kind; ev.forced = forced; - WriteEventsToClient (client, 1, (xEvent *) &ev); + WriteEventsToClient (pEv->client, 1, (xEvent *) &ev); } } |