Merge pull request #1 from emersion/martinetd/xdg_shell

Wrap wl_resource_get_user_data into safer helper functions (for xdg-shell stable too)

backend/meson.build

@@ -28,14 +28,15 @@ backend_files = files(
 )
 
 backend_deps = [
-	wayland_server,
+	drm,
 	egl,
 	gbm,
 	libinput,
-	wlr_render,
-	wlr_protos,
-	drm,
 	pixman,
+	xkbcommon,
+	wayland_server,
+	wlr_protos,
+	wlr_render,
 ]
 
 if host_machine.system().startswith('freebsd')

include/wlr/types/wlr_output.h

@@ -157,6 +157,7 @@ void wlr_output_set_gamma(struct wlr_output *output,
 uint32_t wlr_output_get_gamma_size(struct wlr_output *output);
 void wlr_output_set_fullscreen_surface(struct wlr_output *output,
 	struct wlr_surface *surface);
+struct wlr_output *wlr_output_from_resource(struct wl_resource *resource);
 
 
 struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);

include/wlr/types/wlr_region.h

@@ -1,13 +1,16 @@
 #ifndef WLR_TYPES_WLR_REGION_H
 #define WLR_TYPES_WLR_REGION_H
 
+#include <pixman.h>
+
 struct wl_resource;
 
 /*
  * Implements the given resource as region.
- * Sets the associated pixman_region32_t as userdata.
  */
 void wlr_region_create(struct wl_client *client, struct wl_resource *res,
-		uint32_t id);
+	uint32_t id);
+
+pixman_region32_t *wlr_region_from_resource(struct wl_resource *resource);
 
 #endif

include/wlr/types/wlr_seat.h

@@ -530,4 +530,6 @@ bool wlr_seat_touch_has_grab(struct wlr_seat *seat);
  */
 bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial);
 
+struct wlr_seat_client *wlr_seat_client_from_resource(struct wl_resource *resource);
+
 #endif

include/wlr/types/wlr_surface.h

@@ -164,4 +164,6 @@ void wlr_surface_set_role_committed(struct wlr_surface *surface,
 		void (*role_committed)(struct wlr_surface *surface, void *role_data),
 		void *role_data);
 
+struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource);
+
 #endif

render/egl.c

@@ -132,7 +132,9 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
 
 	wlr_log(L_INFO, "Using EGL %d.%d", (int)major, (int)minor);
 	wlr_log(L_INFO, "Supported EGL extensions: %s", egl->egl_exts_str);
+	wlr_log(L_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR));
 	wlr_log(L_INFO, "Using %s", glGetString(GL_VERSION));
+	wlr_log(L_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
 	wlr_log(L_INFO, "Supported OpenGL ES extensions: %s", egl->gl_exts_str);
 
 	if (strstr(egl->egl_exts_str, "EGL_WL_bind_wayland_display") == NULL ||

render/meson.build

@@ -22,7 +22,7 @@ lib_wlr_render = static_library(
 	glapi[0],
 	glapi[1],
 	include_directories: wlr_inc,
-	dependencies: [glesv2, egl, pixman],
+	dependencies: [egl, glesv2, pixman, wayland_server],
 )
 
 wlr_render = declare_dependency(

types/meson.build

@@ -29,5 +29,5 @@ lib_wlr_types = static_library(
 		'wlr_xdg_shell.c',
 	),
 	include_directories: wlr_inc,
-	dependencies: [wayland_server, pixman, wlr_protos],
+	dependencies: [pixman, xkbcommon, wayland_server, wlr_protos],
 )

types/wlr_compositor.c

@@ -7,13 +7,21 @@
 #include <wlr/util/log.h>
 #include "util/signal.h"
 
+static const struct wl_compositor_interface wl_compositor_impl;
+
+static struct wlr_compositor *compositor_from_resource(struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_compositor_interface,
+		&wl_compositor_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void destroy_surface_listener(struct wl_listener *listener, void *data) {
 	wl_list_remove(wl_resource_get_link(data));
 }
 
 static void wl_compositor_create_surface(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id) {
-	struct wlr_compositor *compositor = wl_resource_get_user_data(resource);
+	struct wlr_compositor *compositor = compositor_from_resource(resource);
 
 	struct wl_resource *surface_resource = wl_resource_create(client,
 		&wl_surface_interface, wl_resource_get_version(resource), id);
@@ -44,13 +52,13 @@ static void wl_compositor_create_region(struct wl_client *client,
 	wlr_region_create(client, resource, id);
 }
 
-struct wl_compositor_interface wl_compositor_impl = {
+static const struct wl_compositor_interface wl_compositor_impl = {
 	.create_surface = wl_compositor_create_surface,
 	.create_region = wl_compositor_create_region
 };
 
 static void wl_compositor_destroy(struct wl_resource *resource) {
-	struct wlr_compositor *compositor = wl_resource_get_user_data(resource);
+	struct wlr_compositor *compositor = compositor_from_resource(resource);
 	struct wl_resource *_resource = NULL;
 	wl_resource_for_each(_resource, &compositor->wl_resources) {
 		if (_resource == resource) {
@@ -96,8 +104,8 @@ static void subcompositor_get_subsurface(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *surface_resource,
 		struct wl_resource *parent_resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(surface_resource);
-	struct wlr_surface *parent = wl_resource_get_user_data(parent_resource);
+	struct wlr_surface *parent = wlr_surface_from_resource(parent_resource);
 
 	static const char msg[] = "get_subsurface: wl_subsurface@";
 

types/wlr_data_device.c

@@ -14,6 +14,24 @@
 		WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \
 		WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
 
+static const struct wl_data_offer_interface data_offer_impl;
+
+static struct wlr_data_offer *data_offer_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_data_offer_interface,
+		&data_offer_impl));
+	return wl_resource_get_user_data(resource);
+}
+
+static const struct wl_data_source_interface data_source_impl;
+
+static struct client_data_source *client_data_source_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_data_source_interface,
+		&data_source_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static uint32_t data_offer_choose_action(struct wlr_data_offer *offer) {
 	uint32_t offer_actions, preferred_action = 0;
 	if (wl_resource_get_version(offer->resource) >=
@@ -78,7 +96,7 @@ static void data_offer_update_action(struct wlr_data_offer *offer) {
 
 static void data_offer_accept(struct wl_client *client,
 		struct wl_resource *resource, uint32_t serial, const char *mime_type) {
-	struct wlr_data_offer *offer = wl_resource_get_user_data(resource);
+	struct wlr_data_offer *offer = data_offer_from_resource(resource);
 
 	if (!offer->source || offer != offer->source->offer) {
 		return;
@@ -94,7 +112,7 @@ static void data_offer_accept(struct wl_client *client,
 
 static void data_offer_receive(struct wl_client *client,
 		struct wl_resource *resource, const char *mime_type, int32_t fd) {
-	struct wlr_data_offer *offer = wl_resource_get_user_data(resource);
+	struct wlr_data_offer *offer = data_offer_from_resource(resource);
 
 	if (offer->source && offer == offer->source->offer) {
 		offer->source->send(offer->source, mime_type, fd);
@@ -126,7 +144,7 @@ static void data_source_notify_finish(struct wlr_data_source *source) {
 
 static void data_offer_finish(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_data_offer *offer = wl_resource_get_user_data(resource);
+	struct wlr_data_offer *offer = data_offer_from_resource(resource);
 
 	if (!offer->source || offer->source->offer != offer) {
 		return;
@@ -138,7 +156,7 @@ static void data_offer_finish(struct wl_client *client,
 static void data_offer_set_actions(struct wl_client *client,
 		struct wl_resource *resource, uint32_t actions,
 		uint32_t preferred_action) {
-	struct wlr_data_offer *offer = wl_resource_get_user_data(resource);
+	struct wlr_data_offer *offer = data_offer_from_resource(resource);
 
 	if (actions & ~ALL_ACTIONS) {
 		wl_resource_post_error(offer->resource,
@@ -162,7 +180,7 @@ static void data_offer_set_actions(struct wl_client *client,
 }
 
 static void data_offer_resource_destroy(struct wl_resource *resource) {
-	struct wlr_data_offer *offer = wl_resource_get_user_data(resource);
+	struct wlr_data_offer *offer = data_offer_from_resource(resource);
 
 	if (!offer->source) {
 		goto out;
@@ -332,16 +350,25 @@ void wlr_seat_set_selection(struct wlr_seat *seat,
 	}
 }
 
+static const struct wl_data_device_interface data_device_impl;
+
+static struct wlr_seat_client *seat_client_from_data_device_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_data_device_interface,
+		&data_device_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void data_device_set_selection(struct wl_client *client,
-		struct wl_resource *dd_resource, struct wl_resource *source_resource,
+		struct wl_resource *device_resource,
-		uint32_t serial) {
+		struct wl_resource *source_resource, uint32_t serial) {
 	struct client_data_source *source = NULL;
 	if (source_resource != NULL) {
-		source = wl_resource_get_user_data(source_resource);
+		source = client_data_source_from_resource(source_resource);
 	}
 
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(dd_resource);
+		seat_client_from_data_device_resource(device_resource);
 
 	struct wlr_data_source *wlr_source = (struct wlr_data_source *)source;
 	wlr_seat_set_selection(seat_client->seat, wlr_source, serial);
@@ -783,17 +810,19 @@ static void data_device_start_drag(struct wl_client *client,
 		struct wl_resource *origin_resource, struct wl_resource *icon_resource,
 		uint32_t serial) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(device_resource);
+		seat_client_from_data_device_resource(device_resource);
-	struct wlr_surface *origin = wl_resource_get_user_data(origin_resource);
+	struct wlr_surface *origin = wlr_surface_from_resource(origin_resource);
 	struct wlr_data_source *source = NULL;
 	struct wlr_surface *icon = NULL;
 
 	if (source_resource) {
-		source = wl_resource_get_user_data(source_resource);
+		struct client_data_source *client_source =
+			client_data_source_from_resource(source_resource);
+		source = (struct wlr_data_source *)client_source;
 	}
 
 	if (icon_resource) {
-		icon = wl_resource_get_user_data(icon_resource);
+		icon = wlr_surface_from_resource(icon_resource);
 	}
 	if (icon) {
 		if (wlr_surface_set_role(icon, "wl_data_device-icon",
@@ -876,7 +905,7 @@ static void data_source_destroy(struct wl_client *client,
 static void data_source_set_actions(struct wl_client *client,
 		struct wl_resource *resource, uint32_t dnd_actions) {
 	struct client_data_source *source =
-		wl_resource_get_user_data(resource);
+		client_data_source_from_resource(resource);
 
 	if (source->source.actions >= 0) {
 		wl_resource_post_error(source->resource,
@@ -905,7 +934,8 @@ static void data_source_set_actions(struct wl_client *client,
 
 static void data_source_offer(struct wl_client *client,
 		struct wl_resource *resource, const char *mime_type) {
-	struct client_data_source *source = wl_resource_get_user_data(resource);
+	struct client_data_source *source =
+		client_data_source_from_resource(resource);
 
 	char **p = wl_array_add(&source->source.mime_types, sizeof(*p));
 	if (p) {
@@ -919,14 +949,15 @@ static void data_source_offer(struct wl_client *client,
 	}
 }
 
-static struct wl_data_source_interface data_source_impl = {
+static const struct wl_data_source_interface data_source_impl = {
 	.offer = data_source_offer,
 	.destroy = data_source_destroy,
 	.set_actions = data_source_set_actions,
 };
 
 static void data_source_resource_handle_destroy(struct wl_resource *resource) {
-	struct client_data_source *source = wl_resource_get_user_data(resource);
+	struct client_data_source *source =
+		client_data_source_from_resource(resource);
 	wlr_data_source_finish(&source->source);
 	free(source);
 }
@@ -956,7 +987,7 @@ void data_device_manager_get_data_device(struct wl_client *client,
 		struct wl_resource *manager_resource, uint32_t id,
 		struct wl_resource *seat_resource) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	struct wl_resource *resource = wl_resource_create(client,
 		&wl_data_device_interface, wl_resource_get_version(manager_resource),

types/wlr_gamma_control.c

@@ -23,9 +23,18 @@ static void gamma_control_destroy(struct wlr_gamma_control *gamma_control) {
 	free(gamma_control);
 }
 
+static const struct gamma_control_interface gamma_control_impl;
+
+struct wlr_gamma_control *gamma_control_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &gamma_control_interface,
+		&gamma_control_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void gamma_control_destroy_resource(struct wl_resource *resource) {
 	struct wlr_gamma_control *gamma_control =
-		wl_resource_get_user_data(resource);
+		gamma_control_from_resource(resource);
 	gamma_control_destroy(gamma_control);
 }
 
@@ -40,7 +49,7 @@ static void gamma_control_set_gamma(struct wl_client *client,
 		struct wl_resource *gamma_control_resource, struct wl_array *red,
 		struct wl_array *green, struct wl_array *blue) {
 	struct wlr_gamma_control *gamma_control =
-		wl_resource_get_user_data(gamma_control_resource);
+		gamma_control_from_resource(gamma_control_resource);
 
 	if (red->size != green->size || red->size != blue->size) {
 		wl_resource_post_error(gamma_control_resource,
@@ -68,12 +77,21 @@ static const struct gamma_control_interface gamma_control_impl = {
 	.reset_gamma = gamma_control_reset_gamma,
 };
 
+static const struct gamma_control_manager_interface gamma_control_manager_impl;
+
+struct wlr_gamma_control_manager *gamma_control_manager_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &gamma_control_manager_interface,
+		&gamma_control_manager_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void gamma_control_manager_get_gamma_control(struct wl_client *client,
 		struct wl_resource *gamma_control_manager_resource, uint32_t id,
 		struct wl_resource *output_resource) {
 	struct wlr_gamma_control_manager *manager =
-		wl_resource_get_user_data(gamma_control_manager_resource);
+		gamma_control_manager_from_resource(gamma_control_manager_resource);
-	struct wlr_output *output = wl_resource_get_user_data(output_resource);
+	struct wlr_output *output = wlr_output_from_resource(output_resource);
 
 	struct wlr_gamma_control *gamma_control =
 		calloc(1, sizeof(struct wlr_gamma_control));
@@ -109,7 +127,7 @@ static void gamma_control_manager_get_gamma_control(struct wl_client *client,
 		wlr_output_get_gamma_size(output));
 }
 
-static struct gamma_control_manager_interface gamma_control_manager_impl = {
+static const struct gamma_control_manager_interface gamma_control_manager_impl = {
 	.get_gamma_control = gamma_control_manager_get_gamma_control,
 };
 

types/wlr_idle.c

@@ -7,6 +7,15 @@
 #include "idle-protocol.h"
 #include "util/signal.h"
 
+static const struct org_kde_kwin_idle_timeout_interface idle_timeout_impl;
+
+static struct wlr_idle_timeout *idle_timeout_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&org_kde_kwin_idle_timeout_interface, &idle_timeout_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void idle_timeout_destroy(struct wlr_idle_timeout *timer) {
 	wl_list_remove(&timer->input_listener.link);
 	wl_list_remove(&timer->seat_destroy.link);
@@ -34,7 +43,7 @@ static void handle_activity(struct wlr_idle_timeout *timer) {
 }
 
 static void handle_timer_resource_destroy(struct wl_resource *timer_resource) {
-	struct wlr_idle_timeout *timer = wl_resource_get_user_data(timer_resource);
+	struct wlr_idle_timeout *timer = idle_timeout_from_resource(timer_resource);
 	if (timer != NULL) {
 		idle_timeout_destroy(timer);
 	}
@@ -54,17 +63,27 @@ static void release_idle_timeout(struct wl_client *client,
 
 static void simulate_activity(struct wl_client *client,
 		struct wl_resource *resource){
-	struct wlr_idle_timeout *timer = wl_resource_get_user_data(resource);
+	struct wlr_idle_timeout *timer = idle_timeout_from_resource(resource);
 	handle_activity(timer);
 }
 
-static struct org_kde_kwin_idle_timeout_interface idle_timeout_impl = {
+static const struct org_kde_kwin_idle_timeout_interface idle_timeout_impl = {
 	.release = release_idle_timeout,
 	.simulate_user_activity = simulate_activity,
 };
 
+static const struct org_kde_kwin_idle_interface idle_impl;
+
+static struct wlr_idle *idle_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &org_kde_kwin_idle_interface,
+		&idle_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void handle_input_notification(struct wl_listener *listener, void *data) {
-	struct wlr_idle_timeout *timer = wl_container_of(listener, timer, input_listener);
+	struct wlr_idle_timeout *timer =
+		wl_container_of(listener, timer, input_listener);
 	struct wlr_seat *seat = data;
 	if (timer->seat == seat) {
 		handle_activity(timer);
@@ -72,13 +91,11 @@ static void handle_input_notification(struct wl_listener *listener, void *data)
 }
 
 static void create_idle_timer(struct wl_client *client,
-		struct wl_resource *idle_resource,
+		struct wl_resource *idle_resource, uint32_t id,
-		uint32_t id,
+		struct wl_resource *seat_resource, uint32_t timeout) {
-		struct wl_resource *seat_resource,
+	struct wlr_idle *idle = idle_from_resource(idle_resource);
-		uint32_t timeout) {
-	struct wlr_idle *idle = wl_resource_get_user_data(idle_resource);
 	struct wlr_seat_client *client_seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	struct wlr_idle_timeout *timer =
 		calloc(1, sizeof(struct wlr_idle_timeout));
@@ -122,7 +139,7 @@ static void create_idle_timer(struct wl_client *client,
 	wl_event_source_timer_update(timer->idle_source, timer->timeout);
 }
 
-static struct org_kde_kwin_idle_interface idle_impl = {
+static const struct org_kde_kwin_idle_interface idle_impl = {
 	.get_idle_timeout = create_idle_timer,
 };
 

types/wlr_output.c

@@ -17,7 +17,7 @@
 
 static void wl_output_send_to_resource(struct wl_resource *resource) {
 	assert(resource);
-	struct wlr_output *output = wl_resource_get_user_data(resource);
+	struct wlr_output *output = wlr_output_from_resource(resource);
 	assert(output);
 	const uint32_t version = wl_resource_get_version(resource);
 	if (version >= WL_OUTPUT_GEOMETRY_SINCE_VERSION) {
@@ -53,7 +53,7 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
 static void wlr_output_send_current_mode_to_resource(
 		struct wl_resource *resource) {
 	assert(resource);
-	struct wlr_output *output = wl_resource_get_user_data(resource);
+	struct wlr_output *output = wlr_output_from_resource(resource);
 	assert(output);
 	const uint32_t version = wl_resource_get_version(resource);
 	if (version < WL_OUTPUT_MODE_SINCE_VERSION) {
@@ -75,7 +75,7 @@ static void wlr_output_send_current_mode_to_resource(
 }
 
 static void wl_output_destroy(struct wl_resource *resource) {
-	struct wlr_output *output = wl_resource_get_user_data(resource);
+	struct wlr_output *output = wlr_output_from_resource(resource);
 	struct wl_resource *_resource = NULL;
 	wl_resource_for_each(_resource, &output->wl_resources) {
 		if (_resource == resource) {
@@ -648,6 +648,12 @@ void wlr_output_set_fullscreen_surface(struct wlr_output *output,
 		&output->fullscreen_surface_destroy);
 }
 
+struct wlr_output *wlr_output_from_resource(struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_output_interface,
+		&wl_output_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 
 static void output_cursor_damage_whole(struct wlr_output_cursor *cursor) {
 	struct wlr_box box;

types/wlr_primary_selection.c

@@ -9,10 +9,18 @@
 #include "gtk-primary-selection-protocol.h"
 #include "util/signal.h"
 
+static const struct gtk_primary_selection_offer_interface offer_impl;
+
+static struct wlr_primary_selection_offer *offer_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&gtk_primary_selection_offer_interface, &offer_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void offer_handle_receive(struct wl_client *client,
 		struct wl_resource *resource, const char *mime_type, int32_t fd) {
-	struct wlr_primary_selection_offer *offer =
+	struct wlr_primary_selection_offer *offer = offer_from_resource(resource);
-		wl_resource_get_user_data(resource);
 
 	if (offer->source && offer == offer->source->offer) {
 		offer->source->send(offer->source, mime_type, fd);
@@ -32,8 +40,7 @@ static const struct gtk_primary_selection_offer_interface offer_impl = {
 };
 
 static void offer_resource_handle_destroy(struct wl_resource *resource) {
-	struct wlr_primary_selection_offer *offer =
+	struct wlr_primary_selection_offer *offer = offer_from_resource(resource);
-		wl_resource_get_user_data(resource);
 
 	if (!offer->source) {
 		goto out;
@@ -122,9 +129,19 @@ static struct wlr_primary_selection_offer *source_send_offer(
 	return offer;
 }
 
+static const struct gtk_primary_selection_source_interface source_impl;
+
+static struct client_data_source *client_data_source_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&gtk_primary_selection_source_interface, &source_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void source_handle_offer(struct wl_client *client,
 		struct wl_resource *resource, const char *mime_type) {
-	struct client_data_source *source = wl_resource_get_user_data(resource);
+	struct client_data_source *source =
+		client_data_source_from_resource(resource);
 
 	char **p = wl_array_add(&source->source.mime_types, sizeof(*p));
 	if (p) {
@@ -150,7 +167,7 @@ static const struct gtk_primary_selection_source_interface source_impl = {
 
 static void source_resource_handle_destroy(struct wl_resource *resource) {
 	struct client_data_source *source =
-		wl_resource_get_user_data(resource);
+		client_data_source_from_resource(resource);
 	wlr_primary_selection_source_finish(&source->source);
 	free(source);
 }
@@ -241,11 +258,11 @@ static void device_handle_set_selection(struct wl_client *client,
 		uint32_t serial) {
 	struct client_data_source *source = NULL;
 	if (source_resource != NULL) {
-		source = wl_resource_get_user_data(source_resource);
+		source = client_data_source_from_resource(source_resource);
 	}
 
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(resource);
+		wlr_seat_client_from_resource(resource);
 
 	struct wlr_primary_selection_source *wlr_source =
 		(struct wlr_primary_selection_source *)source;
@@ -317,7 +334,7 @@ void device_manager_handle_get_device(struct wl_client *client,
 		struct wl_resource *manager_resource, uint32_t id,
 		struct wl_resource *seat_resource) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	uint32_t version = wl_resource_get_version(manager_resource);
 	struct wl_resource *resource = wl_resource_create(client,

types/wlr_region.c

@@ -3,16 +3,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <wayland-server.h>
+#include <wlr/types/wlr_region.h>
 
 static void region_add(struct wl_client *client, struct wl_resource *resource,
 		int32_t x, int32_t y, int32_t width, int32_t height) {
-	pixman_region32_t *region = wl_resource_get_user_data(resource);
+	pixman_region32_t *region = wlr_region_from_resource(resource);
 	pixman_region32_union_rect(region, region, x, y, width, height);
 }
 
 static void region_subtract(struct wl_client *client, struct wl_resource *resource,
 		int32_t x, int32_t y, int32_t width, int32_t height) {
-	pixman_region32_t *region = wl_resource_get_user_data(resource);
+	pixman_region32_t *region = wlr_region_from_resource(resource);
 	pixman_region32_union_rect(region, region, x, y, width, height);
 
 	pixman_region32_t rect;
@@ -25,14 +26,14 @@ static void region_destroy(struct wl_client *client, struct wl_resource *resourc
 	wl_resource_destroy(resource);
 }
 
-static const struct wl_region_interface region_interface = {
+static const struct wl_region_interface region_impl = {
 	.destroy = region_destroy,
 	.add = region_add,
 	.subtract = region_subtract,
 };
 
 static void destroy_region(struct wl_resource *resource) {
-	pixman_region32_t *reg = wl_resource_get_user_data(resource);
+	pixman_region32_t *reg = wlr_region_from_resource(resource);
 	pixman_region32_fini(reg);
 	free(reg);
 }
@@ -54,6 +55,12 @@ void wlr_region_create(struct wl_client *client, struct wl_resource *res,
 		wl_resource_post_no_memory(res);
 		return;
 	}
-	wl_resource_set_implementation(region_resource, &region_interface, region,
+	wl_resource_set_implementation(region_resource, &region_impl, region,
 		destroy_region);
 }
+
+pixman_region32_t *wlr_region_from_resource(struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_region_interface,
+		&region_impl));
+	return wl_resource_get_user_data(resource);
+}

types/wlr_screenshooter.c

@@ -9,6 +9,13 @@
 #include <wlr/util/log.h>
 #include "screenshooter-protocol.h"
 
+static struct wlr_screenshot *screenshot_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &orbital_screenshot_interface,
+		NULL));
+	return wl_resource_get_user_data(resource);
+}
+
 struct screenshot_state {
 	struct wl_shm_buffer *shm_buffer;
 	struct wlr_screenshot *screenshot;
@@ -24,7 +31,7 @@ static void screenshot_destroy(struct wlr_screenshot *screenshot) {
 static void handle_screenshot_resource_destroy(
 		struct wl_resource *screenshot_resource) {
 	struct wlr_screenshot *screenshot =
-		wl_resource_get_user_data(screenshot_resource);
+		screenshot_from_resource(screenshot_resource);
 	if (screenshot != NULL) {
 		screenshot_destroy(screenshot);
 	}
@@ -59,13 +66,22 @@ cleanup:
 	free(state);
 }
 
+static const struct orbital_screenshooter_interface screenshooter_impl;
+
+static struct wlr_screenshooter *screenshooter_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &orbital_screenshooter_interface,
+		&screenshooter_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void screenshooter_shoot(struct wl_client *client,
 		struct wl_resource *screenshooter_resource, uint32_t id,
 		struct wl_resource *output_resource,
 		struct wl_resource *buffer_resource) {
 	struct wlr_screenshooter *screenshooter =
-		wl_resource_get_user_data(screenshooter_resource);
+		screenshooter_from_resource(screenshooter_resource);
-	struct wlr_output *output = wl_resource_get_user_data(output_resource);
+	struct wlr_output *output = wlr_output_from_resource(output_resource);
 
 	struct wlr_renderer *renderer = wlr_backend_get_renderer(output->backend);
 	if (renderer == NULL) {
@@ -133,7 +149,7 @@ static void screenshooter_shoot(struct wl_client *client,
 	wlr_output_schedule_frame(output);
 }
 
-static struct orbital_screenshooter_interface screenshooter_impl = {
+static const struct orbital_screenshooter_interface screenshooter_impl = {
 	.shoot = screenshooter_shoot,
 };
 

types/wlr_seat.c

@@ -23,15 +23,24 @@ static void pointer_send_frame(struct wl_resource *resource) {
 	}
 }
 
+static const struct wl_pointer_interface wl_pointer_impl;
+
+static struct wlr_seat_client *seat_client_from_pointer_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_pointer_interface,
+		&wl_pointer_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void wl_pointer_set_cursor(struct wl_client *client,
 		struct wl_resource *pointer_resource, uint32_t serial,
 		struct wl_resource *surface_resource,
 		int32_t hotspot_x, int32_t hotspot_y) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(pointer_resource);
+		seat_client_from_pointer_resource(pointer_resource);
 	struct wlr_surface *surface = NULL;
 	if (surface_resource != NULL) {
-		surface = wl_resource_get_user_data(surface_resource);
+		surface = wlr_surface_from_resource(surface_resource);
 
 		if (wlr_surface_set_role(surface, "wl_pointer-cursor", surface_resource,
 				WL_POINTER_ERROR_ROLE) < 0) {
@@ -67,7 +76,7 @@ static void wl_pointer_destroy(struct wl_resource *resource) {
 static void wl_seat_get_pointer(struct wl_client *client,
 		struct wl_resource *seat_resource, uint32_t id) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 	if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
 		return;
 	}
@@ -126,7 +135,7 @@ static void seat_client_send_repeat_info(struct wlr_seat_client *client,
 static void wl_seat_get_keyboard(struct wl_client *client,
 		struct wl_resource *seat_resource, uint32_t id) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 	if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_KEYBOARD)) {
 		return;
 	}
@@ -160,7 +169,7 @@ static void wl_touch_destroy(struct wl_resource *resource) {
 static void wl_seat_get_touch(struct wl_client *client,
 		struct wl_resource *seat_resource, uint32_t id) {
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 	if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_TOUCH)) {
 		return;
 	}
@@ -177,7 +186,8 @@ static void wl_seat_get_touch(struct wl_client *client,
 }
 
 static void wlr_seat_client_resource_destroy(struct wl_resource *seat_resource) {
-	struct wlr_seat_client *client = wl_resource_get_user_data(seat_resource);
+	struct wlr_seat_client *client =
+		wlr_seat_client_from_resource(seat_resource);
 	wlr_signal_emit_safe(&client->events.destroy, client);
 
 	if (client == client->seat->pointer_state.focused_client) {
@@ -1250,3 +1260,10 @@ bool wlr_seat_validate_grab_serial(struct wlr_seat *seat, uint32_t serial) {
 	return serial == seat->pointer_state.grab_serial ||
 		serial == seat->touch_state.grab_serial;
 }
+
+struct wlr_seat_client *wlr_seat_client_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_seat_interface,
+		&wl_seat_impl));
+	return wl_resource_get_user_data(resource);
+}

types/wlr_server_decoration.c

@@ -6,6 +6,16 @@
 #include "server-decoration-protocol.h"
 #include "util/signal.h"
 
+static const struct org_kde_kwin_server_decoration_interface
+	server_decoration_impl;
+
+static struct wlr_server_decoration *decoration_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&org_kde_kwin_server_decoration_interface, &server_decoration_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void server_decoration_handle_release(struct wl_client *client,
 		struct wl_resource *resource) {
 	wl_resource_destroy(resource);
@@ -14,7 +24,7 @@ static void server_decoration_handle_release(struct wl_client *client,
 static void server_decoration_handle_request_mode(struct wl_client *client,
 		struct wl_resource *resource, uint32_t mode) {
 	struct wlr_server_decoration *decoration =
-		wl_resource_get_user_data(resource);
+		decoration_from_resource(resource);
 	if (decoration->mode == mode) {
 		return;
 	}
@@ -35,7 +45,7 @@ static void server_decoration_destroy(
 
 static void server_decoration_destroy_resource(struct wl_resource *resource) {
 	struct wlr_server_decoration *decoration =
-		wl_resource_get_user_data(resource);
+		decoration_from_resource(resource);
 	if (decoration != NULL) {
 		server_decoration_destroy(decoration);
 	}
@@ -49,17 +59,28 @@ static void server_decoration_handle_surface_destroy(
 }
 
 static const struct org_kde_kwin_server_decoration_interface
-server_decoration_impl = {
+		server_decoration_impl = {
 	.release = server_decoration_handle_release,
 	.request_mode = server_decoration_handle_request_mode,
 };
 
+static const struct org_kde_kwin_server_decoration_manager_interface
+	server_decoration_manager_impl;
+
+static struct wlr_server_decoration_manager *manager_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource,
+		&org_kde_kwin_server_decoration_manager_interface,
+		&server_decoration_manager_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void server_decoration_manager_handle_create(struct wl_client *client,
 		struct wl_resource *manager_resource, uint32_t id,
 		struct wl_resource *surface_resource) {
 	struct wlr_server_decoration_manager *manager =
-		wl_resource_get_user_data(manager_resource);
+		manager_from_resource(manager_resource);
-	struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(surface_resource);
 
 	struct wlr_server_decoration *decoration =
 		calloc(1, sizeof(struct wlr_server_decoration));
@@ -102,7 +123,7 @@ static void server_decoration_manager_handle_create(struct wl_client *client,
 }
 
 static const struct org_kde_kwin_server_decoration_manager_interface
-server_decoration_manager_impl = {
+		server_decoration_manager_impl = {
 	.create = server_decoration_manager_handle_create,
 };
 

types/wlr_surface.c

@@ -4,6 +4,7 @@
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/matrix.h>
+#include <wlr/types/wlr_region.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/log.h>
 #include <wlr/util/region.h>
@@ -50,7 +51,7 @@ static void surface_destroy(struct wl_client *client,
 static void surface_attach(struct wl_client *client,
 		struct wl_resource *resource,
 		struct wl_resource *buffer, int32_t sx, int32_t sy) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 
 	surface->pending->invalid |= WLR_SURFACE_INVALID_BUFFER;
 	surface->pending->sx = sx;
@@ -62,7 +63,7 @@ static void surface_attach(struct wl_client *client,
 static void surface_damage(struct wl_client *client,
 		struct wl_resource *resource,
 		int32_t x, int32_t y, int32_t width, int32_t height) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	if (width < 0 || height < 0) {
 		return;
 	}
@@ -72,15 +73,21 @@ static void surface_damage(struct wl_client *client,
 		x, y, width, height);
 }
 
+static struct wlr_frame_callback *frame_callback_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_callback_interface, NULL));
+	return wl_resource_get_user_data(resource);
+}
+
 static void destroy_frame_callback(struct wl_resource *resource) {
-	struct wlr_frame_callback *cb = wl_resource_get_user_data(resource);
+	struct wlr_frame_callback *cb = frame_callback_from_resource(resource);
 	wl_list_remove(&cb->link);
 	free(cb);
 }
 
 static void surface_frame(struct wl_client *client,
 		struct wl_resource *resource, uint32_t callback) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 
 	struct wlr_frame_callback *cb =
 		calloc(1, sizeof(struct wlr_frame_callback));
@@ -97,8 +104,8 @@ static void surface_frame(struct wl_client *client,
 		return;
 	}
 
-	wl_resource_set_implementation(cb->resource,
+	wl_resource_set_implementation(cb->resource, NULL, cb,
-		NULL, cb, destroy_frame_callback);
+		destroy_frame_callback);
 
 	wl_list_insert(surface->pending->frame_callback_list.prev, &cb->link);
 
@@ -108,13 +115,13 @@ static void surface_frame(struct wl_client *client,
 static void surface_set_opaque_region(struct wl_client *client,
 		struct wl_resource *resource,
 		struct wl_resource *region_resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	if ((surface->pending->invalid & WLR_SURFACE_INVALID_OPAQUE_REGION)) {
 		pixman_region32_clear(&surface->pending->opaque);
 	}
 	surface->pending->invalid |= WLR_SURFACE_INVALID_OPAQUE_REGION;
 	if (region_resource) {
-		pixman_region32_t *region = wl_resource_get_user_data(region_resource);
+		pixman_region32_t *region = wlr_region_from_resource(region_resource);
 		pixman_region32_copy(&surface->pending->opaque, region);
 	} else {
 		pixman_region32_clear(&surface->pending->opaque);
@@ -124,10 +131,10 @@ static void surface_set_opaque_region(struct wl_client *client,
 static void surface_set_input_region(struct wl_client *client,
 		struct wl_resource *resource,
 		struct wl_resource *region_resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	surface->pending->invalid |= WLR_SURFACE_INVALID_INPUT_REGION;
 	if (region_resource) {
-		pixman_region32_t *region = wl_resource_get_user_data(region_resource);
+		pixman_region32_t *region = wlr_region_from_resource(region_resource);
 		pixman_region32_copy(&surface->pending->input, region);
 	} else {
 		pixman_region32_init_rect(&surface->pending->input,
@@ -465,7 +472,7 @@ static void wlr_subsurface_commit(struct wlr_subsurface *subsurface) {
 
 static void surface_commit(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	struct wlr_subsurface *subsurface = surface->subsurface;
 
 	if (subsurface) {
@@ -483,7 +490,7 @@ static void surface_commit(struct wl_client *client,
 
 static void surface_set_buffer_transform(struct wl_client *client,
 		struct wl_resource *resource, int transform) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	surface->pending->invalid |= WLR_SURFACE_INVALID_TRANSFORM;
 	surface->pending->transform = transform;
 }
@@ -491,7 +498,7 @@ static void surface_set_buffer_transform(struct wl_client *client,
 static void surface_set_buffer_scale(struct wl_client *client,
 		struct wl_resource *resource,
 		int32_t scale) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	surface->pending->invalid |= WLR_SURFACE_INVALID_SCALE;
 	surface->pending->scale = scale;
 }
@@ -500,7 +507,7 @@ static void surface_damage_buffer(struct wl_client *client,
 		struct wl_resource *resource,
 		int32_t x, int32_t y, int32_t width,
 		int32_t height) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	if (width < 0 || height < 0) {
 		return;
 	}
@@ -523,6 +530,12 @@ const struct wl_surface_interface surface_interface = {
 	.damage_buffer = surface_damage_buffer
 };
 
+struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_surface_interface,
+		&surface_interface));
+	return wl_resource_get_user_data(resource);
+}
+
 static struct wlr_surface_state *wlr_surface_state_create() {
 	struct wlr_surface_state *state =
 		calloc(1, sizeof(struct wlr_surface_state));
@@ -578,7 +591,7 @@ void wlr_subsurface_destroy(struct wlr_subsurface *subsurface) {
 }
 
 static void destroy_surface(struct wl_resource *resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(resource);
 	wlr_signal_emit_safe(&surface->events.destroy, surface);
 
 	if (surface->subsurface) {
@@ -658,8 +671,17 @@ int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
 	return -1;
 }
 
+static const struct wl_subsurface_interface subsurface_implementation;
+
+static struct wlr_subsurface *subsurface_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_subsurface_interface,
+		&subsurface_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void subsurface_resource_destroy(struct wl_resource *resource) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 
 	if (subsurface) {
 		wlr_subsurface_destroy(subsurface);
@@ -673,7 +695,7 @@ static void subsurface_destroy(struct wl_client *client,
 
 static void subsurface_set_position(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 	struct wlr_surface *surface = subsurface->surface;
 
 	surface->pending->invalid |= WLR_SURFACE_INVALID_SUBSURFACE_POSITION;
@@ -698,10 +720,10 @@ static struct wlr_subsurface *subsurface_find_sibling(
 
 static void subsurface_place_above(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *sibling_resource) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 
 	struct wlr_surface *sibling_surface =
-		wl_resource_get_user_data(sibling_resource);
+		wlr_surface_from_resource(sibling_resource);
 	struct wlr_subsurface *sibling =
 		subsurface_find_sibling(subsurface, sibling_surface);
 
@@ -722,10 +744,10 @@ static void subsurface_place_above(struct wl_client *client,
 
 static void subsurface_place_below(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *sibling_resource) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 
 	struct wlr_surface *sibling_surface =
-		wl_resource_get_user_data(sibling_resource);
+		wlr_surface_from_resource(sibling_resource);
 	struct wlr_subsurface *sibling =
 		subsurface_find_sibling(subsurface, sibling_surface);
 
@@ -746,7 +768,7 @@ static void subsurface_place_below(struct wl_client *client,
 
 static void subsurface_set_sync(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 
 	if (subsurface) {
 		subsurface->synchronized = true;
@@ -755,7 +777,7 @@ static void subsurface_set_sync(struct wl_client *client,
 
 static void subsurface_set_desync(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_subsurface *subsurface = wl_resource_get_user_data(resource);
+	struct wlr_subsurface *subsurface = subsurface_from_resource(resource);
 
 	if (subsurface && subsurface->synchronized) {
 		subsurface->synchronized = false;

types/wlr_wl_shell.c

@@ -94,10 +94,19 @@ static const struct wlr_pointer_grab_interface shell_pointer_grab_impl = {
 	.axis = shell_pointer_grab_axis,
 };
 
+static const struct wl_shell_surface_interface shell_surface_impl;
+
+static struct wlr_wl_shell_surface *shell_surface_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_shell_surface_interface,
+		&shell_surface_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void shell_surface_protocol_pong(struct wl_client *client,
 		struct wl_resource *resource, uint32_t serial) {
 	wlr_log(L_DEBUG, "got shell surface pong");
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	if (surface->ping_serial != serial) {
 		return;
 	}
@@ -109,9 +118,8 @@ static void shell_surface_protocol_pong(struct wl_client *client,
 static void shell_surface_protocol_move(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
-	struct wlr_seat_client *seat =
+	struct wlr_seat_client *seat = wlr_seat_client_from_resource(seat_resource);
-		wl_resource_get_user_data(seat_resource);
 
 	if (!wlr_seat_validate_grab_serial(seat->seat, serial)) {
 		wlr_log(L_DEBUG, "invalid serial for grab");
@@ -172,9 +180,8 @@ static void shell_surface_destroy_popup_state(
 static void shell_surface_protocol_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, enum wl_shell_surface_resize edges) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
-	struct wlr_seat_client *seat =
+	struct wlr_seat_client *seat = wlr_seat_client_from_resource(seat_resource);
-		wl_resource_get_user_data(seat_resource);
 
 	if (!wlr_seat_validate_grab_serial(seat->seat, serial)) {
 		wlr_log(L_DEBUG, "invalid serial for grab");
@@ -207,7 +214,7 @@ static void shell_surface_set_state(struct wlr_wl_shell_surface *surface,
 static void shell_surface_protocol_set_toplevel(struct wl_client *client,
 		struct wl_resource *resource) {
 	wlr_log(L_DEBUG, "got shell surface toplevel");
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL, NULL,
 		NULL);
 }
@@ -243,9 +250,8 @@ static void shell_surface_protocol_set_transient(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *parent_resource,
 		int32_t x, int32_t y, enum wl_shell_surface_transient flags) {
 	wlr_log(L_DEBUG, "got shell surface transient");
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
-	struct wlr_surface *parent =
+	struct wlr_surface *parent = wlr_surface_from_resource(parent_resource);
-		wl_resource_get_user_data(parent_resource);
 	// TODO: check if parent_resource == NULL?
 
 	struct wlr_wl_shell_surface *wl_parent =
@@ -275,10 +281,10 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource,
 		enum wl_shell_surface_fullscreen_method method, uint32_t framerate,
 		struct wl_resource *output_resource) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	struct wlr_output *output = NULL;
 	if (output_resource != NULL) {
-		output = wl_resource_get_user_data(output_resource);
+		output = wlr_output_from_resource(output_resource);
 	}
 
 	shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN,
@@ -298,11 +304,10 @@ static void shell_surface_protocol_set_popup(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, struct wl_resource *parent_resource, int32_t x,
 		int32_t y, enum wl_shell_surface_transient flags) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	struct wlr_seat_client *seat_client =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
-	struct wlr_surface *parent =
+	struct wlr_surface *parent = wlr_surface_from_resource(parent_resource);
-		wl_resource_get_user_data(parent_resource);
 	struct wlr_wl_shell_popup_grab *grab =
 		shell_popup_grab_from_seat(surface->shell, seat_client->seat);
 	if (!grab) {
@@ -355,10 +360,10 @@ static void shell_surface_protocol_set_popup(struct wl_client *client,
 
 static void shell_surface_protocol_set_maximized(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	struct wlr_output *output = NULL;
 	if (output_resource != NULL) {
-		output = wl_resource_get_user_data(output_resource);
+		output = wlr_output_from_resource(output_resource);
 	}
 
 	shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED,
@@ -375,7 +380,7 @@ static void shell_surface_protocol_set_maximized(struct wl_client *client,
 static void shell_surface_protocol_set_title(struct wl_client *client,
 		struct wl_resource *resource, const char *title) {
 	wlr_log(L_DEBUG, "new shell surface title: %s", title);
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 
 	char *tmp = strdup(title);
 	if (tmp == NULL) {
@@ -391,7 +396,7 @@ static void shell_surface_protocol_set_title(struct wl_client *client,
 static void shell_surface_protocol_set_class(struct wl_client *client,
 		struct wl_resource *resource, const char *class) {
 	wlr_log(L_DEBUG, "new shell surface class: %s", class);
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 
 	char *tmp = strdup(class);
 	if (tmp == NULL) {
@@ -439,7 +444,7 @@ static void shell_surface_destroy(struct wlr_wl_shell_surface *surface) {
 }
 
 static void shell_surface_resource_destroy(struct wl_resource *resource) {
-	struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_wl_shell_surface *surface = shell_surface_from_resource(resource);
 	if (surface != NULL) {
 		shell_surface_destroy(surface);
 	}
@@ -480,16 +485,24 @@ static int shell_surface_ping_timeout(void *user_data) {
 	return 1;
 }
 
+static const struct wl_shell_interface shell_impl;
+
+static struct wlr_wl_shell *shell_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &wl_shell_interface, &shell_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void shell_protocol_get_shell_surface(struct wl_client *client,
 		struct wl_resource *shell_resource, uint32_t id,
 		struct wl_resource *surface_resource) {
-	struct wlr_surface *surface = wl_resource_get_user_data(surface_resource);
+	struct wlr_surface *surface = wlr_surface_from_resource(surface_resource);
 	if (wlr_surface_set_role(surface, wlr_wl_shell_surface_role,
 			shell_resource, WL_SHELL_ERROR_ROLE)) {
 		return;
 	}
 
-	struct wlr_wl_shell *wl_shell = wl_resource_get_user_data(shell_resource);
+	struct wlr_wl_shell *wl_shell = shell_from_resource(shell_resource);
 	struct wlr_wl_shell_surface *wl_surface =
 		calloc(1, sizeof(struct wlr_wl_shell_surface));
 	if (wl_surface == NULL) {
@@ -548,7 +561,7 @@ static void shell_protocol_get_shell_surface(struct wl_client *client,
 	wl_list_insert(&wl_shell->surfaces, &wl_surface->link);
 }
 
-static struct wl_shell_interface shell_impl = {
+static const struct wl_shell_interface shell_impl = {
 	.get_shell_surface = shell_protocol_get_shell_surface
 };
 

types/wlr_xdg_shell.c

@@ -223,17 +223,25 @@ static void xdg_surface_destroy(struct wlr_xdg_surface *surface) {
 }
 
 
+static const struct xdg_positioner_interface xdg_positioner_implementation;
+
+static struct wlr_xdg_positioner *xdg_positioner_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &xdg_positioner_interface,
+		&xdg_positioner_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_positioner_destroy(struct wl_resource *resource) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 	free(positioner);
-
 }
 
 static void xdg_positioner_protocol_set_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (width < 1 || height < 1) {
 		wl_resource_post_error(resource,
@@ -250,7 +258,7 @@ static void xdg_positioner_protocol_set_anchor_rect(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y, int32_t width,
 		int32_t height) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (width < 0 || height < 0) {
 		wl_resource_post_error(resource,
@@ -268,7 +276,7 @@ static void xdg_positioner_protocol_set_anchor_rect(struct wl_client *client,
 static void xdg_positioner_protocol_set_anchor(struct wl_client *client,
 		struct wl_resource *resource, uint32_t anchor) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (anchor > XDG_POSITIONER_ANCHOR_BOTTOM_RIGHT) {
 		wl_resource_post_error(resource,
@@ -283,7 +291,7 @@ static void xdg_positioner_protocol_set_anchor(struct wl_client *client,
 static void xdg_positioner_protocol_set_gravity(struct wl_client *client,
 		struct wl_resource *resource, uint32_t gravity) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (gravity > XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT) {
 		wl_resource_post_error(resource,
@@ -299,7 +307,7 @@ static void xdg_positioner_protocol_set_constraint_adjustment(
 		struct wl_client *client, struct wl_resource *resource,
 		uint32_t constraint_adjustment) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	positioner->constraint_adjustment = constraint_adjustment;
 }
@@ -307,7 +315,7 @@ static void xdg_positioner_protocol_set_constraint_adjustment(
 static void xdg_positioner_protocol_set_offset(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y) {
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	positioner->offset.x = x;
 	positioner->offset.y = y;
@@ -353,52 +361,6 @@ static void xdg_shell_create_positioner(struct wl_client *wl_client,
 		positioner, xdg_positioner_destroy);
 }
 
-static void xdg_popup_protocol_grab(struct wl_client *client,
-		struct wl_resource *resource, struct wl_resource *seat_resource,
-		uint32_t serial) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
-	struct wlr_seat_client *seat_client = wl_resource_get_user_data(seat_resource);
-
-	if (surface->popup_state->committed) {
-		wl_resource_post_error(surface->popup_state->resource,
-			XDG_POPUP_ERROR_INVALID_GRAB,
-			"xdg_popup is already mapped");
-		return;
-	}
-
-	struct wlr_xdg_popup_grab *popup_grab =
-		xdg_shell_popup_grab_from_seat(surface->client->shell,
-			seat_client->seat);
-
-	struct wlr_xdg_surface *topmost = xdg_popup_grab_get_topmost(popup_grab);
-	bool parent_is_toplevel =
-		surface->popup_state->parent->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL;
-
-	if ((topmost == NULL && !parent_is_toplevel) ||
-			(topmost != NULL && topmost != surface->popup_state->parent)) {
-		wl_resource_post_error(surface->client->resource,
-			XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP,
-			"xdg_popup was not created on the topmost popup");
-		return;
-	}
-
-	popup_grab->client = surface->client->client;
-	surface->popup_state->seat = seat_client->seat;
-
-	wl_list_insert(&popup_grab->popups, &surface->popup_state->grab_link);
-
-	wlr_seat_pointer_start_grab(seat_client->seat,
-		&popup_grab->pointer_grab);
-	wlr_seat_keyboard_start_grab(seat_client->seat,
-		&popup_grab->keyboard_grab);
-}
-
-static const struct xdg_popup_interface xdg_popup_implementation = {
-	.destroy = resource_destroy,
-	.grab = xdg_popup_protocol_grab,
-};
-
-
 static struct wlr_box xdg_positioner_get_geometry(
 		struct wlr_xdg_positioner *positioner,
 		struct wlr_xdg_surface *surface, struct wlr_xdg_surface *parent) {
@@ -486,23 +448,90 @@ static struct wlr_box xdg_positioner_get_geometry(
 	return geometry;
 }
 
+
+static const struct xdg_popup_interface xdg_popup_implementation;
+
+static struct wlr_xdg_surface *xdg_surface_from_xdg_popup_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &xdg_popup_interface,
+		&xdg_popup_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
+static void xdg_popup_protocol_grab(struct wl_client *client,
+		struct wl_resource *resource, struct wl_resource *seat_resource,
+		uint32_t serial) {
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_popup_resource(resource);
+	struct wlr_seat_client *seat_client =
+		wlr_seat_client_from_resource(seat_resource);
+
+	if (surface->popup_state->committed) {
+		wl_resource_post_error(surface->popup_state->resource,
+			XDG_POPUP_ERROR_INVALID_GRAB,
+			"xdg_popup is already mapped");
+		return;
+	}
+
+	struct wlr_xdg_popup_grab *popup_grab =
+		xdg_shell_popup_grab_from_seat(surface->client->shell,
+			seat_client->seat);
+
+	struct wlr_xdg_surface *topmost = xdg_popup_grab_get_topmost(popup_grab);
+	bool parent_is_toplevel =
+		surface->popup_state->parent->role == WLR_XDG_SURFACE_ROLE_TOPLEVEL;
+
+	if ((topmost == NULL && !parent_is_toplevel) ||
+			(topmost != NULL && topmost != surface->popup_state->parent)) {
+		wl_resource_post_error(surface->client->resource,
+			XDG_WM_BASE_ERROR_NOT_THE_TOPMOST_POPUP,
+			"xdg_popup was not created on the topmost popup");
+		return;
+	}
+
+	popup_grab->client = surface->client->client;
+	surface->popup_state->seat = seat_client->seat;
+
+	wl_list_insert(&popup_grab->popups, &surface->popup_state->grab_link);
+
+	wlr_seat_pointer_start_grab(seat_client->seat,
+		&popup_grab->pointer_grab);
+	wlr_seat_keyboard_start_grab(seat_client->seat,
+		&popup_grab->keyboard_grab);
+}
+
+static const struct xdg_popup_interface xdg_popup_implementation = {
+	.destroy = resource_destroy,
+	.grab = xdg_popup_protocol_grab,
+};
+
 static void xdg_popup_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_popup_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
 }
 
+static const struct xdg_surface_interface xdg_surface_implementation;
+
+static struct wlr_xdg_surface *xdg_surface_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &xdg_surface_interface,
+		&xdg_surface_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_surface_get_popup(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *parent_resource,
 		struct wl_resource *positioner_resource) {
 	struct wlr_xdg_surface *surface =
-		wl_resource_get_user_data(resource);
+		xdg_surface_from_resource(resource);
 	struct wlr_xdg_surface *parent =
-		wl_resource_get_user_data(parent_resource);
+		xdg_surface_from_resource(parent_resource);
 	struct wlr_xdg_positioner *positioner =
-		wl_resource_get_user_data(positioner_resource);
+		xdg_positioner_from_resource(positioner_resource);
 
 	if (positioner->size.width == -1 || positioner->anchor_rect.width == -1) {
 		wl_resource_post_error(resource,
@@ -546,13 +575,23 @@ static void xdg_surface_get_popup(struct wl_client *client,
 }
 
 
+static const struct xdg_toplevel_interface xdg_toplevel_implementation;
+
+static struct wlr_xdg_surface *xdg_surface_from_xdg_toplevel_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &xdg_toplevel_interface,
+		&xdg_toplevel_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_toplevel_protocol_set_parent(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *parent_resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_xdg_surface *parent = NULL;
 
 	if (parent_resource != NULL) {
-		parent = wl_resource_get_user_data(parent_resource);
+		parent = xdg_surface_from_xdg_toplevel_resource(parent_resource);
 	}
 
 	surface->toplevel_state->parent = parent;
@@ -560,7 +599,8 @@ static void xdg_toplevel_protocol_set_parent(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_title(struct wl_client *client,
 		struct wl_resource *resource, const char *title) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	char *tmp;
 
 	tmp = strdup(title);
@@ -574,7 +614,8 @@ static void xdg_toplevel_protocol_set_title(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_app_id(struct wl_client *client,
 		struct wl_resource *resource, const char *app_id) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	char *tmp;
 
 	tmp = strdup(app_id);
@@ -589,9 +630,10 @@ static void xdg_toplevel_protocol_set_app_id(struct wl_client *client,
 static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, int32_t x, int32_t y) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -619,9 +661,10 @@ static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client,
 static void xdg_toplevel_protocol_move(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -647,9 +690,10 @@ static void xdg_toplevel_protocol_move(struct wl_client *client,
 static void xdg_toplevel_protocol_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, uint32_t edges) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -675,39 +719,44 @@ static void xdg_toplevel_protocol_resize(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_max_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.max_width = width;
 	surface->toplevel_state->next.max_height = height;
 }
 
 static void xdg_toplevel_protocol_set_min_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.min_width = width;
 	surface->toplevel_state->next.min_height = height;
 }
 
 static void xdg_toplevel_protocol_set_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.maximized = true;
 	wlr_signal_emit_safe(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.maximized = false;
 	wlr_signal_emit_safe(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
 	struct wlr_output *output = NULL;
 	if (output_resource != NULL) {
-		output = wl_resource_get_user_data(output_resource);
+		output = wlr_output_from_resource(output_resource);
 	}
 
 	surface->toplevel_state->next.fullscreen = true;
@@ -723,7 +772,8 @@ static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 
 static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
 	surface->toplevel_state->next.fullscreen = false;
 
@@ -738,12 +788,12 @@ static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_minimized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	wlr_signal_emit_safe(&surface->events.request_minimize, surface);
 }
 
-static const struct xdg_toplevel_interface xdg_toplevel_implementation =
+static const struct xdg_toplevel_interface xdg_toplevel_implementation = {
-{
 	.destroy = resource_destroy,
 	.set_parent = xdg_toplevel_protocol_set_parent,
 	.set_title = xdg_toplevel_protocol_set_title,
@@ -761,14 +811,16 @@ static const struct xdg_toplevel_interface xdg_toplevel_implementation =
 };
 
 static void xdg_surface_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
 }
 
 static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
@@ -776,7 +828,7 @@ static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
 
 static void xdg_surface_get_toplevel(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface = xdg_surface_from_resource(resource);
 
 	if (wlr_surface_set_role(surface->surface, wlr_desktop_xdg_toplevel_role,
 			resource, XDG_WM_BASE_ERROR_ROLE)) {
@@ -818,7 +870,7 @@ static void wlr_xdg_toplevel_ack_configure(
 
 static void xdg_surface_ack_configure(struct wl_client *client,
 		struct wl_resource *resource, uint32_t serial) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface = xdg_surface_from_resource(resource);
 
 	if (surface->role == WLR_XDG_SURFACE_ROLE_NONE) {
 		wl_resource_post_error(surface->resource,
@@ -868,7 +920,7 @@ static void xdg_surface_ack_configure(struct wl_client *client,
 static void xdg_surface_set_window_geometry(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y, int32_t width,
 		int32_t height) {
-	struct wlr_xdg_surface *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface *surface = xdg_surface_from_resource(resource);
 
 	if (surface->role == WLR_XDG_SURFACE_ROLE_NONE) {
 		wl_resource_post_error(surface->resource,
@@ -897,9 +949,7 @@ static bool wlr_xdg_surface_toplevel_state_compare(
 		struct wlr_xdg_toplevel *state) {
 	struct {
 		struct wlr_xdg_toplevel_state state;
-		uint32_t width;
+		uint32_t width, height;
-		uint32_t height;
-
 	} configured;
 
 	// is pending state different from current state?
@@ -1158,11 +1208,20 @@ static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
 	}
 }
 
+static const struct xdg_wm_base_interface xdg_shell_impl;
+
+static struct wlr_xdg_client *xdg_client_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &xdg_wm_base_interface,
+		&xdg_shell_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 		struct wl_resource *client_resource, uint32_t id,
 		struct wl_resource *surface_resource) {
 	struct wlr_xdg_client *client =
-		wl_resource_get_user_data(client_resource);
+		xdg_client_from_resource(client_resource);
 
 	struct wlr_xdg_surface *surface;
 	if (!(surface = calloc(1, sizeof(struct wlr_xdg_surface)))) {
@@ -1185,7 +1244,7 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 
 	surface->client = client;
 	surface->role = WLR_XDG_SURFACE_ROLE_NONE;
-	surface->surface = wl_resource_get_user_data(surface_resource);
+	surface->surface = wlr_surface_from_resource(surface_resource);
 	surface->resource = wl_resource_create(wl_client,
 		&xdg_surface_interface, wl_resource_get_version(client_resource),
 		id);
@@ -1236,7 +1295,7 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 
 static void xdg_shell_pong(struct wl_client *wl_client,
 		struct wl_resource *resource, uint32_t serial) {
-	struct wlr_xdg_client *client = wl_resource_get_user_data(resource);
+	struct wlr_xdg_client *client = xdg_client_from_resource(resource);
 
 	if (client->ping_serial != serial) {
 		return;
@@ -1246,7 +1305,7 @@ static void xdg_shell_pong(struct wl_client *wl_client,
 	client->ping_serial = 0;
 }
 
-static struct xdg_wm_base_interface xdg_shell_impl = {
+static const struct xdg_wm_base_interface xdg_shell_impl = {
 	.destroy = resource_destroy,
 	.create_positioner = xdg_shell_create_positioner,
 	.get_xdg_surface = xdg_shell_get_xdg_surface,
@@ -1254,7 +1313,7 @@ static struct xdg_wm_base_interface xdg_shell_impl = {
 };
 
 static void wlr_xdg_client_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_client *client = wl_resource_get_user_data(resource);
+	struct wlr_xdg_client *client = xdg_client_from_resource(resource);
 
 	struct wlr_xdg_surface *surface, *tmp = NULL;
 	wl_list_for_each_safe(surface, tmp, &client->surfaces, link) {

types/wlr_xdg_shell_v6.c

@@ -223,9 +223,19 @@ static void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface) {
 }
 
 
+static const struct zxdg_positioner_v6_interface
+	zxdg_positioner_v6_implementation;
+
+static struct wlr_xdg_positioner_v6 *xdg_positioner_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &zxdg_positioner_v6_interface,
+		&zxdg_positioner_v6_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_positioner_destroy(struct wl_resource *resource) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 	free(positioner);
 
 }
@@ -233,7 +243,7 @@ static void xdg_positioner_destroy(struct wl_resource *resource) {
 static void xdg_positioner_protocol_set_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (width < 1 || height < 1) {
 		wl_resource_post_error(resource,
@@ -250,7 +260,7 @@ static void xdg_positioner_protocol_set_anchor_rect(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y, int32_t width,
 		int32_t height) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (width < 1 || height < 1) {
 		wl_resource_post_error(resource,
@@ -268,7 +278,7 @@ static void xdg_positioner_protocol_set_anchor_rect(struct wl_client *client,
 static void xdg_positioner_protocol_set_anchor(struct wl_client *client,
 		struct wl_resource *resource, uint32_t anchor) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (((anchor & ZXDG_POSITIONER_V6_ANCHOR_TOP ) &&
 				(anchor & ZXDG_POSITIONER_V6_ANCHOR_BOTTOM)) ||
@@ -286,7 +296,7 @@ static void xdg_positioner_protocol_set_anchor(struct wl_client *client,
 static void xdg_positioner_protocol_set_gravity(struct wl_client *client,
 		struct wl_resource *resource, uint32_t gravity) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	if (((gravity & ZXDG_POSITIONER_V6_GRAVITY_TOP) &&
 				(gravity & ZXDG_POSITIONER_V6_GRAVITY_BOTTOM)) ||
@@ -305,7 +315,7 @@ static void xdg_positioner_protocol_set_constraint_adjustment(
 		struct wl_client *client, struct wl_resource *resource,
 		uint32_t constraint_adjustment) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	positioner->constraint_adjustment = constraint_adjustment;
 }
@@ -313,7 +323,7 @@ static void xdg_positioner_protocol_set_constraint_adjustment(
 static void xdg_positioner_protocol_set_offset(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y) {
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(resource);
+		xdg_positioner_from_resource(resource);
 
 	positioner->offset.x = x;
 	positioner->offset.y = y;
@@ -355,52 +365,6 @@ static void xdg_shell_create_positioner(struct wl_client *wl_client,
 		positioner, xdg_positioner_destroy);
 }
 
-static void xdg_popup_protocol_grab(struct wl_client *client,
-		struct wl_resource *resource, struct wl_resource *seat_resource,
-		uint32_t serial) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
-	struct wlr_seat_client *seat_client = wl_resource_get_user_data(seat_resource);
-
-	if (surface->popup_state->committed) {
-		wl_resource_post_error(surface->popup_state->resource,
-			ZXDG_POPUP_V6_ERROR_INVALID_GRAB,
-			"xdg_popup is already mapped");
-		return;
-	}
-
-	struct wlr_xdg_popup_grab_v6 *popup_grab =
-		xdg_shell_popup_grab_from_seat(surface->client->shell,
-			seat_client->seat);
-
-	struct wlr_xdg_surface_v6 *topmost = xdg_popup_grab_get_topmost(popup_grab);
-	bool parent_is_toplevel =
-		surface->popup_state->parent->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL;
-
-	if ((topmost == NULL && !parent_is_toplevel) ||
-			(topmost != NULL && topmost != surface->popup_state->parent)) {
-		wl_resource_post_error(surface->client->resource,
-			ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP,
-			"xdg_popup was not created on the topmost popup");
-		return;
-	}
-
-	popup_grab->client = surface->client->client;
-	surface->popup_state->seat = seat_client->seat;
-
-	wl_list_insert(&popup_grab->popups, &surface->popup_state->grab_link);
-
-	wlr_seat_pointer_start_grab(seat_client->seat,
-		&popup_grab->pointer_grab);
-	wlr_seat_keyboard_start_grab(seat_client->seat,
-		&popup_grab->keyboard_grab);
-}
-
-static const struct zxdg_popup_v6_interface zxdg_popup_v6_implementation = {
-	.destroy = resource_destroy,
-	.grab = xdg_popup_protocol_grab,
-};
-
-
 static struct wlr_box xdg_positioner_get_geometry(
 		struct wlr_xdg_positioner_v6 *positioner,
 		struct wlr_xdg_surface_v6 *surface, struct wlr_xdg_surface_v6 *parent) {
@@ -456,23 +420,90 @@ static struct wlr_box xdg_positioner_get_geometry(
 	return geometry;
 }
 
+
+static const struct zxdg_popup_v6_interface zxdg_popup_v6_implementation;
+
+static struct wlr_xdg_surface_v6 *xdg_surface_from_xdg_popup_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &zxdg_popup_v6_interface,
+		&zxdg_popup_v6_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
+static void xdg_popup_protocol_grab(struct wl_client *client,
+		struct wl_resource *resource, struct wl_resource *seat_resource,
+		uint32_t serial) {
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_popup_resource(resource);
+	struct wlr_seat_client *seat_client =
+		wlr_seat_client_from_resource(seat_resource);
+
+	if (surface->popup_state->committed) {
+		wl_resource_post_error(surface->popup_state->resource,
+			ZXDG_POPUP_V6_ERROR_INVALID_GRAB,
+			"xdg_popup is already mapped");
+		return;
+	}
+
+	struct wlr_xdg_popup_grab_v6 *popup_grab =
+		xdg_shell_popup_grab_from_seat(surface->client->shell,
+			seat_client->seat);
+
+	struct wlr_xdg_surface_v6 *topmost = xdg_popup_grab_get_topmost(popup_grab);
+	bool parent_is_toplevel =
+		surface->popup_state->parent->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL;
+
+	if ((topmost == NULL && !parent_is_toplevel) ||
+			(topmost != NULL && topmost != surface->popup_state->parent)) {
+		wl_resource_post_error(surface->client->resource,
+			ZXDG_SHELL_V6_ERROR_NOT_THE_TOPMOST_POPUP,
+			"xdg_popup was not created on the topmost popup");
+		return;
+	}
+
+	popup_grab->client = surface->client->client;
+	surface->popup_state->seat = seat_client->seat;
+
+	wl_list_insert(&popup_grab->popups, &surface->popup_state->grab_link);
+
+	wlr_seat_pointer_start_grab(seat_client->seat,
+		&popup_grab->pointer_grab);
+	wlr_seat_keyboard_start_grab(seat_client->seat,
+		&popup_grab->keyboard_grab);
+}
+
+static const struct zxdg_popup_v6_interface zxdg_popup_v6_implementation = {
+	.destroy = resource_destroy,
+	.grab = xdg_popup_protocol_grab,
+};
+
 static void xdg_popup_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_popup_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
 }
 
+static const struct zxdg_surface_v6_interface zxdg_surface_v6_implementation;
+
+static struct wlr_xdg_surface_v6 *xdg_surface_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &zxdg_surface_v6_interface,
+		&zxdg_surface_v6_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_surface_get_popup(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id,
 		struct wl_resource *parent_resource,
 		struct wl_resource *positioner_resource) {
 	struct wlr_xdg_surface_v6 *surface =
-		wl_resource_get_user_data(resource);
+		xdg_surface_from_resource(resource);
 	struct wlr_xdg_surface_v6 *parent =
-		wl_resource_get_user_data(parent_resource);
+		xdg_surface_from_resource(parent_resource);
 	struct wlr_xdg_positioner_v6 *positioner =
-		wl_resource_get_user_data(positioner_resource);
+		xdg_positioner_from_resource(positioner_resource);
 
 	if (positioner->size.width == 0 || positioner->anchor_rect.width == 0) {
 		wl_resource_post_error(resource,
@@ -516,13 +547,23 @@ static void xdg_surface_get_popup(struct wl_client *client,
 }
 
 
+static const struct zxdg_toplevel_v6_interface zxdg_toplevel_v6_implementation;
+
+static struct wlr_xdg_surface_v6 *xdg_surface_from_xdg_toplevel_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &zxdg_toplevel_v6_interface,
+		&zxdg_toplevel_v6_implementation));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_toplevel_protocol_set_parent(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *parent_resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
-	struct wlr_xdg_surface_v6 *parent = NULL;
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
+	struct wlr_xdg_surface_v6 *parent = NULL;
 	if (parent_resource != NULL) {
-		parent = wl_resource_get_user_data(parent_resource);
+		parent = xdg_surface_from_xdg_toplevel_resource(parent_resource);
 	}
 
 	surface->toplevel_state->parent = parent;
@@ -530,10 +571,10 @@ static void xdg_toplevel_protocol_set_parent(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_title(struct wl_client *client,
 		struct wl_resource *resource, const char *title) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
-	char *tmp;
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
-	tmp = strdup(title);
+	char *tmp = strdup(title);
 	if (tmp == NULL) {
 		return;
 	}
@@ -544,10 +585,10 @@ static void xdg_toplevel_protocol_set_title(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_app_id(struct wl_client *client,
 		struct wl_resource *resource, const char *app_id) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
-	char *tmp;
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
-	tmp = strdup(app_id);
+	char *tmp = strdup(app_id);
 	if (tmp == NULL) {
 		return;
 	}
@@ -559,9 +600,10 @@ static void xdg_toplevel_protocol_set_app_id(struct wl_client *client,
 static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, int32_t x, int32_t y) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -589,9 +631,10 @@ static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client,
 static void xdg_toplevel_protocol_move(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -617,9 +660,10 @@ static void xdg_toplevel_protocol_move(struct wl_client *client,
 static void xdg_toplevel_protocol_resize(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *seat_resource,
 		uint32_t serial, uint32_t edges) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	struct wlr_seat_client *seat =
-		wl_resource_get_user_data(seat_resource);
+		wlr_seat_client_from_resource(seat_resource);
 
 	if (!surface->configured) {
 		wl_resource_post_error(surface->toplevel_state->resource,
@@ -645,39 +689,44 @@ static void xdg_toplevel_protocol_resize(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_max_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.max_width = width;
 	surface->toplevel_state->next.max_height = height;
 }
 
 static void xdg_toplevel_protocol_set_min_size(struct wl_client *client,
 		struct wl_resource *resource, int32_t width, int32_t height) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.min_width = width;
 	surface->toplevel_state->next.min_height = height;
 }
 
 static void xdg_toplevel_protocol_set_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.maximized = true;
 	wlr_signal_emit_safe(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	surface->toplevel_state->next.maximized = false;
 	wlr_signal_emit_safe(&surface->events.request_maximize, surface);
 }
 
 static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 		struct wl_resource *resource, struct wl_resource *output_resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
 	struct wlr_output *output = NULL;
 	if (output_resource != NULL) {
-		output = wl_resource_get_user_data(output_resource);
+		output = wlr_output_from_resource(output_resource);
 	}
 
 	surface->toplevel_state->next.fullscreen = true;
@@ -693,7 +742,8 @@ static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
 
 static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 
 	surface->toplevel_state->next.fullscreen = false;
 
@@ -708,7 +758,8 @@ static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
 
 static void xdg_toplevel_protocol_set_minimized(struct wl_client *client,
 		struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	wlr_signal_emit_safe(&surface->events.request_minimize, surface);
 }
 
@@ -731,14 +782,15 @@ static const struct zxdg_toplevel_v6_interface zxdg_toplevel_v6_implementation =
 };
 
 static void xdg_surface_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface = xdg_surface_from_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
 }
 
 static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface =
+		xdg_surface_from_xdg_toplevel_resource(resource);
 	if (surface != NULL) {
 		xdg_surface_destroy(surface);
 	}
@@ -746,7 +798,7 @@ static void xdg_toplevel_resource_destroy(struct wl_resource *resource) {
 
 static void xdg_surface_get_toplevel(struct wl_client *client,
 		struct wl_resource *resource, uint32_t id) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface = xdg_surface_from_resource(resource);
 
 	if (wlr_surface_set_role(surface->surface, wlr_desktop_xdg_toplevel_role,
 			resource, ZXDG_SHELL_V6_ERROR_ROLE)) {
@@ -788,7 +840,7 @@ static void wlr_xdg_toplevel_v6_ack_configure(
 
 static void xdg_surface_ack_configure(struct wl_client *client,
 		struct wl_resource *resource, uint32_t serial) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface = xdg_surface_from_resource(resource);
 
 	if (surface->role == WLR_XDG_SURFACE_V6_ROLE_NONE) {
 		wl_resource_post_error(surface->resource,
@@ -838,7 +890,7 @@ static void xdg_surface_ack_configure(struct wl_client *client,
 static void xdg_surface_set_window_geometry(struct wl_client *client,
 		struct wl_resource *resource, int32_t x, int32_t y, int32_t width,
 		int32_t height) {
-	struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+	struct wlr_xdg_surface_v6 *surface = xdg_surface_from_resource(resource);
 
 	if (surface->role == WLR_XDG_SURFACE_V6_ROLE_NONE) {
 		wl_resource_post_error(surface->resource,
@@ -867,9 +919,7 @@ static bool wlr_xdg_surface_v6_toplevel_state_compare(
 		struct wlr_xdg_toplevel_v6 *state) {
 	struct {
 		struct wlr_xdg_toplevel_v6_state state;
-		uint32_t width;
+		uint32_t width, height;
-		uint32_t height;
-
 	} configured;
 
 	// is pending state different from current state?
@@ -1128,11 +1178,20 @@ static void handle_wlr_surface_committed(struct wlr_surface *wlr_surface,
 	}
 }
 
+static const struct zxdg_shell_v6_interface xdg_shell_impl;
+
+static struct wlr_xdg_client_v6 *xdg_client_from_resource(
+		struct wl_resource *resource) {
+	assert(wl_resource_instance_of(resource, &zxdg_shell_v6_interface,
+		&xdg_shell_impl));
+	return wl_resource_get_user_data(resource);
+}
+
 static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 		struct wl_resource *client_resource, uint32_t id,
 		struct wl_resource *surface_resource) {
 	struct wlr_xdg_client_v6 *client =
-		wl_resource_get_user_data(client_resource);
+		xdg_client_from_resource(client_resource);
 
 	struct wlr_xdg_surface_v6 *surface;
 	if (!(surface = calloc(1, sizeof(struct wlr_xdg_surface_v6)))) {
@@ -1155,7 +1214,7 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 
 	surface->client = client;
 	surface->role = WLR_XDG_SURFACE_V6_ROLE_NONE;
-	surface->surface = wl_resource_get_user_data(surface_resource);
+	surface->surface = wlr_surface_from_resource(surface_resource);
 	surface->resource = wl_resource_create(wl_client,
 		&zxdg_surface_v6_interface, wl_resource_get_version(client_resource),
 		id);
@@ -1206,7 +1265,7 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 
 static void xdg_shell_pong(struct wl_client *wl_client,
 		struct wl_resource *resource, uint32_t serial) {
-	struct wlr_xdg_client_v6 *client = wl_resource_get_user_data(resource);
+	struct wlr_xdg_client_v6 *client = xdg_client_from_resource(resource);
 
 	if (client->ping_serial != serial) {
 		return;
@@ -1216,7 +1275,7 @@ static void xdg_shell_pong(struct wl_client *wl_client,
 	client->ping_serial = 0;
 }
 
-static struct zxdg_shell_v6_interface xdg_shell_impl = {
+static const struct zxdg_shell_v6_interface xdg_shell_impl = {
 	.destroy = resource_destroy,
 	.create_positioner = xdg_shell_create_positioner,
 	.get_xdg_surface = xdg_shell_get_xdg_surface,
@@ -1224,7 +1283,7 @@ static struct zxdg_shell_v6_interface xdg_shell_impl = {
 };
 
 static void wlr_xdg_client_v6_destroy(struct wl_resource *resource) {
-	struct wlr_xdg_client_v6 *client = wl_resource_get_user_data(resource);
+	struct wlr_xdg_client_v6 *client = xdg_client_from_resource(resource);
 
 	struct wlr_xdg_surface_v6 *surface, *tmp = NULL;
 	wl_list_for_each_safe(surface, tmp, &client->surfaces, link) {

xwayland/meson.build

@@ -15,6 +15,7 @@ lib_wlr_xwayland = static_library(
 		xcb_image,
 		xcb_render,
 		xcb_icccm,
+		xkbcommon,
 		pixman,
 	],
 )

xwayland/xwm.c

@@ -742,7 +742,7 @@ static void xwm_handle_surface_id_message(struct wlr_xwm *xwm,
 	struct wl_resource *resource =
 		wl_client_get_object(xwm->xwayland->client, id);
 	if (resource) {
-		struct wlr_surface *surface = wl_resource_get_user_data(resource);
+		struct wlr_surface *surface = wlr_surface_from_resource(resource);
 		xsurface->surface_id = 0;
 		xwm_map_shell_surface(xwm, xsurface, surface);
 	} else {