X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=655fe0d53bd7a3d0e43fbd7d8b5b90885d3b7a67;hb=a4a8d09f4b9431d6d831cb7aa220e6c952802c95;hp=bff7c2e5e885628dd1dab2a0d08dd2917be3578a;hpb=5f8e2b75fadc1878aebf063e5fc5bf25fbf70385;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index bff7c2e5..655fe0d5 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 <sys/select.h>
 #endif // HAVE_SYS_SELECT_H
 
-#include <Python.h>
-  
-// 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)
 }
@@ -83,17 +77,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<char*>(s));
-    fclose(rcpyfd);
-  }
-}
-
-
 Openbox::Openbox(int argc, char **argv)
   : otk::OtkEventDispatcher(),
     otk::OtkEventHandler()
@@ -114,20 +97,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 +118,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 +128,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 +152,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);
@@ -223,6 +177,8 @@ Openbox::~Openbox()
   delete _bindings;
   delete _actions;
   delete _property;
+
+  python_destroy();
   
   // close the X display
   otk::OBDisplay::destroy();