X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=1740d1b131fddd29d14bab4ab1feb9561288ca7f;hb=7886b797a36f5a035a75a19424e0b3cf7825baf8;hp=a58441b08a754df95821feae2e8a3a1d7d9662e4;hpb=a048c4302aa7c450fe7a97e69c15029eb5459ab2;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index a58441b0..1740d1b1 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,6 +1,12 @@ #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" @@ -13,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; } @@ -27,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); } @@ -149,17 +153,40 @@ 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")) { 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 +478,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 +489,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 +502,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 +513,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; } @@ -606,41 +630,22 @@ 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); } -void action_move(union ActionData *data) +void action_moveresize(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); - - 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); + moveresize_start(c, data->moveresize.x, data->moveresize.y, + data->moveresize.button, data->moveresize.corner); } void action_restart(union ActionData *data) @@ -656,5 +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); + } } + +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); + + grab_pointer(TRUE, None); + + XMapWindow(ob_display, coords); + } + + if (hide) { + XDestroyWindow(ob_display, coords); + coords = None; + + grab_pointer(FALSE, None); + } 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); + } +} + +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); +} +