aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2015-07-31 10:22:29 -0400
committerKen Moore <moorekou@gmail.com>2015-07-31 10:22:29 -0400
commitb9bdd2d2276ddeb2c82cc6d94f044d7d3c914263 (patch)
tree0b86c4c791a6dbc09c144c106aa0c2a80f2ce7f2
parentConvert a few more X11 functions to XCB - almost done.... (diff)
downloadlumina-b9bdd2d2276ddeb2c82cc6d94f044d7d3c914263.tar.gz
lumina-b9bdd2d2276ddeb2c82cc6d94f044d7d3c914263.tar.bz2
lumina-b9bdd2d2276ddeb2c82cc6d94f044d7d3c914263.zip
Move all the X11 usage in LDesktop.cpp to XCB
-rw-r--r--lumina-desktop/LDesktop.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index 6546cec4..4732f651 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -349,7 +349,7 @@ void LDesktop::LocaleChanged(){
void LDesktop::UpdateMenu(bool fast){
if(DEBUG){ qDebug() << " - Update Menu:" << desktopnumber; }
//Put a label at the top
- int num = LX11::GetCurrentDesktop();
+ int num = LSession::handle()->XCB->CurrentWorkpace(); //LX11::GetCurrentDesktop();
if(DEBUG){ qDebug() << "Found workspace number:" << num; }
if(num < 0){ workspacelabel->setText( "<b>"+tr("Lumina Desktop")+"</b>"); }
else{ workspacelabel->setText( "<b>"+QString(tr("Workspace %1")).arg(QString::number(num+1))+"</b>"); }
@@ -393,7 +393,7 @@ void LDesktop::UpdateMenu(bool fast){
void LDesktop::UpdateWinMenu(){
winMenu->clear();
//Get the current list of windows
- QList<WId> wins = LX11::WindowList();
+ QList<WId> wins = LSession::handle()->XCB->WindowList();
//Now add them to the menu
for(int i=0; i<wins.length(); i++){
LWinInfo info(wins[i]);
@@ -404,7 +404,7 @@ void LDesktop::UpdateWinMenu(){
}
void LDesktop::winClicked(QAction* act){
- LX11::ActivateWindow( act->data().toString().toULong() );
+ LSession::handle()->XCB->ActivateWindow( act->data().toString().toULong() );
}
void LDesktop::UpdateDesktop(){
bgstack15