redundant if'ing

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index ed05a58d8c58e28cb1809dc2f433010c856f9e45..9dd78c17934960dd6d4f3bce946b633445447b97 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1158,8 +1158,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
                notify is sent or not */
         }
 
-        if (move || resize) {
+        {
             gint lw,lh;
+            gulong ignore_start;
 
             client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
 
@@ -1176,18 +1177,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
             client_find_onscreen(client, &x, &y, w, h, FALSE);
 
-            /* if they requested something that moves the window, or if
-               the window is actually being changed then configure it and
-               send a configure notify to them */
-            if (move || !RECT_EQUAL_DIMS(client->area, x, y, w, h)) {
-                gulong ignore_start;
-
-                ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
-                         x, y, w, h);
-                ignore_start = event_start_ignore_all_enters();
-                client_configure(client, x, y, w, h, FALSE, TRUE);
-                event_end_ignore_all_enters(ignore_start);
-            }
+            ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
+                     x, y, w, h);
+            ignore_start = event_start_ignore_all_enters();
+            client_configure(client, x, y, w, h, FALSE, TRUE);
+            event_end_ignore_all_enters(ignore_start);
         }
         break;
     }
@@ -1487,9 +1481,25 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
         msgtype = e->xproperty.atom;
         if (msgtype == XA_WM_NORMAL_HINTS) {
+            gint x, y, w, h, lw, lh;
+
+            ob_debug("Update NORMAL hints\n");
             client_update_normal_hints(client);
             /* normal hints can make a window non-resizable */
-            client_setup_decor_and_functions(client, TRUE);
+            client_setup_decor_and_functions(client, FALSE);
+
+            /* make sure the client's sizes are within its bounds */
+            RECT_TO_DIMS(client->area, x, y, w, h);
+            client_try_configure(client, &x, &y, &w, &h, &lw, &lh, FALSE);
+            if (!RECT_EQUAL_DIMS(client->area, x, y, w, h)) {
+                gulong ignore_start;
+
+                ob_debug("Configuring client x %d y %d w %d h %d\n",
+                         x, y, w, h);
+                ignore_start = event_start_ignore_all_enters();
+                client_configure(client, x, y, w, h, FALSE, TRUE);
+                event_end_ignore_all_enters(ignore_start);
+            }
         } else if (msgtype == XA_WM_HINTS) {
             client_update_wmhints(client);
         } else if (msgtype == XA_WM_TRANSIENT_FOR) {
@@ -1922,8 +1932,7 @@ void event_cancel_all_key_grabs()
            on from the KeyPress. If the grab is left on, and focus
            moves during that time, it will be NotifyWhileGrabbed, and
            applications like to ignore those! */
-        if (!keyboard_interactively_grabbed())
-            XUngrabKeyboard(ob_display, CurrentTime);
+        XUngrabKeyboard(ob_display, CurrentTime);
 
 }