Merge branch 'master' into next

diff --cc i3bar/src/child.c
Simple merge

diff --cc i3bar/src/xcb.c
index cbab7423616897d8af50822284bbf5ee3ed662c8,b417110ae240eebe1d028f0877de2e272b71e783..3a1b8cb2277807a766e8f094a5194a3ef77dd1a0
--- 1/i3bar/src/xcb.c
--- 2/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,