X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=50b1e54556f9e76e0714361b4c8fb18d5548bab6;hb=c99bb4a049d29d2546074365ab76cecad4d1f65b;hp=53d46cde9970b628aca3107cee32d3c79e181184;hpb=ec4e24a42269b44c9585176943f76310495536ea;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 53d46cde..50b1e545 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -6,6 +6,8 @@
 #include "action.h"
 #include "dispatch.h"
 #include "openbox.h"
+#include "engine.h"
+#include "render/render.h"
 
 #include <glib.h>
 
@@ -619,11 +621,44 @@ void action_previous_desktop_row(union ActionData *data)
 
 void action_toggle_decorations(union ActionData *data)
 {
-    Client *c = data->client.c;
+    Client *c = data->client.c;;
+
+    if (!c) return;
+
     c->disabled_decorations = c->disabled_decorations ? 0 : ~0;
     client_setup_decor_and_functions(c);
 }
 
+static void popup_coords(char *format, int a, int b, 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 {
+        Size s;
+        char *text;
+
+        text = g_strdup_printf(format, a, b);
+        engine_size_label(text, TRUE, TRUE, &s);
+        XMoveResizeWindow(ob_display, coords,
+                          10, 10, s.width, s.height);
+        engine_render_label(coords, &s, text, TRUE, TRUE);
+        g_free(text);
+
+        XMapWindow(ob_display, coords);
+    }
+}
+
 void action_move(union ActionData *data)
 {
     Client *c = data->move.c;
@@ -634,6 +669,8 @@ void action_move(union ActionData *data)
 
     dispatch_move(c, &x, &y);
 
+    popup_coords("X:  %d  Y:  %d", x, y, data->move.final);
+
     frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
     client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height,
                      TRUE, data->move.final);
@@ -648,12 +685,15 @@ void action_resize(union ActionData *data)
     if (!c || c->shaded || !client_normal(c)) return;
 
     dispatch_resize(c, &w, &h, data->resize.corner);
-    
+
     w -= c->frame->size.left + c->frame->size.right;
     h -= c->frame->size.top + c->frame->size.bottom;
     
     client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h,
                      TRUE, data->resize.final);
+
+    popup_coords("W:  %d  H:  %d", c->logical_size.width,
+                 c->logical_size.height, data->move.final);
 }
 
 void action_restart(union ActionData *data)
@@ -672,55 +712,44 @@ void action_showmenu(union ActionData *data)
     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;
-                break;
-            }
-        } while (it != start);
-    } else {
-        if (t) stacking_raise(t);
-        goto done_cycle;
+        Rect *a;
+        Size s;
+
+        a = screen_area(c->desktop);
+
+        engine_size_label(c->title, TRUE, TRUE, &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);
+
+        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));
 }