Merge branch 'master' into next

[i3/i3] / include / i3.h

diff --git a/include/i3.h b/include/i3.h
index 060a0cf847838a444d7b78cb4f7e6bc7f4b29db7..22dcd476b9605349f2ef53fbd02039a3659498b1 100644 (file)
--- a/include/i3.h
+++ b/include/i3.h
@@ -26,10 +26,14 @@ extern Display *xlibdpy, *xkbdpy;
 extern int xkb_current_group;
 extern TAILQ_HEAD(bindings_head, Binding) *bindings;
 extern TAILQ_HEAD(autostarts_head, Autostart) autostarts;
+extern TAILQ_HEAD(autostarts_always_head, Autostart) autostarts_always;
+extern TAILQ_HEAD(ws_assignments_head, Workspace_Assignment) ws_assignments;
 extern TAILQ_HEAD(assignments_head, Assignment) assignments;
 extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins;
+extern xcb_screen_t *root_screen;
 extern uint8_t root_depth;
 extern bool xcursor_supported, xkb_supported;
 extern xcb_window_t root;
+extern struct ev_loop *main_loop;
 
 #endif