-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
#endif
-#include "../version.h"
#include "openbox.hh"
#include "client.hh"
#include "screen.hh"
#include "actions.hh"
-#include "python_client.hh"
+#include "bindings.hh"
+#include "python.hh"
#include "otk/property.hh"
-#include "otk/display.hh"
#include "otk/assassin.hh"
-#include "otk/util.hh" // TEMPORARY
+#include "otk/property.hh"
+#include "otk/util.hh"
extern "C" {
#include <X11/cursorfont.h>
# include <sys/select.h>
#endif // HAVE_SYS_SELECT_H
+#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif // HAVE_SYS_WAIT_H
+
#include "gettext.h"
#define _(str) gettext(str)
}
namespace ob {
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *openbox = (Openbox *) 0;
void Openbox::signalHandler(int signal)
{
switch (signal) {
+ case SIGUSR1:
+ printf("Caught SIGUSR1 signal. Restarting.\n");
+ openbox->restart();
+ break;
+
+ case SIGCHLD:
+ wait(NULL);
+ 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();
-
+ openbox->shutdown();
break;
+
case SIGFPE:
case SIGSEGV:
printf("Caught signal %d. Aborting and dumping core.\n", signal);
Openbox::Openbox(int argc, char **argv)
- : otk::OtkEventDispatcher(),
- otk::OtkEventHandler()
+ : otk::EventDispatcher(),
+ otk::EventHandler(),
+ _display()
{
struct sigaction action;
_state = State_Starting; // initializing everything
- Openbox::instance = this;
+ openbox = this;
_displayreq = (char*) 0;
- _argv0 = argv[0];
- _doshutdown = false;
+ _argv = argv;
+ _shutdown = false;
+ _restart = false;
_rcfilepath = otk::expandTilde("~/.openbox/rc3");
-
- _pyclients = (PyDictObject*) PyDict_New();
- assert(_pyclients);
+ _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::display, _sync);
+
// set up the signal handler
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);
sigaction(SIGTERM, &action, (struct sigaction *) 0);
sigaction(SIGINT, &action, (struct sigaction *) 0);
sigaction(SIGHUP, &action, (struct sigaction *) 0);
+ sigaction(SIGCHLD, &action, (struct sigaction *) 0);
- _property = new otk::OBProperty();
+ // anything that died while we were restarting won't give us a SIGCHLD
+ while (waitpid(-1, NULL, WNOHANG) > 0);
- _actions = new OBActions();
+ otk::Timer::initialize();
+ otk::Property::initialize();
+ _actions = new Actions();
+ _bindings = new Bindings();
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);
+ _cursors.session = XCreateFontCursor(**otk::display, XC_left_ptr);
+ _cursors.move = XCreateFontCursor(**otk::display, XC_fleur);
+ _cursors.ll_angle = XCreateFontCursor(**otk::display, XC_ll_angle);
+ _cursors.lr_angle = XCreateFontCursor(**otk::display, XC_lr_angle);
+ _cursors.ul_angle = XCreateFontCursor(**otk::display, XC_ul_angle);
+ _cursors.ur_angle = XCreateFontCursor(**otk::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 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;
+ Screen *screen;
+ int i = _single ? DefaultScreen(**otk::display) : 0;
+ int max = _single ? i + 1 : ScreenCount(**otk::display);
+ for (; i < max; ++i) {
+ screen = new Screen(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);
}
- // 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);
+ 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
- std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+ int first_screen = _screens.front()->number();
- // close the X display
- otk::OBDisplay::destroy();
+ std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+
+ delete _bindings;
+ delete _actions;
+
+ python_destroy();
+
+ XSetInputFocus(**otk::display, PointerRoot, RevertToNone,
+ CurrentTime);
+ XSync(**otk::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::display->destroy();
+
+ otk::Timer::destroy();
+
+ if (_restart) {
+ if (!_restart_prog.empty()) {
+ otk::putenv(otk::display->screenInfo(first_screen)->displayString());
+ execl("/bin/sh", "/bin/sh", "-c", _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);
+ }
}
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 == "-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) {
- dispatchEvents(); // from OtkEventDispatcher
- _timermanager.fire();
+ while (true) {
+ dispatchEvents(); // from otk::EventDispatcher
+ XFlush(**otk::display); // flush here before we go wait for timers
+ // don't wait if we're to shutdown
+ if (_shutdown) break;
+ otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode
}
}
-void Openbox::addClient(Window window, OBClient *client)
+void Openbox::addClient(Window window, Client *client)
{
_clients[window] = client;
-
- // maintain the python list here too
- PyClientObject* pyclient = PyObject_New(PyClientObject, &PyClient_Type);
- pyclient->window = window;
- pyclient->client = client;
- PyDict_SetItem((PyObject*)_pyclients, PyLong_FromLong(window),
- (PyObject*)pyclient);
}
}
-OBClient *Openbox::findClient(Window window)
+Client *Openbox::findClient(Window window)
{
/*
NOTE: we dont use _clients[] to find the value because that will insert
if (it != _clients.end())
return it->second;
else
- return (OBClient*) 0;
+ return (Client*) 0;
+}
+
+
+void Openbox::setFocusedClient(Client *c)
+{
+ _focused_client = c;
+ if (c) {
+ _focused_screen = _screens[c->screen()];
+ } else {
+ assert(_focused_screen);
+ XSetInputFocus(**otk::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::display->screenInfo(num)->rootWindow();
+ otk::Property::set(root, otk::Property::atoms.net_active_window,
+ otk::Property::atoms.window,
+ (c && _focused_screen == *it) ? c->window() : None);
+ }
+
+ // call the python Focus callbacks
+ EventData data(_focused_screen->number(), c, EventFocus, 0);
+ _bindings->fireEvent(&data);
+}
+
+void Openbox::execute(int screen, const std::string &bin)
+{
+ if (screen >= ScreenCount(**otk::display))
+ screen = 0;
+ otk::bexec(bin, otk::display->screenInfo(screen)->displayString());
}
}