5 files changed, 28 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index a51ad0c01..c31acc26a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -1278,6 +1278,25 @@ static void nxagentParseOptions(char *name, char *value)
 
     return;
   }
+  else if (!strcmp(name, "autodpi"))
+  {
+    if (nxagentReconnectTrap == True)
+    {
+      #ifdef DEBUG
+      fprintf(stderr, "nxagentParseOptions: Ignoring option 'autodpi' at reconnection.\n");
+      #endif
+    }
+    else if (!strcmp(value, "0"))
+    {
+      nxagentAutoDPI = False;
+    }
+    else
+    {
+      nxagentAutoDPI = True;
+    }
+
+    return;
+  }
   else if (strcmp(name, "shadowuid") == 0)
   {
     nxagentShadowUid = atoi(value);
diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
index eb7307b77..d3069bffd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
+++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1
@@ -606,6 +606,11 @@ proxy <-> agent remote sessions)
 .B magicpixel=<bool>
 enable/disable magic pixel support in fullscreen mode (default: 1, enabled)
 .TP 8
+.B autodpi=<bool>
+enable/disable deriving session DPI automatically from real server
+(default: 0, disabled); only takes effect on session startups, gets
+ignored when reconnecting to a suspended session
+.TP 8
 .B sleep=<int>
 delay X server operations when suspended (provided in msec), set to
 \fI0\fR to keep \fBnxagent\fR session fully functional when suspended
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 251eb04f3..5365a99cf 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -8476,7 +8476,8 @@ int ParseEnvironmentOptions(const char *env, int force)
                  strcasecmp(name, "tile") == 0 ||
                      strcasecmp(name, "menu") == 0 ||
                         strcasecmp(name, "magicpixel") == 0 ||
-                          strcasecmp(name, "state") == 0 )
+                          strcasecmp(name, "autodpi") == 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 b6bf24578..4f1af0ec4 100644
--- a/nxcomp/src/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -344,6 +344,7 @@ defer=n\n\
 tile=s\n\
 menu=n\n\
 magicpixel=n\n\
+autodpi=n\n\
 sleep=n\n\
 tolerancechecks=s\n\
 keyconv=s\n\
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1
index 1bf070c96..b5ab89340 100644
--- a/nxproxy/man/nxproxy.1
+++ b/nxproxy/man/nxproxy.1
@@ -328,6 +328,7 @@ encryption of the point to point communication.
     tile=<string>
     menu=<int>
     magicpixel=<bool>
+    autodpi=<bool>
     sleep=<int>
 
 .SH NX ENVIRONMENT VARIABLES