diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:36:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-02-02 11:37:35 -0500 |
| commit | 0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8 (patch) | |
| tree | 0fe4df591efed9b1d50607ac1ec1d45565714403 /openbox/event.c | |
| parent | 76fcb473fa801728badf916cfebe349822759056 (diff) | |
| parent | 746859c1017e9cdf73eb91470e795f0c4b98b21a (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/event.c
openbox/mouse.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
parser/parse.h
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/openbox/event.c b/openbox/event.c index 5207e093..bce1de12 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -521,7 +521,6 @@ static void event_process(const XEvent *ec, gpointer data) window with RevertToParent focus */ frame_adjust_focus(client->frame, FALSE); /* focus_set_client(NULL) has already been called */ - client_calc_layer(client); } else if (e->xfocus.detail == NotifyPointerRoot || e->xfocus.detail == NotifyDetailNone || @@ -631,7 +630,6 @@ static void event_process(const XEvent *ec, gpointer data) frame_adjust_focus(client->frame, FALSE); /* focus_set_client(NULL) has already been called in this section or by focus_fallback */ - client_calc_layer(client); } } else if (client) @@ -708,7 +706,7 @@ static void event_process(const XEvent *ec, gpointer data) if (e->type == ButtonPress || e->type == ButtonRelease) { /* If the button press was on some non-root window, or was physically - on the root window, the process it */ + on the root window, then process it */ if (window != obt_root(ob_screen) || e->xbutton.subwindow == None) { |