From 7ad2a57feb4c7e4b191edfbaa68ff3a2fd703f9f Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Fri, 22 Sep 2017 16:00:27 +1200
Subject: Open X11 Window
---
include/backend/x11.h | 12 ++++++++++++
include/wlr/backend/x11.h | 6 ++++--
2 files changed, 16 insertions(+), 2 deletions(-)
(limited to 'include')
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 2f319672..6ef86c8a 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -1,8 +1,20 @@
#ifndef WLR_X11_H
#define WLR_X11_H
+#include <xcb/xcb.h>
+#include <X11/Xlib-xcb.h>
+#include <wayland-server.h>
+#include <wlr/egl.h>
+
struct wlr_x11_backend {
struct wlr_backend backend;
+
+ Display *xlib_conn;
+ xcb_connection_t *xcb_conn;
+ xcb_window_t win;
+
+ struct wlr_egl egl;
+ struct wl_event_source *event_source;
};
#endif
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index 28d027c5..3901649b 100644
--- a/include/wlr/backend/x11.h
+++ b/include/wlr/backend/x11.h
@@ -1,10 +1,12 @@
#ifndef WLR_BACKEND_X11_H
#define WLR_BACKEND_X11_H
-#include <wlr/backend.h>
#include <stdbool.h>
+#include <wayland-server.h>
+#include <wlr/backend.h>
-struct wlr_backend *wlr_x11_backend_create(const char *display);
+struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
+ const char *x11_display);
bool wlr_backend_is_x11(struct wlr_backend *backend);
--
cgit v1.2.3