X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=93570c8cf9e37f59ff80c9ced4aca55ed1318538;hb=0da967a8313bad4a9dbcca9b5c760bda32b7981f;hp=ee2fffb52be6bcaabcb3834d5b3a9d53bf92a041;hpb=0b17bd83c7d09ee364913f5e5f6b214f996b3a83;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index ee2fffb5..93570c8c 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -6,10 +6,15 @@ #include "../version.h" #include "openbox.hh" +#include "screen.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 @@ -39,6 +44,8 @@ extern "C" { #define _(str) gettext(str) } +#include + namespace ob { Openbox *Openbox::instance = (Openbox *) 0; @@ -77,9 +84,24 @@ Openbox::Openbox(int argc, char **argv) _displayreq = (char*) 0; _argv0 = argv[0]; _doshutdown = false; + _rcfilepath = otk::expandTilde("~/.openbox/rc3"); 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); @@ -96,7 +118,29 @@ Openbox::Openbox(int argc, char **argv) sigaction(SIGHUP, &action, (struct sigaction *) 0); _property = new otk::OBProperty(); - + + // 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); + } _state = State_Normal; // done starting } @@ -106,9 +150,7 @@ Openbox::~Openbox() { _state = State_Exiting; // time to kill everything - // unmanage all windows - while (!_clients.empty()) - _xeventhandler.unmanageWindow(_clients.begin()->second); + std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); // close the X display otk::OBDisplay::destroy();