X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=24f4b36f7d91e6e6113234e149f8d9d710d99346;hb=8ab1e9537e5aebfe48d826cbf266cf8d582d9d65;hp=61f346b1cad329aeedd75ce248f92890c1827a6a;hpb=1e6c375fdd1d10ba0b019505436069d21c751945;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 61f346b1..24f4b36f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -96,78 +96,6 @@ ObAction* action_copy(const ObAction *src) return a; } -void setup_action_directional_focus_north(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_east(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_EAST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_south(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_west(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_WEST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - -void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact) -{ - (*a)->data.interdiraction.inter.any.interactive = TRUE; - (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST; - (*a)->data.interdiraction.dialog = TRUE; - (*a)->data.interdiraction.dock_windows = FALSE; - (*a)->data.interdiraction.desktop_windows = FALSE; -} - void setup_action_send_to_desktop(ObAction **a, ObUserAction uact) { (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS; @@ -234,13 +162,6 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact) (*a)->data.sendtodir.follow = TRUE; } -void setup_action_desktop(ObAction **a, ObUserAction uact) -{ -/* - (*a)->data.desktop.inter.any.interactive = FALSE; -*/ -} - void setup_action_desktop_prev(ObAction **a, ObUserAction uact) { (*a)->data.desktopdir.inter.any.interactive = TRUE; @@ -414,51 +335,6 @@ void setup_client_action(ObAction **a, ObUserAction uact) ActionString actionstrings[] = { - { - "directionalfocusnorth", - action_directional_focus, - setup_action_directional_focus_north - }, - { - "directionalfocuseast", - action_directional_focus, - setup_action_directional_focus_east - }, - { - "directionalfocussouth", - action_directional_focus, - setup_action_directional_focus_south - }, - { - "directionalfocuswest", - action_directional_focus, - setup_action_directional_focus_west - }, - { - "directionalfocusnortheast", - action_directional_focus, - setup_action_directional_focus_northeast - }, - { - "directionalfocussoutheast", - action_directional_focus, - setup_action_directional_focus_southeast - }, - { - "directionalfocussouthwest", - action_directional_focus, - setup_action_directional_focus_southwest - }, - { - "directionalfocusnorthwest", - action_directional_focus, - setup_action_directional_focus_northwest - }, - { - "kill", - action_kill, - setup_client_action - }, { "shadelower", action_shadelower, @@ -469,56 +345,6 @@ ActionString actionstrings[] = action_unshaderaise, setup_client_action }, - { - "shade", - action_shade, - setup_client_action - }, - { - "unshade", - action_unshade, - setup_client_action - }, - { - "toggleshade", - action_toggle_shade, - setup_client_action - }, - { - "toggleomnipresent", - action_toggle_omnipresent, - setup_client_action - }, - { - "moverelativehorz", - action_move_relative_horz, - setup_client_action - }, - { - "moverelativevert", - action_move_relative_vert, - setup_client_action - }, - { - "resizerelativehorz", - action_resize_relative_horz, - setup_client_action - }, - { - "resizerelativevert", - action_resize_relative_vert, - setup_client_action - }, - { - "moverelative", - action_move_relative, - setup_client_action - }, - { - "resizerelative", - action_resize_relative, - setup_client_action - }, { "sendtodesktop", action_send_to_desktop, @@ -554,61 +380,11 @@ ActionString actionstrings[] = action_send_to_desktop_dir, setup_action_send_to_desktop_down }, - { - "desktop", - action_desktop, - setup_action_desktop - }, - { - "desktopnext", - action_desktop_dir, - setup_action_desktop_next - }, - { - "desktopprevious", - action_desktop_dir, - setup_action_desktop_prev - }, - { - "desktopright", - action_desktop_dir, - setup_action_desktop_right - }, - { - "desktopleft", - action_desktop_dir, - setup_action_desktop_left - }, - { - "desktopup", - action_desktop_dir, - setup_action_desktop_up - }, - { - "desktopdown", - action_desktop_dir, - setup_action_desktop_down - }, - { - "toggledecorations", - action_toggle_decorations, - setup_client_action - }, - { - "resize", - action_resize, - setup_action_resize - }, { "toggledockautohide", action_toggle_dockautohide, NULL }, - { - "desktoplast", - action_desktop_last, - NULL - }, { "sendtotoplayer", action_send_to_layer, @@ -762,47 +538,13 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (parse_attr_string("name", node, &actname)) { if ((act = action_from_string(actname, uact))) { - } else if (act->func == action_move_relative_horz || - act->func == action_move_relative_vert || - act->func == action_resize_relative_horz || - act->func == action_resize_relative_vert) { - if ((n = parse_find_node("delta", node->xmlChildrenNode))) - 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); - if (act->data.desktop.desk > 0) act->data.desktop.desk--; -/* - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.desktop.inter.any.interactive = - parse_bool(doc, n); -*/ } else if (act->func == action_send_to_desktop) { if ((n = parse_find_node("desktop", node->xmlChildrenNode))) act->data.sendto.desk = parse_int(doc, n); if (act->data.sendto.desk > 0) act->data.sendto.desk--; if ((n = parse_find_node("follow", node->xmlChildrenNode))) act->data.sendto.follow = parse_bool(doc, n); - } else if (act->func == action_desktop_dir) { - if ((n = parse_find_node("wrap", node->xmlChildrenNode))) - act->data.desktopdir.wrap = parse_bool(doc, n); - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.desktopdir.inter.any.interactive = - parse_bool(doc, n); } else if (act->func == action_send_to_desktop_dir) { if ((n = parse_find_node("wrap", node->xmlChildrenNode))) act->data.sendtodir.wrap = parse_bool(doc, n); @@ -811,43 +553,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if ((n = parse_find_node("dialog", node->xmlChildrenNode))) act->data.sendtodir.inter.any.interactive = parse_bool(doc, n); - } else if (act->func == action_directional_focus) { - if ((n = parse_find_node("dialog", node->xmlChildrenNode))) - act->data.interdiraction.dialog = parse_bool(doc, n); - if ((n = parse_find_node("panels", node->xmlChildrenNode))) - act->data.interdiraction.dock_windows = parse_bool(doc, n); - if ((n = parse_find_node("desktop", node->xmlChildrenNode))) - act->data.interdiraction.desktop_windows = - parse_bool(doc, n); - } else if (act->func == action_resize) { - if ((n = parse_find_node("edge", node->xmlChildrenNode))) { - gchar *s = parse_string(doc, n); - if (!g_ascii_strcasecmp(s, "top")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_top; - else if (!g_ascii_strcasecmp(s, "bottom")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_bottom; - else if (!g_ascii_strcasecmp(s, "left")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_left; - else if (!g_ascii_strcasecmp(s, "right")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_right; - else if (!g_ascii_strcasecmp(s, "topleft")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_topleft; - else if (!g_ascii_strcasecmp(s, "topright")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_topright; - else if (!g_ascii_strcasecmp(s, "bottomleft")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_bottomleft; - else if (!g_ascii_strcasecmp(s, "bottomright")) - act->data.moveresize.corner = - prop_atoms.net_wm_moveresize_size_bottomright; - g_free(s); - } INTERACTIVE_LIMIT(act, uact); } g_free(actname); @@ -971,113 +676,8 @@ void action_shadelower(union ActionData *data) action_shade(data); } -void action_kill(union ActionData *data) -{ - client_kill(data->client.any.c); -} - -void action_shade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, TRUE); - client_action_end(data, config_focus_under_mouse); -} - -void action_unshade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, FALSE); - client_action_end(data, config_focus_under_mouse); -} - -void action_toggle_shade(union ActionData *data) -{ - client_action_start(data); - client_shade(data->client.any.c, !data->client.any.c->shaded); - client_action_end(data, config_focus_under_mouse); -} - -void action_toggle_omnipresent(union ActionData *data) -{ - client_set_desktop(data->client.any.c, - data->client.any.c->desktop == DESKTOP_ALL ? - screen_desktop : DESKTOP_ALL, FALSE, TRUE); -} - -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.deltax, c->area.y); - client_action_end(data, FALSE); -} - -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.deltax); - client_action_end(data, FALSE); -} - -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.deltax * c->size_inc.width, - c->area.height); - client_action_end(data, FALSE); -} - -void action_resize_relative_vert(union ActionData *data) -{ - ObClient *c = data->relative.any.c; - if (!c->shaded) { - client_action_start(data); - client_resize(c, c->area.width, c->area.height + - data->relative.deltax * c->size_inc.height); - client_action_end(data, FALSE); - } -} - -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, FALSE); -} - void action_resize_relative(union ActionData *data) { - ObClient *c = data->relative.any.c; - gint x, y, ow, xoff, nw, oh, yoff, nh, lw, lh; - - client_action_start(data); - - x = c->area.x; - y = c->area.y; - ow = c->area.width; - xoff = -data->relative.deltaxl * c->size_inc.width; - nw = ow + data->relative.deltax * c->size_inc.width - + data->relative.deltaxl * c->size_inc.width; - oh = c->area.height; - yoff = -data->relative.deltayu * c->size_inc.height; - nh = oh + data->relative.deltay * c->size_inc.height - + data->relative.deltayu * c->size_inc.height; - - g_print("deltax %d %d x %d ow %d xoff %d nw %d\n", - data->relative.deltax, - data->relative.deltaxl, - x, ow, xoff, nw); - - client_try_configure(c, &x, &y, &nw, &nh, &lw, &lh, TRUE); - xoff = xoff == 0 ? 0 : (xoff < 0 ? MAX(xoff, ow-nw) : MIN(xoff, ow-nw)); - yoff = yoff == 0 ? 0 : (yoff < 0 ? MAX(yoff, oh-nh) : MIN(yoff, oh-nh)); - client_move_resize(c, x + xoff, y + yoff, nw, nh); - client_action_end(data, FALSE); } void action_send_to_desktop(union ActionData *data) @@ -1094,40 +694,6 @@ void action_send_to_desktop(union ActionData *data) } } -void action_desktop(union ActionData *data) -{ - /* XXX add the interactive/dialog option back again once the dialog - has been made to not use grabs */ - if (data->desktop.desk < screen_num_desktops || - data->desktop.desk == DESKTOP_ALL) - { - screen_set_desktop(data->desktop.desk, TRUE); - if (data->inter.any.interactive) - screen_desktop_popup(data->desktop.desk, TRUE); - } -} - -void action_desktop_dir(union ActionData *data) -{ - guint d; - - d = screen_cycle_desktop(data->desktopdir.dir, - data->desktopdir.wrap, - data->desktopdir.linear, - data->desktopdir.inter.any.interactive, - data->desktopdir.inter.final, - data->desktopdir.inter.cancel); - /* only move the desktop when the action is complete. if we switch - desktops during the interactive action, focus will move but with - NotifyWhileGrabbed and applications don't like that. */ - if (!data->sendtodir.inter.any.interactive || - (data->sendtodir.inter.final && !data->sendtodir.inter.cancel)) - { - if (d != screen_desktop) - screen_set_desktop(d, TRUE); - } -} - void action_send_to_desktop_dir(union ActionData *data) { ObClient *c = data->sendtodir.inter.any.c; @@ -1152,150 +718,6 @@ void action_send_to_desktop_dir(union ActionData *data) } } -void action_desktop_last(union ActionData *data) -{ - if (screen_last_desktop < screen_num_desktops) - screen_set_desktop(screen_last_desktop, TRUE); -} - -void action_toggle_decorations(union ActionData *data) -{ - ObClient *c = data->client.any.c; - - client_action_start(data); - client_set_undecorated(c, !c->undecorated); - client_action_end(data, FALSE); -} - -static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch, - gboolean shaded) -{ - /* let's make x and y client relative instead of screen relative */ - x = x - cx; - y = ch - (y - cy); /* y is inverted, 0 is at the bottom of the window */ - -#define X x*ch/cw -#define A -4*X + 7*ch/3 -#define B 4*X -15*ch/9 -#define C -X/4 + 2*ch/3 -#define D X/4 + 5*ch/12 -#define E X/4 + ch/3 -#define F -X/4 + 7*ch/12 -#define G 4*X - 4*ch/3 -#define H -4*X + 8*ch/3 -#define a (y > 5*ch/9) -#define b (x < 4*cw/9) -#define c (x > 5*cw/9) -#define d (y < 4*ch/9) - - /* - Each of these defines (except X which is just there for fun), represents - the equation of a line. The lines they represent are shown in the diagram - below. Checking y against these lines, we are able to choose a region - of the window as shown. - - +---------------------A-------|-------|-------B---------------------+ - | |A B| | - | |A | | B| | - | | A B | | - | | A | | B | | - | | A B | | - | | A | | B | | - | northwest | A north B | northeast | - | | A | | B | | - | | A B | | - C---------------------+----A--+-------+--B----+---------------------D - |CCCCCCC | A B | DDDDDDD| - | CCCCCCCC | A | | B | DDDDDDDD | - | CCCCCCC A B DDDDDDD | - - - - - - - - - - - - +CCCCCCC+aaaaaaa+DDDDDDD+ - - - - - - - - - - - - - | | b c | | sh - | west | b move c | east | ad - | | b c | | ed - - - - - - - - - - - - +EEEEEEE+ddddddd+FFFFFFF+- - - - - - - - - - - - - | EEEEEEE G H FFFFFFF | - | EEEEEEEE | G | | H | FFFFFFFF | - |EEEEEEE | G H | FFFFFFF| - E---------------------+----G--+-------+--H----+---------------------F - | | G H | | - | | G | | H | | - | southwest | G south H | southeast | - | | G | | H | | - | | G H | | - | | G | | H | | - | | G H | | - | |G | | H| | - | |G H| | - +---------------------G-------|-------|-------H---------------------+ - */ - - if (shaded) { - /* for shaded windows, you can only resize west/east and move */ - if (b) - return prop_atoms.net_wm_moveresize_size_left; - if (c) - return prop_atoms.net_wm_moveresize_size_right; - return prop_atoms.net_wm_moveresize_move; - } - - if (y < A && y >= C) - return prop_atoms.net_wm_moveresize_size_topleft; - else if (y >= A && y >= B && a) - return prop_atoms.net_wm_moveresize_size_top; - else if (y < B && y >= D) - return prop_atoms.net_wm_moveresize_size_topright; - else if (y < C && y >= E && b) - return prop_atoms.net_wm_moveresize_size_left; - else if (y < D && y >= F && c) - return prop_atoms.net_wm_moveresize_size_right; - else if (y < E && y >= G) - return prop_atoms.net_wm_moveresize_size_bottomleft; - else if (y < G && y < H && d) - return prop_atoms.net_wm_moveresize_size_bottom; - else if (y >= H && y < F) - return prop_atoms.net_wm_moveresize_size_bottomright; - else - return prop_atoms.net_wm_moveresize_move; - -#undef X -#undef A -#undef B -#undef C -#undef D -#undef E -#undef F -#undef G -#undef H -#undef a -#undef b -#undef c -#undef d -} - -void action_resize(union ActionData *data) -{ - ObClient *c = data->moveresize.any.c; - guint32 corner; - - if (data->moveresize.keyboard) - corner = prop_atoms.net_wm_moveresize_size_keyboard; - else if (data->moveresize.corner) - corner = data->moveresize.corner; /* it was specified in the binding */ - else - corner = pick_corner(data->any.x, data->any.y, - c->frame->area.x, c->frame->area.y, - /* use the client size because the frame - can be differently sized (shaded - windows) and we want this based on the - clients size */ - c->area.width + c->frame->size.left + - c->frame->size.right, - c->area.height + c->frame->size.top + - c->frame->size.bottom, c->shaded); - - moveresize_start(c, data->any.x, data->any.y, data->any.button, corner); -} - void action_directional_focus(union ActionData *data) { /* if using focus_delay, stop the timer now so that focus doesn't go moving