aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Image.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-18 09:27:39 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-18 09:27:39 +0200
commit2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (patch)
treebc82daeb0090eea8dc7eb977cc82a3ed47284262 /nx-X11/programs/Xserver/hw/nxagent/Image.c
parent3dea5a88cad4ee51b2240bb95693ccb4c43047b5 (diff)
parent6051dec4a1ae6decd9123a3310098baf43f45c49 (diff)
downloadnx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.gz
nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.bz2
nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.zip
Merge branch 'Ionic-feature/configurablesleep' into 3.6.x
Attributes GH PR #143: https://github.com/ArcticaProject/nx-libs/pull/143
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, 3 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c
index 6a7d46c35..a158a11db 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Image.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c
@@ -69,15 +69,6 @@
#define IMAGE_UNIQUE_RATIO 10
/*
- * Introduce a small delay after each image
- * operation if the session is down. Value
- * is in microseconds and is multiplied by
- * the image data size in kilobytes.
- */
-
-#define IMAGE_DELAY_IF_DOWN 250
-
-/*
* Preferred pack and split parameters we
* got from the NX transport.
*/
@@ -521,11 +512,12 @@ void nxagentPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth,
length = nxagentImageLength(dstWidth, dstHeight, format, leftPad, depth);
if (nxagentShadowCounter == 0 &&
- NXDisplayError(nxagentDisplay) == 1)
+ NXDisplayError(nxagentDisplay) == 1 &&
+ nxagentOption(SleepTime) > 0)
{
int us;
- us = IMAGE_DELAY_IF_DOWN * (length / 1024);
+ us = nxagentOption(SleepTime) * 4 * (length / 1024);
us = (us < 10000 ? 10000 : (us > 1000000 ? 1000000 : us));