X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=6c7bfdb8b5ce4c57757cb8e021b7733bce5697e5;hb=68194ce957db36ead19a39fdc7636a220befafe9;hp=440c4f70fd6c56f5be43acfaa6110b8e51b2bb51;hpb=ace8c8896aa13a6fc4e489277cf9c96f49175322;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 440c4f70..6c7bfdb8 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -6,9 +6,17 @@ #include "../version.h" #include "openbox.hh" +#include "client.hh" +#include "screen.hh" +#include "actions.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 +46,11 @@ extern "C" { #define _(str) gettext(str) } -namespace ob { - - -Openbox *Openbox::instance = (Openbox *) 0; +#include +namespace ob { -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 - - return false; -} +Openbox *Openbox::instance = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -70,30 +63,52 @@ 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"); + + _clients = (PyDictObject*) PyDict_New(); + assert(_clients); parseCommandLine(argc, argv); + // TEMPORARY: using the xrdb rc3 + _config.setFile(_rcfilepath); + if (!_config.load()) { + printf("failed to load rc file %s\n", _config.file().c_str()); + ::exit(2); + } + std::string s; + _config.getValue("session.styleFile", s); + _config.setFile(s); + if (!_config.load()) { + printf("failed to load style %s\n", _config.file().c_str()); + ::exit(2); + } + // open the X display (and gets some info about it, and its screens) otk::OBDisplay::initialize(_displayreq); assert(otk::OBDisplay::display); @@ -109,14 +124,57 @@ 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(); + + 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 all the screens + OBScreen *screen; + screen = new OBScreen(0, _config); + if (screen->managed()) { + _screens.push_back(screen); + _screens[0]->manageExisting(); + // 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); + } + + // initialize the python interface + Py_SetProgramName(argv[0]); + Py_Initialize(); + initopenbox(); // initialize the static 'openbox' module + FILE *rcpyfd = fopen("/home/natas/.openbox/user.py", "r"); + if (!rcpyfd) { + printf("failed to load python file /home/natas/.openbox/user.py\n"); + } else { + PyRun_SimpleFile(rcpyfd, "/home/natas/.openbox/user.py"); + fclose(rcpyfd); + } - _state = State_Normal; // done starting } Openbox::~Openbox() { + _state = State_Exiting; // time to kill everything + + std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); + // close the X display otk::OBDisplay::destroy(); } @@ -208,54 +266,35 @@ 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 + _timermanager.fire(); } } +void Openbox::addClient(Window window, OBClient *client) +{ + // maintain the python list here too + PyDict_SetItem((PyObject*)_clients, PyLong_FromLong(window), + (PyObject*)client); +} + + +void Openbox::removeClient(Window window) +{ + PyDict_DelItem((PyObject*)_clients, PyLong_FromLong(window)); +} + + +OBClient *Openbox::findClient(Window window) +{ + PyClientObject *client = PyDist_GetItem((PyObject*)_clients, + PyLong_FromLong(window)); + if (client) + return client->client; + return 0; +} + }