X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=50146e270dad245e0a025535aab917cba032c75c;hb=1da8531a7b4eea22592b6d0760352d2a34e9b6b0;hp=49849ea9e26e54b7f1b6130d59879d8c7e8bf023;hpb=44358dfbaa66592da813ce84e88675dfa293384f;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 49849ea9..50146e27 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -14,6 +14,7 @@ #include "otk/assassin.hh" #include "otk/property.hh" #include "otk/util.hh" +#include "otk/rendercolor.hh" extern "C" { #include @@ -34,15 +35,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 @@ -66,7 +58,7 @@ void Openbox::signalHandler(int signal) openbox->restart(); break; - case SIGCLD: + case SIGCHLD: wait(NULL); break; @@ -105,6 +97,7 @@ Openbox::Openbox(int argc, char **argv) _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = false; parseCommandLine(argc, argv); @@ -121,11 +114,12 @@ 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(SIGCLD, &action, (struct sigaction *) 0); + sigaction(SIGCHLD, &action, (struct sigaction *) 0); - // anything that died while we were restarting won't give us a SIGCLD + // 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(); @@ -145,25 +139,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); @@ -178,7 +185,6 @@ Openbox::Openbox(int argc, char **argv) _bindings->grabKeys(true); // set up input focus - _focused_screen = _screens[0]; setFocusedClient(0); _state = State_Normal; // done starting @@ -189,8 +195,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; @@ -205,21 +209,10 @@ Openbox::~Openbox() // 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(); + //delete _display; 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::RenderColor::destroy(); } @@ -290,7 +283,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 +360,27 @@ Client *Openbox::findClient(Window window) void Openbox::setFocusedClient(Client *c) { + if (c == _focused_client) return; + 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 +393,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()); -} - }