X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=1c54b6e8ec83c16b0612ec136121ddbe0db25258;hb=ee2368044dd077207962f71194158265c74fe74e;hp=ccb988d970f8399db0b603cd9a472a4f4ec3dbd5;hpb=8ac5a60322d1556337fa78036d10dd630e1cd305;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index ccb988d9..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 @@ -52,6 +55,10 @@ Action *action_from_string(char *name) a = action_new(action_close); } else if (!g_ascii_strcasecmp(name, "kill")) { a = action_new(action_kill); + } else if (!g_ascii_strcasecmp(name, "shadelower")) { + a = action_new(action_shadelower); + } else if (!g_ascii_strcasecmp(name, "unshaderaise")) { + a = action_new(action_unshaderaise); } else if (!g_ascii_strcasecmp(name, "shade")) { a = action_new(action_shade); } else if (!g_ascii_strcasecmp(name, "unshade")) { @@ -86,6 +93,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; @@ -150,7 +160,26 @@ 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")) { + 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; } @@ -196,6 +225,26 @@ void action_raise(union ActionData *data) stacking_raise(data->client.c); } +void action_unshaderaise(union ActionData *data) +{ + if (data->client.c) { + if (data->client.c->shaded) + client_shade(data->client.c, FALSE); + else + stacking_raise(data->client.c); + } +} + +void action_shadelower(union ActionData *data) +{ + if (data->client.c) { + if (data->client.c->shaded) + stacking_lower(data->client.c); + else + client_shade(data->client.c, TRUE); + } +} + void action_lower(union ActionData *data) { if (data->client.c) @@ -270,7 +319,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); @@ -335,17 +384,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) { @@ -360,7 +413,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) { @@ -416,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 - @@ -428,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: @@ -441,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 - @@ -453,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; } @@ -576,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; @@ -586,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); @@ -597,14 +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; 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) @@ -617,3 +705,62 @@ void action_exit(union ActionData *data) { ob_shutdown = TRUE; } + +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; +} +