aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 11:15:38 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-05-24 11:15:38 +0200
commit7ec73ef21efa5411d768d0648e2670c2b476ee02 (patch)
treea603c8faacbcbe3d2f9cb032b8b10107297a72e4 /nx-X11
parentc0f67abb494b6d61dc4a67284004072570b3c5e7 (diff)
parent3f6d8f3e8faca7dc060a9be51dbb9b76d2bdb9a5 (diff)
downloadnx-libs-7ec73ef21efa5411d768d0648e2670c2b476ee02.tar.gz
nx-libs-7ec73ef21efa5411d768d0648e2670c2b476ee02.tar.bz2
nx-libs-7ec73ef21efa5411d768d0648e2670c2b476ee02.zip
Merge branch 'uli42-pr/xinerama_without_wm' into 3.6.x
Attributes GH PR #695: https://github.com/ArcticaProject/nx-libs/pull/695
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index dee8dd7e0..0eca8e491 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -2041,6 +2041,18 @@ FIXME: Don't enqueue the KeyRelease event if the key was
nxagentVisibilityTimeout = GetTimeInMillis() + 2000;
}
+ /*
+ * without window manager there will be no ConfigureNotify
+ * event that would trigger xinerama updates. So we do that once
+ * the nxagent window gets mapped.
+ */
+ if (nxagentWMIsRunning == 0 &&
+ X.xmap.window == nxagentDefaultWindows[nxagentScreen(X.xmap.window)->myNum])
+ {
+ nxagentChangeScreenConfig(nxagentScreen(X.xmap.window)->myNum, nxagentOption(Width),
+ nxagentOption(Height));
+ }
+
break;
}
case MappingNotify: