#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>
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);
g_message(__FUNCTION__);
}
-void action_cycle_windows(union ActionData *data)
+static void popup_cycle(Client *c, gboolean hide)
{
- static Client *first = NULL;
- static Client *t = NULL;
- static GList *order = NULL;
- GList *it, *start, *list;
+ XSetWindowAttributes attrib;
+ static Window coords = None;
- if (data->cycle.cancel) {
- if (first) client_focus(first);
- goto done_cycle;
+ 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 (!first) first = focus_client;
- if (data->cycle.linear)
- list = client_list;
+ if (hide)
+ XUnmapWindow(ob_display, coords);
else {
- if (!order) order = g_list_copy(focus_order[screen_desktop]);
- list = order;
- }
- start = it = g_list_find(list, data->cycle.c);
- if (!start) goto done_cycle;
-
- if (!data->cycle.final) {
- t = NULL;
- if (!start) /* switched desktops or something? */
- goto done_cycle;
-
- do {
- if (data->cycle.forward) {
- it = it->next;
- if (it == NULL) it = list;
- } else {
- it = it->prev;
- if (it == NULL) it = g_list_last(list);
- }
- if (client_focus(it->data)) {
- t = it->data;
- focus_ignore_in++;
- break;
- }
- } while (it != start);
- } else {
- if (t) stacking_raise(t);
- goto done_cycle;
+ 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);
}
- return;
+}
- done_cycle:
- first = NULL;
- g_list_free(order);
- order = NULL;
+void action_cycle_windows(union ActionData *data)
+{
+ 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);
}