X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=1c54b6e8ec83c16b0612ec136121ddbe0db25258;hb=ee2368044dd077207962f71194158265c74fe74e;hp=a58441b08a754df95821feae2e8a3a1d7d9662e4;hpb=a048c4302aa7c450fe7a97e69c15029eb5459ab2;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index a58441b0..1c54b6e8 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,10 +1,13 @@ #include "client.h" +#include "focus.h" #include "stacking.h" #include "frame.h" #include "screen.h" #include "action.h" #include "dispatch.h" #include "openbox.h" +#include "engine.h" +#include "render/render.h" #include @@ -157,9 +160,24 @@ Action *action_from_string(char *name) a = action_new(action_restart); } else if (!g_ascii_strcasecmp(name, "exit")) { a = action_new(action_exit); - } - else if (!g_ascii_strcasecmp(name, "showmenu")) { + } else if (!g_ascii_strcasecmp(name, "showmenu")) { a = action_new(action_showmenu); + } else if (!g_ascii_strcasecmp(name, "nextwindowlinear")) { + a = action_new(action_cycle_windows); + a->data.cycle.linear = TRUE; + a->data.cycle.forward = TRUE; + } else if (!g_ascii_strcasecmp(name, "previouswindowlinear")) { + 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; @@ -451,7 +469,6 @@ static void cur_row_col(guint *r, guint *c) screen_desktop / screen_desktop_layout.columns; *c = screen_desktop % screen_desktop_layout.columns; break; - break; case Corner_TopRight: *r = screen_desktop / screen_desktop_layout.columns; *c = screen_desktop_layout.columns - 1 - @@ -463,8 +480,8 @@ static void cur_row_col(guint *r, guint *c) *c = screen_desktop_layout.columns - 1 - screen_desktop % screen_desktop_layout.columns; break; - break; } + break; case Orientation_Vert: switch (screen_desktop_layout.start_corner) { case Corner_TopLeft: @@ -476,7 +493,6 @@ static void cur_row_col(guint *r, guint *c) screen_desktop % screen_desktop_layout.rows; *c = screen_desktop / screen_desktop_layout.rows; break; - break; case Corner_TopRight: *r = screen_desktop % screen_desktop_layout.rows; *c = screen_desktop_layout.columns - 1 - @@ -488,7 +504,6 @@ static void cur_row_col(guint *r, guint *c) *c = screen_desktop_layout.columns - 1 - screen_desktop / screen_desktop_layout.rows; break; - break; } break; } @@ -611,6 +626,38 @@ void action_toggle_decorations(union ActionData *data) 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 { + 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; + XMoveResizeWindow(ob_display, coords, + area.x, area.y, area.width, area.height); + engine_render_label(coords, &area, text, TRUE, TRUE); + g_free(text); + + XMapWindow(ob_display, coords); + } +} + void action_move(union ActionData *data) { Client *c = data->move.c; @@ -621,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); @@ -635,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) @@ -658,3 +710,57 @@ void action_showmenu(union ActionData *data) { g_message(__FUNCTION__); } + +void action_cycle_windows(union ActionData *data) +{ + static Client *first = NULL; + static Client *t = NULL; + static GList *order = NULL; + GList *it, *start, *list; + + if (data->cycle.cancel) { + if (first) client_focus(first); + goto done_cycle; + } + if (!first) first = focus_client; + + if (data->cycle.linear) + list = client_list; + 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; + } + return; + + done_cycle: + first = NULL; + g_list_free(order); + order = NULL; +} +