From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 11 Feb 2015 20:08:00 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db62b5a4df3d7ee7ac9363e4c430ea0155abba25;p=i3%2Fi3

Merge branch 'master' into next
---

db62b5a4df3d7ee7ac9363e4c430ea0155abba25
diff --cc i3bar/src/xcb.c
index cbab7423,b417110a..3a1b8cb2
--- a/i3bar/src/xcb.c
+++ b/i3bar/src/xcb.c
@@@ -1512,16 -1460,8 +1512,14 @@@ void reconfig_windows(bool redraw_bars
               * BUTTON_PRESS, to handle clicks on the workspace buttons
               * */
              values[2] = XCB_EVENT_MASK_EXPOSURE |
-                         XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
+                         XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
+                         XCB_EVENT_MASK_BUTTON_PRESS;
 +            if (config.hide_on_modifier == M_DOCK) {
 +                /* If the bar is normally visible, catch visibility change events to suspend
 +                 * the status process when the bar is obscured by full-screened windows.  */
 +                values[2] |= XCB_EVENT_MASK_VISIBILITY_CHANGE;
 +                walk->visible = true;
 +            }
-             if (!config.disable_ws) {
-                 values[2] |= XCB_EVENT_MASK_BUTTON_PRESS;
-             }
              xcb_void_cookie_t win_cookie = xcb_create_window_checked(xcb_connection,
                                                                       root_screen->root_depth,
                                                                       walk->bar,