X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=4d1de42afbb9341b577e03b6e7ad25894b6db997;hb=1297c7c157584599f474aa13effaca5a866bfb14;hp=e7ffb76bf76fe305619c3ff1b956724b6ec0376c;hpb=db1fb534b8f5a1f19710ac77ef2ce85c4c1270ec;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index e7ffb76b..4d1de42a 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -10,6 +10,7 @@ #include "screen.hh" #include "actions.hh" #include "bindings.hh" +#include "python.hh" #include "otk/property.hh" #include "otk/display.hh" #include "otk/assassin.hh" @@ -43,13 +44,6 @@ extern "C" { # 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); - #include "gettext.h" #define _(str) gettext(str) } @@ -64,16 +58,17 @@ Openbox *Openbox::instance = (Openbox *) 0; 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: @@ -83,17 +78,6 @@ 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() @@ -105,8 +89,9 @@ Openbox::Openbox(int argc, char **argv) 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; @@ -114,20 +99,6 @@ Openbox::Openbox(int argc, char **argv) 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); @@ -149,26 +120,6 @@ Openbox::Openbox(int argc, char **argv) _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("A-1", 1); - - printf("CHAINS:\n"); - _bindings->display(); - ::exit(0); - setMasterHandler(_actions); // set as the master event handler // create the mouse cursors we'll use @@ -179,24 +130,21 @@ Openbox::Openbox(int argc, char **argv) _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 + python_exec(_scriptfilepath.c_str()); + // initialize all the screens OBScreen *screen; - screen = new OBScreen(0, _config); + screen = new OBScreen(0); 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; @@ -206,6 +154,14 @@ Openbox::Openbox(int argc, char **argv) ::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); @@ -218,14 +174,38 @@ Openbox::~Openbox() { _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(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); + } } @@ -294,7 +274,7 @@ void Openbox::showHelp() -menu use alternate menu file.\n\ -script use alternate startup script file.\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\ @@ -323,10 +303,10 @@ void Openbox::showHelp() void Openbox::eventLoop() { - while (!_doshutdown) { + while (!_shutdown) { + _timermanager.fire(); dispatchEvents(); // from OtkEventDispatcher XFlush(otk::OBDisplay::display); // flush here before we go wait for timers - _timermanager.fire(); } } @@ -368,6 +348,36 @@ void Openbox::setFocusedClient(OBClient *c) 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); + } +} + +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(dstr.c_str())); + assert(ret != -1); + ret = execl("/bin/sh", "/bin/sh", "-c", bin.c_str(), NULL); + exit(ret); + } +#endif // __EMX__ } }