X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=41f0c7b1cc0860f33474d2e92da074d5af70344d;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=4aac9ba51d9995beab78b1c2ef6660909701cf33;hpb=ad80ef0f667e3b72d9e35d7a93451a1e2dfa0ab6;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 4aac9ba5..41f0c7b1 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,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 @@ -34,30 +42,22 @@ extern "C" { # include #endif // HAVE_SYS_SELECT_H +#include + +// The initializer in openbox_wrap.cc +extern void init_openbox(void); +// The initializer in otk_wrap.cc +extern void init_otk(void); + #include "gettext.h" #define _(str) gettext(str) } -namespace ob { - +#include -Openbox *Openbox::instance = (Openbox *) 0; +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,31 +70,61 @@ void Openbox::signalHandler(int signal) case SIGINT: case SIGTERM: case SIGPIPE: - printf("Caught signal %d. Exiting.", signal); + 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(); } } +static void runPython(const char *s) { + FILE *rcpyfd = fopen(s, "r"); + if (!rcpyfd) { + printf("failed to load python file %s\n", s); + } else { + PyRun_SimpleFile(rcpyfd, const_cast(s)); + fclose(rcpyfd); + } +} + + 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"); 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); @@ -110,14 +140,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); + + // start up python and run the user's startup script + Py_SetProgramName(argv[0]); + Py_Initialize(); + init_otk(); + init_openbox(); + PyRun_SimpleString("from _otk import *; from _openbox import *;"); + PyRun_SimpleString("openbox = Openbox_instance()"); + + runPython(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients + runPython(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks + runPython(_scriptfilepath.c_str()); + + // 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); + } - _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(); } @@ -145,6 +218,11 @@ 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 == "-version") { showVersion(); ::exit(0); @@ -179,6 +257,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); @@ -209,17 +288,38 @@ void Openbox::showHelp() void Openbox::eventLoop() { - while (_state == State_Normal) { - if (XPending(otk::OBDisplay::display)) { - XEvent e; - XNextEvent(otk::OBDisplay::display, &e); - process_event(&e); - } else { - _timermanager.fire(); - } + while (!_doshutdown) { + dispatchEvents(); // from OtkEventDispatcher + _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; +} + }