diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
| commit | 67599026d01692c52276df6ff5e8332d2413c18f (patch) | |
| tree | b93b8d6643dd6438f0844d48008d6cb9ffee405f /nx-X11/programs/Xserver/hw/nxagent/Handlers.c | |
| parent | 5a8f1e921b4cafedc9efac22d5fbd2ce05e45ba9 (diff) | |
| parent | cf8797c3c0e9623e5092a2c9f5ea7cb31bc11657 (diff) | |
| download | nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.gz nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.bz2 nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.zip | |
Merge branch 'uli42-pr/various3' into 3.6.x
Attributes GH PR #880: https://github.com/ArcticaProject/nx-libs/pull/880
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Handlers.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Handlers.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c index f1455b935..559eae719 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Handlers.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Handlers.c @@ -726,8 +726,6 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas } #endif - #ifndef __CYGWIN32__ - if (nxagentReadEvents(nxagentDisplay) > 0 || nxagentReadEvents(nxagentShadowDisplay) > 0) { @@ -745,19 +743,6 @@ void nxagentShadowBlockHandler(void * data, struct timeval **timeout, void * mas nxagentShadowAdaptToRatio(); } - #else - - if (nxagentReadEvents(nxagentDisplay) > 0) - { - #ifdef TEST - fprintf(stderr, "nxagentShadowBlockHandler: Reading X events queued.\n"); - #endif - - nxagentDispatchEvents(NULL); - } - - #endif - changed = 0; NXShadowGetScreenSize(&width_, &height_); @@ -800,26 +785,6 @@ FIXME: Must queue multiple writes and handle the events by resembling *timeout = &zero; } - #ifdef __CYGWIN32__ - - if (nxagentOption(SleepTime) > 0) { -#ifdef TEST - fprintf(stderr, "nxagentShadowBlockHandler: sleeping for %d milliseconds for slowdown.\n", - nxagentOption(SleepTime)); -#endif - usleep(nxagentOption(SleepTime) * 1000); - } -#ifdef TEST - else if (0 == nxagentOption(SleepTime)) { - fprintf(stderr, "nxagentShadowBlockHandler: not sleeping for slowdown.\n"); - } -#endif - - (*timeout) -> tv_sec = 0; - (*timeout) -> tv_usec = 50 * 1000; - - #else - if (changed == 0) { (*timeout) -> tv_sec = 0; @@ -831,8 +796,6 @@ FIXME: Must queue multiple writes and handle the events by resembling (*timeout) -> tv_usec = 0; } - #endif - nxagentPrintGeometry(); #ifdef BLOCKS @@ -857,7 +820,6 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask) if (!SmartScheduleSignalEnable) { - #ifdef DEBUG fprintf(stderr, "nxagentShadowWakeupHandler: Resetting the dispatch state after wakeup.\n"); #endif @@ -866,7 +828,6 @@ void nxagentShadowWakeupHandler(void * data, int count, void * mask) nxagentDispatch.in = nxagentBytesIn; nxagentDispatch.out = nxagentBytesOut; - } /* |