X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=a70f8be44fc69eee26d0bdba10808def1deddeb4;hb=c03068ee3a2e981e31eeda583d10b9d572de92bd;hp=655fe0d53bd7a3d0e43fbd7d8b5b90885d3b7a67;hpb=3a65ca613c966226f29a3ca3701ba8e1002d25a8;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 655fe0d5..a70f8be4 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -4,7 +4,6 @@ # include "../config.h" #endif -#include "../version.h" #include "openbox.hh" #include "client.hh" #include "screen.hh" @@ -14,7 +13,7 @@ #include "otk/property.hh" #include "otk/display.hh" #include "otk/assassin.hh" -#include "otk/util.hh" // TEMPORARY +#include "otk/util.hh" extern "C" { #include @@ -58,17 +57,19 @@ Openbox *Openbox::instance = (Openbox *) 0; void Openbox::signalHandler(int signal) { switch (signal) { + case SIGUSR1: + printf("Caught SIGUSR1 signal. Restarting.\n"); + instance->restart(); + break; + case SIGHUP: - // XXX: Do something with HUP? Really shouldn't, we get this when X shuts - // down and hangs-up on us. - case SIGINT: case SIGTERM: case SIGPIPE: printf("Caught signal %d. Exiting.\n", signal); instance->shutdown(); - break; + case SIGFPE: case SIGSEGV: printf("Caught signal %d. Aborting and dumping core.\n", signal); @@ -78,8 +79,8 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) - : otk::OtkEventDispatcher(), - otk::OtkEventHandler() + : otk::EventDispatcher(), + otk::EventHandler() { struct sigaction action; @@ -88,8 +89,9 @@ Openbox::Openbox(int argc, char **argv) Openbox::instance = this; _displayreq = (char*) 0; - _argv0 = argv[0]; - _doshutdown = false; + _argv = argv; + _shutdown = false; + _restart = false; _rcfilepath = otk::expandTilde("~/.openbox/rc3"); _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; @@ -98,15 +100,16 @@ Openbox::Openbox(int argc, char **argv) parseCommandLine(argc, argv); // open the X display (and gets some info about it, and its screens) - otk::OBDisplay::initialize(_displayreq); - assert(otk::OBDisplay::display); + otk::Display::initialize(_displayreq); + assert(otk::Display::display); - XSynchronize(otk::OBDisplay::display, _sync); + XSynchronize(otk::Display::display, _sync); // set up the signal handler action.sa_handler = Openbox::signalHandler; action.sa_mask = sigset_t(); action.sa_flags = SA_NOCLDSTOP | SA_NODEFER; + sigaction(SIGUSR1, &action, (struct sigaction *) 0); sigaction(SIGPIPE, &action, (struct sigaction *) 0); sigaction(SIGSEGV, &action, (struct sigaction *) 0); sigaction(SIGFPE, &action, (struct sigaction *) 0); @@ -114,19 +117,19 @@ Openbox::Openbox(int argc, char **argv) sigaction(SIGINT, &action, (struct sigaction *) 0); sigaction(SIGHUP, &action, (struct sigaction *) 0); - _property = new otk::OBProperty(); - _actions = new OBActions(); - _bindings = new OBBindings(); + _property = new otk::Property(); + _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::OBDisplay::display, XC_left_ptr); - _cursors.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur); - _cursors.ll_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ll_angle); - _cursors.lr_angle = XCreateFontCursor(otk::OBDisplay::display, XC_lr_angle); - _cursors.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle); - _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle); + _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); // initialize scripting python_init(argv[0]); @@ -135,17 +138,21 @@ Openbox::Openbox(int argc, char **argv) python_exec(SCRIPTDIR"/config.py"); // load openbox config values // run all of the python scripts python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks - // run the user's script - python_exec(_scriptfilepath.c_str()); + // 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 - OBScreen *screen; - screen = new OBScreen(0); - if (screen->managed()) { - _screens.push_back(screen); - // XXX: "change to" the first workspace on the screen to initialize stuff - } else - delete screen; + Screen *screen; + int i = _single ? DefaultScreen(otk::Display::display) : 0; + int max = _single ? i + 1 : ScreenCount(otk::Display::display); + for (; i < max; ++i) { + screen = new Screen(i); + if (screen->managed()) + _screens.push_back(screen); + else + delete screen; + } if (_screens.empty()) { printf(_("No screens were found without a window manager. Exiting.\n")); @@ -172,6 +179,8 @@ 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; @@ -179,9 +188,29 @@ Openbox::~Openbox() delete _property; python_destroy(); - - // close the X display - otk::OBDisplay::destroy(); + + XSetInputFocus(otk::Display::display, PointerRoot, RevertToNone, + CurrentTime); + XSync(otk::Display::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); + } } @@ -214,6 +243,8 @@ void Openbox::parseCommandLine(int argc, char **argv) _scriptfilepath = argv[i]; } else if (arg == "-sync") { _sync = true; + } else if (arg == "-single") { + _single = true; } else if (arg == "-version") { showVersion(); ::exit(0); @@ -233,7 +264,7 @@ void Openbox::parseCommandLine(int argc, char **argv) void Openbox::showVersion() { - printf(_("Openbox - version %s\n"), OPENBOX_VERSION); + printf(_("Openbox - version %s\n"), VERSION); printf(" (c) 2002 - 2002 Ben Jansens\n\n"); } @@ -246,16 +277,19 @@ void Openbox::showHelp() printf(_("Usage: %s [OPTIONS...]\n\ Options:\n\ -display use display connection.\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\ -version display version and exit.\n\ - -help display this help text and exit.\n\n"), _argv0); + -help display this help text and exit.\n\n"), _argv[0]); printf(_("Compile time options:\n\ Debugging: %s\n\ Shape: %s\n\ - Xinerama: %s\n"), + Xinerama: %s\n\ + Xkb: %s\n"), #ifdef DEBUG _("yes"), #else // !DEBUG @@ -269,25 +303,31 @@ void Openbox::showHelp() #endif // SHAPE #ifdef XINERAMA - _("yes") + _("yes"), #else // !XINERAMA - _("no") + _("no"), #endif // XINERAMA + +#ifdef XKB + _("yes") +#else // !XKB + _("no") +#endif // XKB ); } void Openbox::eventLoop() { - while (!_doshutdown) { - dispatchEvents(); // from OtkEventDispatcher - XFlush(otk::OBDisplay::display); // flush here before we go wait for timers - _timermanager.fire(); + while (!_shutdown) { + 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 } } -void Openbox::addClient(Window window, OBClient *client) +void Openbox::addClient(Window window, Client *client) { _clients[window] = client; } @@ -299,7 +339,7 @@ void Openbox::removeClient(Window window) } -OBClient *Openbox::findClient(Window window) +Client *Openbox::findClient(Window window) { /* NOTE: we dont use _clients[] to find the value because that will insert @@ -310,20 +350,40 @@ OBClient *Openbox::findClient(Window window) if (it != _clients.end()) return it->second; else - return (OBClient*) 0; + return (Client*) 0; } -void Openbox::setFocusedClient(OBClient *c) +void Openbox::setFocusedClient(Client *c) { _focused_client = c; if (c) { _focused_screen = _screens[c->screen()]; } else { assert(_focused_screen); - XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(), + XSetInputFocus(otk::Display::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); + } + + // 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()); } }