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/randr | |
| 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/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, |