From e7b4440f2a525524fdaf8f132afe2dd824ed7714 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 30 Dec 2020 19:00:48 +0100 Subject: nxagent: make full screen mode selectable at startup fullscreen= now accepts the new value "2" for a fullscreen covering only one screen. -geometry and geometry= now know additional keywords "allscreens" and "onescreen". Fixes ArcticaProject/nx-libs#923 --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c') 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); -- cgit v1.2.3