# include "../config.h"
#endif
-#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 <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)
}
void Openbox::signalHandler(int signal)
{
switch (signal) {
+ case SIGUSR1:
+ printf("Caught SIGUSR1 signal. Restarting.\n");
+ instance->restart();
+ break;
+
case SIGHUP:
- // XXX: Do something with HUP? Really shouldn't, we get this when X shuts
- // down and hangs-up on us.
-
case SIGINT:
case SIGTERM:
case SIGPIPE:
printf("Caught signal %d. Exiting.\n", signal);
instance->shutdown();
-
break;
+
case SIGFPE:
case SIGSEGV:
printf("Caught signal %d. Aborting and dumping core.\n", 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<char*>(s));
- fclose(rcpyfd);
- }
-}
-
-
Openbox::Openbox(int argc, char **argv)
: otk::OtkEventDispatcher(),
otk::OtkEventHandler()
Openbox::instance = this;
_displayreq = (char*) 0;
- _argv0 = argv[0];
- _doshutdown = false;
+ _argv = argv;
+ _shutdown = false;
+ _restart = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
_scriptfilepath = otk::expandTilde("~/.openbox/user.py");
_focused_client = 0;
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);
action.sa_handler = Openbox::signalHandler;
action.sa_mask = sigset_t();
action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
+ sigaction(SIGUSR1, &action, (struct sigaction *) 0);
sigaction(SIGPIPE, &action, (struct sigaction *) 0);
sigaction(SIGSEGV, &action, (struct sigaction *) 0);
sigaction(SIGFPE, &action, (struct sigaction *) 0);
_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);
-
- _bindings->display();
- ::exit(0);
-
setMasterHandler(_actions); // set as the master event handler
// create the mouse cursors we'll use
_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 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 or the system defaults if that fails
+ if (!python_exec(_scriptfilepath.c_str()))
+ python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
+
// initialize all the screens
OBScreen *screen;
- screen = new OBScreen(0, _config);
- 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;
+ int i = _single ? DefaultScreen(otk::OBDisplay::display) : 0;
+ int max = _single ? i + 1 : ScreenCount(otk::OBDisplay::display);
+ for (; i < max; ++i) {
+ screen = new OBScreen(i);
+ if (screen->managed())
+ _screens.push_back(screen);
+ 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_Exiting; // time to kill everything
+ int first_screen = _screens.front()->number();
+
std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
delete _bindings;
delete _actions;
delete _property;
-
- // close the X display
- otk::OBDisplay::destroy();
+
+ python_destroy();
+
+ XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone,
+ CurrentTime);
+ XSync(otk::OBDisplay::display, false);
+
+ // this tends to block.. i honestly am not sure why. causing an x error in
+ // the shutdown process unblocks it. blackbox simply did a ::exit(0), so
+ // all im gunna do is the same.
+ //otk::OBDisplay::destroy();
+
+ if (_restart) {
+ if (!_restart_prog.empty()) {
+ const std::string &dstr =
+ otk::OBDisplay::screenInfo(first_screen)->displayString();
+ putenv(const_cast<char *>(dstr.c_str()));
+ execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL);
+ perror(_restart_prog.c_str());
+ }
+
+ // fall back in case the above execlp doesn't work
+ execvp(_argv[0], _argv);
+ execvp(otk::basename(_argv[0]).c_str(), _argv);
+ }
}
_scriptfilepath = argv[i];
} else if (arg == "-sync") {
_sync = true;
+ } else if (arg == "-single") {
+ _single = true;
} else if (arg == "-version") {
showVersion();
::exit(0);
void Openbox::showVersion()
{
- printf(_("Openbox - version %s\n"), OPENBOX_VERSION);
+ printf(_("Openbox - version %s\n"), VERSION);
printf(" (c) 2002 - 2002 Ben Jansens\n\n");
}
printf(_("Usage: %s [OPTIONS...]\n\
Options:\n\
-display <string> use display connection.\n\
+ -single run on a single screen (default is to run every one).\n\
-rc <string> use alternate resource file.\n\
-menu <string> use alternate menu file.\n\
-script <string> use alternate startup script file.\n\
+ -sync run in synchronous mode (for debugging).\n\
-version display version and exit.\n\
- -help display this help text and exit.\n\n"), _argv0);
+ -help display this help text and exit.\n\n"), _argv[0]);
printf(_("Compile time options:\n\
Debugging: %s\n\
Shape: %s\n\
- Xinerama: %s\n"),
+ Xinerama: %s\n\
+ Xkb: %s\n"),
#ifdef DEBUG
_("yes"),
#else // !DEBUG
#endif // SHAPE
#ifdef XINERAMA
- _("yes")
+ _("yes"),
#else // !XINERAMA
- _("no")
+ _("no"),
#endif // XINERAMA
+
+#ifdef XKB
+ _("yes")
+#else // !XKB
+ _("no")
+#endif // XKB
);
}
void Openbox::eventLoop()
{
- while (!_doshutdown) {
+ while (!_shutdown) {
+ _timermanager.fire(!_sync); // wait if not in sync mode
dispatchEvents(); // from OtkEventDispatcher
XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
- _timermanager.fire();
}
}
XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(),
RevertToNone, CurrentTime);
}
+ // set the NET_ACTIVE_WINDOW hint for all screens
+ ScreenList::iterator it, end = _screens.end();
+ for (it = _screens.begin(); it != end; ++it) {
+ int num = (*it)->number();
+ Window root = otk::OBDisplay::screenInfo(num)->rootWindow();
+ _property->set(root, otk::OBProperty::net_active_window,
+ otk::OBProperty::Atom_Window,
+ (c && _focused_screen == *it) ? c->window() : None);
+ }
+
+ // call the python Focus callbacks
+ EventData data(_focused_screen->number(), c, EventFocus, 0);
+ Openbox::instance->bindings()->fireEvent(&data);
+}
+
+void Openbox::execute(int screen, const std::string &bin)
+{
+#ifdef __EMX__
+ // XXX: whats this for? windows?
+ spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", bin.c_str(), NULL);
+#else // __EMX__
+ if (screen >= ScreenCount(otk::OBDisplay::display))
+ screen = 0;
+ const std::string &dstr =
+ otk::OBDisplay::screenInfo(screen)->displayString();
+
+ if (! fork()) {
+ setsid();
+ int ret = putenv(const_cast<char *>(dstr.c_str()));
+ assert(ret != -1);
+ ret = execl("/bin/sh", "/bin/sh", "-c", bin.c_str(), NULL);
+ exit(ret);
+ }
+#endif // __EMX__
}
}
projects / chaz / openbox / blobdiff