X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=683e205f098f5170b7f918c46dded265df99f7f0;hb=4769c65a8480c11349a44cea0e515a713fb97b0a;hp=50b1e54556f9e76e0714361b4c8fb18d5548bab6;hpb=0272ef26e719b2b817b21afaaed1bb7331942eac;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 50b1e545..683e205f 100644
--- 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>
 
@@ -649,10 +648,10 @@ static void popup_coords(char *format, int a, int b, gboolean hide)
         char *text;
 
         text = g_strdup_printf(format, a, b);
-        engine_size_label(text, TRUE, TRUE, &s);
+        framerender_size_popup_label(text, &s);
         XMoveResizeWindow(ob_display, coords,
                           10, 10, s.width, s.height);
-        engine_render_label(coords, &s, text, TRUE, TRUE);
+        framerender_popup_label(coords, &s, text);
         g_free(text);
 
         XMapWindow(ob_display, coords);
@@ -733,12 +732,12 @@ static void popup_cycle(Client *c, gboolean hide)
 
         a = screen_area(c->desktop);
 
-        engine_size_label(c->title, TRUE, TRUE, &s);
+        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);
-        engine_render_label(coords, &s, c->title, TRUE, TRUE);
+        framerender_popup_label(coords, &s, c->title);
 
         XMapWindow(ob_display, coords);
     }
@@ -750,6 +749,6 @@ void action_cycle_windows(union ActionData *data)
     
     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));
+    popup_cycle(c, !c || data->cycle.final || data->cycle.cancel);
 }