Merge branch 'master' into display-destroy

4 files changed, 88 insertions, 1 deletions

diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 713c291c..41cd21c8 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -7,6 +7,7 @@
 #include <wayland-egl.h>
 #include <wlr/render/egl.h>
 #include <wlr/backend/wayland.h>
+#include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wayland-util.h>
@@ -76,6 +77,8 @@ void wlr_wl_registry_poll(struct wlr_wl_backend *backend);
 void wlr_wl_output_update_cursor(struct wlr_wl_backend_output *output);
 struct wlr_wl_backend_output *wlr_wl_output_for_surface(
 		struct wlr_wl_backend *backend, struct wl_surface *surface);
+void wlr_wl_output_layout_get_box(struct wlr_wl_backend *backend,
+		struct wlr_box *box);
 
 extern const struct wl_seat_listener seat_listener;
 
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index abd7c285..cbedf240 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -62,6 +62,8 @@ struct wlr_output {
 		struct wl_signal frame;
 		struct wl_signal swap_buffers;
 		struct wl_signal resolution;
+		struct wl_signal scale;
+		struct wl_signal transform;
 		struct wl_signal destroy;
 	} events;
 
@@ -87,7 +89,7 @@ bool wlr_output_set_mode(struct wlr_output *output,
 	struct wlr_output_mode *mode);
 bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width,
 	int32_t height, int32_t refresh);
-void wlr_output_transform(struct wlr_output *output,
+void wlr_output_set_transform(struct wlr_output *output,
 	enum wl_output_transform transform);
 void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly);
 void wlr_output_set_scale(struct wlr_output *output, uint32_t scale);
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index f6b43851..468437bc 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -33,6 +33,13 @@ struct wlr_xwayland {
 		struct wl_signal new_surface;
 	} events;
 
+	/**
+	 * Add a custom event handler to xwayland. Return 1 if the event was
+	 * handled or 0 to use the default wlr-xwayland handler. wlr-xwayland will
+	 * free the event.
+	 */
+	int (*user_event_handler)(struct wlr_xwm *xwm, xcb_generic_event_t *event);
+
 	void *data;
 };
 
diff --git a/include/wlr/xwm.h b/include/wlr/xwm.h
new file mode 100644
index 00000000..c350b6e2
--- /dev/null
+++ b/include/wlr/xwm.h
@@ -0,0 +1,75 @@
+#ifndef XWAYLAND_INTERNALS_H
+#define XWAYLAND_INTERNALS_H
+
+#include <xcb/render.h>
+#include <wayland-server-core.h>
+#include <wlr/xwayland.h>
+
+enum atom_name {
+	WL_SURFACE_ID,
+	WM_DELETE_WINDOW,
+	WM_PROTOCOLS,
+	WM_HINTS,
+	WM_NORMAL_HINTS,
+	WM_SIZE_HINTS,
+	MOTIF_WM_HINTS,
+	UTF8_STRING,
+	WM_S0,
+	NET_SUPPORTED,
+	NET_WM_S0,
+	NET_WM_PID,
+	NET_WM_NAME,
+	NET_WM_STATE,
+	NET_WM_WINDOW_TYPE,
+	WM_TAKE_FOCUS,
+	WINDOW,
+	_NET_ACTIVE_WINDOW,
+	_NET_WM_MOVERESIZE,
+	_NET_WM_NAME,
+	_NET_SUPPORTING_WM_CHECK,
+	_NET_WM_STATE_FULLSCREEN,
+	_NET_WM_STATE_MAXIMIZED_VERT,
+	_NET_WM_STATE_MAXIMIZED_HORZ,
+	WM_STATE,
+	ATOM_LAST,
+};
+
+extern const char *atom_map[ATOM_LAST];
+
+enum net_wm_state_action {
+	NET_WM_STATE_REMOVE = 0,
+	NET_WM_STATE_ADD = 1,
+	NET_WM_STATE_TOGGLE = 2,
+};
+
+struct wlr_xwm {
+	struct wlr_xwayland *xwayland;
+	struct wl_event_source *event_source;
+
+	xcb_atom_t atoms[ATOM_LAST];
+	xcb_connection_t *xcb_conn;
+	xcb_screen_t *screen;
+	xcb_window_t window;
+	xcb_visualid_t visual_id;
+	xcb_colormap_t colormap;
+	xcb_render_pictformat_t render_format_id;
+	xcb_cursor_t cursor;
+
+	struct wlr_xwayland_surface *focus_surface;
+
+	struct wl_list surfaces; // wlr_xwayland_surface::link
+	struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link
+
+	const xcb_query_extension_reply_t *xfixes;
+
+	struct wl_listener compositor_surface_create;
+};
+
+struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland);
+
+void xwm_destroy(struct wlr_xwm *xwm);
+
+void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
+	uint32_t width, uint32_t height, int32_t hotspot_x, int32_t hotspot_y);
+
+#endif