nxagent: re-implement timeout handling

Option -timeout used the screensaver facility. This patch changes that
to an own timer that is independent. This effectly means we can drop
most of the derived screensaving stuff in a follow-up commit.

1 files changed, 6 insertions, 6 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index e804acbd2..329a8cbcb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -125,6 +125,7 @@ Equipment Corporation.
 #include <nx/Shadow.h>
 #include "Handlers.h"
 #include "Keyboard.h"
+#include "Init.h"
 
 const int nxagentMaxFontNames = 10000;
 
@@ -139,12 +140,6 @@ void nxagentWaitDisplay(void);
 
 void nxagentListRemoteFonts(const char *, int);
 
-/*
- * Timeouts based on screen saver time.
- */
-
-int nxagentAutoDisconnectTimeout = 0;
-
 #include "Xatom.h"
 
 /*
@@ -312,6 +307,9 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
 
     if (!(dispatchException & DE_TERMINATE))
         dispatchException = 0;
+
+    /* Init TimeoutTimer if requested */
+    nxagentSetTimeoutTimer(0);
 #endif /* NXAGENT_SERVER */
 
     while (!dispatchException)
@@ -547,6 +545,8 @@ Reply   Total	Cached	Bits In			Bits Out		Bits/Reply	  Ratio
 #endif
 
 #ifdef NXAGENT_SERVER
+    nxagentFreeTimeoutTimer();
+
     /* FIXME: maybe move the code up to the KillAllClients() call to ddxBeforeReset? */
     if ((dispatchException & DE_RESET) && 
             (serverGeneration > nxagentMaxAllowedResets))