From b34824a4e2ddc0247099fa1b3952de426bfde05b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 25 Dec 2002 04:54:44 +0000 Subject: global python scripts. client motion/resizing is all done via python now --- src/openbox.cc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/openbox.cc') diff --git a/src/openbox.cc b/src/openbox.cc index aa61a313..cf41975d 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,9 @@ 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(_scriptfilepath.c_str()); // initialize all the screens OBScreen *screen; -- cgit v1.2.3