fix \'s

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index 9234a18817060ebc524b6d0d28a3be5fdcf0ba4d..a427a21e6f63f759da1ffdd69dc3b2d0abcaf507 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -897,7 +897,10 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e)
   } else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) {
     // can't compress these
 #ifdef DEBUG
-    printf("net_wm_state for 0x%lx\n", _window);
+    printf("net_wm_state %s %ld %ld for 0x%lx\n",
+           (e.data.l[0] == 0 ? "Remove" : e.data.l[0] == 1 ? "Add" :
+            e.data.l[0] == 2 ? "Toggle" : "INVALID"),
+           e.data.l[1], e.data.l[2], _window);
 #endif
     setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]);
   } else if (e.message_type ==
@@ -911,6 +914,9 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e)
 #ifdef DEBUG
     printf("net_active_window for 0x%lx\n", _window);
 #endif
+    if (_shaded)
+      shade(false);
+    // XXX: deiconify
     focus();
     Openbox::instance->screen(_screen)->restack(true, this); // raise
   }
@@ -997,8 +1003,26 @@ void OBClient::move(int x, int y)
   _area.setPos(x, y);
 
   // move the frame to be in the requested position
-  if (frame) // this can be called while mapping, before frame exists
+  if (frame) { // this can be called while mapping, before frame exists
     frame->adjustPosition();
+
+    // send synthetic configure notify (we don't need to if we aren't mapped
+    // yet)
+    XEvent event;
+    event.type = ConfigureNotify;
+    event.xconfigure.display = otk::OBDisplay::display;
+    event.xconfigure.event = _window;
+    event.xconfigure.window = _window;
+    event.xconfigure.x = x;
+    event.xconfigure.y = y;
+    event.xconfigure.width = _area.width();
+    event.xconfigure.height = _area.height();
+    event.xconfigure.border_width = _border_width;
+    event.xconfigure.above = frame->window();
+    event.xconfigure.override_redirect = False;
+    XSendEvent(event.xconfigure.display, event.xconfigure.window, False,
+               StructureNotifyMask, &event);
+  }
 }
 
 
@@ -1025,7 +1049,7 @@ void OBClient::close()
   ce.xclient.data.l[2] = 0l;
   ce.xclient.data.l[3] = 0l;
   ce.xclient.data.l[4] = 0l;
-  XSendEvent(otk::OBDisplay::display, _window, False, NoEventMask, &ce);
+  XSendEvent(otk::OBDisplay::display, _window, false, NoEventMask, &ce);
 }
 
 
@@ -1082,9 +1106,12 @@ void OBClient::shade(bool shade)
 }
 
 
-bool OBClient::focus()
+bool OBClient::focus() const
 {
-  if (!(_can_focus || _focus_notify)) return false;
+  // won't try focus if the client doesn't want it, or if the window isn't
+  // visible on the screen
+  if (!(frame->isVisible() && (_can_focus || _focus_notify))) return false;
+
   if (_focused) return true;
 
   if (_can_focus)
@@ -1112,7 +1139,7 @@ bool OBClient::focus()
 }
 
 
-void OBClient::unfocus()
+void OBClient::unfocus() const
 {
   if (!_focused) return;
 
@@ -1269,8 +1296,8 @@ void OBClient::reparentHandler(const XReparentEvent &e)
     to an already unmapped window.
   */
 
-  // put another copy of this event on the stack (for the frame reparent
-  // process)
+  // we don't want the reparent event, put it back on the stack for the X
+  // server to deal with after we unmanage the window
   XEvent ev;
   ev.xreparent = e;
   XPutBackEvent(otk::OBDisplay::display, &ev);