can tell where events are coming from!

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index d2213ec40b016a5daa6152059a1436c2cdb52e4d..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)
@@ -121,8 +123,9 @@ Openbox::Openbox(int argc, char **argv)
 
   _property = new otk::OBProperty();
 
-  // set this class as the fallback event handler (for map events)
-  setFallbackHandler(this);
+  _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);
@@ -263,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);
 }
 
 
@@ -283,59 +284,5 @@ OBClient *Openbox::findClient(Window window)
     return (OBClient*) 0;
 }
 
-
-void Openbox::mapRequestHandler(const XMapRequestEvent &e)
-{
-#ifdef    DEBUG
-  printf("MapRequest for 0x%lx\n", e.window);
-#endif // DEBUG
-
-  otk::OtkEventHandler::mapRequestHandler(e);
-
-  OBClient *client = findClient(e.window);
-
-  if (client) {
-    // XXX: uniconify and/or unshade the window
-  } else {
-    int screen = INT_MAX;
-
-    for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i)
-      if (otk::OBDisplay::screenInfo(i)->getRootWindow() == e.parent) {
-        screen = i;
-        break;
-      }
-
-    if (screen >= ScreenCount(otk::OBDisplay::display)) {
-      /*
-        we got a map request for a window who's parent isn't root. this
-        can happen in only one circumstance:
-
-        a client window unmapped a managed window, and then remapped it
-        somewhere between unmapping the client window and reparenting it
-        to root.
-
-        regardless of how it happens, we need to find the screen that
-        the window is on
-      */
-      XWindowAttributes wattrib;
-      if (! XGetWindowAttributes(otk::OBDisplay::display, e.window,
-                                 &wattrib)) {
-        // failed to get the window attributes, perhaps the window has
-        // now been destroyed?
-        return;
-      }
-
-      for (int i = 0; i < ScreenCount(otk::OBDisplay::display); ++i)
-        if (otk::OBDisplay::screenInfo(i)->getRootWindow() == wattrib.root) {
-          screen = i;
-          break;
-        }
-    }
-
-    assert(screen < static_cast<int>(_screens.size()));
-    _screens[screen]->manageWindow(e.window);
-  }
-}
-
 }