more layout fixes for the decoration elements

[chaz/openbox] / src / xeventhandler.cc

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index 585f9dbc516899f4b53c634ae0142aedc546122d..9d738dde0e6773f2ff294af934b2348b21351d95 100644 (file)
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -172,7 +172,20 @@ void OBXEventHandler::manageWindow(int screen, Window window)
   otk::Style *style = ((Blackbox*)Openbox::instance)->
     searchScreen(RootWindow(otk::OBDisplay::display, screen))->
     getWindowStyle();
+  // create the decoration frame for the client window
   client->frame = new OBFrame(client, style);
+
+  // add all the client's decoration windows as event handlers for the client
+  Openbox::instance->addClient(client->frame->window(), client);
+  Openbox::instance->addClient(client->frame->titlebar(), client);
+  Openbox::instance->addClient(client->frame->buttonIconify(), client);
+  Openbox::instance->addClient(client->frame->buttonMax(), client);
+  Openbox::instance->addClient(client->frame->buttonStick(), client);
+  Openbox::instance->addClient(client->frame->buttonClose(), client);
+  Openbox::instance->addClient(client->frame->label(), client);
+  Openbox::instance->addClient(client->frame->handle(), client);
+  Openbox::instance->addClient(client->frame->gripLeft(), client);
+  Openbox::instance->addClient(client->frame->gripRight(), client);
   
   // XXX: if on the current desktop..
   XMapWindow(otk::OBDisplay::display, client->frame->window());
@@ -201,6 +214,17 @@ void OBXEventHandler::unmanageWindow(OBClient *client)
 
   // remove the client class from the search list
   Openbox::instance->removeClient(client->window());
+  // remove the frame's decor elements as event handlers for the client
+  Openbox::instance->removeClient(frame->window());
+  Openbox::instance->removeClient(frame->titlebar());
+  Openbox::instance->removeClient(frame->buttonIconify());
+  Openbox::instance->removeClient(frame->buttonMax());
+  Openbox::instance->removeClient(frame->buttonStick());
+  Openbox::instance->removeClient(frame->buttonClose());
+  Openbox::instance->removeClient(frame->label());
+  Openbox::instance->removeClient(frame->handle());
+  Openbox::instance->removeClient(frame->gripLeft());
+  Openbox::instance->removeClient(frame->gripRight());
 
   delete client->frame;
   client->frame = 0;
@@ -517,7 +541,7 @@ void OBXEventHandler::shapeEvent(const XShapeEvent &e)
   if (!client) return;
 
   client->update(e);
-  client->frame->shape();
+  client->frame->update();
 }
 #endif // SHAPE
 
@@ -618,6 +642,7 @@ void OBXEventHandler::handle(const XEvent &e)
 
     // These types of XEvent's can be bound to actions by the user, and so end
     // up getting passed off to the OBBindingMapper class at some point
+    // IOW: THESE WILL HAVE GUILE HOOKS
   case ButtonPress:
     buttonPress(e.xbutton);
     break;