X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=d2ce85fd2b990697e9e37637b60e5241e621fdba;hb=7d215bd255d0744101b9ceb52c235bdc985fa034;hp=dda528483f15630460b60474e71730a8838ac7f1;hpb=a2de94e91e1c0e7775c97745ae11d14e5c5f5659;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index dda52848..d2ce85fd 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -1,10 +1,7 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" -#include "../version.h" #include "openbox.hh" #include "client.hh" #include "screen.hh" @@ -12,21 +9,16 @@ #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" +#include "otk/renderstyle.hh" +#include "otk/messagedialog.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 @@ -35,24 +27,26 @@ 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) } #include +#include +#include + +namespace otk { +extern void initialize(); +extern void destroy(); +} namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *openbox = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -60,7 +54,11 @@ void Openbox::signalHandler(int signal) switch (signal) { case SIGUSR1: printf("Caught SIGUSR1 signal. Restarting.\n"); - instance->restart(); + openbox->restart(); + break; + + case SIGCHLD: + wait(NULL); break; case SIGHUP: @@ -68,7 +66,7 @@ void Openbox::signalHandler(int signal) case SIGTERM: case SIGPIPE: printf("Caught signal %d. Exiting.\n", signal); - instance->shutdown(); + openbox->shutdown(); break; case SIGFPE: @@ -80,16 +78,15 @@ void Openbox::signalHandler(int signal) Openbox::Openbox(int argc, char **argv) - : otk::OtkEventDispatcher(), - otk::OtkEventHandler() + : otk::EventDispatcher(), + otk::EventHandler() { struct sigaction action; _state = State_Starting; // initializing everything - Openbox::instance = this; + openbox = this; - _displayreq = (char*) 0; _argv = argv; _shutdown = false; _restart = false; @@ -97,14 +94,14 @@ Openbox::Openbox(int argc, char **argv) _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = false; + _remote = 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); + otk::initialize(); + + XSynchronize(**otk::display, _sync); // set up the signal handler action.sa_handler = Openbox::signalHandler; @@ -117,55 +114,92 @@ 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(SIGCHLD, &action, (struct sigaction *) 0); + + // anything that died while we were restarting won't give us a SIGCHLD + while (waitpid(-1, NULL, WNOHANG) > 0); - _property = new otk::OBProperty(); - _actions = new OBActions(); - _bindings = new OBBindings(); + _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); - - // initialize scripting - python_init(argv[0]); - - // load 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()); + _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 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; - - if (_screens.empty()) { + _focused_screen = 0; + _managed_count = 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; + _managed_count++; + } else { + delete screen; + _screens.push_back(0); + } + } + + if (!_managed_count) { printf(_("No screens were found without a window manager. Exiting.\n")); ::exit(1); } - ScreenList::iterator it, end = _screens.end(); - for (it = _screens.begin(); it != end; ++it) { - (*it)->manageExisting(); + assert(_focused_screen); + + // initialize scripting + python_init(argv[0]); + + // load the theme XXX TEMP SHIT + otk::RenderStyle::setStyle(0, ""); + + int ret = python_exec(_scriptfilepath.c_str()); + if (ret == 2) { + std::string msg; + msg += _("An error occured while executing the python scripts."); + msg += "\n\n"; + msg += _("See the exact error message in Openbox's output for details."); + otk::MessageDialog dia(this, _("Python Error"), msg); + otk::DialogButton ok(_("Okay"), true); + otk::DialogButton retry(_("Restart")); + dia.addButton(ok); + dia.addButton(retry); + dia.show(); + dia.focus(); + const otk::DialogButton &res = dia.run(); + if (res == retry) { + _restart = _shutdown = true; + return; + } } - + + if (ret) + python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors + + ScreenList::iterator it, end = _screens.end(); + for (it = _screens.begin(); it != end; ++it) + if (*it) (*it)->manageExisting(); + // grab any keys set up before the screens existed - _bindings->grabKeys(true); + //_bindings->grabKeys(true); // set up input focus - _focused_screen = _screens[0]; setFocusedClient(0); _state = State_Normal; // done starting @@ -176,38 +210,18 @@ 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; delete _actions; - delete _property; python_destroy(); - XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone, + XSetInputFocus(**otk::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); - } + XSync(**otk::display, false); + + otk::destroy(); } @@ -218,12 +232,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 @@ -240,6 +249,10 @@ 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 == "-remote") { + _remote = true; } else if (arg == "-version") { showVersion(); ::exit(0); @@ -259,7 +272,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"); } @@ -271,17 +284,21 @@ void Openbox::showHelp() // print program usage and command line options printf(_("Usage: %s [OPTIONS...]\n\ Options:\n\ - -display use display connection.\n\ + -remote optimize for a remote (low bandwidth) connection to the\n\ + display/Xserver.\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"), _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 @@ -295,25 +312,35 @@ 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 (!_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 + while (true) { + dispatchEvents(false); // from otk::EventDispatcher +// XFlush(**otk::display); // flush here before we go wait for timers + // .. the XPending() should have done this last + // already, it does a flush when it returns 0 + // 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; } @@ -325,7 +352,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 @@ -336,57 +363,50 @@ 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) { + // 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::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::OBDisplay::screenInfo(num)->rootWindow(); - _property->set(root, otk::OBProperty::net_active_window, - otk::OBProperty::Atom_Window, - (c && _focused_screen == *it) ? c->window() : None); + 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 = new_event_data(_focused_screen->number(), - c ? c->window() : 0, - EventFocus, 0); - Openbox::instance->bindings()->fireEvent(data); - Py_XDECREF((PyObject*)data); -} - -void Openbox::execute(int screen, const std::string &bin) -{ -#ifdef __EMX__ - // XXX: whats this for? windows? - spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", bin.c_str(), NULL); -#else // __EMX__ - if (screen >= ScreenCount(otk::OBDisplay::display)) - screen = 0; - const std::string &dstr = - otk::OBDisplay::screenInfo(screen)->displayString(); - - if (! fork()) { - setsid(); - int ret = putenv(const_cast(dstr.c_str())); - assert(ret != -1); - ret = execl("/bin/sh", "/bin/sh", "-c", bin.c_str(), NULL); - exit(ret); - } -#endif // __EMX__ + EventData data(_focused_screen->number(), c, EventAction::Focus, 0); + _bindings->fireEvent(&data); } }