aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop-unified/global-objects.h
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-01-09 14:41:30 -0500
committerKen Moore <ken@ixsystems.com>2017-01-09 14:41:30 -0500
commitd1750c349cf59bce56569e5be74886edc97ba967 (patch)
tree48a28f398286f721c8272c85017aa8bbf3b83228 /src-qt5/core/lumina-desktop-unified/global-objects.h
parentFlip the location of the +/- buttons on the panel config widget to match the ... (diff)
parentMerge remote-tracking branch 'origin/master' (diff)
downloadlumina-d1750c349cf59bce56569e5be74886edc97ba967.tar.gz
lumina-d1750c349cf59bce56569e5be74886edc97ba967.tar.bz2
lumina-d1750c349cf59bce56569e5be74886edc97ba967.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.h28
1 files changed, 24 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 d712c32b..043bc46c 100644
--- a/src-qt5/core/lumina-desktop-unified/global-objects.h
+++ b/src-qt5/core/lumina-desktop-unified/global-objects.h
@@ -1,15 +1,29 @@
//===========================================
// Lumina-desktop source code
-// Copyright (c) 2015-2016, Ken Moore
+// Copyright (c) 2015-2017, Ken Moore
// Available under the 3-clause BSD license
// See the LICENSE file for full details
//===========================================
-// Global defines and enumerations for external includes
+// Global defines and enumerations for internal includes
//===========================================
+
+//====WARNING=====
+// ONLY #include this file within *.cpp files
+// Use "global-includes.h" for the generic includes in *.h files
+//=================
+
#ifndef _LUMINA_INTERNAL_GLOBAL_OBJECTS_H
#define _LUMINA_INTERNAL_GLOBAL_OBJECTS_H
-#include "Global-includes.h"
+#include "global-includes.h"
+
+//Load the appropriate "EventFilter" class for the graphics subsystem
+//#ifndef USE_WAYLAND
+#include <LXcbEventFilter.h>
+//#endif
+
+#include "<LScreenSaver.h>"
+#include "src-WM/LWindowManager.h"
//Any special defines for settings/testing
#define ANIMTIME 80 //animation time in milliseconds
@@ -20,7 +34,13 @@ namespace Lumina{
enum WindowAction{MoveResize, Show, Hide, TryClose, Closed, WA_NONE};
//Data structures and objects
- extern LXCB *SYSTEM;
+ extern EventFilter *EFILTER; //Native Event Watcher
+ //ScreenSaver
+ extern LScreenSaver *SS;
+ //Window Manager
+ //LWindowManager *WM;
+
+ QThread *EVThread; //X Event thread
};
bgstack15