Add a couple more XCB EWMH functions. One change required a re-definition of an enumeration (WINDOWSTATE -> WINDOWVISIBILITY), so I fixed the usage of that enum in the lumina-desktop project as well.

5 files changed, 8 insertions, 24 deletions

diff --git a/lumina-desktop/LWinInfo.cpp b/lumina-desktop/LWinInfo.cpp
index b1476c4e..93f589a4 100644
--- a/lumina-desktop/LWinInfo.cpp
+++ b/lumina-desktop/LWinInfo.cpp
@@ -37,26 +37,10 @@ QString LWinInfo::Class(){
   return LSession::handle()->XCB->WindowClass(window);
 }
 	
-LXCB::WINDOWSTATE LWinInfo::status(bool update){
+LXCB::WINDOWVISIBILITY LWinInfo::status(bool update){
   if(window==0){ return LXCB::IGNORE; }
   if(update || cstate == LXCB::IGNORE){
     cstate = LSession::handle()->XCB->WindowState(window);
   }
   return cstate;
-  //LX11::WINDOWSTATE ws = LX11::GetWindowState(window);
- /*Lumina::STATES state;
-  switch(ws){
-    case LXCB::VISIBLE:
-	    state = Lumina::VISIBLE; break;
-    case LXCB::INVISIBLE:
-	    state = Lumina::INVISIBLE; break;
-    case LXCB::ACTIVE:
-	    state = Lumina::ACTIVE; break;
-    case LXCB::ATTENTION:
-	    state = Lumina::NOTIFICATION; break;
-    default:
-	    state = Lumina::NOSHOW;
-  }*/
-  //qDebug() << "Window State:" << ws << state;
-  //return ws;
 }
\ No newline at end of file
diff --git a/lumina-desktop/LWinInfo.h b/lumina-desktop/LWinInfo.h
index b483e87e..3d2ea65a 100644
--- a/lumina-desktop/LWinInfo.h
+++ b/lumina-desktop/LWinInfo.h
@@ -25,7 +25,7 @@
 class LWinInfo{
 private:
 	WId window;
-	LXCB::WINDOWSTATE cstate; //current window state
+	LXCB::WINDOWVISIBILITY cstate; //current window state
 
 public:
 	LWinInfo(WId id = 0){
@@ -44,7 +44,7 @@ public:
 	QString  text();
 	QIcon icon(bool &noicon);
 	QString Class();
-	LXCB::WINDOWSTATE status(bool update = false);
+	LXCB::WINDOWVISIBILITY status(bool update = false);
 };
 
 #endif
\ No newline at end of file
diff --git a/lumina-desktop/panel-plugins/LTBWidget.h b/lumina-desktop/panel-plugins/LTBWidget.h
index 53ea1be0..560e5811 100644
--- a/lumina-desktop/panel-plugins/LTBWidget.h
+++ b/lumina-desktop/panel-plugins/LTBWidget.h
@@ -18,7 +18,7 @@ class LTBWidget : public QToolButton{
 	Q_OBJECT
 
 private:
-	LXCB::WINDOWSTATE cstate;
+	LXCB::WINDOWVISIBILITY cstate;
 	//QString rawstyle;
 	void updateBackground(){
 	  //QString background = "background: transparent; "; //default value
@@ -52,7 +52,7 @@ public:
 	~LTBWidget(){ 
 	}
 	
-	void setState(LXCB::WINDOWSTATE newstate){
+	void setState(LXCB::WINDOWVISIBILITY newstate){
 	  cstate = newstate;
 	  updateBackground();
 	}
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
index c46c29b4..7dba1352 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
@@ -87,7 +87,7 @@ void LTaskButton::UpdateButton(){
   LWINLIST = WINLIST;
   
   winMenu->clear();
-  LXCB::WINDOWSTATE showstate = LXCB::IGNORE;
+  LXCB::WINDOWVISIBILITY showstate = LXCB::IGNORE;
   for(int i=0; i<WINLIST.length(); i++){
     if(WINLIST[i].windowID() == 0){
       WINLIST.removeAt(i);
@@ -108,7 +108,7 @@ void LTaskButton::UpdateButton(){
     bool junk;
     QAction *tmp = winMenu->addAction( WINLIST[i].icon(junk), WINLIST[i].text() );
       tmp->setData(i); //save which number in the WINLIST this entry is for
-    LXCB::WINDOWSTATE stat = WINLIST[i].status(true); //update the saved state for the window
+    LXCB::WINDOWVISIBILITY stat = WINLIST[i].status(true); //update the saved state for the window
     if(stat<LXCB::ACTIVE && WINLIST[i].windowID() == LSession::handle()->activeWindow()){ stat = LXCB::ACTIVE; }
     if(stat > showstate){ showstate = stat; } //higher priority
     
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
index c26492e4..43dbaa90 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h
@@ -49,7 +49,7 @@ private:
 	bool noicon, showText;
 
 	LWinInfo currentWindow(); //For getting the currently-active window
-	LXCB::WINDOWSTATE cstate; //current state of the button
+	LXCB::WINDOWVISIBILITY cstate; //current state of the button
 
 public slots:
 	void UpdateButton(); //re-sync the current window infomation