read protocols too in OBClient

diff --git a/src/client.cc b/src/client.cc
index 9b26b3bf180ccac6eb71dd2d029b47c475b240b6..5ecbb9aefa56560bb19eda738d2da1971ebef903 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -34,6 +34,7 @@ OBClient::OBClient(Window window)
   getState();
   getShaped();
 
+  updateProtocols();
   updateNormalHints();
   updateWMHints();
   // XXX: updateTransientFor();
@@ -176,6 +177,7 @@ void OBClient::getArea()
   assert(XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib));
 
   _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
+  _border_width = wattrib.border_width;
 }
 
 
@@ -227,6 +229,29 @@ void OBClient::getShaped()
 }
 
 
+void OBClient::updateProtocols() {
+  const otk::OBProperty *property = Openbox::instance->property();
+
+  Atom *proto;
+  int num_return = 0;
+
+  _focus_notify = false;
+
+  if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) {
+    for (int i = 0; i < num_return; ++i) {
+      if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) {
+        // XXX: do shit with this! let the window close, and show a close
+        // button
+      } else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus))
+        // if this protocol is requested, then the window will be notified
+        // by the window manager whenever it receives focus
+        _focus_notify = true;
+    }
+    XFree(proto);
+  }
+}
+
+
 void OBClient::updateNormalHints()
 {
   XSizeHints size;
@@ -351,7 +376,10 @@ void OBClient::update(const XPropertyEvent &e)
     updateTitle();
   else if (e.atom == property->atom(otk::OBProperty::wm_class))
     updateClass();
+  else if (e.atom == property->atom(otk::OBProperty::wm_protocols))
+    updateProtocols();
   // XXX: transient for hint
+  // XXX: strut hint
 }
 
 

diff --git a/src/client.hh b/src/client.hh
index 799ff70337670178805f63a106240e7f2318396a..5d309262d5eb9291d1fe913265df4be6d42d5813 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -89,6 +89,13 @@ private:
   //! Position and size of the window (relative to the root window)
   otk::Rect    _area;
 
+  //! Width of the border on the window.
+  /*!
+    The window manager will set this to 0 while the window is being managed,
+    but needs to restore it afterwards, so it is saved here.
+  */
+  int _border_width;
+
   // size bounds
   // if min > max, then the window is not resizable
   int _min_x, _min_y; // minumum size
@@ -144,7 +151,8 @@ private:
   void setWMState(long state);
   void setDesktop(long desktop);
   void setState(StateAction action, long data1, long data2);
-  
+
+  void updateProtocols();
   void updateNormalHints();
   void updateWMHints();
   // XXX: updateTransientFor();

diff --git a/src/xeventhandler.cc b/src/xeventhandler.cc
index c31aaf9793a96093167b079c2888cbe96269cc99..88d16f5607207853177359695aa1210df16d9a67 100644 (file)
--- a/src/xeventhandler.cc
+++ b/src/xeventhandler.cc
@@ -6,6 +6,11 @@
 #include "otk/display.hh"
 #include "otk/rect.hh"
 
+extern "C" {
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+}
+
 namespace ob {
 
 
@@ -113,6 +118,37 @@ void OBXEventHandler::configureRequest(const XConfigureRequestEvent &e)
 }
 
 
+// XXX: put this into the OBScreen class!
+static void manageWindow(Window window)
+{
+  XWMHints *wmhint;
+  XSetWindowAttributes attrib_set;
+
+  // XXX: manage the window, i.e. grab events n shit
+
+  // is the window a docking app
+  if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) {
+    if ((wmhint->flags & StateHint) &&
+        wmhint->initial_state == WithdrawnState) {
+      //slit->addClient(w); // XXX: make dock apps work!
+      XFree(wmhint);
+      return;
+    }
+    XFree(wmhint);
+  }
+
+  // choose the events we want to receive on the CLIENT window
+  attrib_set.event_mask = PropertyChangeMask | FocusChangeMask |
+                          StructureNotifyMask;
+  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));
+}
+
 void OBXEventHandler::mapRequest(const XMapRequestEvent &e)
 {
 #ifdef    DEBUG
@@ -124,8 +160,7 @@ 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));
+    manageWindow(e.window);
   }
   
 /*