fixes for handling char**s

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 8196ef673e096798806dba3410d49ca91bd67bd7..683e205f098f5170b7f918c46dded265df99f7f0 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -2,12 +2,11 @@
 #include "focus.h"
 #include "stacking.h"
 #include "frame.h"
+#include "framerender.h"
 #include "screen.h"
 #include "action.h"
 #include "dispatch.h"
 #include "openbox.h"
-#include "engine.h"
-#include "render/render.h"
 
 #include <glib.h>
 
@@ -645,16 +644,14 @@ static void popup_coords(char *format, int a, int b, gboolean hide)
     if (hide)
         XUnmapWindow(ob_display, coords);
     else {
-        Rect area = { 10, 10, 1, 1 };
         Size s;
         char *text;
 
         text = g_strdup_printf(format, a, b);
-        engine_size_label(text, TRUE, TRUE, &s);
-        area.width = s.width; area.height = s.height;
+        framerender_size_popup_label(text, &s);
         XMoveResizeWindow(ob_display, coords,
-                          area.x, area.y, area.width, area.height);
-        engine_render_label(coords, &area, text, TRUE, TRUE);
+                          10, 10, s.width, s.height);
+        framerender_popup_label(coords, &s, text);
         g_free(text);
 
         XMapWindow(ob_display, coords);
@@ -714,9 +711,44 @@ void action_showmenu(union ActionData *data)
     g_message(__FUNCTION__);
 }
 
+static void popup_cycle(Client *c, gboolean hide)
+{
+    XSetWindowAttributes attrib;
+    static Window coords = None;
+
+    if (coords == None) {
+        attrib.override_redirect = TRUE;
+        coords = XCreateWindow(ob_display, ob_root,
+                               0, 0, 1, 1, 0, render_depth, InputOutput,
+                               render_visual, CWOverrideRedirect, &attrib);
+        g_assert(coords != None);
+    }
+
+    if (hide)
+        XUnmapWindow(ob_display, coords);
+    else {
+        Rect *a;
+        Size s;
+
+        a = screen_area(c->desktop);
+
+        framerender_size_popup_label(c->title, &s);
+        XMoveResizeWindow(ob_display, coords,
+                          a->x + (a->width - s.width) / 2,
+                          a->y + (a->height - s.height) / 2,
+                          s.width, s.height);
+        framerender_popup_label(coords, &s, c->title);
+
+        XMapWindow(ob_display, coords);
+    }
+}
+
 void action_cycle_windows(union ActionData *data)
 {
-    focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
-                data->cycle.cancel);
+    Client *c;
+    
+    c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
+                    data->cycle.cancel);
+    popup_cycle(c, !c || data->cycle.final || data->cycle.cancel);
 }