X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fxeventhandler.cc;h=5d5273779200eb1c4aaa27bbba1c8e5f8fb5b1eb;hb=977ecf1f1e82f385a542648b545a0d0877febaf0;hp=c31aaf9793a96093167b079c2888cbe96269cc99;hpb=d363f720a6b0d1c361bc2022d0e5fcd5a75fd04d;p=chaz%2Fopenbox

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index c31aaf97..5d527377 100644
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -1,11 +1,22 @@
 // -*- mode: C++; indent-tabs-mode: nil; -*-
 
+#ifdef HAVE_CONFIG_H
+# include "../config.h"
+#endif
+
 #include "xeventhandler.hh"
 #include "client.hh"
 #include "openbox.hh"
+#include "screen.hh"
+#include "frame.hh"
 #include "otk/display.hh"
 #include "otk/rect.hh"
 
+extern "C" {
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+}
+
 namespace ob {
 
 
@@ -124,8 +135,44 @@ void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
   if (client) {
     // XXX: uniconify and/or unshade the window
   } else {
-    // XXX: manage the window, i.e. grab events n shit
-    Openbox::instance->addClient(e.window, new OBClient(e.window));
+    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 < ScreenCount(otk::OBDisplay::display));
+
+    Openbox::instance->screen(screen)->manageWindow(e.window);
   }
   
 /*
@@ -184,9 +231,11 @@ void OBXEventHandler::unmapNotify(const XUnmapEvent &e)
 {
   OBClient *client = Openbox::instance->findClient(e.window);
   if (!client) return;
-  
-  // XXX: unmanage the window, i.e. ungrab events n reparent n shit
-  Openbox::instance->removeClient(e.window);
+
+  if (client->ignore_unmaps == 0)
+    Openbox::instance->screen(client->screen())->unmanageWindow(client);
+  else
+    client->ignore_unmaps--;
 }
 
 
@@ -197,8 +246,7 @@ void OBXEventHandler::destroyNotify(const XDestroyWindowEvent &e)
   OBClient *client = Openbox::instance->findClient(e.window);
   if (!client) return;
   
-  // XXX: unmanage the window, i.e. ungrab events n reparent n shit
-  Openbox::instance->removeClient(e.window);
+  Openbox::instance->screen(client->screen())->unmanageWindow(client);
 }
 
 
@@ -381,11 +429,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;
 
-  if (win && shape_event->kind == ShapeBounding)
-    win->shapeEvent(shape_event);
+  OBClient *client = Openbox::instance->findClient(e.window);
+  if (!client) return;
+
+  client->update(e);
+  client->frame->update();
 }
 #endif // SHAPE
 
@@ -486,6 +537,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;
@@ -554,7 +606,7 @@ void OBXEventHandler::handle(const XEvent &e)
   default:
 #ifdef    SHAPE
     if (e.type == otk::OBDisplay::shapeEventBase())
-      shapeEvent(e);
+      shapeEvent((*(XShapeEvent*)&e));
 #endif // SHAPE
     break;