diff options
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 2d58a01..8ed5f41 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -362,7 +362,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
362 | *resource.gc_join_style); | 362 | *resource.gc_join_style); |
363 | 363 | ||
364 | #ifdef SLIT | 364 | #ifdef SLIT |
365 | m_slit.reset(new Slit(*this, *layerManager().getLayer(fluxbox->getDesktopLayer()), | 365 | m_slit.reset(new Slit(*this, *layerManager().getLayer(Layer::DESKTOP), |
366 | fluxbox->getSlitlistFilename().c_str())); | 366 | fluxbox->getSlitlistFilename().c_str())); |
367 | #endif // SLIT | 367 | #endif // SLIT |
368 | 368 | ||
@@ -458,8 +458,6 @@ void BScreen::initWindows() { | |||
458 | Display *disp = FbTk::App::instance()->display(); | 458 | Display *disp = FbTk::App::instance()->display(); |
459 | XQueryTree(disp, rootWindow().window(), &r, &p, &children, &nchild); | 459 | XQueryTree(disp, rootWindow().window(), &r, &p, &children, &nchild); |
460 | 460 | ||
461 | Fluxbox *fluxbox = Fluxbox::instance(); | ||
462 | |||
463 | // preen the window list of all icon windows... for better dockapp support | 461 | // preen the window list of all icon windows... for better dockapp support |
464 | for (unsigned int i = 0; i < nchild; i++) { | 462 | for (unsigned int i = 0; i < nchild; i++) { |
465 | 463 | ||
@@ -486,6 +484,8 @@ void BScreen::initWindows() { | |||
486 | 484 | ||
487 | } | 485 | } |
488 | 486 | ||
487 | Fluxbox *fluxbox = Fluxbox::instance(); | ||
488 | |||
489 | // manage shown windows | 489 | // manage shown windows |
490 | // complexity: O(n^2) if we have lots of transients to transient_for | 490 | // complexity: O(n^2) if we have lots of transients to transient_for |
491 | // but usually O(n) | 491 | // but usually O(n) |
@@ -617,7 +617,7 @@ void BScreen::update(FbTk::Subject *subj) { | |||
617 | FbTk::Menu *BScreen::createMenu(const std::string &label) { | 617 | FbTk::Menu *BScreen::createMenu(const std::string &label) { |
618 | FbTk::Menu *menu = new FbMenu(menuTheme(), | 618 | FbTk::Menu *menu = new FbMenu(menuTheme(), |
619 | imageControl(), | 619 | imageControl(), |
620 | *layerManager().getLayer(Fluxbox::instance()->getMenuLayer())); | 620 | *layerManager().getLayer(Layer::MENU)); |
621 | if (!label.empty()) | 621 | if (!label.empty()) |
622 | menu->setLabel(label.c_str()); | 622 | menu->setLabel(label.c_str()); |
623 | 623 | ||
@@ -1235,7 +1235,7 @@ FluxboxWindow *BScreen::createWindow(Window client) { | |||
1235 | else { | 1235 | else { |
1236 | win = new FluxboxWindow(*winclient, | 1236 | win = new FluxboxWindow(*winclient, |
1237 | winFrameTheme(), | 1237 | winFrameTheme(), |
1238 | *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); | 1238 | *layerManager().getLayer(Layer::NORMAL)); |
1239 | 1239 | ||
1240 | if (!win->isManaged()) { | 1240 | if (!win->isManaged()) { |
1241 | delete win; | 1241 | delete win; |
@@ -1274,7 +1274,7 @@ FluxboxWindow *BScreen::createWindow(WinClient &client) { | |||
1274 | 1274 | ||
1275 | FluxboxWindow *win = new FluxboxWindow(client, | 1275 | FluxboxWindow *win = new FluxboxWindow(client, |
1276 | winFrameTheme(), | 1276 | winFrameTheme(), |
1277 | *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); | 1277 | *layerManager().getLayer(Layer::NORMAL)); |
1278 | 1278 | ||
1279 | #ifdef SLIT | 1279 | #ifdef SLIT |
1280 | if (win->initialState() == WithdrawnState && slit() != 0) { | 1280 | if (win->initialState() == WithdrawnState && slit() != 0) { |