X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.c;h=2fd0372a89790b313039523a4584fb67e20e77e7;hb=6d2650263193aaa7e94b29261c6ba249c0be3fd3;hp=501918599f59ded0a4ce5625a7c5416be78a4ea1;hpb=361bf6af5c7de09f30f3cf4a220b3f84a3fe451d;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 50191859..2fd0372a 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -38,19 +38,16 @@ #include -inline void client_action_start(union ActionData *data) +static void client_action_start(union ActionData *data) { - if (config_focus_follow) - if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button) - grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); } -inline void client_action_end(union ActionData *data) +static void client_action_end(union ActionData *data) { if (config_focus_follow) if (data->any.context != OB_FRAME_CONTEXT_CLIENT) { - if (!data->any.button) { - ungrab_pointer(); + if (!data->any.button && data->any.c) { + event_ignore_enters_leaving_window(data->any.c); } else { ObClient *c; @@ -1141,9 +1138,15 @@ 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 */ + moveresize starts. UGLY HACK XXX + + XXX ALSO don't queue showmenu events, because on button press + events we need to know if a mouse grab is going to take place, + and set the button to 0, so that later motion events don't think + that a drag is going on. since showmenu grabs the pointer.. + */ if (a->data.any.interactive || a->func == action_move || - a->func == action_resize) + a->func == action_resize || a->func == action_showmenu) { /* interactive actions are not queued */ a->func(&a->data); @@ -1296,7 +1299,7 @@ void action_focus(union ActionData *data) go moving on us */ event_halt_focus_delay(); - client_focus(data->client.any.c, FALSE); + client_focus(data->client.any.c); } } else { /* focus action on something other than a client, make keybindings @@ -1309,7 +1312,7 @@ void action_focus(union ActionData *data) void action_unfocus (union ActionData *data) { if (data->client.any.c == focus_client) - focus_fallback(TRUE); + focus_fallback(FALSE); } void action_iconify(union ActionData *data)