X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=9642cd062f4354efcbf6a5642c32e235157876ca;hb=6871cff3face4486055444a6c6218a552ddad461;hp=2be91335d2ffd1d49133c168e812fc99ce1ac12f;hpb=703ef4df2278adef66a65bcfc9455da41d0413e6;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 2be91335..9642cd06 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -11,8 +11,8 @@ #include "bindings.hh" #include "python.hh" #include "otk/property.hh" -#include "otk/display.hh" #include "otk/assassin.hh" +#include "otk/property.hh" #include "otk/util.hh" extern "C" { @@ -43,6 +43,10 @@ extern "C" { # include #endif // HAVE_SYS_SELECT_H +#ifdef HAVE_SYS_WAIT_H +# include +#endif // HAVE_SYS_WAIT_H + #include "gettext.h" #define _(str) gettext(str) } @@ -51,7 +55,7 @@ extern "C" { namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *openbox = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -59,7 +63,11 @@ void Openbox::signalHandler(int signal) switch (signal) { case SIGUSR1: printf("Caught SIGUSR1 signal. Restarting.\n"); - instance->restart(); + openbox->restart(); + break; + + case SIGCHLD: + wait(NULL); break; case SIGHUP: @@ -67,7 +75,7 @@ void Openbox::signalHandler(int signal) case SIGTERM: case SIGPIPE: printf("Caught signal %d. Exiting.\n", signal); - instance->shutdown(); + openbox->shutdown(); break; case SIGFPE: @@ -80,13 +88,14 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) : otk::EventDispatcher(), - otk::EventHandler() + otk::EventHandler(), + _display() { struct sigaction action; _state = State_Starting; // initializing everything - Openbox::instance = this; + openbox = this; _displayreq = (char*) 0; _argv = argv; @@ -99,11 +108,7 @@ Openbox::Openbox(int argc, char **argv) parseCommandLine(argc, argv); - // open the X display (and gets some info about it, and its screens) - otk::Display::initialize(_displayreq); - assert(otk::Display::display); - - XSynchronize(otk::Display::display, _sync); + XSynchronize(**otk::display, _sync); // set up the signal handler action.sa_handler = Openbox::signalHandler; @@ -116,20 +121,25 @@ Openbox::Openbox(int argc, char **argv) sigaction(SIGTERM, &action, (struct sigaction *) 0); sigaction(SIGINT, &action, (struct sigaction *) 0); sigaction(SIGHUP, &action, (struct sigaction *) 0); + sigaction(SIGCHLD, &action, (struct sigaction *) 0); + + // anything that died while we were restarting won't give us a SIGCHLD + while (waitpid(-1, NULL, WNOHANG) > 0); - _property = new otk::Property(); + otk::Timer::initialize(); + otk::Property::initialize(); _actions = new Actions(); _bindings = new Bindings(); setMasterHandler(_actions); // set as the master event handler // create the mouse cursors we'll use - _cursors.session = XCreateFontCursor(otk::Display::display, XC_left_ptr); - _cursors.move = XCreateFontCursor(otk::Display::display, XC_fleur); - _cursors.ll_angle = XCreateFontCursor(otk::Display::display, XC_ll_angle); - _cursors.lr_angle = XCreateFontCursor(otk::Display::display, XC_lr_angle); - _cursors.ul_angle = XCreateFontCursor(otk::Display::display, XC_ul_angle); - _cursors.ur_angle = XCreateFontCursor(otk::Display::display, XC_ur_angle); + _cursors.session = XCreateFontCursor(**otk::display, XC_left_ptr); + _cursors.move = XCreateFontCursor(**otk::display, XC_fleur); + _cursors.ll_angle = XCreateFontCursor(**otk::display, XC_ll_angle); + _cursors.lr_angle = XCreateFontCursor(**otk::display, XC_lr_angle); + _cursors.ul_angle = XCreateFontCursor(**otk::display, XC_ul_angle); + _cursors.ur_angle = XCreateFontCursor(**otk::display, XC_ur_angle); // initialize scripting python_init(argv[0]); @@ -144,8 +154,8 @@ Openbox::Openbox(int argc, char **argv) // initialize all the screens Screen *screen; - int i = _single ? DefaultScreen(otk::Display::display) : 0; - int max = _single ? i + 1 : ScreenCount(otk::Display::display); + int i = _single ? DefaultScreen(**otk::display) : 0; + int max = _single ? i + 1 : ScreenCount(**otk::display); for (; i < max; ++i) { screen = new Screen(i); if (screen->managed()) @@ -185,25 +195,24 @@ Openbox::~Openbox() delete _bindings; delete _actions; - delete _property; python_destroy(); - XSetInputFocus(otk::Display::display, PointerRoot, RevertToNone, + XSetInputFocus(**otk::display, PointerRoot, RevertToNone, CurrentTime); - XSync(otk::Display::display, false); + XSync(**otk::display, false); // this tends to block.. i honestly am not sure why. causing an x error in // the shutdown process unblocks it. blackbox simply did a ::exit(0), so // all im gunna do is the same. - //otk::Display::destroy(); + //otk::display->destroy(); + + otk::Timer::destroy(); if (_restart) { if (!_restart_prog.empty()) { - const std::string &dstr = - otk::Display::screenInfo(first_screen)->displayString(); - otk::putenv(const_cast(dstr.c_str())); - execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL); + otk::putenv(otk::display->screenInfo(first_screen)->displayString()); + execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL); perror(_restart_prog.c_str()); } @@ -321,10 +330,10 @@ void Openbox::eventLoop() { while (true) { dispatchEvents(); // from otk::EventDispatcher - XFlush(otk::Display::display); // flush here before we go wait for timers + XFlush(**otk::display); // flush here before we go wait for timers // don't wait if we're to shutdown if (_shutdown) break; - _timermanager.fire(!_sync); // wait if not in sync mode + otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode } } @@ -363,29 +372,29 @@ void Openbox::setFocusedClient(Client *c) _focused_screen = _screens[c->screen()]; } else { assert(_focused_screen); - XSetInputFocus(otk::Display::display, _focused_screen->focuswindow(), + XSetInputFocus(**otk::display, _focused_screen->focuswindow(), RevertToNone, CurrentTime); } // set the NET_ACTIVE_WINDOW hint for all screens ScreenList::iterator it, end = _screens.end(); for (it = _screens.begin(); it != end; ++it) { int num = (*it)->number(); - Window root = otk::Display::screenInfo(num)->rootWindow(); - _property->set(root, otk::Property::net_active_window, - otk::Property::Atom_Window, - (c && _focused_screen == *it) ? c->window() : None); + Window root = otk::display->screenInfo(num)->rootWindow(); + otk::Property::set(root, otk::Property::atoms.net_active_window, + otk::Property::atoms.window, + (c && _focused_screen == *it) ? c->window() : None); } // call the python Focus callbacks EventData data(_focused_screen->number(), c, EventFocus, 0); - Openbox::instance->bindings()->fireEvent(&data); + _bindings->fireEvent(&data); } void Openbox::execute(int screen, const std::string &bin) { - if (screen >= ScreenCount(otk::Display::display)) + if (screen >= ScreenCount(**otk::display)) screen = 0; - otk::bexec(bin, otk::Display::screenInfo(screen)->displayString()); + otk::bexec(bin, otk::display->screenInfo(screen)->displayString()); } }