diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 17:09:21 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-15 17:09:21 +0100 |
| commit | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (patch) | |
| tree | 966779d6cdbb3a6b78194b2cf6037974b99e25fb /nx-X11/programs/Xserver/hw/nxagent/Args.c | |
| parent | 1257561577cd8227f3534fc44b72a1239aba363c (diff) | |
| parent | e7b4440f2a525524fdaf8f132afe2dd824ed7714 (diff) | |
| download | nx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.tar.gz nx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.tar.bz2 nx-libs-3523d15e2a9f84e2136e3370129a9bea0e16e072.zip | |
Merge branch 'uli42-pr/fullscreen_select' into 3.6.x
Attributes GH PR #978: https://github.com/ArcticaProject/nx-libs/pull/978
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index ee76fc795..d5d13ea56 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -571,12 +571,16 @@ int ddxProcessArgument(int argc, char *argv[], int i) { if (++i < argc) { - if (!strcmp(argv[i],"fullscreen")) + if (!strcmp(argv[i],"fullscreen") || !strcmp(argv[i],"allscreens")) { nxagentChangeOption(Fullscreen, True); - nxagentChangeOption(AllScreens, True); } + else if (!strcmp(argv[i],"onescreen")) + { + nxagentChangeOption(Fullscreen, True); + nxagentChangeOption(AllScreens, False); + } else { if (nxagentUserGeometry.flag == 0) @@ -1112,6 +1116,11 @@ static void nxagentParseSingleOption(char *name, char *value) fprintf(stderr, "nxagentParseSingleOption: Ignoring option 'fullscreen' at reconnection.\n"); #endif } + else if (!strcmp(value, "2")) + { + nxagentChangeOption(Fullscreen, True); + nxagentChangeOption(AllScreens, False); + } else if (!strcmp(value, "1")) { nxagentChangeOption(Fullscreen, True); |