summaryrefslogtreecommitdiff
path: root/src/openbox.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-02 20:36:14 +0000
committerDana Jansens <danakj@orodu.net>2003-01-02 20:36:14 +0000
commit66a26917a0631463df7f72c34cbeb39df466918a (patch)
tree0ffd823b664d12e81159569076553d705cb7ae2a /src/openbox.cc
parent745e840547b5443ecfb9b6f0a4f14b0d035d59c2 (diff)
new code for bindings/callbacks. much sexier. now passes python classes back to the callbacks, and the storage of the callbacks in the code is much more clear. huzzah.
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 01316d79..f7f2098b 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -128,8 +128,10 @@ 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 load config values
+ // initialize scripting
python_init(argv[0]);
+
+ // load config values
python_exec(SCRIPTDIR"/config.py"); // load openbox config values
// initialize all the screens
@@ -179,6 +181,8 @@ Openbox::~Openbox()
delete _property;
+ python_destroy();
+
// close the X display
otk::OBDisplay::destroy();
}
@@ -325,10 +329,5 @@ void Openbox::setFocusedClient(OBClient *c)
}
}
-
-bool Openbox::getConfigString(const char *name, std::string *value) {
- return python_get_string(name, value);
-}
-
}