X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fxeventhandler.cc;h=ca9be143965467823eb67641bf185274c40e8bf3;hb=8b041e2f5c2edc6d295697d129cbc65b9bb2c6b7;hp=c7ca3aeb81f98a39ebdf47ea63eaaee179fa0378;hpb=a0cc4a7f234aaa3d7d4f1cd8de29b08aef6e13a1;p=chaz%2Fopenbox

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index c7ca3aeb..ca9be143 100644
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -118,7 +118,7 @@ void OBXEventHandler::configureRequest(const XConfigureRequestEvent &e)
 }
 
 
-// XXX: put this into the OBScreen class!
+// XXX: put this into the OBScreen or OBClient class!
 static void manageWindow(Window window)
 {
   OBClient *client = 0;
@@ -168,19 +168,54 @@ static void manageWindow(Window window)
   /// XMapSubwindows(otk::OBDisplay::display, FRAMEWINDOW);
   XMapWindow(otk::OBDisplay::display, window);
  
-  // handle any requested states such as shaded/maximized
+  // XXX: handle any requested states such as shaded/maximized
 }
 
+// XXX: move this to the OBScreen or OBClient class!
 static void unmanageWindow(OBClient *client)
 {
-  Window window = client->window();
+  bool remap = false; // remap the window when we're done?
   
-  // we dont want a border on the client
-  XSetWindowBorderWidth(otk::OBDisplay::display, window,client->borderWidth());
+  Window window = client->window();
 
+  // XXX: pass around focus if this window was focused
+  
   // remove the window from our save set
   XChangeSaveSet(otk::OBDisplay::display, window, SetModeDelete);
+
+  // we dont want events no more
+  XSelectInput(otk::OBDisplay::display, window, NoEventMask);
+
+  // XXX: XUnmapWindow(otk::OBDisplay::display, FRAME);
+  XUnmapWindow(otk::OBDisplay::display, window);
   
+  // we dont want a border on the client
+  XSetWindowBorderWidth(otk::OBDisplay::display, window,client->borderWidth());
+
+  // remove the client class from the search list
+  Openbox::instance->removeClient(window);
+
+  // check if the app has already reparented its window to the root window
+  XEvent ev;
+  if (XCheckTypedWindowEvent(otk::OBDisplay::display, window, ReparentNotify,
+                             &ev)) {
+    remap = true; // XXX: why do we remap the window if they already
+                  // reparented to root?
+  } else {
+    // according to the ICCCM - if the client doesn't reparent to
+    // root, then we have to do it for them
+    XReparentWindow(otk::OBDisplay::display, window,
+                    RootWindow(otk::OBDisplay::display,
+                               DefaultScreen(otk::OBDisplay::display)),
+                    // XXX: screen->getRootWindow(),
+                    client->area().x(), client->area().y());
+  }
+
+  // if we want to remap the window, do so now
+  if (remap)
+    XMapWindow(otk::OBDisplay::display, window);
+
+  delete client;
 }
 
 void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
@@ -254,8 +289,7 @@ 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);
+  unmanageWindow(client);
 }
 
 
@@ -266,8 +300,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);
+  unmanageWindow(client);
 }