diff options
| author | Weblate <noreply@weblate.org> | 2017-07-19 18:57:55 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-07-19 18:57:55 +0000 |
| commit | 72e16f90563b4998a71feed573140041f2db8fc3 (patch) | |
| tree | cc9418321d40d2fa187c6b48e174cea360f7fd27 /src-qt5/core/lumina-desktop-unified/global-objects.h | |
| parent | Translated using Weblate (Czech) (diff) | |
| parent | Merge branch 'master' of github.com:trueos/lumina (diff) | |
| download | lumina-72e16f90563b4998a71feed573140041f2db8fc3.tar.gz lumina-72e16f90563b4998a71feed573140041f2db8fc3.tar.bz2 lumina-72e16f90563b4998a71feed573140041f2db8fc3.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/global-objects.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/global-objects.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/global-objects.h b/src-qt5/core/lumina-desktop-unified/global-objects.h index 2f298e27..474412eb 100644 --- a/src-qt5/core/lumina-desktop-unified/global-objects.h +++ b/src-qt5/core/lumina-desktop-unified/global-objects.h @@ -19,7 +19,7 @@ //Load the appropriate "EventFilter" class for the graphics subsystem //#ifndef USE_WAYLAND -#include "src-events/LXcbEventFilter.h" +//#include "src-events/LXcbEventFilter.h" //#endif #include "src-events/LShortcutEvents.h" @@ -30,11 +30,15 @@ #define ANIMTIME 80 //animation time in milliseconds //Global flags/structures -namespace Lumina{ +namespace Lumina{ //Data structures and objects - extern EventFilter *EFILTER; //Native Event Watcher + // -- Native Window System Objects + extern NativeWindowSystem *NWS; + extern NativeEventFilter *NEF; + + //extern EventFilter *EFILTER; //Native Event Watcher extern LShortcutEvents *SHORTCUTS; //Keyboard/mouse shortcut events - extern DesktopSettings *SETTINGS; //All Settings files + //extern DesktopSettings *SETTINGS; //All Settings files //ScreenSaver extern LScreenSaver *SS; //Root Window @@ -43,7 +47,7 @@ namespace Lumina{ //LWindowManager *WM; //Application List extern XDGDesktopList *APPLIST; - + extern QThread *EVThread; //X Event thread }; |