X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=41f0c7b1cc0860f33474d2e92da074d5af70344d;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=aa61a3139c379e1cb18629f5b15df9a0b6ec117f;hpb=27193f659d6badda0ebdb456b61fb55f21f8e4c5;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index aa61a313..41f0c7b1 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -82,6 +82,17 @@ 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() @@ -150,13 +161,10 @@ Openbox::Openbox(int argc, char **argv) init_openbox(); PyRun_SimpleString("from _otk import *; from _openbox import *;"); PyRun_SimpleString("openbox = Openbox_instance()"); - FILE *rcpyfd = fopen(_scriptfilepath.c_str(), "r"); - if (!rcpyfd) { - printf("failed to load python file %s\n", _scriptfilepath.c_str()); - } else { - PyRun_SimpleFile(rcpyfd, const_cast(_scriptfilepath.c_str())); - fclose(rcpyfd); - } + + runPython(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients + runPython(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks + runPython(_scriptfilepath.c_str()); // initialize all the screens OBScreen *screen;