X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=42cc1fefe96a3017c2a93a73bc0a40ab6ec67eec;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=4d2f102479c266d781d580d2d24f9fb657e440cd;hpb=105bd729e8341bacce630f2780f0a9a5a0102526;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 4d2f1024..42cc1fef 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" @@ -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); @@ -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; @@ -107,6 +109,7 @@ Openbox::Openbox(int argc, char **argv) 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); @@ -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; + int i = _single ? DefaultScreen(otk::OBDisplay::display) : 0; + int max = _single ? i + 1 : ScreenCount(otk::OBDisplay::display); + for (; i < max; ++i) { + screen = new OBScreen(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::OBDisplay::display, PointerRoot, RevertToNone, + CurrentTime); + XSync(otk::OBDisplay::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::OBDisplay::destroy(); + + if (_restart) { + if (!_restart_prog.empty()) { + const std::string &dstr = + otk::OBDisplay::screenInfo(first_screen)->displayString(); + 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,20 +303,26 @@ 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) { + while (!_shutdown) { + _timermanager.fire(!_sync); // wait if not in sync mode dispatchEvents(); // from OtkEventDispatcher XFlush(otk::OBDisplay::display); // flush here before we go wait for timers - _timermanager.fire(); } } @@ -324,6 +364,19 @@ void Openbox::setFocusedClient(OBClient *c) XSetInputFocus(otk::OBDisplay::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::OBDisplay::screenInfo(num)->rootWindow(); + _property->set(root, otk::OBProperty::net_active_window, + otk::OBProperty::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)