X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=2d13ba1b42b9294804fd7eae143dddb46a607fbb;hb=ee14d8a3ccadfaeb16f47187f071914353258bc6;hp=d2213ec40b016a5daa6152059a1436c2cdb52e4d;hpb=74cb09bb2cc4832463a57743b1495eef24237d2a;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index d2213ec4..2d13ba1b 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,7 +6,10 @@ #include "../version.h" #include "openbox.hh" +#include "client.hh" #include "screen.hh" +#include "actions.hh" +#include "bindings.hh" #include "otk/property.hh" #include "otk/display.hh" #include "otk/assassin.hh" @@ -40,6 +43,13 @@ 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) } @@ -48,7 +58,7 @@ extern "C" { namespace ob { -Openbox *Openbox::instance = (Openbox *) 0; +Openbox *Openbox::instance = (Openbox *) 0; void Openbox::signalHandler(int signal) @@ -73,6 +83,17 @@ void Openbox::signalHandler(int signal) } +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() @@ -87,6 +108,9 @@ Openbox::Openbox(int argc, char **argv) _argv0 = argv[0]; _doshutdown = false; _rcfilepath = otk::expandTilde("~/.openbox/rc3"); + _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); + _focused_client = 0; + _sync = false; parseCommandLine(argc, argv); @@ -107,7 +131,9 @@ Openbox::Openbox(int argc, char **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(); @@ -120,9 +146,25 @@ Openbox::Openbox(int argc, char **argv) sigaction(SIGHUP, &action, (struct sigaction *) 0); _property = new otk::OBProperty(); - - // set this class as the fallback event handler (for map events) - setFallbackHandler(this); + _actions = new OBActions(); + _bindings = new OBBindings(); + + OBBindings::StringVect v; + v.push_back("C-x"); + v.push_back("C-y"); + v.push_back("v"); + _bindings->add(v, 1); + v.clear(); +// v.push_back("C-x"); +// v.push_back("C-z"); + v.push_back("a"); + _bindings->add(v, 2); + + printf("CHAINS:\n"); + _bindings->display(); + ::exit(0); + + setMasterHandler(_actions); // set as the master event handler // create the mouse cursors we'll use _cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr); @@ -132,6 +174,18 @@ Openbox::Openbox(int argc, char **argv) _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); @@ -146,6 +200,10 @@ Openbox::Openbox(int argc, char **argv) printf(_("No screens were found without a window manager. Exiting.\n")); ::exit(1); } + + // set up input focus + _focused_screen = _screens[0]; + setFocusedClient(0); _state = State_Normal; // done starting } @@ -156,6 +214,10 @@ Openbox::~Openbox() _state = State_Exiting; // time to kill everything std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin()); + + delete _bindings; + delete _actions; + delete _property; // close the X display otk::OBDisplay::destroy(); @@ -184,6 +246,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); @@ -218,6 +287,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); @@ -250,6 +320,7 @@ void Openbox::eventLoop() { while (!_doshutdown) { dispatchEvents(); // from OtkEventDispatcher + XFlush(otk::OBDisplay::display); // flush here before we go wait for timers _timermanager.fire(); } } @@ -263,9 +334,7 @@ void Openbox::addClient(Window window, OBClient *client) void Openbox::removeClient(Window window) { - ClientMap::iterator it = _clients.find(window); - if (it != _clients.end()) - _clients.erase(it); + _clients.erase(window); } @@ -284,56 +353,15 @@ OBClient *Openbox::findClient(Window window) } -void Openbox::mapRequestHandler(const XMapRequestEvent &e) +void Openbox::setFocusedClient(OBClient *c) { -#ifdef DEBUG - printf("MapRequest for 0x%lx\n", e.window); -#endif // DEBUG - - otk::OtkEventHandler::mapRequestHandler(e); - - OBClient *client = findClient(e.window); - - if (client) { - // XXX: uniconify and/or unshade the window + _focused_client = c; + if (c) { + _focused_screen = _screens[c->screen()]; } else { - int screen = INT_MAX; - - for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i) - if (otk::OBDisplay::screenInfo(i)->getRootWindow() == e.parent) { - screen = i; - break; - } - - if (screen >= ScreenCount(otk::OBDisplay::display)) { - /* - we got a map request for a window who's parent isn't root. this - can happen in only one circumstance: - - a client window unmapped a managed window, and then remapped it - somewhere between unmapping the client window and reparenting it - to root. - - regardless of how it happens, we need to find the screen that - the window is on - */ - XWindowAttributes wattrib; - if (! XGetWindowAttributes(otk::OBDisplay::display, e.window, - &wattrib)) { - // failed to get the window attributes, perhaps the window has - // now been destroyed? - return; - } - - for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i) - if (otk::OBDisplay::screenInfo(i)->getRootWindow() == wattrib.root) { - screen = i; - break; - } - } - - assert(screen < static_cast(_screens.size())); - _screens[screen]->manageWindow(e.window); + assert(_focused_screen); + XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(), + RevertToNone, CurrentTime); } }