X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=80869e1529da394f06baa71feb7adb5b737eb97f;hb=a6f5b33ad90637705af9717c978bf895455c71ba;hp=ac196f933acfa9428eb9f4142afc98120f29ed2b;hpb=d9e7a7b8cd667cc6e11add9062d3c12ef21b6fda;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index ac196f93..80869e15 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -44,6 +44,7 @@ OBClient::OBClient(int screen, Window window)
   
   getArea();
   getDesktop();
+  // XXX: updateTransientFor();
   getType();
 
   // set the decorations and functions
@@ -85,12 +86,12 @@ OBClient::OBClient(int screen, Window window)
   updateProtocols();
   updateNormalHints();
   updateWMHints();
-  // XXX: updateTransientFor();
   updateTitle();
   updateIconTitle();
   updateClass();
 
   calcLayer();
+  changeState();
 }
 
 
@@ -338,7 +339,8 @@ void OBClient::updateProtocols()
       if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) {
         _decorations |= Decor_Close;
         _functions |= Func_Close;
-        // XXX: update the decor?
+        if (frame)
+          frame->adjustSize(); // update the decorations
       } 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
@@ -783,21 +785,24 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e)
   } else if (e.message_type ==
              property->atom(otk::OBProperty::net_active_window)) {
     focus();
+    Openbox::instance->screen(_screen)->restack(true, this); // raise
+  } else {
   }
 }
 
 
-#if defined(SHAPE) || defined(DOXYGEN_IGNORE)
+#if defined(SHAPE)
 void OBClient::shapeHandler(const XShapeEvent &e)
 {
   otk::OtkEventHandler::shapeHandler(e);
   
   _shaped = e.shaped;
+  frame->adjustShape();
 }
 #endif
 
 
-void OBClient::resize(Corner anchor, int w, int h)
+void OBClient::resize(Corner anchor, int w, int h, int x, int y)
 {
   w -= _base_size.x(); 
   h -= _base_size.y();
@@ -830,23 +835,27 @@ void OBClient::resize(Corner anchor, int w, int h)
   w += _base_size.x();
   h += _base_size.y();
 
-  int x = _area.x(), y = _area.y();  
-  switch (anchor) {
-  case TopLeft:
-    break;
-  case TopRight:
-    x -= w - _area.width();
-    break;
-  case BottomLeft:
-    y -= h - _area.height();
-    break;
-  case BottomRight:
-    x -= w - _area.width();
-    y -= h - _area.height();
-    break;
+  if (x == INT_MIN || y == INT_MIN) {
+    x = _area.x();
+    y = _area.y();
+    switch (anchor) {
+    case TopLeft:
+      break;
+    case TopRight:
+      x -= w - _area.width();
+      break;
+    case BottomLeft:
+      y -= h - _area.height();
+      break;
+    case BottomRight:
+      x -= w - _area.width();
+      y -= h - _area.height();
+      break;
+    }
   }
 
   _area.setSize(w, h);
+
   XResizeWindow(otk::OBDisplay::display, _window, w, h);
 
   // resize the frame to match the request
@@ -858,6 +867,7 @@ void OBClient::resize(Corner anchor, int w, int h)
 void OBClient::move(int x, int y)
 {
   _area.setPos(x, y);
+
   // move the frame to be in the requested position
   frame->adjustPosition();
 }
@@ -1043,10 +1053,14 @@ void OBClient::configureRequestHandler(const XConfigureRequestEvent &e)
       corner = TopLeft;
     }
 
-    resize(corner, w, h);
-  }
-
-  if (e.value_mask & (CWX | CWY)) {
+    // if moving AND resizing ...
+    if (e.value_mask & (CWX | CWY)) {
+      int x = (e.value_mask & CWX) ? e.x : _area.x();
+      int y = (e.value_mask & CWY) ? e.y : _area.y();
+      resize(corner, w, h, x, y);
+    } else // if JUST resizing...
+      resize(corner, w, h);
+  } else if (e.value_mask & (CWX | CWY)) { // if JUST moving...
     int x = (e.value_mask & CWX) ? e.x : _area.x();
     int y = (e.value_mask & CWY) ? e.y : _area.y();
     move(x, y);