X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=ad31718359a335c69c65d1d27ba7f00354e5de4c;hb=656701140bd636d7ae70c544d2ed1cf8479275ca;hp=cf41975d3c2af08f5c509eed6d2f8b4e19873a02;hpb=b34824a4e2ddc0247099fa1b3952de426bfde05b;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index cf41975d..ad317183 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -108,6 +108,8 @@ Openbox::Openbox(int argc, char **argv)
   _doshutdown = false;
   _rcfilepath = otk::expandTilde("~/.openbox/rc3");
   _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
+  _focused_client = 0;
+  _sync = false;
 
   parseCommandLine(argc, argv);
 
@@ -128,7 +130,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();
@@ -163,6 +167,7 @@ Openbox::Openbox(int argc, char **argv)
   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
@@ -180,6 +185,10 @@ Openbox::Openbox(int argc, char **argv)
     ::exit(1);
   }
 
+  // set up input focus
+  _focused_screen = _screens[0];
+  setFocusedClient(0);
+  
   _state = State_Normal; // done starting
 }
 
@@ -222,6 +231,8 @@ void Openbox::parseCommandLine(int argc, char **argv)
         err = true;
       else
         _scriptfilepath = argv[i];
+    } else if (arg == "-sync") {
+      _sync = true;
     } else if (arg == "-version") {
       showVersion();
       ::exit(0);
@@ -289,6 +300,7 @@ void Openbox::eventLoop()
 {
   while (!_doshutdown) {
     dispatchEvents(); // from OtkEventDispatcher
+    XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
     _timermanager.fire();
   }
 }
@@ -320,5 +332,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);
+  }
+}
+
 }