move screen.cc/hh to bbscreen.cc/hh

[chaz/openbox] / src / xeventhandler.cc

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index bdebadd8f63417a6508a32b3f86d47e2d43ec3c7..afa5eceeb4095923a28718fd67adf61a3dfd7bd2 100644 (file)
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -1,5 +1,9 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
 
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "xeventhandler.hh"
 #include "client.hh"
 #include "frame.hh"
@@ -9,7 +13,7 @@
 
 // XXX: REMOVE THIS SOON!!#!
 #include "blackbox.hh"
-#include "screen.hh"
+#include "bbscreen.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -124,7 +128,7 @@ void OBXEventHandler::configureRequest(const XConfigureRequestEvent &e)
 
 
 // XXX: put this into the OBScreen or OBClient class!
-static void manageWindow(int screen, Window window)
+void OBXEventHandler::manageWindow(int screen, Window window)
 {
   OBClient *client = 0;
   XWMHints *wmhint;
@@ -168,7 +172,20 @@ static void 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());
@@ -177,7 +194,7 @@ static void manageWindow(int screen, Window window)
 }
 
 // XXX: move this to the OBScreen or OBClient class!
-static void unmanageWindow(OBClient *client)
+void OBXEventHandler::unmanageWindow(OBClient *client)
 {
   OBFrame *frame = client->frame;
 
@@ -197,6 +214,17 @@ static void 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;
@@ -506,11 +534,14 @@ void OBXEventHandler::focusOut(const XFocusChangeEvent &e)
 #ifdef    SHAPE
 void OBXEventHandler::shapeEvent(const XShapeEvent &e)
 {
-  XShapeEvent *shape_event = (XShapeEvent *) e;
-  BlackboxWindow *win = searchWindow(e->xany.window);
+  printf("ShapeEvent\n");
+  if (e.kind != ShapeBounding) return;
+
+  OBClient *client = Openbox::instance->findClient(e.window);
+  if (!client) return;
 
-  if (win && shape_event->kind == ShapeBounding)
-    win->shapeEvent(shape_event);
+  client->update(e);
+  client->frame->update();
 }
 #endif // SHAPE
 
@@ -611,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;
@@ -679,7 +711,7 @@ void OBXEventHandler::handle(const XEvent &e)
   default:
 #ifdef    SHAPE
     if (e.type == otk::OBDisplay::shapeEventBase())
-      shapeEvent(e);
+      shapeEvent((*(XShapeEvent*)&e));
 #endif // SHAPE
     break;