From 0fa7452220701ee44d8bafc57001e362afcedb0c Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Mon, 1 Dec 2008 21:09:44 +0100 Subject: RRNotify subevents have 'window' at different offsets, the sequel f176b2bda103f6f38aabab8207f47a02cc797659 fixed XRRWireToEvent, but XRREventToWire had the same bug. Signed-off-by: Julien Cristau --- src/Xrandr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Xrandr.c b/src/Xrandr.c index 2de995c..06dbe10 100644 --- a/src/Xrandr.c +++ b/src/Xrandr.c @@ -177,12 +177,12 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire) XRRNotifyEvent *aevent = (XRRNotifyEvent *) event; awire->type = aevent->type | (aevent->send_event ? 0x80 : 0); awire->sequenceNumber = aevent->serial & 0xFFFF; - awire->window = aevent->window; awire->subCode = aevent->subtype; switch (aevent->subtype) { case RRNotify_OutputChange: { xRROutputChangeNotifyEvent *awire = (xRROutputChangeNotifyEvent *) wire; XRROutputChangeNotifyEvent *aevent = (XRROutputChangeNotifyEvent *) event; + awire->window = aevent->window; awire->output = aevent->output; awire->crtc = aevent->crtc; awire->mode = aevent->mode; @@ -194,6 +194,7 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire) case RRNotify_CrtcChange: { xRRCrtcChangeNotifyEvent *awire = (xRRCrtcChangeNotifyEvent *) wire; XRRCrtcChangeNotifyEvent *aevent = (XRRCrtcChangeNotifyEvent *) event; + awire->window = aevent->window; awire->crtc = aevent->crtc; awire->mode = aevent->mode; awire->rotation = aevent->rotation; @@ -206,6 +207,7 @@ static Status XRREventToWire(Display *dpy, XEvent *event, xEvent *wire) case RRNotify_OutputProperty: { xRROutputPropertyNotifyEvent *awire = (xRROutputPropertyNotifyEvent *) wire; XRROutputPropertyNotifyEvent *aevent = (XRROutputPropertyNotifyEvent *) event; + awire->window = aevent->window; awire->output = aevent->output; awire->atom = aevent->property; awire->timestamp = aevent->timestamp; -- cgit v1.2.3