Commit 29c166db authored by Mike Gabriel's avatar Mike Gabriel Committed by Mihai Moldovan

nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking only…

nxagent: Also provide auto DPI feature via nx/nx option 'autodpi', taking only effect on session startups.
parent 9dd2830e
...@@ -1278,6 +1278,25 @@ static void nxagentParseOptions(char *name, char *value) ...@@ -1278,6 +1278,25 @@ static void nxagentParseOptions(char *name, char *value)
return; 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) else if (strcmp(name, "shadowuid") == 0)
{ {
nxagentShadowUid = atoi(value); nxagentShadowUid = atoi(value);
......
...@@ -606,6 +606,11 @@ proxy <-> agent remote sessions) ...@@ -606,6 +606,11 @@ proxy <-> agent remote sessions)
.B magicpixel=<bool> .B magicpixel=<bool>
enable/disable magic pixel support in fullscreen mode (default: 1, enabled) enable/disable magic pixel support in fullscreen mode (default: 1, enabled)
.TP 8 .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> .B sleep=<int>
delay X server operations when suspended (provided in msec), set to delay X server operations when suspended (provided in msec), set to
\fI0\fR to keep \fBnxagent\fR session fully functional when suspended \fI0\fR to keep \fBnxagent\fR session fully functional when suspended
......
...@@ -8476,7 +8476,8 @@ int ParseEnvironmentOptions(const char *env, int force) ...@@ -8476,7 +8476,8 @@ int ParseEnvironmentOptions(const char *env, int force)
strcasecmp(name, "tile") == 0 || strcasecmp(name, "tile") == 0 ||
strcasecmp(name, "menu") == 0 || strcasecmp(name, "menu") == 0 ||
strcasecmp(name, "magicpixel") == 0 || strcasecmp(name, "magicpixel") == 0 ||
strcasecmp(name, "state") == 0 ) strcasecmp(name, "autodpi") == 0 ||
strcasecmp(name, "state") == 0 )
{ {
nxdbg << "Loop: Ignoring agent option '" << name nxdbg << "Loop: Ignoring agent option '" << name
<< "' with value '" << value << "'.\n" << "' with value '" << value << "'.\n"
......
...@@ -344,6 +344,7 @@ defer=n\n\ ...@@ -344,6 +344,7 @@ defer=n\n\
tile=s\n\ tile=s\n\
menu=n\n\ menu=n\n\
magicpixel=n\n\ magicpixel=n\n\
autodpi=n\n\
sleep=n\n\ sleep=n\n\
tolerancechecks=s\n\ tolerancechecks=s\n\
keyconv=s\n\ keyconv=s\n\
......
...@@ -328,6 +328,7 @@ encryption of the point to point communication. ...@@ -328,6 +328,7 @@ encryption of the point to point communication.
tile=<string> tile=<string>
menu=<int> menu=<int>
magicpixel=<bool> magicpixel=<bool>
autodpi=<bool>
sleep=<int> sleep=<int>
.SH NX ENVIRONMENT VARIABLES .SH NX ENVIRONMENT VARIABLES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment