# include <sys/select.h>
#endif // HAVE_SYS_SELECT_H
-//#include <guile/gh.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");
+ _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
parseCommandLine(argc, 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);
::exit(1);
}
- /*
- // make our guile interfaces exist
- SWIG_init();
-
- // run the guile of d3th
- FILE *rcpyfd = fopen("/home/natas/.openbox/user.scm", "r");
- if (!rcpyfd) {
- printf("failed to load guile script /home/natas/.openbox/user.scm\n");
- } else {
- fclose(rcpyfd);
- gh_load("/home/natas/.openbox/user.scm");
- }
- */
-
- Py_SetProgramName(argv[0]);
- Py_Initialize();
- //initopenbox(); // initialize the static 'openbox' module
- init_openbox();
- 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);
- }
-
-
_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 == "-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);