revert that, center the popups for move/resize and keychains

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8b31dbfa2847b8851b4339ebe9a0675b7a84f2b2..232cc9b9716abe38d3a79138f1e969264fbe9758 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -68,6 +68,7 @@ static void client_dest(ObClient *client, gpointer data)
 void moveresize_startup(gboolean reconfig)
 {
     popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 
     if (!reconfig)
         client_add_destroy_notify(client_dest, NULL);
@@ -152,12 +153,11 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 {
     ObCursor cur;
-
-    moving = (cnr == prop_atoms.net_wm_moveresize_move ||
-              cnr == prop_atoms.net_wm_moveresize_move_keyboard);
+    gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move ||
+                   cnr == prop_atoms.net_wm_moveresize_move_keyboard);
 
     if (moveresize_in_progress || !c->frame->visible ||
-        !(moving ?
+        !(mv ?
           (c->functions & OB_CLIENT_FUNC_MOVE) :
           (c->functions & OB_CLIENT_FUNC_RESIZE)))
         return;
@@ -197,6 +197,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 
     frame_end_iconify_animation(c->frame);
 
+    moving = mv;
     moveresize_client = c;
     start_cx = c->area.x;
     start_cy = c->area.y;
@@ -295,9 +296,10 @@ void moveresize_end(gboolean cancel)
 #endif
 
         get_resize_position(&x, &y, cancel);
-        client_configure_full(moveresize_client, x, y,
-                              (cancel ? start_cw : cur_x),
-                              (cancel ? start_ch : cur_y), TRUE, TRUE);
+        client_configure(moveresize_client, x, y,
+                         (cancel ? start_cw : cur_x),
+                         (cancel ? start_ch : cur_y),
+                         TRUE, TRUE);
     }
 
     moveresize_in_progress = FALSE;
@@ -314,9 +316,10 @@ static void do_move(gboolean keyboard)
     if (!keyboard) resist = config_resist_edge;
     resist_move_monitors(moveresize_client, resist, &cur_x, &cur_y);
 
-    client_configure_full(moveresize_client, cur_x, cur_y,
-                          moveresize_client->area.width,
-                          moveresize_client->area.height, TRUE, FALSE);
+    client_configure(moveresize_client, cur_x, cur_y,
+                     moveresize_client->area.width,
+                     moveresize_client->area.height,
+                     TRUE, FALSE);
     if (config_resize_popup_show == 2) /* == "Always" */
         popup_coords(moveresize_client, "%d x %d",
                      moveresize_client->frame->area.x,
@@ -325,31 +328,32 @@ static void do_move(gboolean keyboard)
 
 static void do_resize()
 {
+    gint x, y, w, h, lw, lh;
+
+    /* see if it is actually going to resize */
+    x = 0;
+    y = 0;
+    w = cur_x;
+    h = cur_y;
+    client_try_configure(moveresize_client, &x, &y, &w, &h,
+                         &lw, &lh, TRUE);
+    if (w == moveresize_client->area.width &&
+        h == moveresize_client->area.height)
+    {
+        return;
+    }
+
 #ifdef SYNC
     if (config_resize_redraw && extensions_sync &&
         moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         XEvent ce;
         XSyncValue val;
-        gint x, y, w, h, lw, lh;
 
         /* are we already waiting for the sync counter to catch up? */
         if (waiting_for_sync)
             return;
 
-        /* see if it is actually going to resize */
-        x = 0;
-        y = 0;
-        w = cur_x;
-        h = cur_y;
-        client_try_configure(moveresize_client, &x, &y, &w, &h,
-                             &lw, &lh, TRUE);
-        if (w == moveresize_client->area.width &&
-            h == moveresize_client->area.height)
-        {
-            return;
-        }
-
         /* increment the value we're waiting for */
         ++moveresize_client->sync_counter_value;
         XSyncIntToValue(&val, moveresize_client->sync_counter_value);
@@ -372,12 +376,8 @@ static void do_resize()
     }
 #endif
 
-    {
-        gint x, y;
-        get_resize_position(&x, &y, FALSE);
-        client_configure_full(moveresize_client,
-                              x, y, cur_x, cur_y, TRUE, FALSE);
-    }
+    get_resize_position(&x, &y, FALSE);
+    client_configure(moveresize_client, x, y, cur_x, cur_y, TRUE, FALSE);
 
     /* this would be better with a fixed width font ... XXX can do it better
        if there are 2 text boxes */