summaryrefslogtreecommitdiff
path: root/src/openbox.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-02 21:05:29 +0000
committerDana Jansens <danakj@orodu.net>2003-01-02 21:05:29 +0000
commit14cf42ff0780bf58a6b54c9443c87c7402b61faa (patch)
treeb4517a43cf036fd482b655d978660cf5d7ff990d /src/openbox.cc
parent6d58d84f22887f03ac5471b9775452b90103b6f0 (diff)
run scripts before initializing screens. kill the globals.py. add the python_get_stringlist.
Diffstat (limited to 'src/openbox.cc')
-rw-r--r--src/openbox.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/openbox.cc b/src/openbox.cc
index f7f2098b..436c09fa 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -133,6 +133,11 @@ Openbox::Openbox(int argc, char **argv)
// load config values
python_exec(SCRIPTDIR"/config.py"); // load openbox config values
+ // run all of the python scripts
+ python_exec(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
+ python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
+ // run the user's script
+ python_exec(_scriptfilepath.c_str());
// initialize all the screens
OBScreen *screen;
@@ -148,12 +153,6 @@ Openbox::Openbox(int argc, char **argv)
::exit(1);
}
- // run all of the python scripts, including the user's
- python_exec(SCRIPTDIR"/globals.py"); // create/set global vars
- python_exec(SCRIPTDIR"/clientmotion.py"); // moving and resizing clients
- python_exec(SCRIPTDIR"/clicks.py"); // titlebar/root clicks and dblclicks
- python_exec(_scriptfilepath.c_str());
-
ScreenList::iterator it, end = _screens.end();
for (it = _screens.begin(); it != end; ++it) {
(*it)->manageExisting();