X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=d068880baf08e8c1a6d66c2dc3adc5fea180419b;hb=7fe3301e7ea905a8a76d54c22751f3d8a346e28b;hp=9642cd062f4354efcbf6a5642c32e235157876ca;hpb=d17b86a41f13b9e01b9adef3190a2d3bb022f6a5;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 9642cd06..d068880b 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" @@ -14,18 +12,12 @@ #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,15 +26,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 @@ -52,6 +35,13 @@ extern "C" { } #include +#include +#include + +namespace otk { +extern void initialize(); +extern void destroy(); +} namespace ob { @@ -88,8 +78,7 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) : otk::EventDispatcher(), - otk::EventHandler(), - _display() + otk::EventHandler() { struct sigaction action; @@ -97,7 +86,6 @@ Openbox::Openbox(int argc, char **argv) openbox = this; - _displayreq = (char*) 0; _argv = argv; _shutdown = false; _restart = false; @@ -105,9 +93,12 @@ Openbox::Openbox(int argc, char **argv) _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = false; parseCommandLine(argc, argv); + otk::initialize(); + XSynchronize(**otk::display, _sync); // set up the signal handler @@ -126,8 +117,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::Timer::initialize(); - otk::Property::initialize(); _actions = new Actions(); _bindings = new Bindings(); @@ -145,25 +134,38 @@ Openbox::Openbox(int argc, char **argv) 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) : 0; - int max = _single ? i + 1 : ScreenCount(**otk::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); @@ -173,12 +175,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 @@ -189,8 +190,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; @@ -202,24 +201,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(); - - 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(); } @@ -230,12 +212,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 @@ -290,7 +267,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]); @@ -367,13 +344,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(); @@ -386,16 +380,9 @@ void Openbox::setFocusedClient(Client *c) } // call the python Focus callbacks - EventData data(_focused_screen->number(), c, EventFocus, 0); + EventData data(_focused_screen->number(), c, EventAction::Focus, 0); _bindings->fireEvent(&data); } -void Openbox::execute(int screen, const std::string &bin) -{ - if (screen >= ScreenCount(**otk::display)) - screen = 0; - otk::bexec(bin, otk::display->screenInfo(screen)->displayString()); -} - }