diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
| commit | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (patch) | |
| tree | 14fb36919947e80ba0dfc151d0f1f02ed46fd712 /openbox/event.c | |
| parent | 84843c3f9842046e34366202f1a8f80ce8565f91 (diff) | |
| parent | 672aea85cfe2ac2bc8cb4e3f34fd023f10d90182 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/grab.c
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/openbox/event.c b/openbox/event.c index 38b6bec2..4ddb7ac7 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1329,10 +1329,7 @@ static void event_handle_client(ObClient *client, XEvent *e) (e->xclient.data.l[0] == 2 ? "user" : "INVALID")))); /* XXX make use of data.l[2] !? */ if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) { - /* don't use the user's timestamp for client_focus, cuz if it's - an old broken timestamp (happens all the time) then focus - won't move even though we're trying to move it - event_curtime = e->xclient.data.l[1];*/ + event_curtime = e->xclient.data.l[1]; if (e->xclient.data.l[1] == 0) ob_debug_type(OB_DEBUG_APP_BUGS, "_NET_ACTIVE_WINDOW message for window %s is" @@ -1341,7 +1338,7 @@ static void event_handle_client(ObClient *client, XEvent *e) ob_debug_type(OB_DEBUG_APP_BUGS, "_NET_ACTIVE_WINDOW message for window %s is " "missing source indication", client->title); - client_activate(client, TRUE, TRUE, TRUE, + client_activate(client, FALSE, TRUE, TRUE, (e->xclient.data.l[0] == 0 || e->xclient.data.l[0] == 2)); } else if (msgtype == OBT_PROP_ATOM(NET_WM_MOVERESIZE)) { |