diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-06-27 08:20:14 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-06-27 08:20:14 -0400 |
| commit | 79ed54ff31ed654b953d46987851ce4f572245c2 (patch) | |
| tree | b61de25f0ece7cfdb266f396a826b271c47ed0dd /src-qt5/core/lumina-desktop-unified/global-objects.h | |
| parent | Quick fix for the mkport.sh script (diff) | |
| download | lumina-79ed54ff31ed654b953d46987851ce4f572245c2.tar.gz lumina-79ed54ff31ed654b953d46987851ce4f572245c2.tar.bz2 lumina-79ed54ff31ed654b953d46987851ce4f572245c2.zip | |
Another large batch of re-organization for lumina-desktop-unified.
This gets the new "NativeWindowSystem" and associated Native* classes all integrated (untested)
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/global-objects.h')
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/global-objects.h | 12 |
1 files changed, 8 insertions, 4 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..8d76772e 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,9 +30,13 @@ #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 //ScreenSaver @@ -43,7 +47,7 @@ namespace Lumina{ //LWindowManager *WM; //Application List extern XDGDesktopList *APPLIST; - + extern QThread *EVThread; //X Event thread }; |