X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=9350c3ce6bc6c0cd9db6300dc7f54c8d06479fd3;hb=d3d4aa29871111737a4f6985da695c8688a05270;hp=4ea50fe51f93961825ccfee246a4f25d8dc1a287;hpb=91de569e694668ab2a9e9457a1878b6d7fdd7858;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 4ea50fe5..9350c3ce 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1,6 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- action.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -29,6 +30,7 @@ #include "grab.h" #include "keyboard.h" #include "event.h" +#include "dock.h" #include "config.h" #include "mainloop.h" @@ -301,28 +303,60 @@ void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact) (*a)->data.cycle.dialog = TRUE; } +void setup_action_movefromedge_north(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = TRUE; +} + +void setup_action_movefromedge_south(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = TRUE; +} + +void setup_action_movefromedge_east(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = TRUE; +} + +void setup_action_movefromedge_west(ObAction **a, ObUserAction uact) +{ + (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; + (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = TRUE; +} + void setup_action_movetoedge_north(ObAction **a, ObUserAction uact) { (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; (*a)->data.diraction.direction = OB_DIRECTION_NORTH; + (*a)->data.diraction.hang = FALSE; } void setup_action_movetoedge_south(ObAction **a, ObUserAction uact) { (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; (*a)->data.diraction.direction = OB_DIRECTION_SOUTH; + (*a)->data.diraction.hang = FALSE; } void setup_action_movetoedge_east(ObAction **a, ObUserAction uact) { (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; (*a)->data.diraction.direction = OB_DIRECTION_EAST; + (*a)->data.diraction.hang = FALSE; } void setup_action_movetoedge_west(ObAction **a, ObUserAction uact) { (*a)->data.diraction.any.client_action = OB_CLIENT_ACTION_ALWAYS; (*a)->data.diraction.direction = OB_DIRECTION_WEST; + (*a)->data.diraction.hang = FALSE; } void setup_action_growtoedge_north(ObAction **a, ObUserAction uact) @@ -395,7 +429,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; } } @@ -471,6 +505,11 @@ ActionString actionstrings[] = action_iconify, setup_client_action }, + { + "focustobottom", + action_focus_order_to_bottom, + setup_client_action + }, { "raiselower", action_raiselower, @@ -536,6 +575,11 @@ ActionString actionstrings[] = action_move_relative_vert, setup_client_action }, + { + "movetocenter", + action_move_to_center, + setup_client_action + }, { "resizerelativehorz", action_resize_relative_horz, @@ -546,6 +590,16 @@ ActionString actionstrings[] = action_resize_relative_vert, setup_client_action }, + { + "moverelative", + action_move_relative, + setup_client_action + }, + { + "resizerelative", + action_resize_relative, + setup_client_action + }, { "maximizefull", action_maximize_full, @@ -591,6 +645,11 @@ ActionString actionstrings[] = action_toggle_maximize_vert, setup_client_action }, + { + "togglefullscreen", + action_toggle_fullscreen, + setup_client_action + }, { "sendtodesktop", action_send_to_desktop, @@ -676,6 +735,11 @@ ActionString actionstrings[] = action_moveresize, setup_action_resize }, + { + "toggledockautohide", + action_toggle_dockautohide, + NULL + }, { "toggleshowdesktop", action_toggle_show_desktop, @@ -751,6 +815,26 @@ ActionString actionstrings[] = action_cycle_windows, setup_action_cycle_windows_previous }, + { + "movefromedgenorth", + action_movetoedge, + setup_action_movefromedge_north + }, + { + "movefromedgesouth", + action_movetoedge, + setup_action_movefromedge_south + }, + { + "movefromedgewest", + action_movetoedge, + setup_action_movefromedge_west + }, + { + "movefromedgeeast", + action_movetoedge, + setup_action_movefromedge_east + }, { "movetoedgenorth", action_movetoedge, @@ -817,7 +901,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) @@ -851,7 +936,21 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, act->func == action_resize_relative_horz || act->func == action_resize_relative_vert) { if ((n = parse_find_node("delta", node->xmlChildrenNode))) - act->data.relative.delta = parse_int(doc, n); + act->data.relative.deltax = parse_int(doc, n); + } else if (act->func == action_move_relative) { + if ((n = parse_find_node("x", node->xmlChildrenNode))) + act->data.relative.deltax = parse_int(doc, n); + if ((n = parse_find_node("y", node->xmlChildrenNode))) + act->data.relative.deltay = parse_int(doc, n); + } else if (act->func == action_resize_relative) { + if ((n = parse_find_node("left", node->xmlChildrenNode))) + act->data.relative.deltaxl = parse_int(doc, n); + if ((n = parse_find_node("up", node->xmlChildrenNode))) + act->data.relative.deltayu = parse_int(doc, n); + if ((n = parse_find_node("right", node->xmlChildrenNode))) + act->data.relative.deltax = parse_int(doc, n); + if ((n = parse_find_node("down", node->xmlChildrenNode))) + act->data.relative.deltay = parse_int(doc, n); } else if (act->func == action_desktop) { if ((n = parse_find_node("desktop", node->xmlChildrenNode))) act->data.desktop.desk = parse_int(doc, n); @@ -890,6 +989,13 @@ 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); } @@ -978,14 +1084,23 @@ void action_run_string(const gchar *name, struct _ObClient *c) void action_execute(union ActionData *data) { GError *e = NULL; - gchar *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 { @@ -1010,12 +1125,20 @@ void action_focus(union ActionData *data) void action_unfocus (union ActionData *data) { - client_unfocus(data->client.any.c); + if (data->client.any.c == focus_client) + focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING); } void action_iconify(union ActionData *data) { + client_action_start(data); client_iconify(data->client.any.c, TRUE, TRUE); + client_action_end(data); +} + +void action_focus_order_to_bottom(union ActionData *data) +{ + focus_order_to_bottom(data->client.any.c); } void action_raiselower(union ActionData *data) @@ -1025,54 +1148,57 @@ void action_raiselower(union ActionData *data) gboolean raise = FALSE; for (it = stacking_list; it; it = g_list_next(it)) { - ObClient *cit = it->data; - - if (cit == c) break; - if (client_normal(cit) == client_normal(c) && - cit->layer == c->layer && - cit->frame->visible && - !client_search_transient(c, cit)) - { - if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) { - raise = TRUE; - break; + if (WINDOW_IS_CLIENT(it->data)) { + ObClient *cit = it->data; + + if (cit == c) break; + if (client_normal(cit) == client_normal(c) && + cit->layer == c->layer && + cit->frame->visible && + !client_search_transient(c, cit)) + { + if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) { + raise = TRUE; + break; + } } } } - 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) @@ -1117,7 +1243,7 @@ void action_move_relative_horz(union ActionData *data) { ObClient *c = data->relative.any.c; client_action_start(data); - client_move(c, c->area.x + data->relative.delta, c->area.y); + client_move(c, c->area.x + data->relative.deltax, c->area.y); client_action_end(data); } @@ -1125,7 +1251,18 @@ void action_move_relative_vert(union ActionData *data) { ObClient *c = data->relative.any.c; client_action_start(data); - client_move(c, c->area.x, c->area.y + data->relative.delta); + client_move(c, c->area.x, c->area.y + data->relative.deltax); + 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); } @@ -1134,7 +1271,7 @@ void action_resize_relative_horz(union ActionData *data) ObClient *c = data->relative.any.c; client_action_start(data); client_resize(c, - c->area.width + data->relative.delta * c->size_inc.width, + c->area.width + data->relative.deltax * c->size_inc.width, c->area.height); client_action_end(data); } @@ -1145,11 +1282,34 @@ void action_resize_relative_vert(union ActionData *data) if (!c->shaded) { client_action_start(data); client_resize(c, c->area.width, c->area.height + - data->relative.delta * c->size_inc.height); + data->relative.deltax * c->size_inc.height); client_action_end(data); } } +void action_move_relative(union ActionData *data) +{ + ObClient *c = data->relative.any.c; + client_action_start(data); + client_move(c, c->area.x + data->relative.deltax, c->area.y + + data->relative.deltay); + client_action_end(data); +} + +void action_resize_relative(union ActionData *data) +{ + ObClient *c = data->relative.any.c; + client_action_start(data); + client_move_resize(c, + c->area.x - data->relative.deltaxl * c->size_inc.width, + c->area.y - data->relative.deltayu * c->size_inc.height, + c->area.width + data->relative.deltax * c->size_inc.width + + data->relative.deltaxl * c->size_inc.width, + c->area.height + data->relative.deltay * c->size_inc.height + + data->relative.deltayu * c->size_inc.height); + client_action_end(data); +} + void action_maximize_full(union ActionData *data) { client_action_start(data); @@ -1218,6 +1378,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; @@ -1315,25 +1483,40 @@ void action_toggle_decorations(union ActionData *data) static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch) { - if ((cw / 3 < 1) || (x - cx > cw / 3 * 2)) { - if ((ch / 3 < 1) || (y - cy > ch / 3 * 2)) - 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 / 3 * 2) - 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; + 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_bottom; - else - return prop_atoms.net_wm_moveresize_size_top; + 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; } } @@ -1395,7 +1578,7 @@ void action_cycle_windows(union ActionData *data) on us */ event_halt_focus_delay(); - focus_cycle(data->cycle.forward, data->cycle.linear, + focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive, data->cycle.dialog, data->cycle.inter.final, data->cycle.inter.cancel); } @@ -1407,6 +1590,7 @@ void action_directional_focus(union ActionData *data) event_halt_focus_delay(); focus_directional_cycle(data->interdiraction.direction, + data->any.interactive, data->interdiraction.dialog, data->interdiraction.inter.final, data->interdiraction.inter.cancel); @@ -1422,18 +1606,24 @@ void action_movetoedge(union ActionData *data) switch(data->diraction.direction) { case OB_DIRECTION_NORTH: - y = client_directional_edge_search(c, OB_DIRECTION_NORTH); + y = client_directional_edge_search(c, OB_DIRECTION_NORTH, + data->diraction.hang) + - (data->diraction.hang ? c->frame->area.height : 0); break; case OB_DIRECTION_WEST: - x = client_directional_edge_search(c, OB_DIRECTION_WEST); + x = client_directional_edge_search(c, OB_DIRECTION_WEST, + data->diraction.hang) + - (data->diraction.hang ? c->frame->area.width : 0); break; case OB_DIRECTION_SOUTH: - y = client_directional_edge_search(c, OB_DIRECTION_SOUTH) - - c->frame->area.height; + y = client_directional_edge_search(c, OB_DIRECTION_SOUTH, + data->diraction.hang) + - (data->diraction.hang ? 0 : c->frame->area.height); break; case OB_DIRECTION_EAST: - x = client_directional_edge_search(c, OB_DIRECTION_EAST) - - c->frame->area.width; + x = client_directional_edge_search(c, OB_DIRECTION_EAST, + data->diraction.hang) + - (data->diraction.hang ? 0 : c->frame->area.width); break; default: g_assert_not_reached(); @@ -1450,6 +1640,10 @@ void action_growtoedge(union ActionData *data) 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; @@ -1458,7 +1652,7 @@ void action_growtoedge(union ActionData *data) switch(data->diraction.direction) { case OB_DIRECTION_NORTH: - dest = client_directional_edge_search(c, OB_DIRECTION_NORTH); + dest = client_directional_edge_search(c, OB_DIRECTION_NORTH, FALSE); if (a->y == y) height = c->frame->area.height / 2; else { @@ -1467,7 +1661,7 @@ void action_growtoedge(union ActionData *data) } break; case OB_DIRECTION_WEST: - dest = client_directional_edge_search(c, OB_DIRECTION_WEST); + dest = client_directional_edge_search(c, OB_DIRECTION_WEST, FALSE); if (a->x == x) width = c->frame->area.width / 2; else { @@ -1476,7 +1670,7 @@ void action_growtoedge(union ActionData *data) } break; case OB_DIRECTION_SOUTH: - dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH); + dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH, FALSE); if (a->y + a->height == y + c->frame->area.height) { height = c->frame->area.height / 2; y = a->y + a->height - height; @@ -1486,7 +1680,7 @@ void action_growtoedge(union ActionData *data) height -= (height - c->frame->area.height) % c->size_inc.height; break; case OB_DIRECTION_EAST: - dest = client_directional_edge_search(c, OB_DIRECTION_EAST); + dest = client_directional_edge_search(c, OB_DIRECTION_EAST, FALSE); if (a->x + a->width == x + c->frame->area.width) { width = c->frame->area.width / 2; x = a->x + a->width - width; @@ -1523,6 +1717,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);