summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-12-01 21:09:44 +0100
committerJulien Cristau <jcristau@debian.org>2008-12-01 22:54:41 +0100
commit0fa7452220701ee44d8bafc57001e362afcedb0c (patch)
tree0a8ac1ef37606745fda37dee0486d44c7a61a154
parent83e567f427f68dc4ae2de796a1184748bbe0238e (diff)
RRNotify subevents have 'window' at different offsets, the sequel
f176b2bda103f6f38aabab8207f47a02cc797659 fixed XRRWireToEvent, but XRREventToWire had the same bug. Signed-off-by: Julien Cristau <jcristau@debian.org>
-rw-r--r--src/Xrandr.c4
1 files changed, 3 insertions, 1 deletions
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;