these menus should not be removed, they are good and will be used.

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 0e41e2ebc9cc448a0a2294119bc4020b810c2c28..683e205f098f5170b7f918c46dded265df99f7f0 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1,6 +1,8 @@
 #include "client.h"
+#include "focus.h"
 #include "stacking.h"
 #include "frame.h"
+#include "framerender.h"
 #include "screen.h"
 #include "action.h"
 #include "dispatch.h"
@@ -167,6 +169,14 @@ Action *action_from_string(char *name)
         a = action_new(action_cycle_windows);
         a->data.cycle.linear = TRUE;
         a->data.cycle.forward = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "nextwindow")) {
+        a = action_new(action_cycle_windows);
+        a->data.cycle.linear = FALSE;
+        a->data.cycle.forward = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "previouswindow")) {
+        a = action_new(action_cycle_windows);
+        a->data.cycle.linear = FALSE;
+        a->data.cycle.forward = FALSE;
     }
     
     return a;
@@ -610,11 +620,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);
+        framerender_size_popup_label(text, &s);
+        XMoveResizeWindow(ob_display, coords,
+                          10, 10, s.width, s.height);
+        framerender_popup_label(coords, &s, text);
+        g_free(text);
+
+        XMapWindow(ob_display, coords);
+    }
+}
+
 void action_move(union ActionData *data)
 {
     Client *c = data->move.c;
@@ -625,6 +668,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);
@@ -639,12 +684,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)
@@ -663,26 +711,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)
 {
-    if (data->cycle.linear) {
-        if (!data->cycle.final) {
-            GList *it, *start;
-
-            start = it = g_list_find(client_list, data->cycle.c);
-            do {
-                if (data->cycle.forward) {
-                    it = it->next;
-                    if (it == NULL) it = client_list;
-                } else {
-                    it = it->prev;
-                    if (it == NULL) it = g_list_last(client_list);
-                }
-                if (client_focus(it->data))
-                    break;
-            } while (it != start);
-        }
-    } else {
+    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)
+{
+    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);
+}
+