X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=18c4a5ca6e45697e874176b06e2e705adadec955;hb=77a8e11660edd66279f2d3def6de3768874ba780;hp=0c534a0f18df6f92018ecbca527bd46040a86a90;hpb=fb3848450e649a05c0bed84a02bc9ab4e563b5d9;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 0c534a0f..18c4a5ca 100644
--- 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,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);
@@ -260,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);
 }