-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
#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 <X11/cursorfont.h>
+
#ifdef HAVE_STDIO_H
# include <stdio.h>
#endif // HAVE_STDIO_H
#define _(str) gettext(str)
}
+#include <algorithm>
+
namespace ob {
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *Openbox::instance = (Openbox *) 0;
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();
}
}
Openbox::Openbox(int argc, char **argv)
+ : otk::OtkEventDispatcher(),
+ otk::OtkEventHandler()
{
struct sigaction action;
_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();
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"/builtins.py"); // builtin callbacks
+ // 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
}
{
_state = State_Exiting; // time to kill everything
- // unmanage all windows
- ClientMap::iterator it, end;
- for (it = _clients.begin(), end = _clients.end(); it != end; ++it) {
- _xeventhandler.unmanageWindow(it->second);
- }
+ std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+
+ delete _bindings;
+ delete _actions;
+ delete _property;
+
+ python_destroy();
// close the X display
otk::OBDisplay::destroy();
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);
-display <string> use display connection.\n\
-rc <string> use alternate resource file.\n\
-menu <string> use alternate menu file.\n\
+ -script <string> use alternate startup script file.\n\
-version display version and exit.\n\
-help display this help text and exit.\n\n"), _argv0);
void Openbox::eventLoop()
{
while (!_doshutdown) {
- if (XPending(otk::OBDisplay::display)) {
- XEvent e;
- XNextEvent(otk::OBDisplay::display, &e);
- //process_event(&e);
- _xeventhandler.handle(e);
- } else {
- _timermanager.fire();
- }
+ dispatchEvents(); // from OtkEventDispatcher
+ XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
+ _timermanager.fire();
}
}
void Openbox::removeClient(Window window)
{
- _clients[window] = (OBClient *) 0;
+ _clients.erase(window);
}
OBClient *Openbox::findClient(Window window)
{
- return _clients[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);
+ }
}
}
projects / chaz / openbox / blobdiff