From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 21 Mar 2004 00:10:14 +0000 (+0000)
Subject: if this works, i will be amazed. <resize><popupShow>nbr<//> nbr = 0 never show size... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=7d1382a984a29c03a1c2c48fb77244c9d3a839f0;p=chaz%2Fopenbox

if this works, i will be amazed. <resize><popupShow>nbr<//> nbr = 0 never show size popup, 1 as it is now ie only show when resize terminals etc, 2 always show
---

diff --git a/openbox/config.c b/openbox/config.c
index c5c1aeb9..6a8dfaca 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -41,6 +41,7 @@ GSList *config_desktops_names;
 gint    config_screen_firstdesk;
 
 gboolean config_resize_redraw;
+gint     config_resize_popup_show;
 
 ObStackingLayer config_dock_layer;
 gboolean        config_dock_floating;
@@ -292,6 +293,14 @@ static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     
     if ((n = parse_find_node("drawContents", node)))
         config_resize_redraw = parse_bool(doc, n);
+    if ((n = parse_find_node("popupShow", node))) {
+        if (parse_contains("Always", doc, n))
+            config_resize_popup_show = 2;
+        else if (parse_contains("Never", doc, n))
+            config_resize_popup_show = 0;
+        else if (parse_contains("Nonpixel", doc, n))
+            config_resize_popup_show = 1;
+    }
 }
 
 static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -531,6 +540,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "desktops", parse_desktops, NULL);
 
     config_resize_redraw = TRUE;
+    config_resize_popup_show = 1;
 
     parse_register(i, "resize", parse_resize, NULL);
 
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 2344e86a..4b46e175 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -195,6 +195,10 @@ static void do_move(gboolean resist)
     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)
+        popup_coords(moveresize_client, "%d x %d",
+                moveresize_client->frame->area.x,
+                moveresize_client->frame->area.y);
 }
 
 static void do_resize(gboolean resist)
@@ -220,8 +224,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 ||
+            (config_resize_popup_show == 1 &&
+                (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);