Merge branch 'release-4.16.1'

[i3/i3] / include / i3.h

diff --git a/include/i3.h b/include/i3.h
index 2a43148602bb0cc44b624fead17bc04e42598b98..93a7e0a34cf6ca5983fe41cf7298b369bd32d9fe 100644 (file)
--- a/include/i3.h
+++ b/include/i3.h
@@ -9,6 +9,8 @@
  */
 #pragma once
 
+#include <config.h>
+
 #include <sys/time.h>
 #include <sys/resource.h>
 
@@ -35,7 +37,6 @@ extern struct rlimit original_rlimit_core;
 extern bool debug_build;
 /** The number of file descriptors passed via socket activation. */
 extern int listen_fds;
-extern xcb_connection_t *conn;
 extern int conn_screen;
 /**
  * The EWMH support window that is used to indicate that an EWMH-compliant
@@ -61,7 +62,6 @@ 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;
 
 /* Color depth, visual id and colormap to use when creating windows and
  * pixmaps. Will use 32 bit depth and an appropriate visual, if available,
@@ -74,3 +74,4 @@ extern bool xcursor_supported, xkb_supported;
 extern xcb_window_t root;
 extern struct ev_loop *main_loop;
 extern bool only_check_config;
+extern bool force_xinerama;