aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-12-09 12:54:24 +0100
committerMihai Moldovan <ionic@ionic.de>2017-12-09 12:54:24 +0100
commit6d7536bd4f5cad9a779c186bd2649b34ec71b367 (patch)
treef97ee578d7ae26a6216668e6bfa700e4205fa968
parenteb9618739d0fb99f4aca933750a9d65dbe02aefb (diff)
parenteff0f366db57783c49a19420a2351b5501ec9f1b (diff)
downloadnx-libs-6d7536bd4f5cad9a779c186bd2649b34ec71b367.tar.gz
nx-libs-6d7536bd4f5cad9a779c186bd2649b34ec71b367.tar.bz2
nx-libs-6d7536bd4f5cad9a779c186bd2649b34ec71b367.zip
Merge branch 'uli42-pr/keep_co' into 3.6.x
Attributes GH PR #582: https://github.com/ArcticaProject/nx-libs/pull/582
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/man/nxagent.16
-rw-r--r--nx-X11/programs/Xserver/os/utils.c11
2 files changed, 17 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index e5393c71e..f28c1616f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -161,6 +161,12 @@ sets key-click volume (allowable range: 0-100).
sets the visual class for the root window of color screens.
The class numbers are as specified in the X protocol.
Not obeyed by all servers.
+.TP 8
+.B \-co \fIfilename\fP
+This used to be the option for specifying the path to the RGB color
+database file. As the RGB color database is now embedded into the
+binary this option has no effect but is kept for
+compatibility. Deprecated.
.ig
.TP 8
.B \-config \fIfilename\fP
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index dd637ca4b..a9c4b2ee4 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -571,6 +571,9 @@ void UseMsg(void)
ErrorF("-c turns off key-click\n");
ErrorF("c # key-click volume (0-100)\n");
ErrorF("-cc int default color visual class\n");
+#ifdef NXAGENT_SERVER
+ ErrorF("-co file deprecated, has no effect\n");
+#endif
#ifdef COMMANDLINE_CHALLENGED_OPERATING_SYSTEMS
ErrorF("-config file read options from file\n");
#endif
@@ -776,6 +779,14 @@ ProcessCommandLine(int argc, char *argv[])
else
UseMsg();
}
+#ifdef NXAGENT_SERVER
+ else if ( strcmp( argv[i], "-co") == 0)
+ {
+ fprintf(stderr, "Warning: Ignoring deprecated command line option '%s'.\n", argv[i]);
+ if(++i >= argc)
+ UseMsg();
+ }
+#endif
else if ( strcmp( argv[i], "-core") == 0)
CoreDump = TRUE;
else if ( strcmp( argv[i], "-dpi") == 0)