aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMihai Moldovan <ïonic@ionic.de>2016-06-17 01:45:40 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-21 04:06:27 +0200
commit4d6d3c56706e0c5a0725c13356c28d3655f72cac (patch)
treebc82daeb0090eea8dc7eb977cc82a3ed47284262 /nxcomp
parent04d2fe3aef464560de16d5b15ed91f8d63c6fb09 (diff)
downloadnx-libs-4d6d3c56706e0c5a0725c13356c28d3655f72cac.tar.gz
nx-libs-4d6d3c56706e0c5a0725c13356c28d3655f72cac.tar.bz2
nx-libs-4d6d3c56706e0c5a0725c13356c28d3655f72cac.zip
{nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended.
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/Loop.cpp3
-rw-r--r--nxcomp/Misc.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index 473488593..5086db012 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -9003,7 +9003,8 @@ int ParseEnvironmentOptions(const char *env, int force)
strcasecmp(name, "keyboard") == 0 ||
strcasecmp(name, "clipboard") == 0 ||
strcasecmp(name, "streaming") == 0 ||
- strcasecmp(name, "backingstore") == 0)
+ strcasecmp(name, "backingstore") == 0 ||
+ strcasecmp(name, "sleep") == 0)
{
#ifdef DEBUG
*logofs << "Loop: Ignoring agent option '" << name
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index ee73f19d8..05794bded 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -316,7 +316,8 @@ shadowuid=n\n\
shadowmode=s\n\
defer=n\n\
tile=s\n\
-menu=n These options are interpreted by the NX agent. They\n\
+menu=n\n\
+sleep=n These options are interpreted by the NX agent. They\n\
are ignored by the proxy.\n\
\n\
Environment:\n\