-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
# include <sys/select.h>
#endif // HAVE_SYS_SELECT_H
+#include <Python.h>
+
+// 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)
}
}
+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<char*>(s));
+ fclose(rcpyfd);
+ }
+}
+
+
Openbox::Openbox(int argc, char **argv)
: otk::OtkEventDispatcher(),
otk::OtkEventHandler()
_argv0 = argv[0];
_doshutdown = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
-
- _clients = (PyDictObject*) PyDict_New();
- assert(_clients);
+ _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();
_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);
::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);
- }
-
+ // set up input focus
+ _focused_screen = _screens[0];
+ setFocusedClient(0);
+
_state = State_Normal; // done starting
}
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);
{
while (!_doshutdown) {
dispatchEvents(); // from OtkEventDispatcher
+ XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
_timermanager.fire();
}
}
void Openbox::addClient(Window window, OBClient *client)
{
- // maintain the python list here too
- PyDict_SetItem((PyObject*)_clients, PyLong_FromLong(window),
- (PyObject*)client);
+ _clients[window] = client;
}
void Openbox::removeClient(Window window)
{
- PyDict_DelItem((PyObject*)_clients, PyLong_FromLong(window));
+ _clients.erase(window);
}
OBClient *Openbox::findClient(Window window)
{
- PyClientObject *client = PyDist_GetItem((PyObject*)_clients,
- PyLong_FromLong(window));
- if (client)
- return client->client;
- return 0;
+ /*
+ 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);
+ }
}
}