Continue the re-assembly of the desktop backend.

Move the system tray registration/management into the XCB Event Filter class itself (since it needs access to the XCB library functions to work). This should restrict almost all use of the XCB classes to the EventFilter instance itself.
Also continue moving around the source files as they are evaluated and tied into the project file. The src-screensaver and src-eventfilter directories are used now, but the src-DE and src-WM directories are still just holding cells for the files from the old lumina-desktop and lumina-wm subprojects that are not yet evaluated.

3 files changed, 474 insertions, 0 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.cpp b/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.cpp
new file mode 100644
index 00000000..e2b1cb2c
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.cpp
@@ -0,0 +1,345 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2015-2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "LXcbEventFilter.h"
+
+//==================================================
+// NOTE: All the XCB interactions and atoms are accessed via: 
+//    obj->XCB->EWMH.(atom name)
+//    obj->XCB->(do something)
+//==================================================
+#include "global-objects.h"
+
+//SYSTEM TRAY STANDARD DEFINITIONS
+#define SYSTEM_TRAY_REQUEST_DOCK 0
+#define SYSTEM_TRAY_BEGIN_MESSAGE 1
+#define SYSTEM_TRAY_CANCEL_MESSAGE 2
+
+
+#define DEBUG 1
+
+// Also keep the root window/screen around for use in the filters
+namespace L_XCB{
+  xcb_screen_t *root_screen;
+  xcb_window_t root;
+}
+
+//Constructor for the Event Filter wrapper
+EventFilter::EventFilter() : QObject(){
+  XCB = new LXCB();
+  EF = new XCBEventFilter(this);
+  L_XCB::root_screen = xcb_aux_get_screen(QX11Info::connection(), QX11Info::appScreen());
+  L_XCB::root = L_XCB::root_screen->root;
+  WMFlag = 0;
+}
+
+void EventFilter::start(){
+  if(DEBUG){ qDebug() << " - Install event filter..."; }
+  QCoreApplication::instance()->installNativeEventFilter(EF);
+   if(DEBUG){ qDebug() << " - Run request check..."; }
+   if(!XCB->setupEventsForRoot()){
+     qCritical() << "[ERROR] Unable to setup WM event retrieval. Is another WM running?";
+     exit(1);
+   }
+  if(DEBUG){ qDebug() << " - Create WM ID Window"; }
+  WMFlag = XCB->WM_CreateWindow();
+      XCB->setupEventsForRoot(WMFlag);
+      XCB->WM_Set_Supporting_WM(WMFlag);
+
+  EF->startSystemTray();
+
+  QCoreApplication::instance()->flush();
+}
+
+void EventFilter::stop(){
+  EF->stopSystemTray();
+}
+
+QList<WId> EventFilter::currentTrayApps(){
+  return EF->trayApps();
+}
+
+//=============================
+//  XCBEventFilter Class
+//=============================
+
+//Constructor for the XCB event filter
+XCBEventFilter::XCBEventFilter(EventFilter *parent) : QAbstractNativeEventFilter(){
+  obj = parent;
+  SystemTrayID = 0;
+  TrayDmgID = 0;
+  InitAtoms();
+}
+
+void XCBEventFilter::InitAtoms(){
+  //Initialize any special atoms that we need to save/use regularly
+  //NOTE: All the EWMH atoms are already saved globally in obj->XCB->EWMH
+  WinNotifyAtoms.clear();
+    WinNotifyAtoms << obj->XCB->EWMH._NET_WM_NAME \
+				<< obj->XCB->EWMH._NET_WM_VISIBLE_NAME \
+				<< obj->XCB->EWMH._NET_WM_ICON_NAME \
+				<< obj->XCB->EWMH._NET_WM_VISIBLE_ICON_NAME \
+				<< obj->XCB->EWMH._NET_WM_ICON \
+				<< obj->XCB->EWMH._NET_WM_ICON_GEOMETRY;
+	
+  SysNotifyAtoms.clear();
+    SysNotifyAtoms << obj->XCB->EWMH._NET_CLIENT_LIST \
+				<< obj->XCB->EWMH._NET_CLIENT_LIST_STACKING \
+				<< obj->XCB->EWMH._NET_CURRENT_DESKTOP \
+				<< obj->XCB->EWMH._NET_WM_STATE \
+				<< obj->XCB->EWMH._NET_ACTIVE_WINDOW \
+				<< obj->XCB->EWMH._NET_WM_ICON \
+				<< obj->XCB->EWMH._NET_WM_ICON_GEOMETRY;
+}
+
+bool XCBEventFilter::startSystemTray(){
+
+}
+
+bool XCBEventFilter::stopSystemTray(){
+
+}
+
+//This function format taken directly from the Qt5.3 documentation
+bool XCBEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE
+{
+	//if(stopping){ return false; } //don't do any parsing
+	//qDebug() << "New Event";
+	bool stopevent = false;
+	if(eventType=="xcb_generic_event_t"){
+	  //Convert to known event type (for X11 systems)
+	   xcb_generic_event_t *ev = static_cast<xcb_generic_event_t *>(message);
+	  //Now parse the event and emit signals as necessary
+	  switch( ev->response_type & ~0x80){
+//==============================
+//  INTERACTIVITY EVENTS
+//==============================
+	    case XCB_KEY_PRESS:
+		//This is a keyboard key press
+	 	//qDebug() << "Key Press Event";
+		obj->emit NewInputEvent();
+	        stopevent = BlockInputEvent( ((xcb_key_press_event_t *) ev)->root ); //use the main "root" window - not the child widget
+		break;
+	    case XCB_KEY_RELEASE:
+		//This is a keyboard key release
+		//qDebug() << "Key Release Event";
+		obj->emit NewInputEvent();
+	        stopevent = BlockInputEvent( ((xcb_key_release_event_t *) ev)->root ); //use the main "root" window - not the child widget
+		break;
+	    case XCB_BUTTON_PRESS:
+		//This is a mouse button press
+		//qDebug() << "Button Press Event";
+		obj->emit NewInputEvent();
+		stopevent = BlockInputEvent( ((xcb_button_press_event_t *) ev)->root ); //use the main "root" window - not the child widget
+	        if(!stopevent){
+		  //Activate the window right now if needed
+		  if(obj->XCB->WM_Get_Active_Window()!=((xcb_button_press_event_t *) ev)->root){
+		    obj->XCB->WM_Set_Active_Window( ((xcb_button_press_event_t *) ev)->root);
+		  }
+		}
+		break;
+	    case XCB_BUTTON_RELEASE:
+		//This is a mouse button release
+		//qDebug() << "Button Release Event";
+	        //xcb_button_release_event_t *tmp = (xcb_button_release_event_t *)ev;
+		stopevent = BlockInputEvent( ((xcb_button_release_event_t *) ev)->root ); //use the main "root" window - not the child widget
+		break;
+	    case XCB_MOTION_NOTIFY:
+		//This is a mouse movement event
+		//qDebug() << "Motion Notify Event";
+		obj->emit NewInputEvent();
+	        stopevent = BlockInputEvent( ((xcb_motion_notify_event_t *) ev)->root ); //use the main "root" window - not the child widget);
+	        break;
+	    case XCB_ENTER_NOTIFY:
+		//This is a mouse movement event when mouse goes over a new window
+		//qDebug() << "Enter Notify Event";
+		obj->emit NewInputEvent();
+	        stopevent = BlockInputEvent( ((xcb_enter_notify_event_t *) ev)->root );
+	        break;
+	    case XCB_LEAVE_NOTIFY:
+		//This is a mouse movement event when mouse goes leaves a window
+		//qDebug() << "Leave Notify Event";
+		obj->emit NewInputEvent();
+	        stopevent = BlockInputEvent();
+	        break;
+//==============================
+	    case XCB_EXPOSE:
+		//qDebug() << "Expose Notify Event:";
+		//qDebug() << " - Given Window:" << ((xcb_property_notify_event_t*)ev)->window;
+		break;
+//==============================
+	    case XCB_MAP_NOTIFY:
+		break; //This is just a notification that a window was mapped - nothing needs to change here
+	    case XCB_MAP_REQUEST:
+		qDebug() << "Window Map Request Event";
+	        obj->emit ModifyWindow( ((xcb_map_request_event_t *) ev)->window, LWM::Show);
+		break;
+//==============================	    
+	    case XCB_CREATE_NOTIFY:
+		qDebug() << "Window Create Event";
+	        break;
+//==============================
+	    case XCB_UNMAP_NOTIFY:
+		qDebug() << "Window Unmap Event";
+		obj->emit ModifyWindow( ((xcb_unmap_notify_event_t *)ev)->window, LWM::Hide);
+		break;
+//==============================	    
+	    case XCB_DESTROY_NOTIFY:
+		qDebug() << "Window Closed Event";
+		if( !rmTrayApp( ((xcb_destroy_notify_event_t *) ev)->window ) ){
+		  obj->emit WindowClosed( ((xcb_destroy_notify_event_t *) ev)->window );
+		}
+	        break;
+//==============================
+	    case XCB_FOCUS_IN:
+		//qDebug() << "Focus In Event:";
+		break;	    
+//==============================
+	    case XCB_FOCUS_OUT:
+		//qDebug() << "Focus Out Event:";
+		break;
+//==============================
+	    case XCB_PROPERTY_NOTIFY:
+		//qDebug() << "Property Notify Event:";
+		//qDebug() << " - Given Window:" << ((xcb_property_notify_event_t*)ev)->window;
+		break;
+//==============================	    
+	    case XCB_CLIENT_MESSAGE:
+		//qDebug() << "Client Message Event";
+		//qDebug() << " - Given Window:" << ((xcb_client_message_event_t*)ev)->window;
+		if( ((xcb_client_message_event_t*)ev)->type == _NET_SYSTEM_TRAY_OPCODE && ((xcb_client_message_event_t*)ev)->format == 32){
+		  //data32[0] is timestamp, [1] is opcode, [2] is  window handle
+		  if(SYSTEM_TRAY_REQUEST_DOCK == ((xcb_client_message_event_t*)ev)->data.data32[1]){
+		      addTrayApp( ((xcb_client_message_event_t*)ev)->data.data32[2] );
+		  }
+		  //Ignore the System Tray messages at the moment
+		  
+	        }
+	        break;
+//==============================	    
+	    case XCB_CONFIGURE_NOTIFY:
+		//qDebug() << "Configure Notify Event";
+	        break;
+//==============================	    
+	    case XCB_CONFIGURE_REQUEST:
+		//qDebug() << "Configure Request Event";
+	        break;
+//==============================	    
+	    case XCB_SELECTION_CLEAR:
+		//qDebug() << "Selection Clear Event";
+	        break;
+//==============================	    
+	    case 85: //not sure what event this is - but it seems to come up very often (just hide the notice)
+	    case 0:
+	    case XCB_GE_GENERIC:
+		break; //generic event - don't do anything special
+	    default:
+		//if( (ev->response_type & ~0x80)==TrayDmgID){
+		  checkDamageID( ((xcb_damage_notify_event_t*)ev)->drawable );
+		//}else{
+		  qDebug() << "Default Event:" << (ev->response_type & ~0x80);
+		//}
+//==============================
+	  }
+	}
+	return false; 
+	//never stop event handling (this will not impact the X events themselves - just the internal screensaver/WM/widgets)
+}
+
+//System Tray Functions
+QList<WId> XCBEventFilter::trayApps(){
+   //return the list of all current tray apps
+    //Check the validity of all the current tray apps (make sure nothing closed erratically)
+    for(int i=0; i<RunningTrayApps.length(); i++){
+      if(obj->XCB->WindowClass(RunningTrayApps[i]).isEmpty()){ 
+        obj->emit Tray_AppClosed(RunningTrayApps.takeAt(i) ); 
+        i--; 
+      }
+    }
+  return RunningTrayApps;
+}
+
+bool XCBEventFilter::startSystemTray(){
+  if(SystemTrayID != 0){ return; } //already started
+  RunningTrayApps.clear(); //nothing running yet
+  SystemTrayID = obj->XCB->startSystemTray(0);
+  if(SystemTrayID!=0){
+    obj->XCB->SelectInput(SystemTrayID); //make sure TrayID events get forwarded here
+    TrayDmgID = obj->XCB->GenerateDamageID(SystemTrayID);
+    qDebug() << "System Tray Started Successfully";
+    if(DEBUG){ qDebug() << " - System Tray Flags:" << TrayDmgID; }
+  }
+  return (SystemTrayID!=0);
+}
+
+bool XCBEventFilter::stopSystemTray(){
+  if(SystemTrayID==0){ return; } //already stopped
+  qDebug() << "Stopping system tray...";
+  //Close all the running Tray Apps
+  QList<WId> tmpApps = RunningTrayApps;
+  //RunningTrayApps.clear(); //clear this ahead of time so tray's do not attempt to re-access the apps
+  //Close all the running tray apps
+    for(int i=0; i<tmpApps.length(); i++){
+      qDebug() << " - Stopping tray app:" << obj->XCB->WindowClass(tmpApps[i]);
+      //Tray apps are special and closing the window does not close the app
+      obj->XCB->KillClient(tmpApps[i]);
+    }  
+  //Now close down the tray backend
+ obj->XCB->closeSystemTray(SystemTrayID);
+  SystemTrayID = 0;
+  TrayDmgID = 0; 
+}
+
+//=========
+//  PRIVATE
+//=========
+bool XCBEventFilter::BlockInputEvent(WId win){
+  //Checks the current state of the WM and sets the stop flag as needed
+  // - Always let the screensaver know about the event first (need to reset timers and such)
+  obj->emit NewInputEvent();
+  // - Check the state of the screensaver
+  if(SS->isLocked()){ qDebug() << "SS Locked"; return true; }
+  // - Check the state of any fullscreen apps
+  /*else if( win!=0 && !obj->FS_WINS.isEmpty()){
+    if(!obj->FS_WINS.contains(win) ){
+      //If this event is for an app underneath a fullscreen window - stop it
+      if(obj->FS_WINS.length() == QApplication::desktop()->screenCount()){ qDebug() << "Screens Covered"; return true; } //all screens covered right now
+    }
+  }*/
+  return false;
+}
+
+//System Tray functions
+void XCBEventFilter::addTrayApp(WId win){
+  if(SystemTrayID==0){ return; }
+  if(RunningTrayApps.contains(win)){ return; } //already managed
+  qDebug() << "Session Tray: Window Added" << obj->XCB->windowClass(win);
+  RunningTrayApps << win;
+  if(DEBUG){ qDebug() << "Tray List Changed"; }
+  obj->emit Tray_AppAdded(win);
+}
+
+bool XCBEventFilter::rmTrayApp(WId win){
+   //returns "true" if the tray app was found and removed
+  if(SystemTrayID==0){ return false; }
+  for(int i=0; i<RunningTrayApps.length(); i++){
+    if(win==RunningTrayApps[i]){ 
+      qDebug() << "Session Tray: Window Removed";
+      RunningTrayApps.removeAt(i); 
+      obj->emit Tray_AppClosed(win);
+      return true;
+    }
+  }
+  return false;
+}
+
+void XCBEventFilter::checkDamageID(WId id){
+  if(runningTrayApps.contains(id)){
+    obj->emit Tray_AppUpdated(id);
+  }else{
+    //Could check for window damage ID's - but we should not need this
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.h b/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.h
new file mode 100644
index 00000000..6726ef8b
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-events/LXcbEventFilter.h
@@ -0,0 +1,123 @@
+//===========================================
+//  Lumina-DE source code
+//  Copyright (c) 2012-2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This class provides the XCB event handling/registrations that are needed
+//===========================================
+#ifndef _LUMINA_DESKTOP_XCB_FILTER_H
+#define _LUMINA_DESKTOP_XCB_FILTER_H
+
+#include "GlobalDefines.h"
+
+
+/*
+List of XCB response types (since almost impossible to find good docs on XCB)
+switch (xcb_generic_event_t*->response_type  & ~0x80)
+case values:
+XCB_KEY_[PRESS | RELEASE]
+XCB_BUTTON_[PRESS | RELEASE]
+XCB_MOTION_NOTIFY
+XCB_ENTER_NOTIFY
+XCB_LEAVE_NOTIFY
+XCB_FOCUS_[IN | OUT]
+XCB_KEYMAP_NOTIFY
+XCB_EXPOSE
+XCB_GRAPHICS_EXPOSURE
+XCB_VISIBILITY_NOTIFY
+XCB_CREATE_NOTIFY
+XCB_DESTROY_NOTIFY
+XCB_UNMAP_NOTIFY
+XCB_MAP_[NOTIFY | REQUEST]
+XCB_REPARENT_NOTIFY
+XCB_CONFIGURE_[NOTIFY | REQUEST]
+XCB_GRAVITY_NOTIFY
+XCB_RESIZE_REQUEST
+XCB_CIRCULATE_[NOTIFY | REQUEST]
+XCB_PROPERTY_NOTIFY
+XCB_SELECTION_[CLEAR | REQUEST | NOTIFY]
+XCB_COLORMAP_NOTIFY
+XCB_CLIENT_MESSAGE
+*/
+
+			
+class EventFilter : public QObject{
+	Q_OBJECT
+private:
+	QAbstractNativeEventFilter* EF;
+	WId WMFlag; //used to flag a running WM process
+
+public:
+	EventFilter();
+	~EventFilter(){}
+
+	void start();
+	void stop();
+
+	//Public System Tray Functions
+	QList<WId> currentTrayApps();
+
+	//Variables/Functions needed by the XCBEventFilter class only (not really needed by anything else)
+	LXCB *XCB; //used to interact with the X11 graphics subsystem
+
+public slots:
+
+signals:
+	void NewInputEvent();
+	void NewManagedWindow(WId);
+	void WindowClosed(WId);
+	void ModifyWindow(WId win, LWM::WindowAction);
+
+	//System Tray Signals
+	void Tray_AppAdded(WId); //new tray app registered
+	void Tray_AppClosed(WId); //tray app de-registered
+	void Tray_AppUpdated(WId); //tray app appearance changed (damage event)
+};
+	
+class XCBEventFilter : public QAbstractNativeEventFilter{
+public:
+	XCBEventFilter(EventFilter *parent);
+	~XCBEventFilter(){}
+
+	virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *);
+		
+	//System Tray Functions
+	QList<WId> trayApps(); //return the list of all current tray apps
+	bool startSystemTray();
+	bool stopSystemTray();
+
+private:
+	EventFilter *obj;
+	QList<xcb_atom_t> WinNotifyAtoms, SysNotifyAtoms;
+	void InitAtoms();	
+
+	bool BlockInputEvent(WId win = 0); //Checks the current state of the system to see if the event should be stopped
+
+	//System Tray Variables
+	WId SystemTrayID;
+	int TrayDmgID;
+	QList<WId> RunningTrayApps;
+	//System Tray functions
+	void addTrayApp(WId);
+	bool rmTrayApp(WId); //returns "true" if the tray app was found and removed
+	void checkDamageID(WId);
+
+	//Longer Event handling functions
+	//bool ParseKeyPressEvent();
+	//bool ParseKeyReleaseEvent();
+	//bool ParseButtonPressEvent();
+	//bool ParseButtonReleaseEvent();
+	//bool ParseMotionEvent();
+	//bool ParsePropertyEvent();
+	//bool ParseClientMessageEvent();
+	//bool ParseDestroyEvent();
+	//bool ParseConfigureEvent();
+	//bool ParseKeySelectionClearEvent();
+	
+	
+
+	
+};
+
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-events/events.pri b/src-qt5/core/lumina-desktop-unified/src-events/events.pri
new file mode 100644
index 00000000..38225d7f
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-events/events.pri
@@ -0,0 +1,6 @@
+SOURCES *= $${PWD}/LXCBEventFilter.cpp
+
+HEADERS *= $${PWD}/LXCBEventFilter.h
+
+#update the includepath so we can just (#include <LXCBEventFilter.h>) as needed without paths
+INCLUDEPATH *= ${PWD}