summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-13 03:03:48 +0000
committerDana Jansens <danakj@orodu.net>2007-05-13 03:03:48 +0000
commitbfe974dbd06fac507147701c8c7de4c8249b0a25 (patch)
tree07a05f4511552f4f4ef29b11efc97fcbf4fe5d93 /openbox
parent84f022847bb6a9b547fb1649811f0366ac0e8767 (diff)
revert part of r6074. i don't think it needs to be removed anymore and then everything will "just work" better
Diffstat (limited to 'openbox')
-rw-r--r--openbox/action.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/openbox/action.c b/openbox/action.c
index e3409791..0f1a04d2 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -48,8 +48,21 @@ 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 && !data->any.button)
- grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
+ 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
+ that moves windows our from under the cursor, the enter
+ event will come as a GrabNotify which is ignored, so this
+ makes a fake enter event
+ */
+ if ((c = client_under_pointer()))
+ event_enter_client(c);
+ }
+ }
}
typedef struct