diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-18 11:37:25 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-18 11:37:25 +0100 |
| commit | f4782bbd2c3e98176cd34ed1bfabba954d9489e4 (patch) | |
| tree | b6566c945bcf150683b489bbd1aab59dea236edd | |
| parent | f60ac577713c28212cdf2f4203b2cc0726034f5f (diff) | |
| parent | e156bdc0350e14dbd0429fab899b4eb9ee1a201b (diff) | |
| download | nx-libs-f4782bbd2c3e98176cd34ed1bfabba954d9489e4.tar.gz nx-libs-f4782bbd2c3e98176cd34ed1bfabba954d9489e4.tar.bz2 nx-libs-f4782bbd2c3e98176cd34ed1bfabba954d9489e4.zip | |
Merge branch 'uli42-pr/fix_fullscreen' into 3.6.x
Attributes GH PR #990: https://github.com/ArcticaProject/nx-libs/pull/990
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index f24d15c55..72d6d050c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -2083,7 +2083,7 @@ void ddxUseMsg(void) ErrorF("-full utilize full regeneration\n"); ErrorF("-class string default visual class\n"); ErrorF("-depth int default depth\n"); - ErrorF("-geometry WxH+X+Y window size and position\n"); + ErrorF("-geometry string window size and position (WXH+X+Y) or 'allscreens' / 'onescreen'\n"); ErrorF("-bw int window border width\n"); ErrorF("-name string window name\n"); ErrorF("-scrns int number of screens to generate\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 173d2fb82..a6b312aaa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -337,12 +337,6 @@ void nxagentMinimizeFromFullScreen(ScreenPtr pScreen) */ void nxagentMaximizeToFullScreen(ScreenPtr pScreen) { - if (nxagentOption(AllScreens)) - nxagentSwitchAllScreens(pScreen, True); - else - nxagentSwitchFullscreen(pScreen, True); - return; - /* XUnmapWindow(nxagentDisplay, nxagentIconWindow); */ |