X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=1740d1b131fddd29d14bab4ab1feb9561288ca7f;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=cc934206ce58935654a6c77a09868b716070d310;hpb=d498522a560529ef315dd30fc4bc14c7a6214b30;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index cc934206..1740d1b1 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,13 +1,16 @@ #include "client.h" +#include "grab.h" #include "focus.h" +#include "moveresize.h" +#include "menu.h" +#include "prop.h" #include "stacking.h" #include "frame.h" +#include "framerender.h" #include "screen.h" #include "action.h" #include "dispatch.h" #include "openbox.h" -#include "engine.h" -#include "render/render.h" #include @@ -16,10 +19,6 @@ Action *action_new(void (*func)(union ActionData *data)) Action *a = g_new0(Action, 1); a->func = func; - /* deal with pointers */ - if (func == action_execute) - a->data.execute.path = NULL; - return a; } @@ -30,6 +29,8 @@ void action_free(Action *a) /* deal with pointers */ if (a->func == action_execute || a->func == action_restart) g_free(a->data.execute.path); + else if (a->func == action_showmenu) + g_free(a->data.showmenu.name); g_free(a); } @@ -152,10 +153,18 @@ Action *action_from_string(char *name) a->data.nextprevdesktop.wrap = TRUE; } else if (!g_ascii_strcasecmp(name, "toggledecorations")) { a = action_new(action_toggle_decorations); + } else if (!g_ascii_strcasecmp(name, "keyboardmove")) { + a = action_new(action_moveresize); + a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard; } else if (!g_ascii_strcasecmp(name, "move")) { - a = action_new(action_move); + a = action_new(action_moveresize); + a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move; } else if (!g_ascii_strcasecmp(name, "resize")) { - a = action_new(action_resize); + a = action_new(action_moveresize); + a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft; + } else if (!g_ascii_strcasecmp(name, "keyboardresize")) { + a = action_new(action_moveresize); + a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard; } else if (!g_ascii_strcasecmp(name, "restart")) { a = action_new(action_restart); } else if (!g_ascii_strcasecmp(name, "exit")) { @@ -629,73 +638,14 @@ 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) +void action_moveresize(union ActionData *data) { - 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; - int x = data->move.x; - int y = data->move.y; + Client *c = data->moveresize.c; if (!c || !client_normal(c)) return; - 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); -} - -void action_resize(union ActionData *data) -{ - Client *c = data->resize.c; - int w = data->resize.x; - int h = data->resize.y; - - 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); + moveresize_start(c, data->moveresize.x, data->moveresize.y, + data->moveresize.button, data->moveresize.corner); } void action_restart(union ActionData *data) @@ -711,59 +661,55 @@ void action_exit(union ActionData *data) void action_showmenu(union ActionData *data) { - g_message(__FUNCTION__); + if (data->showmenu.name) { + menu_show(data->showmenu.name, data->showmenu.x, data->showmenu.y, + data->showmenu.c); + } } -void action_cycle_windows(union ActionData *data) +static void popup_cycle(Client *c, gboolean hide) { - static Client *first = NULL; - static Client *t = NULL; - static GList *order = NULL; - GList *it, *start, *list; + XSetWindowAttributes attrib; + static Window coords = None; - if (data->cycle.cancel) { - if (first) client_focus(first); - goto done_cycle; - } - if (!first) first = focus_client; + 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); + + grab_pointer(TRUE, None); - if (data->cycle.linear) - list = client_list; - else { - if (!order) order = g_list_copy(focus_order[screen_desktop]); - list = order; + XMapWindow(ob_display, coords); } - 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); + + if (hide) { + XDestroyWindow(ob_display, coords); + coords = None; + + grab_pointer(FALSE, None); } else { - if (t) stacking_raise(t); - goto done_cycle; + 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); } - return; +} - done_cycle: - first = NULL; - g_list_free(order); - order = NULL; +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); }