1) translate all of openbox's output

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 41bb2d2a61b64fad1ab9b7272c5e151c58f591cd..6d319924f74ca1e798f403bf698c4af98521b37b 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    moveresize.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,8 +39,8 @@ ObClient *moveresize_client = NULL;
 
 static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */
 
-static int start_x, start_y, start_cx, start_cy, start_cw, start_ch;
-static int cur_x, cur_y;
+static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch;
+static gint cur_x, cur_y;
 static guint button;
 static guint32 corner;
 static ObCorner lockcorner;
@@ -72,25 +73,37 @@ void moveresize_shutdown(gboolean reconfig)
     popup = NULL;
 }
 
-static void popup_coords(ObClient *c, char *format, int a, int b)
+static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 {
-    char *text;
+    gchar *text;
 
     text = g_strdup_printf(format, a, b);
-    popup_position(popup, CenterGravity,
-                   c->frame->area.x + c->frame->size.left +
-                   c->area.width / 2,
-                   c->frame->area.y + c->frame->size.top +
-                   c->area.height / 2);
+    if (config_resize_popup_pos == 1) /* == "Top" */
+        popup_position(popup, SouthGravity,
+                       c->frame->area.x
+                     + c->frame->area.width/2,
+                       c->frame->area.y);
+    else /* == "Center" */
+        popup_position(popup, CenterGravity,
+                       c->frame->area.x + c->frame->size.left +
+                       c->area.width / 2,
+                       c->frame->area.y + c->frame->size.top +
+                       c->area.height / 2);
     popup_show(popup, text);
     g_free(text);
 }
 
-void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
+void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 {
     ObCursor cur;
 
-    if (moveresize_in_progress || !c->frame->visible)
+    moving = (cnr == prop_atoms.net_wm_moveresize_move ||
+              cnr == prop_atoms.net_wm_moveresize_move_keyboard);
+
+    if (moveresize_in_progress || !c->frame->visible ||
+        !(moving ?
+          (c->functions & OB_CLIENT_FUNC_MOVE) :
+          (c->functions & OB_CLIENT_FUNC_RESIZE)))
         return;
 
     moveresize_client = c;
@@ -116,15 +129,12 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
                      c->area.width / 2, c->area.height / 2);
     */
 
-    if (corner == prop_atoms.net_wm_moveresize_move ||
-        corner == prop_atoms.net_wm_moveresize_move_keyboard) {
+    if (moving) {
         cur_x = start_cx;
         cur_y = start_cy;
-        moving = TRUE;
     } else {
         cur_x = start_cw;
         cur_y = start_ch;
-        moving = FALSE;
     }
 
     moveresize_in_progress = TRUE;
@@ -154,14 +164,14 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
     else
         g_assert_not_reached();
 
-    grab_pointer(TRUE, cur);
+    grab_pointer(TRUE, FALSE, cur);
     grab_keyboard(TRUE);
 }
 
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -183,15 +193,20 @@ void moveresize_end(gboolean cancel)
 
 static void do_move(gboolean resist)
 {
-    if (resist)
+    if (resist) {
         resist_move_windows(moveresize_client, &cur_x, &cur_y);
-    resist_move_monitors(moveresize_client, &cur_x, &cur_y);
+        resist_move_monitors(moveresize_client, &cur_x, &cur_y);
+    }
 
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
     client_configure(moveresize_client, OB_CORNER_TOPLEFT, 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,
+                moveresize_client->frame->area.y);
 }
 
 static void do_resize(gboolean resist)
@@ -202,9 +217,10 @@ static void do_resize(gboolean resist)
     cur_y += moveresize_client->frame->size.top +
         moveresize_client->frame->size.bottom;
 
-    if (resist)
+    if (resist) {
         resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
-    resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+        resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+    }
 
     cur_x -= moveresize_client->frame->size.left +
         moveresize_client->frame->size.right;
@@ -217,8 +233,11 @@ static void do_resize(gboolean resist)
 
     /* this would be better with a fixed width font ... XXX can do it better
        if there are 2 text boxes */
-    if (moveresize_client->size_inc.width > 1 ||
-        moveresize_client->size_inc.height > 1)
+    if (config_resize_popup_show == 2 || /* == "Always" */
+            (config_resize_popup_show == 1 && /* == "Nonpixel" */
+                (moveresize_client->size_inc.width > 1 ||
+                 moveresize_client->size_inc.height > 1))
+        )
         popup_coords(moveresize_client, "%d x %d",
                      moveresize_client->logical_size.width,
                      moveresize_client->logical_size.height);
@@ -294,7 +313,7 @@ void moveresize_event(XEvent *e)
             moveresize_end(FALSE);
         else {
             if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
-                int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+                gint dx = 0, dy = 0, ox = cur_x, oy = cur_y;
 
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
                     dx = MAX(4, moveresize_client->size_inc.width);
@@ -326,8 +345,8 @@ void moveresize_event(XEvent *e)
                 start_x += dx - (cur_x - ox);
                 start_y += dy - (cur_y - oy);
             } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
-                int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
-                int opx, px, opy, py;
+                gint dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+                gint opx, px, opy, py;
 
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
                     dx = 4;