// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
#include "openbox.hh"
#include "client.hh"
#include "bindings.hh"
#include "python.hh"
#include "otk/property.hh"
-#include "otk/display.hh"
#include "otk/assassin.hh"
+#include "otk/property.hh"
#include "otk/util.hh"
+#include "otk/rendercolor.hh"
+#include "otk/renderstyle.hh"
extern "C" {
#include <X11/cursorfont.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
#ifdef HAVE_SIGNAL_H
# include <signal.h>
#endif // HAVE_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)
}
#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
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");
- instance->restart();
+ openbox->restart();
+ break;
+
+ case SIGCHLD:
+ wait(NULL);
break;
case SIGHUP:
case SIGTERM:
case SIGPIPE:
printf("Caught signal %d. Exiting.\n", signal);
- instance->shutdown();
+ openbox->shutdown();
break;
case SIGFPE:
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;
_argv = argv;
_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);
-
- XSynchronize(otk::OBDisplay::display, _sync);
+ XSynchronize(**otk::display, _sync);
// set up the signal handler
action.sa_handler = Openbox::signalHandler;
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();
- _actions = new OBActions();
- _bindings = new OBBindings();
+ // anything that died while we were restarting won't give us a SIGCHLD
+ while (waitpid(-1, NULL, WNOHANG) > 0);
+
+ otk::RenderColor::initialize();
+ otk::RenderStyle::initialize();
+ 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
+ //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"/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
- OBScreen *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())
+ _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);
- else
+ 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);
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
- int first_screen = _screens.front()->number();
-
std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
delete _bindings;
delete _actions;
- delete _property;
python_destroy();
- XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone,
+ XSetInputFocus(**otk::display, PointerRoot, RevertToNone,
CurrentTime);
- XSync(otk::OBDisplay::display, false);
+ 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::OBDisplay::destroy();
-
- if (_restart) {
- if (!_restart_prog.empty()) {
- const std::string &dstr =
- otk::OBDisplay::screenInfo(first_screen)->displayString();
- otk::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);
- }
+ //delete _display;
+
+ otk::Timer::destroy();
+ otk::RenderStyle::destroy();
+ otk::RenderColor::destroy();
}
-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\
+ -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"), _argv[0]);
void Openbox::eventLoop()
{
- 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
+ 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;
}
}
-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(OBClient *c)
+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
+
+ assert(_focused_screen);
+
+ // 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 {
- assert(_focused_screen);
- XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(),
+ 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::OBDisplay::screenInfo(num)->rootWindow();
- _property->set(root, otk::OBProperty::net_active_window,
- otk::OBProperty::Atom_Window,
- (c && _focused_screen == *it) ? c->window() : None);
+ 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);
- Openbox::instance->bindings()->fireEvent(&data);
-}
-
-void Openbox::execute(int screen, const std::string &bin)
-{
- if (screen >= ScreenCount(otk::OBDisplay::display))
- screen = 0;
- otk::bexec(bin, otk::OBDisplay::screenInfo(screen)->displayString());
+ EventData data(_focused_screen->number(), c, EventAction::Focus, 0);
+ _bindings->fireEvent(&data);
}
}
projects / chaz / openbox / blobdiff