merge r6925-28 from trunk

diff --git a/openbox/action.c b/openbox/action.c
index 39da39a5b7842ec4159545abd1f3ddf9ad7f7ef5..d16d13f19a02c1df7465420c35e2f2763556679a 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -57,7 +57,7 @@ static void client_action_end(union ActionData *data)
                    event will come as a GrabNotify which is ignored, so this
                    makes a fake enter event
                 */
-                if ((c = client_under_pointer()))
+                if ((c = client_under_pointer()) && c != data->any.c)
                     event_enter_client(c);
             }
         }

diff --git a/openbox/client.c b/openbox/client.c
index 948ecd8aff9663cd63d536f025991a23fa98c385..148bc6490bea0730f2cc1ceb9a7381eb2eb97e08 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1802,9 +1802,6 @@ static void client_change_allowed_actions(ObClient *self)
 
 void client_reconfigure(ObClient *self)
 {
-    /* by making this pass FALSE for user, we avoid the emacs event storm where
-       every configurenotify causes an update in its normal hints, i think this
-       is generally what we want anyways... */
     client_configure(self, self->area.x, self->area.y,
                      self->area.width, self->area.height,
                      self->border_width, FALSE, TRUE);
@@ -2828,8 +2825,7 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
         changes.height = MAX(h, oldh);
         changes.border_width = self->border_width;
         XConfigureWindow(ob_display, self->window,
-                         (moved ? CWX|CWY : 0) |
-                         (resized ? CWWidth|CWHeight|CWBorderWidth : 0),
+                         CWX|CWY|CWWidth|CWHeight|CWBorderWidth,
                          &changes);
         /* resize the plate to show the client padding color underneath */
         frame_adjust_client_area(self->frame);
@@ -2895,8 +2891,7 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
             changes.height = h;
             changes.border_width = self->border_width;
             XConfigureWindow(ob_display, self->window,
-                             (moved ? CWX|CWY : 0) |
-                             (resized ? CWWidth|CWHeight|CWBorderWidth : 0),
+                             CWX|CWY|CWWidth|CWHeight|CWBorderWidth,
                              &changes);
         }
     }