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/focus.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/focus.c')
| -rw-r--r-- | openbox/focus.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/openbox/focus.c b/openbox/focus.c index 2af0da9c..fc0fd99b 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -83,10 +83,6 @@ void focus_set_client(ObClient *client) screen_install_colormap(focus_client, FALSE); screen_install_colormap(client, TRUE); - /* in the middle of cycling..? kill it. */ - focus_cycle_stop(focus_client); - focus_cycle_stop(client); - focus_client = client; if (client != NULL) { @@ -196,8 +192,6 @@ void focus_nothing(void) /* nothing is focused, update the colormap and _the root property_ */ focus_set_client(NULL); - event_cancel_all_key_grabs(); - /* when nothing will be focused, send focus to the backup target */ XSetInputFocus(obt_display, screen_support_win, RevertToPointerRoot, event_curtime); |