aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-03 20:52:05 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-03 20:52:05 +0200
commit147371a28bb23b4dd383ceccff0e279e9dba3bbe (patch)
tree06dfc6d927cfe1b85c7360f202ab607d596a2535 /nx-X11/programs
parent4e0e7c4727ca6b1125895a149dbb42d2e12b4a63 (diff)
parentf34eff0a29191a2b680905776476a3c49b841e4e (diff)
downloadnx-libs-147371a28bb23b4dd383ceccff0e279e9dba3bbe.tar.gz
nx-libs-147371a28bb23b4dd383ceccff0e279e9dba3bbe.tar.bz2
nx-libs-147371a28bb23b4dd383ceccff0e279e9dba3bbe.zip
Merge branch 'sunweaver-pr/xinerama-response-swapping-in-RRXineramaWriteMonitor' into 3.6.x
Attributes GH PR #413: https://github.com/ArcticaProject/nx-libs/pull/413 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 27 Mar 2017 11:43:56 -0700 ,
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/randr/rrxinerama.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index d863897a7..b75b2ace9 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -303,6 +303,13 @@ RRXineramaWriteMonitor(ClientPtr client, RRMonitorPtr monitor)
scratch.width = monitor->geometry.box.x2 - monitor->geometry.box.x1;
scratch.height = monitor->geometry.box.y2 - monitor->geometry.box.y1;
+ if (client->swapped) {
+ swaps(&scratch.x_org);
+ swaps(&scratch.y_org);
+ swaps(&scratch.width);
+ swaps(&scratch.height);
+ }
+
WriteToClient(client, sz_XineramaScreenInfo, &scratch);
}