update children first

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 1312cac80fb07ff61bceab2be67066531990d4b5..d42a962a8f9bcca3f05a212a4633f9b557c08394 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1092,9 +1092,16 @@ void Client::clientMessageHandler(const XClientMessageEvent &e)
       setDesktop(openbox->screen(_screen)->desktop());
     if (_shaded)
       shade(false);
-    // XXX: deiconify
     focus();
     openbox->screen(_screen)->raiseWindow(this);
+  } else if (e.message_type == otk::Property::atoms.openbox_active_window) {
+    if (_iconic)
+      setDesktop(openbox->screen(_screen)->desktop());
+    if (e.data.l[0] && _shaded)
+      shade(false);
+    focus();
+    if (e.data.l[1])
+      openbox->screen(_screen)->raiseWindow(this);
   }
 }