Ticket #463: 463_xss_1.patch

configure.ac

@@ -549 +549 @@
 
 AM_CONDITIONAL(BUILD_GRAPHICS_API, [ test "$have_glut" = yes ])
 
+dnl check for X screen saver lib
+AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo], [have_Xss="yes"], [have_Xss="no"])
+AC_CHECK_HEADER([X11/extensions/scrnsaver.h], [have_Xss="yes"], [have_Xss="no"])
+if test "$have_Xss" == no; then
+    AC_MSG_WARN([libxss missing, disabling X ScreenSaver user idle detection])
+fi
+
 dnl --------------------------------------------------------------------------------
 dnl put double-inclusion protection into config.h
 AH_TOP([
@@ -791 +798 @@
 fi
 LIBS=$svlibs
 
+if test "$have_Xss" == yes; then
+    SAH_CHECK_LIB([Xss],[XScreenSaverAllocInfo],[
+        AC_DEFINE([HAVE_XSS],[1],[Define to 1 if you have xss library])
+        CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])
+    echo DEBUG: CLIENTLIBS=${CLIENTLIBS} >&5
+fi
+
 SAH_CHECK_LIB([resolv],[res_query],[
     AC_DEFINE([HAVE_RESOLV],[1],[Define to 1 if you have the resolv library])
     CLIENTLIBS="${sah_lib_last} ${CLIENTLIBS}"])

client/hostinfo_unix.cpp

@@ -149 +149 @@
 #define _SC_PAGESIZE _SC_PAGE_SIZE
 #endif
 
+#if HAVE_XSS
+#include <X11/extensions/scrnsaver.h>
+#endif
+
 // The following is intended to be true both on Linux
 // and Debian GNU/kFreeBSD (see trac #521)
 //
@@ -1679 +1683 @@
     }
     return last_irq < t;
 }
-#endif
 
+#if HAVE_XSS
+// Ask the X server for user idle time (using XScreenSaver API)
+// Returns true if the idle_treshold is smaller than the
+// idle time of the user (means: true = user is idle)
+bool xss_idle(long idle_treshold) {
+        static XScreenSaverInfo* xssInfo = NULL;
+        static Display* disp = NULL;
+        
+        long idle_time = 0;
+        
+        if(disp != NULL) {
+                XScreenSaverQueryInfo(disp, DefaultRootWindow(disp), xssInfo);
+                idle_time = xssInfo->idle / 1000; // xssInfo->idle is in ms
+        } else {
+                disp = XOpenDisplay(NULL);
+                // XOpenDisplay may return NULL if there is no running X
+                // or DISPLAY points to wrong/invalid display
+                if(disp != NULL) {
+                        xssInfo = XScreenSaverAllocInfo();
+                }
+        }
+
+        return idle_treshold < idle_time;
+}
+#endif // HAVE_XSS
+#endif // LINUX_LIKE_SYSTEM
+
 bool HOST_INFO::users_idle(bool check_all_logins, double idle_time_to_run) {
     time_t idle_time = time(0) - (long) (60 * idle_time_to_run);
 
@@ -1701 +1731 @@
     if (!interrupts_idle(idle_time)) {
         return false;
     }
+
+#if HAVE_XSS
+        if (!xss_idle((long)(idle_time_to_run * 60))) {
+                return false;
+        }
+#endif
+
 #else
     // We should find out which of the following are actually relevant
     // on which systems (if any)