summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 45f9693..73acb3a 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1177,10 +1177,8 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1177 FbTk::App::instance()->sync(false); 1177 FbTk::App::instance()->sync(false);
1178 1178
1179 1179
1180 if (isKdeDockapp(client)) { 1180 if (isKdeDockapp(client) && addKdeDockapp(client)) {
1181 if (addKdeDockapp(client)) { 1181 return 0; // dont create a FluxboxWindow for this one
1182 return 0; // dont create a FluxboxWindow for this one
1183 }
1184 } 1182 }
1185 1183
1186 WinClient *winclient = new WinClient(client, *this); 1184 WinClient *winclient = new WinClient(client, *this);
@@ -1387,7 +1385,7 @@ void BScreen::nextFocus(int opts) {
1387 break; 1385 break;
1388 } 1386 }
1389 1387
1390 FluxboxWindow *fbwin = (*it)->m_win; 1388 FluxboxWindow *fbwin = (*it)->fbwindow();
1391 if (fbwin && !fbwin->isIconic() && 1389 if (fbwin && !fbwin->isIconic() &&
1392 (fbwin->isStuck() 1390 (fbwin->isStuck()
1393 || fbwin->workspaceNumber() == currentWorkspaceID())) { 1391 || fbwin->workspaceNumber() == currentWorkspaceID())) {
@@ -1482,7 +1480,7 @@ void BScreen::prevFocus(int opts) {
1482 break; 1480 break;
1483 } 1481 }
1484 1482
1485 FluxboxWindow *fbwin = (*it)->m_win; 1483 FluxboxWindow *fbwin = (*it)->fbwindow();
1486 if (fbwin && !fbwin->isIconic() && 1484 if (fbwin && !fbwin->isIconic() &&
1487 (fbwin->isStuck() 1485 (fbwin->isStuck()
1488 || fbwin->workspaceNumber() == currentWorkspaceID())) { 1486 || fbwin->workspaceNumber() == currentWorkspaceID())) {
@@ -2220,7 +2218,7 @@ FluxboxWindow *BScreen::findGroupRight(WinClient &winclient) {
2220 other->getGroupLeftWindow() != None) 2218 other->getGroupLeftWindow() != None)
2221 return 0; 2219 return 0;
2222 2220
2223 return other->m_win; 2221 return other->fbwindow();
2224} 2222}
2225void BScreen::initXinerama() { 2223void BScreen::initXinerama() {
2226#ifdef XINERAMA 2224#ifdef XINERAMA