aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-30 22:09:06 -0400
committeremersion <contact@emersion.fr>2018-03-30 23:51:19 -0400
commit0a7a8cbd1c64e50978e846d8cf1bf8b1f6868655 (patch)
tree755a1e6c49c5cf1c1d91660dc35cd4cd7b58c28c /include
parentd4f7ced6e260961f701f73f672fffa87ee333c3d (diff)
downloadwlroots-0a7a8cbd1c64e50978e846d8cf1bf8b1f6868655.tar.xz
backend/x11: add WLR_X11_OUTPUTS support
Diffstat (limited to 'include')
-rw-r--r--include/backend/x11.h7
-rw-r--r--include/wlr/backend/x11.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 92a29725..aa058882 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -3,11 +3,12 @@
#include <stdbool.h>
#include <wayland-server.h>
+#include <wlr/backend/x11.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/interfaces/wlr_input_device.h>
-#include <wlr/interfaces/wlr_output.h>
#define XCB_EVENT_RESPONSE_TYPE_MASK 0x7f
@@ -28,6 +29,7 @@ struct wlr_x11_output {
struct wlr_x11_backend {
struct wlr_backend backend;
struct wl_display *wl_display;
+ bool started;
Display *xlib_conn;
xcb_connection_t *xcb_conn;
@@ -73,7 +75,6 @@ const struct wlr_input_device_impl input_device_impl;
bool x11_handle_input_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *event);
-struct wlr_x11_output *x11_output_create(struct wlr_x11_backend *x11);
void x11_output_handle_configure_notify(struct wlr_x11_output *output,
xcb_configure_notify_event_t *event);
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index b22d7f68..7bc1f891 100644
--- a/include/wlr/backend/x11.h
+++ b/include/wlr/backend/x11.h
@@ -9,6 +9,7 @@
struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
const char *x11_display);
+struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend);
bool wlr_backend_is_x11(struct wlr_backend *backend);
bool wlr_input_device_is_x11(struct wlr_input_device *device);