#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 <sys/select.h>
#endif // HAVE_SYS_SELECT_H
-//#include <guile/gh.h>
-
-//extern void SWIG_init();
-
-#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)
}
_argv0 = argv[0];
_doshutdown = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
+ _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
+ _focused_client = 0;
+ _sync = false;
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);
-
+
+ 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
_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"/clientmotion.py"); // moving and resizing clients
+// python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
+ // run the user's script
+ python_exec(_scriptfilepath.c_str());
+
// initialize all the screens
OBScreen *screen;
- screen = new OBScreen(0, _config);
+ screen = new OBScreen(0);
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;
::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();
- init_otk();
- init_openbox();
- // i wish...
- //PyRun_String("from _otk import *; from _openbox import *;", Py_file_input,
- // Py_None, Py_None);
- 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);
+ 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
+ delete _bindings;
+ delete _actions;
+
std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+
+ 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);
{
while (!_doshutdown) {
dispatchEvents(); // from OtkEventDispatcher
+ XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
_timermanager.fire();
}
}
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);
+ }
+}
+
}