X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=437e5ead23c0b94f3e561cb507737946e4a116db;hb=579ed5aa8d1b33a69476c2182a98ebc30557f096;hp=440c4f70fd6c56f5be43acfaa6110b8e51b2bb51;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 440c4f70..437e5ead 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -1,4 +1,4 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- #ifdef HAVE_CONFIG_H # include "../config.h" @@ -6,9 +6,19 @@ #include "../version.h" #include "openbox.hh" +#include "client.hh" +#include "screen.hh" +#include "actions.hh" +#include "bindings.hh" +#include "python.hh" +#include "otk/property.hh" #include "otk/display.hh" +#include "otk/assassin.hh" +#include "otk/util.hh" // TEMPORARY extern "C" { +#include + #ifdef HAVE_STDIO_H # include #endif // HAVE_STDIO_H @@ -38,26 +48,11 @@ extern "C" { #define _(str) gettext(str) } -namespace ob { - +#include -Openbox *Openbox::instance = (Openbox *) 0; - - -int Openbox::xerrorHandler(Display *d, XErrorEvent *e) -{ -#ifdef DEBUG - char errtxt[128]; - - XGetErrorText(d, e->error_code, errtxt, 128); - printf("X Error: %s\n", errtxt); -#else - (void)d; - (void)e; -#endif +namespace ob { - return false; -} +Openbox *Openbox::instance = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -70,34 +65,44 @@ void Openbox::signalHandler(int signal) case SIGINT: case SIGTERM: case SIGPIPE: - printf("Caught signal %d. Exiting.", signal); - // XXX: Make Openbox exit + printf("Caught signal %d. Exiting.\n", signal); + instance->shutdown(); + break; case SIGFPE: case SIGSEGV: - printf("Caught signal %d. Aborting and dumping core.", signal); + printf("Caught signal %d. Aborting and dumping core.\n", signal); abort(); } } Openbox::Openbox(int argc, char **argv) + : otk::OtkEventDispatcher(), + otk::OtkEventHandler() { struct sigaction action; - _state = State_Starting; + _state = State_Starting; // initializing everything Openbox::instance = this; _displayreq = (char*) 0; _argv0 = argv[0]; + _doshutdown = false; + _rcfilepath = otk::expandTilde("~/.openbox/rc3"); + _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); + _focused_client = 0; + _sync = 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); + // set up the signal handler action.sa_handler = Openbox::signalHandler; action.sa_mask = sigset_t(); @@ -109,7 +114,56 @@ 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(); + + 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"/clientmotion.py"); // moving and resizing clients +// python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks + // run the user's script + python_exec(_scriptfilepath.c_str()); + + // 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()) { + 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(); + } + + // grab any keys set up before the screens existed + _bindings->grabKeys(true); + + // set up input focus + _focused_screen = _screens[0]; + setFocusedClient(0); _state = State_Normal; // done starting } @@ -117,6 +171,17 @@ Openbox::Openbox(int argc, char **argv) Openbox::~Openbox() { + _state = State_Exiting; // time to kill everything + + delete _bindings; + delete _actions; + + std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); + + delete _property; + + python_destroy(); + // close the X display otk::OBDisplay::destroy(); } @@ -144,6 +209,13 @@ void Openbox::parseCommandLine(int argc, char **argv) err = true; else _menufilepath = argv[i]; + } else if (arg == "-script") { + if (++i >= argc) + err = true; + else + _scriptfilepath = argv[i]; + } else if (arg == "-sync") { + _sync = true; } else if (arg == "-version") { showVersion(); ::exit(0); @@ -178,6 +250,7 @@ void Openbox::showHelp() -display use display connection.\n\ -rc use alternate resource file.\n\ -menu use alternate menu file.\n\ + -script use alternate startup script file.\n\ -version display version and exit.\n\ -help display this help text and exit.\n\n"), _argv0); @@ -208,54 +281,52 @@ void Openbox::showHelp() void Openbox::eventLoop() { - const int xfd = ConnectionNumber(otk::OBDisplay::display); - - while (_state == State_Normal) { - if (XPending(otk::OBDisplay::display)) { - XEvent e; - XNextEvent(otk::OBDisplay::display, &e); - process_event(&e); - } else { - fd_set rfds; - timeval now, tm, *timeout = (timeval *) 0; - - FD_ZERO(&rfds); - FD_SET(xfd, &rfds); - -/* if (! timerList.empty()) { - const BTimer* const timer = timerList.top(); - - gettimeofday(&now, 0); - tm = timer->timeRemaining(now); - - timeout = &tm; - } - - select(xfd + 1, &rfds, 0, 0, timeout); - - // check for timer timeout - gettimeofday(&now, 0); - - // there is a small chance for deadlock here: - // *IF* the timer list keeps getting refreshed *AND* the time between - // timer->start() and timer->shouldFire() is within the timer's period - // then the timer will keep firing. This should be VERY near impossible. - while (! timerList.empty()) { - BTimer *timer = timerList.top(); - if (! timer->shouldFire(now)) - break; - - timerList.pop(); - - timer->fireTimeout(); - timer->halt(); - if (timer->isRecurring()) - timer->start(); - }*/ - } + while (!_doshutdown) { + dispatchEvents(); // from OtkEventDispatcher + XFlush(otk::OBDisplay::display); // flush here before we go wait for timers + _timermanager.fire(); } } +void Openbox::addClient(Window window, OBClient *client) +{ + _clients[window] = client; +} + + +void Openbox::removeClient(Window window) +{ + _clients.erase(window); +} + + +OBClient *Openbox::findClient(Window window) +{ + /* + NOTE: we dont use _clients[] to find the value because that will insert + a new null into the hash, which really sucks when we want to clean up the + hash at shutdown! + */ + ClientMap::iterator it = _clients.find(window); + if (it != _clients.end()) + return it->second; + else + return (OBClient*) 0; +} + + +void Openbox::setFocusedClient(OBClient *c) +{ + _focused_client = c; + if (c) { + _focused_screen = _screens[c->screen()]; + } else { + assert(_focused_screen); + XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(), + RevertToNone, CurrentTime); + } +} + }