aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Image.c
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-06-02 21:48:41 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-06-29 22:03:46 +0200
commitbf0861aa0363f55dd95295dca3ccd6ff96acea87 (patch)
tree8c4229fdaaa73b9bf50cb699e77701ffb4404282 /nx-X11/programs/Xserver/hw/nxagent/Image.c
parent4213bf46c117e5186aa404172c5439d92a5ace7f (diff)
downloadnx-libs-bf0861aa0363f55dd95295dca3ccd6ff96acea87.tar.gz
nx-libs-bf0861aa0363f55dd95295dca3ccd6ff96acea87.tar.bz2
nx-libs-bf0861aa0363f55dd95295dca3ccd6ff96acea87.zip
nxagent: clarify sleep time units
No functional changes, just clarification/explanation of the existing code. Fixes ArcticaProject/nx-libs#926
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Image.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Image.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 9369aeb1e..db174a9de 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -492,9 +492,19 @@ void nxagentPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
if (nxagentShadowCounter == 0 &&
NXDisplayError(nxagentDisplay) == 1 &&
- nxagentOption(SleepTime) > 0)
+ nxagentOption(SleepTimeMillis) > 0)
{
- int us = nxagentOption(SleepTime) * 4 * (length / 1024);
+ /*
+ * The original NX code had 250us (microseconds) * length/1024
+ * here and 50ms (milliseconds) elsewhere. Later ONE combined
+ * configurable sleep parameter was introduced, having a default
+ * of 50ms (that's milliseconds, not microseconds!), which is
+ * factor 200. For unknown reasons the factor was changed to 250
+ * at the same time. Ensure the value is somewhere between 10ms
+ * and 1s.
+ */
+
+ int us = nxagentOption(SleepTimeMillis) * 1000 * (length / 1024) / 250;
us = (us < 10000 ? 10000 : (us > 1000000 ? 1000000 : us));