X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=a7ed67fdab9664cddc32e8973e0b19666f3b0396;hb=b4b0c6257c15613f32736ee44f329198ac823c47;hp=a42432a87f4bba68de58fbef584f5beafb3ab897;hpb=dd33644de425ce545f17e9fc0f8ead05aa5bc01f;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index a42432a8..a7ed67fd 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -758,15 +758,16 @@ static void event_handle_client(ObClient *client, XEvent *e)
 	/* if we are iconic (or shaded (fvwm does this)) ignore the event */
 	if (client->iconic || client->shaded) return;
 
-	if (e->xconfigurerequest.value_mask & CWBorderWidth)
-	    client->border_width = e->xconfigurerequest.border_width;
-
 	/* resize, then move, as specified in the EWMH section 7.7 */
 	if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight |
-					       CWX | CWY)) {
+					       CWX | CWY |
+                                               CWBorderWidth)) {
 	    int x, y, w, h;
 	    ObCorner corner;
 
+            if (e->xconfigurerequest.value_mask & CWBorderWidth)
+                client->border_width = e->xconfigurerequest.border_width;
+
 	    x = (e->xconfigurerequest.value_mask & CWX) ?
 		e->xconfigurerequest.x : client->area.x;
 	    y = (e->xconfigurerequest.value_mask & CWY) ?
@@ -802,7 +803,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
 		corner = OB_CORNER_TOPLEFT;
 	    }
 
-	    client_configure(client, corner, x, y, w, h, FALSE, TRUE);
+	    client_configure_full(client, corner, x, y, w, h, FALSE, TRUE,
+                                  TRUE);
 	}
 
 	if (e->xconfigurerequest.value_mask & CWStackMode) {
@@ -967,11 +969,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (e->xclient.data.l[0] & 1 << 10)
                 w = e->xclient.data.l[3];
             else
-                w = client->area.y;
+                w = client->area.width;
             if (e->xclient.data.l[0] & 1 << 11)
                 h = e->xclient.data.l[4];
             else
-                h = client->area.y;
+                h = client->area.height;
             client->gravity = tmpg;
 
             {
@@ -1032,7 +1034,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
 	    client_setup_decor_and_functions(client);
 	}
 	else if (msgtype == prop_atoms.net_wm_strut) {
-            g_message("strut change");
 	    client_update_strut(client);
         }
 	else if (msgtype == prop_atoms.net_wm_icon ||
@@ -1093,7 +1094,7 @@ static void event_handle_menu(ObClient *client, XEvent *e)
 
         /* will call the menu_hide() for each submenu as well */
         if (!it)
-            ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
+            menu_control_keyboard_nav(ob_keycode(OB_KEY_ESCAPE));
 	
         break;
     case MotionNotify: