-// -*- 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 "config.h"
-#include "../version.h"
#include "openbox.hh"
-#include "otk/display.hh"
+#include "client.hh"
+#include "screen.hh"
+#include "actions.hh"
+#include "bindings.hh"
+#include "python.hh"
+#include "otk/property.hh"
+#include "otk/assassin.hh"
+#include "otk/property.hh"
+#include "otk/util.hh"
+#include "otk/rendercolor.hh"
+#include "otk/renderstyle.hh"
extern "C" {
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif // HAVE_STDLIB_H
+#include <X11/cursorfont.h>
#ifdef HAVE_SIGNAL_H
# include <signal.h>
# include <fcntl.h>
#endif // HAVE_FCNTL_H
-#ifdef HAVE_UNISTD_H
-# include <sys/types.h>
-# include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#ifdef HAVE_SYS_SELECT_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;
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
+namespace otk {
+extern void initialize();
+extern void destroy();
+}
-int Openbox::xerrorHandler(Display *d, XErrorEvent *e)
-{
-#ifdef DEBUG
- char errtxt[128];
+namespace ob {
- XGetErrorText(d, e->error_code, errtxt, 128);
- printf("X Error: %s\n", errtxt);
-#else
- (void)d;
- (void)e;
-#endif
-
- return false;
-}
+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.", signal);
- // XXX: Make Openbox exit
+ printf("Caught signal %d. Exiting.\n", signal);
+ openbox->shutdown();
break;
+
case SIGFPE:
case SIGSEGV:
- printf("Caught signal %d. Aborting and dumping core.", signal);
+ printf("Caught signal %d. Aborting and dumping core.\n", signal);
abort();
}
}
Openbox::Openbox(int argc, char **argv)
+ : otk::EventDispatcher(),
+ otk::EventHandler()
{
struct sigaction action;
- _state = State_Starting;
+ _state = State_Starting; // initializing everything
- Openbox::instance = this;
+ openbox = this;
- _displayreq = (char*) 0;
- _argv0 = argv[0];
+ _argv = argv;
+ _shutdown = false;
+ _restart = false;
+ _rcfilepath = otk::expandTilde("~/.openbox/rc3");
+ _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
+ _focused_client = 0;
+ _sync = false;
+ _single = 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);
-
+ otk::initialize();
+
+ 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);
+ // anything that died while we were restarting won't give us a SIGCHLD
+ while (waitpid(-1, NULL, WNOHANG) > 0);
+ _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::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
+ //python_exec(SCRIPTDIR"/focus.py"); // focus helpers
+ // 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
+ _focused_screen = 0;
+
+ for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
+ Screen *screen;
+ // in single mode skip the screens we don't want to manage
+ if (_single && i != DefaultScreen(**otk::display)) {
+ _screens.push_back(0);
+ continue;
+ }
+ // try manage the screen
+ screen = new Screen(i);
+ if (screen->managed()) {
+ _screens.push_back(screen);
+ if (!_focused_screen) // set this to the first screen managed
+ _focused_screen = screen;
+ } else {
+ delete screen;
+ _screens.push_back(0);
+ }
+ }
+
+ assert(_focused_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
+ setFocusedClient(0);
_state = State_Normal; // done starting
}
Openbox::~Openbox()
{
- // close the X display
- otk::OBDisplay::destroy();
+ _state = State_Exiting; // time to kill everything
+
+ 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);
+
+ otk::destroy();
}
for (int i = 1; i < argc; ++i) {
std::string arg(argv[i]);
- if (arg == "-display") {
- if (++i >= argc)
- err = true;
- else
- _displayreq = argv[i];
- } else if (arg == "-rc") {
+ if (arg == "-rc") {
if (++i >= argc)
err = true;
else
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 X errors).\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()
{
- const int xfd = ConnectionNumber(otk::OBDisplay::display);
+ 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
+ }
+}
- while (_state == State_Normal) {
- if (XPending(otk::OBDisplay::display)) {
- XEvent e;
- XNextEvent(otk::OBDisplay::display, &e);
- process_event(&e);
- } else {
- fd_set rfds;
- timeval now, tm, *timeout = (timeval *) 0;
- FD_ZERO(&rfds);
- FD_SET(xfd, &rfds);
+void Openbox::addClient(Window window, Client *client)
+{
+ _clients[window] = client;
+}
-/* if (! timerList.empty()) {
- const BTimer* const timer = timerList.top();
- gettimeofday(&now, 0);
- tm = timer->timeRemaining(now);
+void Openbox::removeClient(Window window)
+{
+ _clients.erase(window);
+}
- timeout = &tm;
- }
- select(xfd + 1, &rfds, 0, 0, timeout);
+Client *Openbox::findClient(Window window)
+{
+ /*
+ 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 (Client*) 0;
+}
- // check for timer timeout
- gettimeofday(&now, 0);
- // there is a small chance for deadlock here:
- // *IF* the timer list keeps getting refreshed *AND* the time between
- // timer->start() and timer->shouldFire() is within the timer's period
- // then the timer will keep firing. This should be VERY near impossible.
- while (! timerList.empty()) {
- BTimer *timer = timerList.top();
- if (! timer->shouldFire(now))
- break;
+void Openbox::setFocusedClient(Client *c)
+{
+ // sometimes this is called with the already-focused window, this is
+ // important for the python scripts to work (eg, c = 0 twice). don't just
+ // return if _focused_client == c
- timerList.pop();
+ assert(_focused_screen);
- timer->fireTimeout();
- timer->halt();
- if (timer->isRecurring())
- timer->start();
- }*/
- }
+ // uninstall the old colormap
+ if (_focused_client)
+ _focused_client->installColormap(false);
+ else
+ _focused_screen->installColormap(false);
+
+ _focused_client = c;
+ if (c) {
+ _focused_screen = _screens[c->screen()];
+
+ // install the client's colormap
+ c->installColormap(true);
+ } else {
+ XSetInputFocus(**otk::display, _focused_screen->focuswindow(),
+ RevertToNone, CurrentTime);
+
+ // install the root window colormap
+ _focused_screen->installColormap(true);
+ }
+ // 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, EventAction::Focus, 0);
+ _bindings->fireEvent(&data);
+}
}
projects / chaz / openbox / blobdiff