aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Window.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-28 18:48:50 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-28 18:48:50 +0100
commit82ab807fd5397aa152dd7369a36beccbacb962cb (patch)
tree1f03b72ac7d497b8cd9ca5094615136edffd257c /nx-X11/programs/Xserver/hw/nxagent/Window.c
parentaa166550657f3a928f5d7a8babc0956b69f4a587 (diff)
parentc29053f82cbea5f2704d99c4d5e8afe0329e5cbe (diff)
downloadnx-libs-82ab807fd5397aa152dd7369a36beccbacb962cb.tar.gz
nx-libs-82ab807fd5397aa152dd7369a36beccbacb962cb.tar.bz2
nx-libs-82ab807fd5397aa152dd7369a36beccbacb962cb.zip
Merge branch 'nxagent'
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 988193609..35a35984a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -3170,10 +3170,17 @@ static void nxagentReconfigureWindow(pointer param0, XID param1, pointer data_bu
{
nxagentRealizeWindow (pWin);
}
+/*
+XXX: This would break Motif menus.
+ If pWin is mapped but not realized, a followin UnmapWindow() wouldn't
+ do anything, leaving this mapped window around. XMapWindow()
+ is called in nxagentRealizeWindow() and there it is enough.
+
else if (pWin->mapped)
{
XMapWindow(nxagentDisplay, nxagentWindow(pWin));
}
+*/
else if (nxagentOption(Rootless) && pWin -> overrideRedirect == 0 &&
nxagentWindowTopLevel(pWin) && nxagentIsIconic(pWin))
{