X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=a83d19dff39195b7a38049a2ddfb1dfe4395eb28;hb=b31eb83f04f68225c5357960d9e04f76c7561c83;hp=0242034635230cf328d890c29c09292d9dc79640;hpb=a116f2c6310db702e377e9cd1a95c9a980aba5ae;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 02420346..a83d19df 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,4 +1,5 @@ #include "client.h" +#include "focus.h" #include "stacking.h" #include "frame.h" #include "screen.h" @@ -90,6 +91,9 @@ Action *action_from_string(char *name) a = action_new(action_unmaximize_vert); } else if (!g_ascii_strcasecmp(name, "togglemaximizevert")) { 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; @@ -154,9 +158,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; @@ -298,7 +317,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); @@ -363,17 +382,21 @@ void action_toggle_maximize_vert(union ActionData *data) void action_send_to_desktop(union ActionData *data) { - if (data->sendto.c) - if (data->sendto.desktop < screen_num_desktops || - data->sendto.desktop == DESKTOP_ALL) - client_set_desktop(data->sendto.c, data->sendto.desktop, 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) { guint d; - if (!data->sendto.c) return; + if (!data->sendtonextprev.c) return; d = screen_desktop + 1; if (d >= screen_num_desktops) { @@ -388,7 +411,7 @@ void action_send_to_previous_desktop(union ActionData *data) { guint d; - if (!data->sendto.c) return; + if (!data->sendtonextprev.c) return; d = screen_desktop - 1; if (d >= screen_num_desktops) { @@ -444,7 +467,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 - @@ -456,8 +478,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: @@ -469,7 +491,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 - @@ -481,7 +502,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; } @@ -625,10 +645,8 @@ 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; @@ -653,3 +671,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; +} +