can tell where events are coming from!

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 9d040e14e786b036f37d2bb9bd94fa73a56b4adf..18c4a5ca6e45697e874176b06e2e705adadec955 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -6,7 +6,9 @@
 
 #include "../version.h"
 #include "openbox.hh"
+#include "client.hh"
 #include "screen.hh"
+#include "actions.hh"
 #include "otk/property.hh"
 #include "otk/display.hh"
 #include "otk/assassin.hh"
@@ -48,7 +50,7 @@ extern "C" {
 
 namespace ob {
 
-Openbox *Openbox::instance = (Openbox *) 0;
+Openbox *Openbox::instance  = (Openbox *) 0;
 
 
 void Openbox::signalHandler(int signal)
@@ -74,6 +76,8 @@ void Openbox::signalHandler(int signal)
 
 
 Openbox::Openbox(int argc, char **argv)
+  : otk::OtkEventDispatcher(),
+    otk::OtkEventHandler()
 {
   struct sigaction action;
 
@@ -119,6 +123,10 @@ Openbox::Openbox(int argc, char **argv)
 
   _property = new otk::OBProperty();
 
+  _actions = new OBActions();
+
+  setMasterHandler(_actions); // set as the master event handler
+
   // create the mouse cursors we'll use
   _cursors.session = XCreateFontCursor(otk::OBDisplay::display, XC_left_ptr);
   _cursors.move = XCreateFontCursor(otk::OBDisplay::display, XC_fleur);
@@ -128,8 +136,19 @@ Openbox::Openbox(int argc, char **argv)
   _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
 
   // initialize all the screens
-  _screens.push_back(new OBScreen(0));
-  _screens[0]->loadStyle(_config);
+  OBScreen *screen;
+  screen = new OBScreen(0, _config);
+  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;
+
+  if (_screens.empty()) {
+    printf(_("No screens were found without a window manager. Exiting.\n"));
+    ::exit(1);
+  }
   
   _state = State_Normal; // done starting
 }
@@ -139,10 +158,6 @@ 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());
   
   // close the X display
@@ -237,14 +252,8 @@ 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
+    _timermanager.fire();
   }
 }
 
@@ -257,9 +266,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);
 }