X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=caacb63ba6f2e75f2e1351fbd216eaa5b9c70794;hb=88a4e59f44d077bae57e4c2be762c88d3141ed36;hp=f5166ba758b82e8f6e7f0709e6edf0b97fe3f404;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index f5166ba7..caacb63b 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -4,16 +4,17 @@ # 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 "otk/util.hh" // TEMPORARY +#include "otk/property.hh" +#include "otk/util.hh" +#include "otk/rendercolor.hh" extern "C" { #include @@ -34,21 +35,9 @@ extern "C" { # include #endif // HAVE_FCNTL_H -#ifdef HAVE_UNISTD_H -# include -# include -#endif // HAVE_UNISTD_H - -#ifdef HAVE_SYS_SELECT_H -# include -#endif // HAVE_SYS_SELECT_H - -#include - -// The initializer in openbox_wrap.cc -extern void init_openbox(void); -// The initializer in otk_wrap.cc -extern void init_otk(void); +#ifdef HAVE_SYS_WAIT_H +# include +#endif // HAVE_SYS_WAIT_H #include "gettext.h" #define _(str) gettext(str) @@ -58,23 +47,29 @@ extern void init_otk(void); 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); @@ -83,130 +78,111 @@ void Openbox::signalHandler(int 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(s)); - fclose(rcpyfd); - } -} - - 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"); _scriptfilepath = otk::expandTilde("~/.openbox/user.py"); _focused_client = 0; _sync = false; + _single = 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); + 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); - _property = new otk::OBProperty(); - _actions = new OBActions(); - _bindings = new OBBindings(); - - OBBindings::StringVect v; - v.push_back("C-A-x"); - v.push_back("C-y"); - v.push_back("v"); - _bindings->add_key(v, 1); - v.clear(); - v.push_back("C-x"); - v.push_back("C-z"); - v.push_back("a"); - _bindings->add_key(v, 2); - v.clear(); - v.push_back("C-a"); - _bindings->add_key(v, 3); - - _bindings->add_mouse("C-1", 1); - - printf("CHAINS:\n"); - _bindings->display(); + otk::RenderColor::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); - - // 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()); - + _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 - 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; + _focused_screen = 0; + + for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) { + Screen *screen; + if (_single && i != DefaultScreen(**otk::display)) { + _screens.push_back(0); + continue; + } + 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 - _focused_screen = _screens[0]; setFocusedClient(0); _state = State_Normal; // done starting @@ -221,10 +197,20 @@ Openbox::~Openbox() delete _bindings; delete _actions; - delete _property; - - // close the X display - otk::OBDisplay::destroy(); + + 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. + //delete _display; + + otk::Timer::destroy(); + otk::RenderColor::destroy(); } @@ -257,6 +243,8 @@ void Openbox::parseCommandLine(int argc, char **argv) _scriptfilepath = argv[i]; } else if (arg == "-sync") { _sync = true; + } else if (arg == "-single") { + _single = true; } else if (arg == "-version") { showVersion(); ::exit(0); @@ -276,7 +264,7 @@ void Openbox::parseCommandLine(int argc, char **argv) void Openbox::showVersion() { - printf(_("Openbox - version %s\n"), OPENBOX_VERSION); + printf(_("Openbox - version %s\n"), VERSION); printf(" (c) 2002 - 2002 Ben Jansens\n\n"); } @@ -289,16 +277,19 @@ void Openbox::showHelp() printf(_("Usage: %s [OPTIONS...]\n\ Options:\n\ -display use display connection.\n\ + -single run on a single screen (default is to run every one).\n\ -rc use alternate resource file.\n\ -menu use alternate menu file.\n\ -script 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 @@ -312,25 +303,33 @@ void Openbox::showHelp() #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 - XFlush(otk::OBDisplay::display); // flush here before we go wait for timers - _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; } @@ -342,7 +341,7 @@ void Openbox::removeClient(Window window) } -OBClient *Openbox::findClient(Window window) +Client *Openbox::findClient(Window window) { /* NOTE: we dont use _clients[] to find the value because that will insert @@ -353,20 +352,33 @@ OBClient *Openbox::findClient(Window window) if (it != _clients.end()) return it->second; else - return (OBClient*) 0; + return (Client*) 0; } -void Openbox::setFocusedClient(OBClient *c) +void Openbox::setFocusedClient(Client *c) { _focused_client = c; if (c) { _focused_screen = _screens[c->screen()]; } else { assert(_focused_screen); - XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(), + 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, EventAction::Focus, 0); + _bindings->fireEvent(&data); } }