X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=d83926b7740b4e4613f5aae648787eef99d66b90;hb=abe258be1d7e7a6e9881a3e654d7e69994498c62;hp=5f60019ecca45d2989fb07e16907170ef545212f;hpb=6f5292c87ece138a2b80d102ba0919b105b1839a;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 5f60019e..d83926b7 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -395,7 +395,7 @@ void setup_action_showmenu(ObAction **a, ObUserAction uact) a time! */ if (uact == OB_USER_ACTION_MENU_SELECTION) { action_unref(*a); - a = NULL; + *a = NULL; } } @@ -536,6 +536,11 @@ ActionString actionstrings[] = action_move_relative_vert, setup_client_action }, + { + "movetocenter", + action_move_to_center, + setup_client_action + }, { "resizerelativehorz", action_resize_relative_horz, @@ -591,6 +596,11 @@ ActionString actionstrings[] = action_toggle_maximize_vert, setup_client_action }, + { + "togglefullscreen", + action_toggle_fullscreen, + setup_client_action + }, { "sendtodesktop", action_send_to_desktop, @@ -676,6 +686,11 @@ ActionString actionstrings[] = action_moveresize, setup_action_resize }, + { + "toggledockautohide", + action_toggle_dockautohide, + NULL + }, { "toggleshowdesktop", action_toggle_show_desktop, @@ -809,7 +824,7 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) { ObAction *a = NULL; gboolean exist = FALSE; - int i; + gint i; for (i = 0; actionstrings[i].name; i++) if (!g_ascii_strcasecmp(name, actionstrings[i].name)) { @@ -817,7 +832,8 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) a = action_new(actionstrings[i].func); if (actionstrings[i].setup) actionstrings[i].setup(&a, uact); - INTERACTIVE_LIMIT(a, uact); + if (a) + INTERACTIVE_LIMIT(a, uact); break; } if (!exist) @@ -831,7 +847,7 @@ ObAction *action_from_string(const gchar *name, ObUserAction uact) ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, ObUserAction uact) { - char *actname; + gchar *actname; ObAction *act = NULL; xmlNodePtr n; @@ -890,9 +906,16 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } else if (act->func == action_directional_focus) { if ((n = parse_find_node("dialog", node->xmlChildrenNode))) act->data.cycle.dialog = parse_bool(doc, n); + } else if (act->func == action_raise || + act->func == action_lower || + act->func == action_raiselower || + act->func == action_shadelower || + act->func == action_unshaderaise) { + if ((n = parse_find_node("group", node->xmlChildrenNode))) + act->data.stacking.group = parse_bool(doc, n); } + INTERACTIVE_LIMIT(act, uact); } - INTERACTIVE_LIMIT(act, uact); g_free(actname); } return act; @@ -946,10 +969,18 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, a->data.inter.cancel = cancel; a->data.inter.final = done; if (!(cancel || done)) - keyboard_interactive_grab(state, a->data.any.c, a); + if (!keyboard_interactive_grab(state, a->data.any.c, a)) + continue; } - ob_main_loop_queue_action(ob_main_loop, a); + /* XXX UGLY HACK race with motion event starting a move and the + button release gettnig processed first. answer: don't queue + moveresize starts. UGLY HACK XXX */ + if (a->data.any.interactive || a->func == action_moveresize) { + /* interactive actions are not queued */ + a->func(&a->data); + } else + ob_main_loop_queue_action(ob_main_loop, a); } } } @@ -970,13 +1001,23 @@ void action_run_string(const gchar *name, struct _ObClient *c) void action_execute(union ActionData *data) { GError *e = NULL; - char *cmd; + gchar *cmd, **argv = 0; if (data->execute.path) { cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL); if (cmd) { - if (!g_spawn_command_line_async(cmd, &e)) { + if (!g_shell_parse_argv (cmd, NULL, &argv, &e)) { g_warning("failed to execute '%s': %s", cmd, e->message); + g_error_free(e); + } else { + if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | + G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, NULL, &e)) { + g_warning("failed to execute '%s': %s", + cmd, e->message); + g_error_free(e); + } + g_strfreev(argv); } g_free(cmd); } else { @@ -992,6 +1033,10 @@ void action_activate(union ActionData *data) void action_focus(union ActionData *data) { + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); + client_focus(data->client.any.c); } @@ -1002,7 +1047,9 @@ void action_unfocus (union ActionData *data) void action_iconify(union ActionData *data) { + client_action_start(data); client_iconify(data->client.any.c, TRUE, TRUE); + client_action_end(data); } void action_raiselower(union ActionData *data) @@ -1027,39 +1074,40 @@ void action_raiselower(union ActionData *data) } } - action_run_string((raise ? "Raise" : "Lower"), c); + if (raise) + action_raise(data); + else + action_lower(data); } void action_raise(union ActionData *data) { client_action_start(data); - stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); + stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group); client_action_end(data); } void action_unshaderaise(union ActionData *data) { if (data->client.any.c->shaded) - action_run_string("Unshade", data->client.any.c); + action_unshade(data); else - action_run_string("Raise", data->client.any.c); + action_raise(data); } void action_shadelower(union ActionData *data) { if (data->client.any.c->shaded) - action_run_string("Lower", data->client.any.c); + action_lower(data); else - action_run_string("Shade", data->client.any.c); + action_shade(data); } void action_lower(union ActionData *data) { client_action_start(data); - stacking_lower(CLIENT_AS_WINDOW(data->client.any.c)); + stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group); client_action_end(data); - - focus_order_to_bottom(data->client.any.c); } void action_close(union ActionData *data) @@ -1116,6 +1164,17 @@ void action_move_relative_vert(union ActionData *data) client_action_end(data); } +void action_move_to_center(union ActionData *data) +{ + ObClient *c = data->client.any.c; + Rect *area; + area = screen_area_monitor(c->desktop, 0); + client_action_start(data); + client_move(c, area->width / 2 - c->area.width / 2, + area->height / 2 - c->area.height / 2); + client_action_end(data); +} + void action_resize_relative_horz(union ActionData *data) { ObClient *c = data->relative.any.c; @@ -1205,6 +1264,14 @@ void action_toggle_maximize_vert(union ActionData *data) client_action_end(data); } +void action_toggle_fullscreen(union ActionData *data) +{ + client_action_start(data); + client_fullscreen(data->client.any.c, + !(data->client.any.c->fullscreen), TRUE); + client_action_end(data); +} + void action_send_to_desktop(union ActionData *data) { ObClient *c = data->sendto.any.c; @@ -1300,18 +1367,42 @@ void action_toggle_decorations(union ActionData *data) client_action_end(data); } -static guint32 pick_corner(int x, int y, int cx, int cy, int cw, int ch) +static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch) { - if (x - cx > cw / 2) { - if (y - cy > ch / 2) - return prop_atoms.net_wm_moveresize_size_bottomright; - else - return prop_atoms.net_wm_moveresize_size_topright; + if (config_resize_four_corners) { + if (x - cx > cw / 2) { + if (y - cy > ch / 2) + return prop_atoms.net_wm_moveresize_size_bottomright; + else + return prop_atoms.net_wm_moveresize_size_topright; + } else { + if (y - cy > ch / 2) + return prop_atoms.net_wm_moveresize_size_bottomleft; + else + return prop_atoms.net_wm_moveresize_size_topleft; + } } else { - if (y - cy > ch / 2) - return prop_atoms.net_wm_moveresize_size_bottomleft; - else - return prop_atoms.net_wm_moveresize_size_topleft; + if (x - cx > cw * 2 / 3) { + if (y - cy > ch * 2 / 3) + return prop_atoms.net_wm_moveresize_size_bottomright; + else if (y - cy < ch / 3) + return prop_atoms.net_wm_moveresize_size_topright; + else + return prop_atoms.net_wm_moveresize_size_right; + } else if (x - cx < cw / 3) { + if (y - cy > ch * 2 / 3) + return prop_atoms.net_wm_moveresize_size_bottomleft; + else if (y - cy < ch / 3) + return prop_atoms.net_wm_moveresize_size_topleft; + else + return prop_atoms.net_wm_moveresize_size_left; + } else + if (y - cy > ch * 2 / 3) + return prop_atoms.net_wm_moveresize_size_bottom; + else if (y - cy < ch / 3) + return prop_atoms.net_wm_moveresize_size_top; + else + return prop_atoms.net_wm_moveresize_move; } } @@ -1369,14 +1460,23 @@ void action_showmenu(union ActionData *data) void action_cycle_windows(union ActionData *data) { - focus_cycle(data->cycle.forward, data->cycle.linear, + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); + + focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive, data->cycle.dialog, data->cycle.inter.final, data->cycle.inter.cancel); } void action_directional_focus(union ActionData *data) { + /* if using focus_delay, stop the timer now so that focus doesn't go moving + on us */ + event_halt_focus_delay(); + focus_directional_cycle(data->interdiraction.direction, + data->any.interactive, data->interdiraction.dialog, data->interdiraction.inter.final, data->interdiraction.inter.cancel); @@ -1384,7 +1484,7 @@ void action_directional_focus(union ActionData *data) void action_movetoedge(union ActionData *data) { - int x, y; + gint x, y; ObClient *c = data->diraction.any.c; x = c->frame->area.x; @@ -1416,10 +1516,14 @@ void action_movetoedge(union ActionData *data) void action_growtoedge(union ActionData *data) { - int x, y, width, height, dest; + gint x, y, width, height, dest; ObClient *c = data->diraction.any.c; Rect *a; + //FIXME growtoedge resizes shaded windows to 0 height + if (c->shaded) + return; + a = screen_area(c->desktop); x = c->frame->area.x; y = c->frame->area.y; @@ -1493,6 +1597,12 @@ void action_toggle_layer(union ActionData *data) client_action_end(data); } +void action_toggle_dockautohide(union ActionData *data) +{ + config_dock_hide = !config_dock_hide; + dock_configure(); +} + void action_toggle_show_desktop(union ActionData *data) { screen_show_desktop(!screen_showing_desktop);