X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=50146e270dad245e0a025535aab917cba032c75c;hb=1cd253f4684ee126340fae38094b637f1b0010ea;hp=655fe0d53bd7a3d0e43fbd7d8b5b90885d3b7a67;hpb=3a65ca613c966226f29a3ca3701ba8e1002d25a8;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 655fe0d5..50146e27 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" @@ -12,9 +11,10 @@ #include "bindings.hh" #include "python.hh" #include "otk/property.hh" -#include "otk/display.hh" #include "otk/assassin.hh" -#include "otk/util.hh" // TEMPORARY +#include "otk/property.hh" +#include "otk/util.hh" +#include "otk/rendercolor.hh" extern "C" { #include @@ -35,14 +35,9 @@ 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 #include "gettext.h" #define _(str) gettext(str) @@ -52,23 +47,29 @@ extern "C" { namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *openbox = (Openbox *) 0; void Openbox::signalHandler(int signal) { switch (signal) { + case SIGUSR1: + printf("Caught SIGUSR1 signal. Restarting.\n"); + openbox->restart(); + break; + + case SIGCHLD: + wait(NULL); + 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(); - + openbox->shutdown(); break; + case SIGFPE: case SIGSEGV: printf("Caught signal %d. Aborting and dumping core.\n", signal); @@ -78,74 +79,97 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) - : otk::OtkEventDispatcher(), - otk::OtkEventHandler() + : otk::EventDispatcher(), + otk::EventHandler(), + _display() { struct sigaction action; _state = State_Starting; // initializing everything - Openbox::instance = this; + openbox = 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; _sync = false; + _single = false; parseCommandLine(argc, argv); - // open the X display (and gets some info about it, and its screens) - otk::OBDisplay::initialize(_displayreq); - assert(otk::OBDisplay::display); - - XSynchronize(otk::OBDisplay::display, _sync); + XSynchronize(**otk::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); sigaction(SIGTERM, &action, (struct sigaction *) 0); sigaction(SIGINT, &action, (struct sigaction *) 0); sigaction(SIGHUP, &action, (struct sigaction *) 0); + sigaction(SIGCHLD, &action, (struct sigaction *) 0); - _property = new otk::OBProperty(); - _actions = new OBActions(); - _bindings = new OBBindings(); + // 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(); 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, XC_left_ptr); + _cursors.move = XCreateFontCursor(**otk::display, XC_fleur); + _cursors.ll_angle = XCreateFontCursor(**otk::display, XC_ll_angle); + _cursors.lr_angle = XCreateFontCursor(**otk::display, XC_lr_angle); + _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 + //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()); + //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 - 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; + _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()) { + _screens.push_back(screen); + 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")); @@ -161,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 @@ -176,12 +199,20 @@ Openbox::~Openbox() delete _bindings; delete _actions; - delete _property; python_destroy(); - - // close the X display - otk::OBDisplay::destroy(); + + XSetInputFocus(**otk::display, PointerRoot, RevertToNone, + 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. + //delete _display; + + otk::Timer::destroy(); + otk::RenderColor::destroy(); } @@ -214,6 +245,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 +266,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 +279,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 X errors).\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 +305,33 @@ 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 (true) { + dispatchEvents(); // from otk::EventDispatcher + XFlush(**otk::display); // flush here before we go wait for timers + // don't wait if we're to shutdown + if (_shutdown) break; + otk::Timer::dispatchTimers(!_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 +343,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 +354,47 @@ 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) { + 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::OBDisplay::display, _focused_screen->focuswindow(), + 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(); + for (it = _screens.begin(); it != end; ++it) { + int num = (*it)->number(); + Window root = otk::display->screenInfo(num)->rootWindow(); + otk::Property::set(root, otk::Property::atoms.net_active_window, + otk::Property::atoms.window, + (c && _focused_screen == *it) ? c->window() : None); + } + + // call the python Focus callbacks + EventData data(_focused_screen->number(), c, EventAction::Focus, 0); + _bindings->fireEvent(&data); } }