X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=cf05e2a87a102dcb9d1180556af3129bab4640d6;hb=3661e55fba3b5f3be246b3f65d650460282018ac;hp=2254f9efae570d858a319c88fa3de6946c8073dc;hpb=5f78b51429b204f89b654d634bb4cc8cb78b95f6;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 2254f9ef..cf05e2a8 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -9,6 +9,7 @@
 #include "client.hh"
 #include "screen.hh"
 #include "actions.hh"
+#include "bindings.hh"
 #include "otk/property.hh"
 #include "otk/display.hh"
 #include "otk/assassin.hh"
@@ -42,12 +43,12 @@ extern "C" {
 #  include <sys/select.h>
 #endif // HAVE_SYS_SELECT_H
 
-//#include <guile/gh.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)
@@ -82,6 +83,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<char*>(s));
+    fclose(rcpyfd);
+  }
+}
+
+
 Openbox::Openbox(int argc, char **argv)
   : otk::OtkEventDispatcher(),
     otk::OtkEventHandler()
@@ -96,6 +108,9 @@ Openbox::Openbox(int argc, char **argv)
   _argv0 = argv[0];
   _doshutdown = false;
   _rcfilepath = otk::expandTilde("~/.openbox/rc3");
+  _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
+  _focused_client = 0;
+  _sync = false;
 
   parseCommandLine(argc, argv);
 
@@ -116,7 +131,9 @@ Openbox::Openbox(int argc, char **argv)
   // open the X display (and gets some info about it, and its screens)
   otk::OBDisplay::initialize(_displayreq);
   assert(otk::OBDisplay::display);
-    
+
+  XSynchronize(otk::OBDisplay::display, _sync);
+  
   // set up the signal handler
   action.sa_handler = Openbox::signalHandler;
   action.sa_mask = sigset_t();
@@ -129,8 +146,23 @@ Openbox::Openbox(int argc, char **argv)
   sigaction(SIGHUP, &action, (struct sigaction *) 0);
 
   _property = new otk::OBProperty();
-
   _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(v, 1);
+  v.clear();
+//  v.push_back("C-x");
+//  v.push_back("C-z");
+  v.push_back("a");
+  _bindings->add(v, 2);
+
+  printf("CHAINS:\n");
+  _bindings->display();
+  ::exit(0);
 
   setMasterHandler(_actions); // set as the master event handler
 
@@ -142,6 +174,18 @@ 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 all the screens
   OBScreen *screen;
   screen = new OBScreen(0, _config);
@@ -157,33 +201,10 @@ Openbox::Openbox(int argc, char **argv)
     ::exit(1);
   }
 
-  /*
-  // make our guile interfaces exist
-  SWIG_init();
-  
-  // run the guile of d3th
-  FILE *rcpyfd = fopen("/home/natas/.openbox/user.scm", "r");
-  if (!rcpyfd) {
-    printf("failed to load guile script /home/natas/.openbox/user.scm\n");
-  } else {
-    fclose(rcpyfd);
-    gh_load("/home/natas/.openbox/user.scm");
-  }
-  */
+  // set up input focus
+  _focused_screen = _screens[0];
+  setFocusedClient(0);
   
-  Py_SetProgramName(argv[0]);
-  Py_Initialize();
-  //initopenbox(); // initialize the static 'openbox' module
-  init_openbox();
-  FILE *rcpyfd = fopen("/home/natas/.openbox/user.py", "r");
-  if (!rcpyfd) {
-    printf("failed to load python file /home/natas/.openbox/user.py\n");
-  } else {
-    PyRun_SimpleFile(rcpyfd, "/home/natas/.openbox/user.py");
-    fclose(rcpyfd);
-  }
-  
-
   _state = State_Normal; // done starting
 }
 
@@ -193,6 +214,10 @@ Openbox::~Openbox()
   _state = State_Exiting; // time to kill everything
 
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+
+  delete _bindings;
+  delete _actions;
+  delete _property;
   
   // close the X display
   otk::OBDisplay::destroy();
@@ -221,6 +246,13 @@ void Openbox::parseCommandLine(int argc, char **argv)
         err = true;
       else
         _menufilepath = argv[i];
+    } else if (arg == "-script") {
+      if (++i >= argc)
+        err = true;
+      else
+        _scriptfilepath = argv[i];
+    } else if (arg == "-sync") {
+      _sync = true;
     } else if (arg == "-version") {
       showVersion();
       ::exit(0);
@@ -255,6 +287,7 @@ void Openbox::showHelp()
   -display <string>  use display connection.\n\
   -rc <string>       use alternate resource file.\n\
   -menu <string>     use alternate menu file.\n\
+  -script <string>   use alternate startup script file.\n\
   -version           display version and exit.\n\
   -help              display this help text and exit.\n\n"), _argv0);
 
@@ -287,6 +320,7 @@ void Openbox::eventLoop()
 {
   while (!_doshutdown) {
     dispatchEvents(); // from OtkEventDispatcher
+    XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
     _timermanager.fire();
   }
 }
@@ -318,5 +352,18 @@ OBClient *Openbox::findClient(Window window)
     return (OBClient*) 0;
 }
 
+
+void Openbox::setFocusedClient(OBClient *c)
+{
+  _focused_client = c;
+  if (c) {
+    _focused_screen = _screens[c->screen()];
+  } else {
+    assert(_focused_screen);
+    XSetInputFocus(otk::OBDisplay::display, _focused_screen->focuswindow(),
+                   RevertToNone, CurrentTime);
+  }
+}
+
 }