X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.c;h=931cff392917417e0faba141f1668a995045b853;hb=fce33883f4828d5dcdc0452f1474fed9a6ff2e2f;hp=cf7b05fa5299d59a26cc7c21fdcdb48a9defe392;hpb=1d1aef75a0a4ab016243336fce0a69d00623caf8;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index cf7b05fa..931cff39 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -417,21 +417,21 @@ void setup_action_bottom_layer(ObAction **a, ObUserAction uact) void setup_action_move(ObAction **a, ObUserAction uact) { (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; - (*a)->data.moveresize.move = TRUE; (*a)->data.moveresize.keyboard = (uact == OB_USER_ACTION_NONE || uact == OB_USER_ACTION_KEYBOARD_KEY || uact == OB_USER_ACTION_MENU_SELECTION); + (*a)->data.moveresize.corner = 0; } void setup_action_resize(ObAction **a, ObUserAction uact) { (*a)->data.moveresize.any.client_action = OB_CLIENT_ACTION_ALWAYS; - (*a)->data.moveresize.move = FALSE; (*a)->data.moveresize.keyboard = (uact == OB_USER_ACTION_NONE || uact == OB_USER_ACTION_KEYBOARD_KEY || uact == OB_USER_ACTION_MENU_SELECTION); + (*a)->data.moveresize.corner = 0; } void setup_action_showmenu(ObAction **a, ObUserAction uact) @@ -745,12 +745,12 @@ ActionString actionstrings[] = }, { "move", - action_moveresize, + action_move, setup_action_move }, { "resize", - action_moveresize, + action_resize, setup_action_resize }, { @@ -1034,6 +1034,35 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, 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); + } } else if (act->func == action_raise || act->func == action_lower || act->func == action_raiselower || @@ -1072,12 +1101,20 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, } } - if (!inter) { - /* sometimes when we execute another app as an action, - it won't work right unless we XUngrabKeyboard first, - even though we grabbed the key/button Asychronously. - e.g. "gnome-panel-control --main-menu" */ - grab_keyboard(FALSE); + if (!inter && button == 0) { + /* Ungrab the keyboard before running the action, if it was + not from a mouse event. + + We have to do this because a key press causes a passive + grab on the keyboard, and so if the action we are running + wants to grab the keyboard, it will fail if the button is still + held down (which is likely). + + Use the X function not out own, because we're not considering + a grab to be in place at all so our function won't try ungrab + anything. + */ + XUngrabKeyboard(ob_display, time); } for (it = acts; it; it = g_slist_next(it)) { @@ -1104,11 +1141,14 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, /* 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) { + if (a->data.any.interactive || a->func == action_move || + a->func == action_resize) + { /* interactive actions are not queued */ a->func(&a->data); - } else if ((context == OB_FRAME_CONTEXT_CLIENT || - (c && c->type == OB_CLIENT_TYPE_DESKTOP && + } else if (c && + (context == OB_FRAME_CONTEXT_CLIENT || + (c->type == OB_CLIENT_TYPE_DESKTOP && context == OB_FRAME_CONTEXT_DESKTOP)) && (a->func == action_focus || a->func == action_activate || @@ -1713,29 +1753,39 @@ static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch, #undef d } -void action_moveresize(union ActionData *data) +void action_move(union ActionData *data) { ObClient *c = data->moveresize.any.c; guint32 corner; - if (data->moveresize.keyboard) { - corner = (data->moveresize.move ? - prop_atoms.net_wm_moveresize_move_keyboard : - prop_atoms.net_wm_moveresize_size_keyboard); - } else { - corner = (data->moveresize.move ? - prop_atoms.net_wm_moveresize_move : - 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)); - } + if (data->moveresize.keyboard) + corner = prop_atoms.net_wm_moveresize_move_keyboard; + else + corner = prop_atoms.net_wm_moveresize_move; + + moveresize_start(c, data->any.x, data->any.y, data->any.button, corner); +} + +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); }