diff options
author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
commit | 164263e1a12fc8a3a496739799cb60d547857f0a (patch) | |
tree | f94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nx-X11/programs/Xserver/hw/nxagent/Args.c | |
parent | 05152b788ab184f45df1f64182791c88a09dc6f9 (diff) | |
parent | 8d00456ad3e7b7a49d8fadb269334589e3704758 (diff) | |
download | nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.gz nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.bz2 nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.zip |
Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658
Fixes: ArcticaProject/nx-libs#657
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Args.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 14f696e2d..604b33187 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -676,6 +676,10 @@ int ddxProcessArgument(int argc, char *argv[], int i) return 1; } + if (!strcmp(argv[i], "-nomagicpixel")) { + nxagentChangeOption(MagicPixel, 0); + return 1; + } if (!strcmp(argv[i], "-noonce")) { @@ -1246,6 +1250,19 @@ static void nxagentParseOptions(char *name, char *value) return; } + else if (!strcmp(name, "magicpixel")) + { + if (!strcmp(value, "0")) + { + nxagentChangeOption(MagicPixel, 0); + } + else + { + nxagentChangeOption(MagicPixel, 1); + } + + return; + } else if (strcmp(name, "shadowuid") == 0) { nxagentShadowUid = atoi(value); @@ -2075,6 +2092,7 @@ void ddxUseMsg() ErrorF("-forcenx force use of NX protocol messages assuming communication through nxproxy\n"); ErrorF("-timeout int auto-disconnect timeout in seconds (minimum allowed: 60)\n"); ErrorF("-norootlessexit don't exit if there are no clients in rootless mode\n"); + ErrorF("-nomagicpixel disable nxagent's magic pixel\n"); #ifdef RENDER ErrorF("-norender disable the use of the render extension\n"); ErrorF("-nocomposite disable the use of the composite extension\n"); |