From 8d00456ad3e7b7a49d8fadb269334589e3704758 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Wed, 21 Feb 2018 10:39:46 +0100
Subject: nxagent: Add support for optionally enabling/disabling the magic
 pixel feature.

Fixes ArcticaProject/nx-libs#657.
---
 nxcomp/src/Loop.cpp | 3 ++-
 nxcomp/src/Misc.cpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'nxcomp')

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\
-- 
cgit v1.2.3