diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-06-29 22:07:14 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-06-29 22:07:14 +0200 |
| commit | a3d493a60de3c704b252775205bcafc3a175c853 (patch) | |
| tree | 886e1d4134cdb61fdb4fedf1d0494e7b5fe5d273 /nx-X11/programs/Xserver/hw/nxagent/Image.c | |
| parent | 4213bf46c117e5186aa404172c5439d92a5ace7f (diff) | |
| parent | ede842c21cb73ce592ebb972fff9ca1ccd239a4e (diff) | |
| download | nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.tar.gz nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.tar.bz2 nx-libs-a3d493a60de3c704b252775205bcafc3a175c853.zip | |
Merge branch 'uli42-pr/clarify_sleep' into 3.6.x
Attributs GH PR #930: https://github.com/ArcticaProject/nx-libs/pull/930
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Image.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Image.c | 14 |
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)); |