Merge branch 'master' into display-destroy

3 files changed, 8 insertions, 77 deletions

diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index 59851898..4d2a4b0a 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -19,7 +19,7 @@
 #include "wlr/util/log.h"
 #include "wlr/xwayland.h"
 #include "sockets.h"
-#include "xwm.h"
+#include "wlr/xwm.h"
 
 #ifdef __FreeBSD__
 static inline int clearenv(void) {
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index cb5d38d4..90b9cba8 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -12,7 +12,7 @@
 #include "wlr/types/wlr_surface.h"
 #include "wlr/xwayland.h"
 #include "wlr/xcursor.h"
-#include "xwm.h"
+#include "wlr/xwm.h"
 
 #ifdef HAS_XCB_ICCCM
 	#include <xcb/xcb_icccm.h>
@@ -938,6 +938,12 @@ static int x11_event_handler(int fd, uint32_t mask, void *data) {
 
 	while ((event = xcb_poll_for_event(xwm->xcb_conn))) {
 		count++;
+
+		if (xwm->xwayland->user_event_handler &&
+				xwm->xwayland->user_event_handler(xwm, event)) {
+			break;
+		}
+
 		switch (event->response_type & XCB_EVENT_RESPONSE_TYPE_MASK) {
 		case XCB_CREATE_NOTIFY:
 			xwm_handle_create_notify(xwm, (xcb_create_notify_event_t *)event);
diff --git a/xwayland/xwm.h b/xwayland/xwm.h
deleted file mode 100644
index c350b6e2..00000000
--- a/xwayland/xwm.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#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