aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-21 10:39:46 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 01:07:46 +0100
commit8d00456ad3e7b7a49d8fadb269334589e3704758 (patch)
treef94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nxcomp/src
parent05152b788ab184f45df1f64182791c88a09dc6f9 (diff)
downloadnx-libs-8d00456ad3e7b7a49d8fadb269334589e3704758.tar.gz
nx-libs-8d00456ad3e7b7a49d8fadb269334589e3704758.tar.bz2
nx-libs-8d00456ad3e7b7a49d8fadb269334589e3704758.zip
nxagent: Add support for optionally enabling/disabling the magic pixel feature.
Fixes ArcticaProject/nx-libs#657.
Diffstat (limited to 'nxcomp/src')
-rw-r--r--nxcomp/src/Loop.cpp3
-rw-r--r--nxcomp/src/Misc.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 754c55c96..4862748e0 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -8474,7 +8474,8 @@ int ParseEnvironmentOptions(const char *env, int force)
else if (strcasecmp(name, "defer") == 0 ||
strcasecmp(name, "tile") == 0 ||
strcasecmp(name, "menu") == 0 ||
- strcasecmp(name, "state") == 0 )
+ strcasecmp(name, "magicpixel") == 0 ||
+ strcasecmp(name, "state") == 0 )
{
nxdbg << "Loop: Ignoring agent option '" << name
<< "' with value '" << value << "'.\n"
diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp
index 7e468f1e2..b6bf24578 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -343,6 +343,7 @@ shadowmode=s\n\
defer=n\n\
tile=s\n\
menu=n\n\
+magicpixel=n\n\
sleep=n\n\
tolerancechecks=s\n\
keyconv=s\n\