Port the Xss based idle time measurement tool to Qt5

3 files changed, 28 insertions, 21 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc7292a06..3ad2e56fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,15 +596,30 @@ if(UNIX)
 		find_package(X11)
 		if(X11_FOUND)
 			set(COMPILE_X11_SUPPORT 1)
+			# The X screensaver stuff is in the libxss-dev package (ubuntu/debian)
 			if(X11_Xscreensaver_FOUND)
-				set(COMPILE_XSS_SUPPORT 1)
-				set(CMAKE_STATUS_X11_SUPPORT "Yes, with scrnsaverproto")
-				include_directories(${X11_Xscreensaver_INCLUDE_PATH})
-				list(APPEND LIBS ${X11_Xscreensaver_LIB})
+				if(CMAKE_STATUS_QT_VERSION VERSION_LESS 5.0.0)
+					set(COMPILE_XSS_SUPPORT 1)
+					set(CMAKE_STATUS_X11_SUPPORT "Yes, with screensaverproto")
+					include_directories(${X11_Xscreensaver_INCLUDE_PATH})
+					list(APPEND LIBS ${X11_Xscreensaver_LIB})
+				else()
+					# Qt5 requires the X11Extras module for the QX11Info class (which is needed for XSS support)
+					find_package(Qt5X11Extras)
+					if(Qt5X11Extras_FOUND)
+						include_directories(${Qt5X11Extras_INCLUDE_DIRS})
+						list(APPEND qt5_kvirc_modules X11Extras)
+						set(COMPILE_XSS_SUPPORT 1)
+						set(CMAKE_STATUS_X11_SUPPORT "Yes, with screensaverproto")
+						include_directories(${X11_Xscreensaver_INCLUDE_PATH})
+						list(APPEND LIBS ${X11_Xscreensaver_LIB})
+					else()
+						set(CMAKE_STATUS_X11_SUPPORT "Yes")
+					endif()
+				endif()
 			else()
 				set(CMAKE_STATUS_X11_SUPPORT "Yes")
 			endif()
-
 			include_directories(${X11_INCLUDE_DIR})
 			list(APPEND LIBS ${X11_LIBRARIES})
 			# Seems like ${X11_LIBRARIES} doesn't add -lXrender, which is needed
diff --git a/src/modules/my/Idle_x11.cpp b/src/modules/my/Idle_x11.cpp
index cc82cf81e..410ddaf7e 100644
--- a/src/modules/my/Idle_x11.cpp
+++ b/src/modules/my/Idle_x11.cpp
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#ifndef COMPILE_ON_MAC
-#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
+
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) && !defined(COMPILE_ON_MAC)
 
 #include"Idle.h"
 
@@ -30,10 +30,7 @@
 #else
 	#include <QApplication>
 	#include <QDesktopWidget>
-#if (QT_VERSION < 0x050000)
 	#include <QX11Info>
-#endif // QT_VERSION < 0x050000
-
 	#include <X11/Xlib.h>
 	#include <X11/Xutil.h>
 	#include <X11/extensions/scrnsaver.h>
@@ -80,14 +77,12 @@
 		old_handler = XSetErrorHandler(xerrhandler);
 
 		int event_base, error_base;
-#if (QT_VERSION < 0x050000)
+
 		if(XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
 			d->ss_info = XScreenSaverAllocInfo();
 			return true;
 		}
-#else
-		// FIXME: Need a replacement for this?
-#endif
+
 		return false;
 	}
 
@@ -95,16 +90,12 @@
 	{
 		if(!d->ss_info)
 			return 0;
-#if (QT_VERSION < 0x050000)
+
 		if(!XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
 			return 0;
-#else
-		// FIXME: Need a replacement for this?
-		return 0;
-#endif
 
 		return d->ss_info->idle / 1000;
 	}
-#endif
+
 #endif
 #endif
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index c8ac52741..4f0e5fd5a 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -136,7 +136,8 @@ static bool my_kvs_cmd_stopIdleTimer(KviKvsModuleCommandCall *)
 	@syntax:
 		<int> $my.globalIdle()
 	@description:
-		Returns the current user global idle time
+		Returns the current user global idle time.
+		You must execute [cmd]my.startIdleTimer[/cmd] before using this function.
 */
 
 static bool my_kvs_fnc_globalIdle(KviKvsModuleFunctionCall * c)