position the client inside the frame correctly.

[chaz/openbox] / src / xeventhandler.cc

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index 88d16f5607207853177359695aa1210df16d9a67..ad7d7e27f22356c85aa6d462429aa5383f8f32cc 100644 (file)
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -2,10 +2,15 @@
 
 #include "xeventhandler.hh"
 #include "client.hh"
+#include "frame.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/rect.hh"
 
+// XXX: REMOVE THIS SOON!!#!
+#include "blackbox.hh"
+#include "screen.hh"
+
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -118,9 +123,10 @@ void OBXEventHandler::configureRequest(const XConfigureRequestEvent &e)
 }
 
 
-// XXX: put this into the OBScreen class!
-static void manageWindow(Window window)
+// XXX: put this into the OBScreen or OBClient class!
+void OBXEventHandler::manageWindow(int screen, Window window)
 {
+  OBClient *client = 0;
   XWMHints *wmhint;
   XSetWindowAttributes attrib_set;
 
@@ -138,15 +144,64 @@ static void manageWindow(Window window)
   }
 
   // choose the events we want to receive on the CLIENT window
-  attrib_set.event_mask = PropertyChangeMask | FocusChangeMask |
-                          StructureNotifyMask;
+  attrib_set.event_mask = OBClient::event_mask;
   attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask |
                                      ButtonMotionMask;
   XChangeWindowAttributes(otk::OBDisplay::display, window,
                           CWEventMask|CWDontPropagate, &attrib_set);
 
   // create the OBClient class, which gets all of the hints on the window
-  Openbox::instance->addClient(window, new OBClient(window));
+  Openbox::instance->addClient(window, client = new OBClient(screen, window));
+
+  // we dont want a border on the client
+  XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+  
+  // specify that if we exit, the window should not be destroyed and should be
+  // reparented back to root automatically
+  XChangeSaveSet(otk::OBDisplay::display, window, SetModeInsert);
+
+  if (!client->positionRequested()) {
+    // XXX: position the window intelligenty
+  }
+
+  // XXX: store a style somewheres cooler!!
+  otk::Style *style = ((Blackbox*)Openbox::instance)->
+    searchScreen(RootWindow(otk::OBDisplay::display, screen))->
+    getWindowStyle();
+  client->frame = new OBFrame(client, style);
+  
+  // XXX: if on the current desktop..
+  XMapWindow(otk::OBDisplay::display, client->frame->window());
+ 
+  // XXX: handle any requested states such as shaded/maximized
+}
+
+// XXX: move this to the OBScreen or OBClient class!
+void OBXEventHandler::unmanageWindow(OBClient *client)
+{
+  OBFrame *frame = client->frame;
+
+  // XXX: pass around focus if this window was focused
+  
+  // remove the window from our save set
+  XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete);
+
+  // we dont want events no more
+  XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
+
+  XUnmapWindow(otk::OBDisplay::display, frame->window());
+  
+  // we dont want a border on the client
+  XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
+                        client->borderWidth());
+
+  // remove the client class from the search list
+  Openbox::instance->removeClient(client->window());
+
+  delete client->frame;
+  client->frame = 0;
+
+  delete client;
 }
 
 void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
@@ -160,7 +215,44 @@ void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
   if (client) {
     // XXX: uniconify and/or unshade the window
   } else {
-    manageWindow(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));
+
+    manageWindow(screen, e.window);
   }
   
 /*
@@ -220,8 +312,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);
 }
 
 
@@ -232,8 +323,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);
 }