X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=683e205f098f5170b7f918c46dded265df99f7f0;hb=3d6e0f941d36ff335ad13ecf83405a40775e4c04;hp=6b98bcb251bf8c878e473e2f1477acccea5d8910;hpb=b6b514c47764517ef6845ddced6530538ce8d33b;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 6b98bcb2..683e205f 100644 --- 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" @@ -92,6 +94,7 @@ Action *action_from_string(char *name) a = action_new(action_toggle_maximize_vert); } else if (!g_ascii_strcasecmp(name, "sendtodesktop")) { a = action_new(action_send_to_desktop); + a->data.sendto.follow = TRUE; } else if (!g_ascii_strcasecmp(name, "sendtonextdesktop")) { a = action_new(action_send_to_next_desktop); a->data.sendtonextprev.wrap = FALSE; @@ -156,9 +159,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; @@ -300,7 +318,7 @@ void action_resize_relative_horz(union ActionData *data) void action_resize_relative_vert(union ActionData *data) { Client *c = data->relative.c; - if (c) + if (c && !c->shaded) client_configure(c, Corner_TopLeft, c->area.x, c->area.y, c->area.width, c->area.height + data->relative.delta, TRUE, TRUE); @@ -365,10 +383,14 @@ void action_toggle_maximize_vert(union ActionData *data) void action_send_to_desktop(union ActionData *data) { - if (data->desktop.c) - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - client_set_desktop(data->desktop.c, data->desktop.desk, TRUE); + if (data->sendto.c) { + if (data->sendto.desk < screen_num_desktops || + data->sendto.desk == DESKTOP_ALL) { + client_set_desktop(data->desktop.c, + data->sendto.desk, data->sendto.follow); + if (data->sendto.follow) screen_set_desktop(data->sendto.desk); + } + } } void action_send_to_next_desktop(union ActionData *data) @@ -446,7 +468,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 - @@ -458,8 +479,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: @@ -471,7 +492,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 - @@ -483,7 +503,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; } @@ -601,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; @@ -616,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); @@ -627,17 +681,18 @@ void action_resize(union ActionData *data) int w = data->resize.x; int h = data->resize.y; - if (!c || !client_normal(c)) return; + if (!c || c->shaded || !client_normal(c)) return; - /* XXX window snapping/struts */ - 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) @@ -655,3 +710,45 @@ void action_showmenu(union ActionData *data) { g_message(__FUNCTION__); } + +static void popup_cycle(Client *c, 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 *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); +} +