X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=230c749d620190f266eb01d28f3564f2cdfcec00;hb=b35dae95a5cdb902f1661b9572af47c3f55c975c;hp=6f42bc206157f102c1df8b0654edea7452b75fc5;hpb=b067510b6114844945381293227783bf9fd7a806;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 6f42bc20..230c749d 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #ifdef HAVE_CONFIG_H
 # include "../config.h"
@@ -6,8 +6,15 @@
 
 #include "../version.h"
 #include "openbox.hh"
+#include "client.hh"
+#include "screen.hh"
+#include "actions.hh"
+#include "bindings.hh"
+#include "python.hh"
 #include "otk/property.hh"
 #include "otk/display.hh"
+#include "otk/assassin.hh"
+#include "otk/util.hh" // TEMPORARY
 
 extern "C" {
 #include <X11/cursorfont.h>
@@ -41,9 +48,11 @@ extern "C" {
 #define _(str) gettext(str)
 }
 
+#include <algorithm>
+
 namespace ob {
 
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *Openbox::instance  = (Openbox *) 0;
 
 
 void Openbox::signalHandler(int signal)
@@ -69,6 +78,8 @@ void Openbox::signalHandler(int signal)
 
 
 Openbox::Openbox(int argc, char **argv)
+  : otk::OtkEventDispatcher(),
+    otk::OtkEventHandler()
 {
   struct sigaction action;
 
@@ -79,13 +90,19 @@ Openbox::Openbox(int argc, char **argv)
   _displayreq = (char*) 0;
   _argv0 = argv[0];
   _doshutdown = false;
+  _rcfilepath = otk::expandTilde("~/.openbox/rc3");
+  _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
+  _focused_client = 0;
+  _sync = false;
 
   parseCommandLine(argc, 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();
@@ -98,6 +115,10 @@ Openbox::Openbox(int argc, char **argv)
   sigaction(SIGHUP, &action, (struct sigaction *) 0);
 
   _property = new otk::OBProperty();
+  _actions = new OBActions();
+  _bindings = new OBBindings();
+
+  setMasterHandler(_actions); // set as the master event handler
 
   // create the mouse cursors we'll use
   _cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);
@@ -106,6 +127,43 @@ Openbox::Openbox(int argc, char **argv)
   _cursors.lr_angle = XCreateFontCursor(otk::OBDisplay::display, XC_lr_angle);
   _cursors.ul_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ul_angle);
   _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
+
+  // 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"/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;
+  screen = new OBScreen(0);
+  if (screen->managed()) {
+    _screens.push_back(screen);
+    // XXX: "change to" the first workspace on the screen to initialize stuff
+  } else
+    delete screen;
+
+  if (_screens.empty()) {
+    printf(_("No screens were found without a window manager. Exiting.\n"));
+    ::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);
   
   _state = State_Normal; // done starting
 }
@@ -115,9 +173,13 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  // unmanage all windows
-  while (!_clients.empty())
-    _xeventhandler.unmanageWindow(_clients.begin()->second);
+  std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
+
+  delete _bindings;
+  delete _actions;
+  delete _property;
+
+  python_destroy();
   
   // close the X display
   otk::OBDisplay::destroy();
@@ -146,6 +208,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);
@@ -180,6 +249,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);
 
@@ -211,14 +281,9 @@ void Openbox::showHelp()
 void Openbox::eventLoop()
 {
   while (!_doshutdown) {
-    if (XPending(otk::OBDisplay::display)) {
-      XEvent e;
-      XNextEvent(otk::OBDisplay::display, &e);
-      //process_event(&e);
-      _xeventhandler.handle(e);
-    } else {
-      _timermanager.fire();
-    }
+    dispatchEvents(); // from OtkEventDispatcher
+    XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
+    _timermanager.fire();
   }
 }
 
@@ -231,9 +296,7 @@ void Openbox::addClient(Window window, OBClient *client)
 
 void Openbox::removeClient(Window window)
 {
-  ClientMap::iterator it = _clients.find(window);
-  if (it != _clients.end())
-    _clients.erase(it);
+  _clients.erase(window);
 }
 
 
@@ -251,5 +314,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);
+  }
+}
+
 }