diff options
| author | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-05 22:57:48 +0200 |
| commit | 0cb19c0a597bfb7a6cac416fb5c0b0a89043081e (patch) | |
| tree | 1c076c798ae6ce960bccde2e0aea675143d961d8 /src/util/clientGUIUtils.h | |
| parent | Fix SIGSEGV-generating lookup bug when incoming multicast transfers are retried (diff) | |
| parent | [PVSGUI] parsing cmdargs fixed (diff) | |
| download | pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.gz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.tar.xz pvs-0cb19c0a597bfb7a6cac416fb5c0b0a89043081e.zip | |
Merge remote branch 'openslx/master' into mcastft
Conflicts:
CMakeLists.txt
pvsmgr.qrc
src/gui/clientConfigDialog.cpp
src/gui/mainWindow.cpp
src/gui/ui/mainwindow.ui
src/gui/ui/mainwindowtouch.ui
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/pvsgui.cpp
Diffstat (limited to 'src/util/clientGUIUtils.h')
| -rwxr-xr-x[-rw-r--r--] | src/util/clientGUIUtils.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/util/clientGUIUtils.h b/src/util/clientGUIUtils.h index 28b05cc..b04d3fe 100644..100755 --- a/src/util/clientGUIUtils.h +++ b/src/util/clientGUIUtils.h @@ -1,21 +1,20 @@ +#ifndef _BLANKSCREEN_H_ +#define _BLANKSCREEN_H_ + #include "src/util/consoleLogger.h" -#include <X11/Xlib.h> // Every Xlib program must include this -#include <X11/cursorfont.h> #include <assert.h> #include <unistd.h> #include <stdio.h> - #define REFRESH_RATE 0.15 - -#ifndef _BLANKSCREEN_H_ -#define _BLANKSCREEN_H_ +class BlankScreen_Sysdep; class BlankScreen { public: BlankScreen(); + virtual ~BlankScreen(); void draw(bool force = false); bool lock(); bool unlock(); @@ -23,17 +22,7 @@ public: bool lock_inputs(); private: - Display *dpy; - Window win; - XEvent ev; - int scr; - - bool locked; - - - QString lockMsg; - int blackColor, whiteColor; - int offX, offY; + BlankScreen_Sysdep* _sysdep; }; -#endif +#endif
\ No newline at end of file |