diff options
| -rw-r--r-- | backend/x11/backend.c | 19 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 15 | ||||
| -rw-r--r-- | backend/x11/output.c | 3 | ||||
| -rw-r--r-- | include/backend/x11.h | 9 | ||||
| -rw-r--r-- | include/wlr/backend/x11.h | 2 |
5 files changed, 33 insertions, 15 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index a9914879..2422b8e8 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -1,25 +1,30 @@ #define _POSIX_C_SOURCE 200112L + #include <assert.h> #include <limits.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <time.h> + +#include <wlr/config.h> + +#include <X11/Xlib-xcb.h> #include <wayland-server.h> +#include <xcb/xcb.h> +#if WLR_HAS_XCB_XKB +#include <xcb/xkb.h> +#endif + #include <wlr/backend/interface.h> #include <wlr/backend/x11.h> -#include <wlr/config.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_pointer.h> #include <wlr/render/egl.h> -#include <wlr/render/gles2.h> +#include <wlr/render/wlr_renderer.h> #include <wlr/util/log.h> -#include <X11/Xlib-xcb.h> -#include <xcb/xcb.h> -#if WLR_HAS_XCB_XKB -#include <xcb/xkb.h> -#endif + #include "backend/x11.h" #include "util/signal.h" diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index b64151e0..fa19221f 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -1,18 +1,23 @@ #include <stdlib.h> + #include <wlr/config.h> -#include <wlr/interfaces/wlr_input_device.h> -#include <wlr/interfaces/wlr_keyboard.h> -#include <wlr/interfaces/wlr_pointer.h> -#include <wlr/util/log.h> -#include <xcb/xcb.h> + #ifdef __linux__ #include <linux/input-event-codes.h> #elif __FreeBSD__ #include <dev/evdev/input-event-codes.h> #endif + +#include <xcb/xcb.h> #if WLR_HAS_XCB_XKB #include <xcb/xkb.h> #endif + +#include <wlr/interfaces/wlr_input_device.h> +#include <wlr/interfaces/wlr_keyboard.h> +#include <wlr/interfaces/wlr_pointer.h> +#include <wlr/util/log.h> + #include "backend/x11.h" #include "util/signal.h" diff --git a/backend/x11/output.c b/backend/x11/output.c index 92eeca66..8cb4b3eb 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -1,10 +1,13 @@ #define _POSIX_C_SOURCE 200809L + #include <assert.h> #include <stdlib.h> #include <string.h> + #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_pointer.h> #include <wlr/util/log.h> + #include "backend/x11.h" #include "util/signal.h" diff --git a/include/backend/x11.h b/include/backend/x11.h index cc7850b1..eccb422b 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -2,14 +2,17 @@ #define BACKEND_X11_H #include <stdbool.h> + +#include <X11/Xlib-xcb.h> #include <wayland-server.h> -#include <wlr/config.h> +#include <xcb/xcb.h> + #include <wlr/backend/x11.h> +#include <wlr/config.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/egl.h> -#include <X11/Xlib-xcb.h> -#include <xcb/xcb.h> +#include <wlr/render/wlr_renderer.h> #define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h index 56360bf7..5793a3b9 100644 --- a/include/wlr/backend/x11.h +++ b/include/wlr/backend/x11.h @@ -2,7 +2,9 @@ #define WLR_BACKEND_X11_H #include <stdbool.h> + #include <wayland-server.h> + #include <wlr/backend.h> #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_output.h> |