X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=9c1041acfce5f4baa31d0d8fa6964bbd06a0f83a;hb=7c32ac2b3f0bfd02a1efea1d67e5ad1c3c5be93f;hp=a70f8be44fc69eee26d0bdba10808def1deddeb4;hpb=c03068ee3a2e981e31eeda583d10b9d572de92bd;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index a70f8be4..9c1041ac 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -1,8 +1,6 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "openbox.hh" #include "client.hh" @@ -11,21 +9,15 @@ #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" +#include "otk/rendercolor.hh" +#include "otk/renderstyle.hh" extern "C" { #include -#ifdef HAVE_STDIO_H -# include -#endif // HAVE_STDIO_H - -#ifdef HAVE_STDLIB_H -# include -#endif // HAVE_STDLIB_H - #ifdef HAVE_SIGNAL_H # include #endif // HAVE_SIGNAL_H @@ -34,24 +26,21 @@ extern "C" { # include #endif // HAVE_FCNTL_H -#ifdef HAVE_UNISTD_H -# include -# include -#endif // HAVE_UNISTD_H - -#ifdef HAVE_SYS_SELECT_H -# include -#endif // HAVE_SYS_SELECT_H +#ifdef HAVE_SYS_WAIT_H +# include +#endif // HAVE_SYS_WAIT_H #include "gettext.h" #define _(str) gettext(str) } #include +#include +#include namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *openbox = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -59,7 +48,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 +60,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 +73,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; @@ -96,14 +90,11 @@ Openbox::Openbox(int argc, char **argv) _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = false; 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,44 +107,64 @@ 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); - _property = new otk::Property(); + // anything that died while we were restarting won't give us a SIGCHLD + while (waitpid(-1, NULL, WNOHANG) > 0); + + otk::RenderColor::initialize(); + otk::RenderStyle::initialize(); + 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]); // load config values - python_exec(SCRIPTDIR"/config.py"); // load openbox config values + //python_exec(SCRIPTDIR"/config.py"); // load openbox config values // run all of the python scripts - python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks + //python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks + //python_exec(SCRIPTDIR"/focus.py"); // focus helpers // run the user's script or the system defaults if that fails if (!python_exec(_scriptfilepath.c_str())) python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors // initialize all the screens - Screen *screen; - int i = _single ? DefaultScreen(otk::Display::display) : 0; - int max = _single ? i + 1 : ScreenCount(otk::Display::display); - for (; i < max; ++i) { + _focused_screen = 0; + + for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) { + Screen *screen; + // in single mode skip the screens we don't want to manage + if (_single && i != DefaultScreen(**otk::display)) { + _screens.push_back(0); + continue; + } + // try manage the screen screen = new Screen(i); - if (screen->managed()) + if (screen->managed()) { _screens.push_back(screen); - else + if (!_focused_screen) // set this to the first screen managed + _focused_screen = screen; + } else { delete screen; + _screens.push_back(0); + } } + assert(_focused_screen); + if (_screens.empty()) { printf(_("No screens were found without a window manager. Exiting.\n")); ::exit(1); @@ -163,12 +174,11 @@ Openbox::Openbox(int argc, char **argv) for (it = _screens.begin(); it != end; ++it) { (*it)->manageExisting(); } - + // grab any keys set up before the screens existed _bindings->grabKeys(true); // set up input focus - _focused_screen = _screens[0]; setFocusedClient(0); _state = State_Normal; // done starting @@ -179,38 +189,25 @@ Openbox::~Openbox() { _state = State_Exiting; // time to kill everything - int first_screen = _screens.front()->number(); - std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); 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(); - - 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); - perror(_restart_prog.c_str()); - } - - // fall back in case the above execlp doesn't work - execvp(_argv[0], _argv); - execvp(otk::basename(_argv[0]).c_str(), _argv); - } + //delete _display; + + otk::Timer::destroy(); + otk::RenderStyle::destroy(); + otk::RenderColor::destroy(); } @@ -281,7 +278,7 @@ void Openbox::showHelp() -rc use alternate resource file.\n\ -menu use alternate menu file.\n\ -script use alternate startup script file.\n\ - -sync run in synchronous mode (for debugging).\n\ + -sync run in synchronous mode (for debugging X errors).\n\ -version display version and exit.\n\ -help display this help text and exit.\n\n"), _argv[0]); @@ -319,10 +316,12 @@ void Openbox::showHelp() void Openbox::eventLoop() { - while (!_shutdown) { + while (true) { dispatchEvents(); // from otk::EventDispatcher - XFlush(otk::Display::display); // flush here before we go wait for timers - _timermanager.fire(!_sync); // wait if not in sync mode + XFlush(**otk::display); // flush here before we go wait for timers + // don't wait if we're to shutdown + if (_shutdown) break; + otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode } } @@ -356,34 +355,44 @@ Client *Openbox::findClient(Window window) void Openbox::setFocusedClient(Client *c) { + // sometimes this is called with the already-focused window, this is + // important for the python scripts to work (eg, c = 0 twice). don't just + // return if _focused_client == c + + assert(_focused_screen); + + // uninstall the old colormap + if (_focused_client) + _focused_client->installColormap(false); + else + _focused_screen->installColormap(false); + _focused_client = c; if (c) { _focused_screen = _screens[c->screen()]; + + // install the client's colormap + c->installColormap(true); } else { - assert(_focused_screen); - XSetInputFocus(otk::Display::display, _focused_screen->focuswindow(), + XSetInputFocus(**otk::display, _focused_screen->focuswindow(), RevertToNone, CurrentTime); + + // install the root window colormap + _focused_screen->installColormap(true); } // 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); -} - -void Openbox::execute(int screen, const std::string &bin) -{ - if (screen >= ScreenCount(otk::Display::display)) - screen = 0; - otk::bexec(bin, otk::Display::screenInfo(screen)->displayString()); + EventData data(_focused_screen->number(), c, EventAction::Focus, 0); + _bindings->fireEvent(&data); } }