X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=11eacbd8ace0ebd5c8e78c3bf99ffcfe274ae5ef;hb=276b2be581c6cb138b439537761ff2ca42201805;hp=9433f3f454febc6aae878c5bcf7da91c476d03db;hpb=e846063fa8cc663d4e72435b36b94281ba1f1afc;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 9433f3f4..11eacbd8 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -595,9 +595,7 @@ static void event_handle_root(XEvent *e)
 #ifdef XRANDR
         XRRUpdateConfiguration(e);
 #endif
-        if (e->xconfigure.width != screen_physical_size.width ||
-            e->xconfigure.height != screen_physical_size.height)
-            screen_resize(e->xconfigure.width, e->xconfigure.height);
+        screen_resize();
         break;
     default:
         ;
@@ -673,7 +671,7 @@ static void event_handle_client(Client *client, XEvent *e)
 	break;
     case EnterNotify:
         if (client_normal(client)) {
-            if (ob_state == State_Starting) {
+            if (ob_state == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
                 guint desktop = client->desktop;
                 if (desktop == DESKTOP_ALL) desktop = screen_desktop;
@@ -724,7 +722,7 @@ static void event_handle_client(Client *client, XEvent *e)
 	if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight |
 					       CWX | CWY)) {
 	    int x, y, w, h;
-	    Corner corner;
+	    ObCorner corner;
 	       
 	    x = (e->xconfigurerequest.value_mask & CWX) ?
 		e->xconfigurerequest.x : client->area.x;
@@ -738,17 +736,17 @@ static void event_handle_client(Client *client, XEvent *e)
 	    switch (client->gravity) {
 	    case NorthEastGravity:
 	    case EastGravity:
-		corner = Corner_TopRight;
+		corner = OB_CORNER_TOPRIGHT;
 		break;
 	    case SouthWestGravity:
 	    case SouthGravity:
-		corner = Corner_BottomLeft;
+		corner = OB_CORNER_BOTTOMLEFT;
 		break;
 	    case SouthEastGravity:
-		corner = Corner_BottomRight;
+		corner = OB_CORNER_BOTTOMRIGHT;
 		break;
 	    default:     /* NorthWest, Static, etc */
-		corner = Corner_TopLeft;
+		corner = OB_CORNER_TOPLEFT;
 	    }
 
 	    client_configure(client, corner, x, y, w, h, FALSE, TRUE);
@@ -922,7 +920,8 @@ static void event_handle_client(Client *client, XEvent *e)
             else
                 h = client->area.y;
             client->gravity = tmpg;
-            client_configure(client, Corner_TopLeft, x, y, w, h, FALSE, TRUE);
+            client_configure(client, OB_CORNER_TOPLEFT,
+                             x, y, w, h, FALSE, TRUE);
             client->gravity = oldg;
         }
 	break;
@@ -1040,9 +1039,9 @@ static void event_handle_menu(Client *client, XEvent *e)
                             menu_control_mouseover(over, FALSE); 
                         menu_entry_render(over);
                         over = NULL;
+                        /* this hides the menu */
+                        menu_entry_fire(entry);
                     }
-                    /* this hides the menu */
-                    menu_entry_fire(entry);
                 }
                 break;
             }