X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=e056487f681294dfc055a7e99a9ff7ef9b534765;hb=a7f65a818c48e272aa9c8c49f2339b46b794078e;hp=c91ea3c727275355da4b1c21d1ddaf52dee66531;hpb=6d3b17488f22a0f02659ab05578059a1584e9486;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index c91ea3c7..e056487f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -48,19 +48,8 @@ inline void client_action_start(union ActionData *data) inline void client_action_end(union ActionData *data) { if (config_focus_follow) - if (data->any.context != OB_FRAME_CONTEXT_CLIENT) { - if (!data->any.button) { - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); - } else { - ObClient *c; - - /* usually this is sorta redundant, but with a press action - the enter event will come as a GrabNotify which is - ignored, so this will handle that case */ - if ((c = client_under_pointer())) - event_enter_client(c); - } - } + if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button) + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); } typedef struct @@ -304,6 +293,7 @@ void setup_action_cycle_windows_next(ObAction **a, ObUserAction uact) (*a)->data.cycle.forward = TRUE; (*a)->data.cycle.dialog = TRUE; (*a)->data.cycle.dock_windows = FALSE; + (*a)->data.cycle.all_desktops = FALSE; } void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact) @@ -313,6 +303,7 @@ void setup_action_cycle_windows_previous(ObAction **a, ObUserAction uact) (*a)->data.cycle.forward = FALSE; (*a)->data.cycle.dialog = TRUE; (*a)->data.cycle.dock_windows = FALSE; + (*a)->data.cycle.all_desktops = FALSE; } void setup_action_movefromedge_north(ObAction **a, ObUserAction uact) @@ -1020,6 +1011,9 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, act->data.cycle.dialog = parse_bool(doc, n); if ((n = parse_find_node("panels", node->xmlChildrenNode))) act->data.cycle.dock_windows = parse_bool(doc, n); + if ((n = parse_find_node("allDesktops", + node->xmlChildrenNode))) + act->data.cycle.all_desktops = 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); @@ -1102,7 +1096,8 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, (c && c->type == OB_CLIENT_TYPE_DESKTOP && context == OB_FRAME_CONTEXT_DESKTOP)) && (a->func == action_focus || - a->func == action_activate)) + a->func == action_activate || + a->func == action_showmenu)) { /* XXX MORE UGLY HACK actions from clicks on client windows are NOT queued. @@ -1120,6 +1115,13 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, so, this is just for that bug, and it will only NOT queue it if it is a focusing action that can be used with the mouse pointer. ugh. + + also with the menus, there is a race going on. if the + desktop wants to pop up a menu, and we do to, we send them + the button before we pop up the menu, so they pop up their + menu first. but not always. if we pop up our menu before + sending them the button press, then the result is + deterministic. yay. */ a->func(&a->data); } else @@ -1266,9 +1268,9 @@ void action_raiselower(union ActionData *data) if (cit == c) break; if (client_normal(cit) == client_normal(c) && - cit->layer == c->layer && - cit->frame->visible && - !client_search_transient(c, cit)) + cit->layer == c->layer && + cit->frame->visible && + !client_search_transient(c, cit)) { if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) { raise = TRUE; @@ -1515,7 +1517,7 @@ void action_send_to_desktop(union ActionData *data) data->sendto.desk == DESKTOP_ALL) { client_set_desktop(c, data->sendto.desk, data->sendto.follow); if (data->sendto.follow) - screen_set_desktop(data->sendto.desk); + screen_set_desktop(data->sendto.desk, TRUE); } } @@ -1532,12 +1534,12 @@ void action_desktop(union ActionData *data) if (data->desktop.desk < screen_num_desktops || data->desktop.desk == DESKTOP_ALL) { - screen_set_desktop(data->desktop.desk); + screen_set_desktop(data->desktop.desk, TRUE); if (data->inter.any.interactive) screen_desktop_popup(data->desktop.desk, TRUE); } } else if (data->inter.cancel) { - screen_set_desktop(first); + screen_set_desktop(first, TRUE); } if (!data->inter.any.interactive || data->inter.final) { @@ -1560,7 +1562,7 @@ void action_desktop_dir(union ActionData *data) !data->sendtodir.inter.final || data->sendtodir.inter.cancel) { - screen_set_desktop(d); + screen_set_desktop(d, TRUE); } } @@ -1582,13 +1584,13 @@ void action_send_to_desktop_dir(union ActionData *data) { client_set_desktop(c, d, data->sendtodir.follow); if (data->sendtodir.follow) - screen_set_desktop(d); + screen_set_desktop(d, TRUE); } } void action_desktop_last(union ActionData *data) { - screen_set_desktop(screen_last_desktop); + screen_set_desktop(screen_last_desktop, TRUE); } void action_toggle_decorations(union ActionData *data) @@ -1774,6 +1776,7 @@ void action_cycle_windows(union ActionData *data) event_halt_focus_delay(); focus_cycle(data->cycle.forward, + data->cycle.all_desktops, data->cycle.dock_windows, data->cycle.linear, data->any.interactive, data->cycle.dialog, @@ -1924,17 +1927,17 @@ void action_toggle_dockautohide(union ActionData *data) void action_toggle_show_desktop(union ActionData *data) { - screen_show_desktop(!screen_showing_desktop); + screen_show_desktop(!screen_showing_desktop, TRUE); } void action_show_desktop(union ActionData *data) { - screen_show_desktop(TRUE); + screen_show_desktop(TRUE, TRUE); } void action_unshow_desktop(union ActionData *data) { - screen_show_desktop(FALSE); + screen_show_desktop(FALSE, TRUE); } void action_break_chroot(union ActionData *data)