X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=f8b2b7b3845175971043169876bd2b57fbcf7f63;hb=31d7680274cdf2fa3c45b8c8d56db2b5d8fbc111;hp=249dec07dcef7f8f458d92a45b84b2002316c5d8;hpb=071b5ee301bc847d95b1ae7b5bd6c2c4d225955d;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 249dec07..f8b2b7b3 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); @@ -1098,16 +1092,37 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context, if (a->data.any.interactive || a->func == action_moveresize) { /* interactive actions are not queued */ a->func(&a->data); - } else if (context == OB_FRAME_CONTEXT_CLIENT || - (c && c->type == OB_CLIENT_TYPE_DESKTOP && - context == OB_FRAME_CONTEXT_DESKTOP)) { + } else if ((context == OB_FRAME_CONTEXT_CLIENT || + (c && c->type == OB_CLIENT_TYPE_DESKTOP && + context == OB_FRAME_CONTEXT_DESKTOP)) && + (a->func == action_focus || + a->func == action_activate || + a->func == action_showmenu)) + { /* XXX MORE UGLY HACK actions from clicks on client windows are NOT queued. this solves the mysterious click-and-drag-doesnt-work problem. it was because the window gets focused and stuff after the button event has already been passed through. i dont really know why it should care but it does and it makes - a difference. */ + a difference. + + however this very bogus ! ! + we want to send the button press to the window BEFORE + we do the action because the action might move the windows + (eg change desktops) and then the button press ends up on + the completely wrong window ! + 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 ob_main_loop_queue_action(ob_main_loop, a); @@ -1253,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; @@ -1502,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); } } @@ -1519,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) { @@ -1547,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); } } @@ -1569,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) @@ -1706,26 +1721,6 @@ void action_moveresize(union ActionData *data) c->frame->size.right, c->area.height + c->frame->size.top + c->frame->size.bottom)); - const gchar *c; - if (corner == prop_atoms.net_wm_moveresize_size_topright) - c = "topright"; - else if (corner == prop_atoms.net_wm_moveresize_size_top) - c = "top"; - else if (corner == prop_atoms.net_wm_moveresize_size_topleft) - c = "topleft"; - else if (corner == prop_atoms.net_wm_moveresize_size_right) - c = "right"; - else if (corner == prop_atoms.net_wm_moveresize_move) - c = "middle"; - else if (corner == prop_atoms.net_wm_moveresize_size_left) - c = "left"; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomright) - c = "bottomright"; - else if (corner == prop_atoms.net_wm_moveresize_size_bottom) - c = "bottom"; - else if (corner == prop_atoms.net_wm_moveresize_size_bottomleft) - c = "bottomleft"; - ob_debug("corner: %s\n", c); } moveresize_start(c, data->any.x, data->any.y, data->any.button, corner); @@ -1761,6 +1756,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, @@ -1911,17 +1907,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)