aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc57
1 files changed, 0 insertions, 57 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2ebf931..e93f363 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -63,9 +63,6 @@
63#include "config.h" 63#include "config.h"
64#endif // HAVE_CONFIG_H 64#endif // HAVE_CONFIG_H
65 65
66#ifdef SLIT
67#include "Slit.hh"
68#endif // SLIT
69#ifdef USE_GNOME 66#ifdef USE_GNOME
70#include "Gnome.hh" 67#include "Gnome.hh"
71#endif // USE_GNOME 68#endif // USE_GNOME
@@ -75,11 +72,6 @@
75#ifdef REMEMBER 72#ifdef REMEMBER
76#include "Remember.hh" 73#include "Remember.hh"
77#endif // REMEMBER 74#endif // REMEMBER
78#ifdef USE_TOOLBAR
79#include "Toolbar.hh"
80#else
81class Toolbar { };
82#endif // USE_TOOLBAR
83 75
84// X headers 76// X headers
85#include <X11/Xlib.h> 77#include <X11/Xlib.h>
@@ -423,25 +415,11 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
423 // 415 //
424 // m_resourcemanager.dump(); 416 // m_resourcemanager.dump();
425 417
426#ifdef USE_TOOLBAR
427 // finally, show toolbar
428 Toolbars::iterator toolbar_it = m_toolbars.begin();
429 Toolbars::iterator toolbar_it_end = m_toolbars.end();
430 for (; toolbar_it != toolbar_it_end; ++toolbar_it)
431 (*toolbar_it)->updateVisibleState();
432#endif // USE_TOOLBAR
433
434} 418}
435 419
436 420
437Fluxbox::~Fluxbox() { 421Fluxbox::~Fluxbox() {
438 422
439 // destroy toolbars
440 while (!m_toolbars.empty()) {
441 delete m_toolbars.back();
442 m_toolbars.pop_back();
443 }
444
445 // destroy atomhandlers 423 // destroy atomhandlers
446 for (AtomHandlerContainerIt it= m_atomhandler.begin(); 424 for (AtomHandlerContainerIt it= m_atomhandler.begin();
447 it != m_atomhandler.end(); 425 it != m_atomhandler.end();
@@ -467,40 +445,9 @@ Fluxbox::~Fluxbox() {
467 445
468void Fluxbox::initScreen(BScreen *screen) { 446void Fluxbox::initScreen(BScreen *screen) {
469 447
470 Display* disp = display();
471
472 // now we can create menus (which needs this screen to be in screen_list) 448 // now we can create menus (which needs this screen to be in screen_list)
473 screen->initMenus(); 449 screen->initMenus();
474 450
475#ifdef HAVE_GETPID
476 pid_t bpid = getpid();
477
478 screen->rootWindow().changeProperty(getFluxboxPidAtom(), XA_CARDINAL,
479 sizeof(pid_t) * 8, PropModeReplace,
480 (unsigned char *) &bpid, 1);
481#endif // HAVE_GETPID
482
483#ifdef HAVE_RANDR
484 // setup RANDR for this screens root window
485 // we need to determine if we should use old randr select input function or not
486#ifdef X_RRScreenChangeSelectInput
487 // use old set randr event
488 XRRScreenChangeSelectInput(disp, screen->rootWindow().window(), True);
489#else
490 XRRSelectInput(disp, screen->rootWindow().window(),
491 RRScreenChangeNotifyMask);
492#endif // X_RRScreenChangeSelectInput
493
494#endif // HAVE_RANDR
495
496
497#ifdef USE_TOOLBAR
498 m_toolbars.push_back(new Toolbar(*screen,
499 *screen->layerManager().
500 getLayer(::Layer::NORMAL)));
501#endif // USE_TOOLBAR
502
503 // must do this after toolbar is created
504 screen->initWindows(); 451 screen->initWindows();
505 452
506 // attach screen signals to this 453 // attach screen signals to this
@@ -519,10 +466,6 @@ void Fluxbox::initScreen(BScreen *screen) {
519 } 466 }
520 467
521 FocusControl::revertFocus(*screen); // make sure focus style is correct 468 FocusControl::revertFocus(*screen); // make sure focus style is correct
522#ifdef SLIT
523 if (screen->slit())
524 screen->slit()->show();
525#endif // SLIT
526 469
527} 470}
528 471