X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=951d4ab45ca82d532461a684a75a40fd2123017c;hb=d2a1ecb1b50902d262a74e347203a36a961e1d92;hp=5e53fb0632ab4860ee430c147128865222c227df;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 5e53fb06..951d4ab4 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" @@ -15,18 +13,12 @@ #include "otk/property.hh" #include "otk/util.hh" #include "otk/rendercolor.hh" +#include "otk/renderstyle.hh" +#include "otk/messagedialog.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 @@ -35,15 +27,6 @@ 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 @@ -53,6 +36,13 @@ extern "C" { } #include +#include +#include + +namespace otk { +extern void initialize(); +extern void destroy(); +} namespace ob { @@ -89,8 +79,7 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) : otk::EventDispatcher(), - otk::EventHandler(), - _display() + otk::EventHandler() { struct sigaction action; @@ -98,7 +87,6 @@ Openbox::Openbox(int argc, char **argv) openbox = this; - _displayreq = (char*) 0; _argv = argv; _shutdown = false; _restart = false; @@ -106,9 +94,13 @@ Openbox::Openbox(int argc, char **argv) _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = false; + _remote = false; parseCommandLine(argc, argv); + otk::initialize(); + XSynchronize(**otk::display, _sync); // set up the signal handler @@ -127,9 +119,6 @@ Openbox::Openbox(int argc, char **argv) // anything that died while we were restarting won't give us a SIGCHLD while (waitpid(-1, NULL, WNOHANG) > 0); - otk::RenderColor::initialize(); - otk::Timer::initialize(); - otk::Property::initialize(); _actions = new Actions(); _bindings = new Bindings(); @@ -143,29 +132,23 @@ Openbox::Openbox(int argc, char **argv) _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 - // run all of the python scripts - //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 + _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); } @@ -176,16 +159,71 @@ Openbox::Openbox(int argc, char **argv) ::exit(1); } + assert(_focused_screen); + ScreenList::iterator it, end = _screens.end(); + + // run the user's script or the system defaults if that fails + bool pyerr, doretry; + do { + // initialize scripting + python_init(argv[0]); + + // load all of the screens' configs here so we have a theme set if + // we decide to show the dialog below + for (it = _screens.begin(); it != end; ++it) + (*it)->config().load(); // load the defaults from config.py + + pyerr = doretry = false; + + // reset all the python stuff + _bindings->removeAllKeys(); + _bindings->removeAllButtons(); + _bindings->removeAllEvents(); + + int ret = python_exec(_scriptfilepath.c_str()); + if (ret == 2) + pyerr = true; + + if (ret) { + // reset all the python stuff + _bindings->removeAllKeys(); + _bindings->removeAllButtons(); + _bindings->removeAllEvents(); + + if (python_exec(SCRIPTDIR"/defaults.py")) // system default bahaviors + pyerr = true; + } + + if (pyerr) { + std::string msg; + msg += _("An error occured while executing the python scripts."); + msg += "\n\n"; + msg += _("See the exact error message in Openbox's output for details."); + otk::MessageDialog dia(this, _("Python Error"), msg); + otk::DialogButton ok(_("Okay"), true); + otk::DialogButton retry(_("Retry")); + dia.addButton(ok); + dia.addButton(retry); + dia.show(); + dia.focus(); + const otk::DialogButton &res = dia.run(); + if (res == retry) { + doretry = true; + python_destroy(); // kill all the python modules so they reinit right + } + } + } while (pyerr && doretry); + for (it = _screens.begin(); it != end; ++it) { + (*it)->config().load(); // load the config as the scripts may change it (*it)->manageExisting(); } - + // grab any keys set up before the screens existed - _bindings->grabKeys(true); + //_bindings->grabKeys(true); // set up input focus - _focused_screen = _screens[0]; setFocusedClient(0); _state = State_Normal; // done starting @@ -196,8 +234,6 @@ 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; @@ -209,25 +245,7 @@ Openbox::~Openbox() CurrentTime); 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::Timer::destroy(); - otk::RenderColor::destroy(); - - if (_restart) { - if (!_restart_prog.empty()) { - otk::putenv(otk::display->screenInfo(first_screen)->displayString()); - execl("/bin/sh", "/bin/sh", "-c", _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); - } + otk::destroy(); } @@ -238,12 +256,7 @@ void Openbox::parseCommandLine(int argc, char **argv) for (int i = 1; i < argc; ++i) { std::string arg(argv[i]); - if (arg == "-display") { - if (++i >= argc) - err = true; - else - _displayreq = argv[i]; - } else if (arg == "-rc") { + if (arg == "-rc") { if (++i >= argc) err = true; else @@ -262,6 +275,8 @@ void Openbox::parseCommandLine(int argc, char **argv) _sync = true; } else if (arg == "-single") { _single = true; + } else if (arg == "-remote") { + _remote = true; } else if (arg == "-version") { showVersion(); ::exit(0); @@ -293,12 +308,13 @@ void Openbox::showHelp() // print program usage and command line options printf(_("Usage: %s [OPTIONS...]\n\ Options:\n\ - -display use display connection.\n\ + -remote optimize for a remote (low bandwidth) connection to the\n\ + display/Xserver.\n\ -single run on a single screen (default is to run every one).\n\ -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]); @@ -337,8 +353,10 @@ void Openbox::showHelp() void Openbox::eventLoop() { while (true) { - dispatchEvents(); // from otk::EventDispatcher - XFlush(**otk::display); // flush here before we go wait for timers + dispatchEvents(false); // from otk::EventDispatcher +// XFlush(**otk::display); // flush here before we go wait for timers + // .. the XPending() should have done this last + // already, it does a flush when it returns 0 // don't wait if we're to shutdown if (_shutdown) break; otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode @@ -375,13 +393,30 @@ 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, _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();