From a98536b9fbda7d7fb2ff78906c1a2d6331f33df2 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Wed, 15 Nov 2017 10:05:29 +0100 Subject: port to qt5 * got rid of the Win32/X11 differentiation * due to QT5, additional packages are needed to compile ** libqt5x11extras5-dev ** libqt5svg5-dev --- src/server/clicklabel/clicklabel.h | 2 +- src/server/connectionframe/connectionframe.h | 2 +- src/server/mainwindow/mainwindow.cpp | 2 +- src/server/mainwindow/mainwindow.h | 2 +- src/server/sessionnamewindow/sessionnamewindow.cpp | 2 +- src/server/sessionnamewindow/sessionnamewindow.h | 2 +- src/server/util/platform/screensaver.cpp | 74 ++++++++++++++++++++++ src/server/util/platform/screensaver_X11.cpp | 74 ---------------------- 8 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 src/server/util/platform/screensaver.cpp delete mode 100644 src/server/util/platform/screensaver_X11.cpp (limited to 'src/server') diff --git a/src/server/clicklabel/clicklabel.h b/src/server/clicklabel/clicklabel.h index 4d730a9..4c5a898 100644 --- a/src/server/clicklabel/clicklabel.h +++ b/src/server/clicklabel/clicklabel.h @@ -1,7 +1,7 @@ #ifndef _CLICKLABEL_H_ #define _CLICKLABEL_H_ -#include +#include #include /** diff --git a/src/server/connectionframe/connectionframe.h b/src/server/connectionframe/connectionframe.h index 7f338a8..72f57f3 100644 --- a/src/server/connectionframe/connectionframe.h +++ b/src/server/connectionframe/connectionframe.h @@ -1,6 +1,6 @@ #ifndef _CONNECTIONFRAME_H_ #define _CONNECTIONFRAME_H_ -#include +#include #include "../net/client.h" class MainWindow; diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index 2eab581..d4819cf 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -16,7 +16,7 @@ // Self #include "mainwindow.h" // QT stuff -#include +#include #include #include #include diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h index 27bf264..ac59481 100644 --- a/src/server/mainwindow/mainwindow.h +++ b/src/server/mainwindow/mainwindow.h @@ -1,7 +1,7 @@ #ifndef _MAINWINDOW_H_ #define _MAINWINDOW_H_ -#include +#include #include #include "../net/client.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.cpp b/src/server/sessionnamewindow/sessionnamewindow.cpp index cc4d751..c171f53 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.cpp +++ b/src/server/sessionnamewindow/sessionnamewindow.cpp @@ -14,7 +14,7 @@ # ----------------------------------------------------------------------------- */ -#include +#include #include "sessionnamewindow.h" #include "../serverapp/serverapp.h" #include "../numerickeyboard/numerickeyboard.h" diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h index 2338def..e46b895 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.h +++ b/src/server/sessionnamewindow/sessionnamewindow.h @@ -1,7 +1,7 @@ #ifndef _SESSIONNAMEWINDOW_H_ #define _SESSIONNAMEWINDOW_H_ -#include +#include namespace Ui diff --git a/src/server/util/platform/screensaver.cpp b/src/server/util/platform/screensaver.cpp new file mode 100644 index 0000000..efffba9 --- /dev/null +++ b/src/server/util/platform/screensaver.cpp @@ -0,0 +1,74 @@ +#include "screensaver.h" + +#include +#include +#include +#include + +#ifdef X11_Xscreensaver_FOUND +# include +#endif +#ifdef X11_dpms_FOUND +#include +#endif + +namespace { + + Display *display = NULL; + bool extensionSupported = false; + bool dpmsSupported = false; + + bool init() + { + if (display != NULL) { + return true; + } + display = QX11Info::display(); + if (display == NULL) { + return false; + } +#ifdef X11_Xscreensaver_FOUND + int dummy; + extensionSupported = (XScreenSaverQueryExtension(display, &dummy, &dummy) == True); +#endif +#ifdef X11_dpms_FOUND + dpmsSupported = (DPMSCapable(display) == True); +#endif + return true; + } + +} + +namespace ScreenSaver { + + void allowSaverAndStandby(bool allow) + { + if (!init()) + return; +#ifdef X11_Xscreensaver_FOUND + if (extensionSupported) { + XScreenSaverSuspend(display, allow ? False : True); + return; + } +#endif + // TODO: Maybe try some fallback, call xset, or trigger some event periodically + } + + void forceUnlockAndScreenOn() + { + if (!init()) + return; + QProcess process; + process.start("xscreensaver-command", QStringList() << "-deactivate"); + process.waitForFinished(100); +#ifdef X11_dpms_FOUND + CARD16 power_level; + BOOL state; + if (DPMSInfo(display, &power_level, &state) && state) { + DPMSForceLevel(display, DPMSModeOn); + return; + } +#endif + } + +} diff --git a/src/server/util/platform/screensaver_X11.cpp b/src/server/util/platform/screensaver_X11.cpp deleted file mode 100644 index efffba9..0000000 --- a/src/server/util/platform/screensaver_X11.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "screensaver.h" - -#include -#include -#include -#include - -#ifdef X11_Xscreensaver_FOUND -# include -#endif -#ifdef X11_dpms_FOUND -#include -#endif - -namespace { - - Display *display = NULL; - bool extensionSupported = false; - bool dpmsSupported = false; - - bool init() - { - if (display != NULL) { - return true; - } - display = QX11Info::display(); - if (display == NULL) { - return false; - } -#ifdef X11_Xscreensaver_FOUND - int dummy; - extensionSupported = (XScreenSaverQueryExtension(display, &dummy, &dummy) == True); -#endif -#ifdef X11_dpms_FOUND - dpmsSupported = (DPMSCapable(display) == True); -#endif - return true; - } - -} - -namespace ScreenSaver { - - void allowSaverAndStandby(bool allow) - { - if (!init()) - return; -#ifdef X11_Xscreensaver_FOUND - if (extensionSupported) { - XScreenSaverSuspend(display, allow ? False : True); - return; - } -#endif - // TODO: Maybe try some fallback, call xset, or trigger some event periodically - } - - void forceUnlockAndScreenOn() - { - if (!init()) - return; - QProcess process; - process.start("xscreensaver-command", QStringList() << "-deactivate"); - process.waitForFinished(100); -#ifdef X11_dpms_FOUND - CARD16 power_level; - BOOL state; - if (DPMSInfo(display, &power_level, &state) && state) { - DPMSForceLevel(display, DPMSModeOn); - return; - } -#endif - } - -} -- cgit v1.2.3-55-g7522