Remove wlr_box.h redirection

Compositors should've all been updated to use the new header by now.

README.md

@@ -1,9 +1,3 @@
-# blankie/wlroots - dkondor-upstream-pr-2551
-
-This branch "frontports" https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2551,
-should be updated when there's a new wlroots version and be unmaintained
-when the pull request above is merged
-
 # wlroots
 
 Pluggable, composable, unopinionated modules for building a [Wayland]

backend/backend.c

@@ -364,19 +364,6 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) {
 		return NULL;
 	}
 	wlr_multi_backend_add(backend, libinput);
-#else
-	const char *no_devs = getenv("WLR_LIBINPUT_NO_DEVICES");
-	if (no_devs && strcmp(no_devs, "1") == 0) {
-		wlr_log(WLR_INFO, "WLR_LIBINPUT_NO_DEVICES is set, "
-			"starting without libinput backend");
-	} else {
-		wlr_log(WLR_ERROR, "libinput support is not compiled in, "
-			"refusing to start");
-		wlr_log(WLR_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check");
-		wlr_session_destroy(multi->session);
-		wlr_backend_destroy(backend);
-		return NULL;
-	}
 #endif
 
 #if WLR_HAS_DRM_BACKEND

include/wlr/render/wlr_texture.h

@@ -33,6 +33,16 @@ struct wlr_texture *wlr_texture_from_pixels(struct wlr_renderer *renderer,
 	uint32_t fmt, uint32_t stride, uint32_t width, uint32_t height,
 	const void *data);
 
+/**
+ * Create a new texture from a wl_drm resource. The returned texture is
+ * immutable.
+ *
+ * Should not be called in a rendering block like renderer_begin()/end() or
+ * between attaching a renderer to an output and committing it.
+ */
+struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer,
+	struct wl_resource *data);
+
 /**
  * Create a new texture from a DMA-BUF. The returned texture is immutable.
  *

include/wlr/types/wlr_box.h

@@ -1,7 +0,0 @@
-#ifndef WLR_TYPES_WLR_BOX_H
-#define WLR_TYPES_WLR_BOX_H
-
-#warning "wlr_box has been moved to wlr/util/box.h"
-#include <wlr/util/box.h>
-
-#endif

include/wlr/types/wlr_foreign_toplevel_management_v1.h

@@ -36,13 +36,10 @@ enum wlr_foreign_toplevel_handle_v1_state {
 
 struct wlr_foreign_toplevel_handle_v1_output {
 	struct wl_list link; // wlr_foreign_toplevel_handle_v1::outputs
-	struct wlr_output *output;
-	struct wlr_foreign_toplevel_handle_v1 *toplevel;
-
-	// private state
-
-	struct wl_listener output_bind;
 	struct wl_listener output_destroy;
+	struct wlr_output *output;
+
+	struct wlr_foreign_toplevel_handle_v1 *toplevel;
 };
 
 struct wlr_foreign_toplevel_handle_v1 {

include/wlr/types/wlr_layer_shell_v1.h

@@ -58,7 +58,7 @@ struct wlr_layer_surface_v1_state {
 	uint32_t anchor;
 	int32_t exclusive_zone;
 	struct {
-		uint32_t top, right, bottom, left;
+		int32_t top, right, bottom, left;
 	} margin;
 	enum zwlr_layer_surface_v1_keyboard_interactivity keyboard_interactive;
 	uint32_t desired_width, desired_height;

include/wlr/types/wlr_scene.h

@@ -68,9 +68,6 @@ struct wlr_scene {
 	// May be NULL
 	struct wlr_presentation *presentation;
 	struct wl_listener presentation_destroy;
-
-	// List of buffers which need to be imported as textures
-	struct wl_list pending_buffers; // wlr_scene_buffer.pending_link
 };
 
 /** A sub-tree in the scene-graph. */
@@ -117,7 +114,6 @@ struct wlr_scene_buffer {
 	struct wlr_fbox src_box;
 	int dst_width, dst_height;
 	enum wl_output_transform transform;
-	struct wl_list pending_link; // wlr_scene.pending_buffers
 };
 
 /** A viewport for an output in the scene-graph */

meson.build

@@ -1,7 +1,7 @@
 project(
 	'wlroots',
 	'c',
-	version: '0.15.1',
+	version: '0.16.0',
 	license: 'MIT',
 	meson_version: '>=0.58.1',
 	default_options: [
@@ -15,7 +15,7 @@ project(
 # necessary for bugfix releases. Increasing soversion is required because
 # wlroots never guarantees ABI stability -- only API stability is guaranteed
 # between minor releases.
-soversion = 10
+soversion = 11
 
 little_endian = host_machine.endian() == 'little'
 big_endian = host_machine.endian() == 'big'

render/gles2/pixel_format.c

@@ -98,10 +98,6 @@ static const struct wlr_gles2_pixel_format formats[] = {
 
 // TODO: more pixel formats
 
-/*
- * Return true if supported for texturing, even if other operations like
- * reading aren't supported.
- */
 bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
 		const struct wlr_gles2_pixel_format *format) {
 	if (format->gl_type == GL_UNSIGNED_INT_2_10_10_10_REV_EXT
@@ -112,12 +108,10 @@ bool is_gles2_pixel_format_supported(const struct wlr_gles2_renderer *renderer,
 			&& !renderer->exts.OES_texture_half_float_linear) {
 		return false;
 	}
-	/*
-	 * Note that we don't need to check for GL_EXT_texture_format_BGRA8888
-	 * here, since we've already checked if we have it at renderer creation
-	 * time and bailed out if not. We do the check there because Wayland
-	 * requires all compositors to support SHM buffers in that format.
-	 */
+	if (format->gl_format == GL_BGRA_EXT
+			&& !renderer->exts.EXT_read_format_bgra) {
+		return false;
+	}
 	return true;
 }
 

render/gles2/renderer.c

@@ -441,12 +441,6 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer,
 		return false;
 	}
 
-	if (fmt->gl_format == GL_BGRA_EXT && !renderer->exts.EXT_read_format_bgra) {
-		wlr_log(WLR_ERROR,
-			"Cannot read pixels: missing GL_EXT_read_format_bgra extension");
-		return false;
-	}
-
 	const struct wlr_pixel_format_info *drm_fmt =
 		drm_get_pixel_format_info(fmt->drm_format);
 	assert(drm_fmt);

render/vulkan/renderer.c

@@ -598,7 +598,7 @@ static void vulkan_end(struct wlr_renderer *wlr_renderer) {
 	wl_list_for_each_safe(texture, tmp_tex, &renderer->foreign_textures, foreign_link) {
 		VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL;
 		if (!texture->transitioned) {
-			src_layout = VK_IMAGE_LAYOUT_UNDEFINED;
+			src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
 			texture->transitioned = true;
 		}
 

render/vulkan/texture.c

@@ -438,7 +438,7 @@ VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer,
 	img_info.arrayLayers = 1;
 	img_info.samples = VK_SAMPLE_COUNT_1_BIT;
 	img_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
-	img_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	img_info.initialLayout = VK_IMAGE_LAYOUT_PREINITIALIZED;
 	img_info.extent = (VkExtent3D) { attribs->width, attribs->height, 1 };
 	img_info.usage = for_render ?
 		VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT :

tinywl/tinywl.c

@@ -611,8 +611,7 @@ static void begin_interactive(struct tinywl_view *view,
 	struct tinywl_server *server = view->server;
 	struct wlr_surface *focused_surface =
 		server->seat->pointer_state.focused_surface;
-	if (view->xdg_surface->surface !=
-			wlr_surface_get_root_surface(focused_surface)) {
+	if (view->xdg_surface->surface != focused_surface) {
 		/* Deny move/resize requests from unfocused clients. */
 		return;
 	}

types/scene/subsurface_tree.c

@@ -13,20 +13,15 @@ struct wlr_scene_subsurface_tree {
 	struct wlr_surface *surface;
 	struct wlr_scene_surface *scene_surface;
 
+	struct wlr_scene_subsurface_tree *parent; // NULL for the top-level surface
+	struct wlr_addon surface_addon; // only set if there's a parent
+
 	struct wl_listener tree_destroy;
 	struct wl_listener surface_destroy;
 	struct wl_listener surface_commit;
+	struct wl_listener surface_map;
+	struct wl_listener surface_unmap;
 	struct wl_listener surface_new_subsurface;
-
-	struct wlr_scene_subsurface_tree *parent; // NULL for the top-level surface
-
-	// Only valid if the surface is a sub-surface
-
-	struct wlr_addon surface_addon;
-
-	struct wl_listener subsurface_destroy;
-	struct wl_listener subsurface_map;
-	struct wl_listener subsurface_unmap;
 };
 
 static void subsurface_tree_handle_tree_destroy(struct wl_listener *listener,
@@ -36,17 +31,23 @@ static void subsurface_tree_handle_tree_destroy(struct wl_listener *listener,
 	// tree and scene_surface will be cleaned up by scene_node_finish
 	if (subsurface_tree->parent) {
 		wlr_addon_finish(&subsurface_tree->surface_addon);
-		wl_list_remove(&subsurface_tree->subsurface_destroy.link);
-		wl_list_remove(&subsurface_tree->subsurface_map.link);
-		wl_list_remove(&subsurface_tree->subsurface_unmap.link);
 	}
 	wl_list_remove(&subsurface_tree->tree_destroy.link);
 	wl_list_remove(&subsurface_tree->surface_destroy.link);
 	wl_list_remove(&subsurface_tree->surface_commit.link);
+	wl_list_remove(&subsurface_tree->surface_map.link);
+	wl_list_remove(&subsurface_tree->surface_unmap.link);
 	wl_list_remove(&subsurface_tree->surface_new_subsurface.link);
 	free(subsurface_tree);
 }
 
+static void subsurface_tree_handle_surface_destroy(struct wl_listener *listener,
+		void *data) {
+	struct wlr_scene_subsurface_tree *subsurface_tree =
+		wl_container_of(listener, subsurface_tree, surface_destroy);
+	wlr_scene_node_destroy(&subsurface_tree->tree->node);
+}
+
 static const struct wlr_addon_interface subsurface_tree_addon_impl;
 
 static struct wlr_scene_subsurface_tree *subsurface_tree_from_subsurface(
@@ -96,13 +97,6 @@ static void subsurface_tree_reconfigure(
 	}
 }
 
-static void subsurface_tree_handle_surface_destroy(struct wl_listener *listener,
-		void *data) {
-	struct wlr_scene_subsurface_tree *subsurface_tree =
-		wl_container_of(listener, subsurface_tree, surface_destroy);
-	wlr_scene_node_destroy(&subsurface_tree->tree->node);
-}
-
 static void subsurface_tree_handle_surface_commit(struct wl_listener *listener,
 		void *data) {
 	struct wlr_scene_subsurface_tree *subsurface_tree =
@@ -112,25 +106,18 @@ static void subsurface_tree_handle_surface_commit(struct wl_listener *listener,
 	subsurface_tree_reconfigure(subsurface_tree);
 }
 
-static void subsurface_tree_handle_subsurface_destroy(struct wl_listener *listener,
+static void subsurface_tree_handle_surface_map(struct wl_listener *listener,
 		void *data) {
 	struct wlr_scene_subsurface_tree *subsurface_tree =
-		wl_container_of(listener, subsurface_tree, subsurface_destroy);
-	wlr_scene_node_destroy(&subsurface_tree->tree->node);
-}
-
-static void subsurface_tree_handle_subsurface_map(struct wl_listener *listener,
-		void *data) {
-	struct wlr_scene_subsurface_tree *subsurface_tree =
-		wl_container_of(listener, subsurface_tree, subsurface_map);
+		wl_container_of(listener, subsurface_tree, surface_map);
 
 	wlr_scene_node_set_enabled(&subsurface_tree->tree->node, true);
 }
 
-static void subsurface_tree_handle_subsurface_unmap(struct wl_listener *listener,
+static void subsurface_tree_handle_surface_unmap(struct wl_listener *listener,
 		void *data) {
 	struct wlr_scene_subsurface_tree *subsurface_tree =
-		wl_container_of(listener, subsurface_tree, subsurface_unmap);
+		wl_container_of(listener, subsurface_tree, surface_unmap);
 
 	wlr_scene_node_set_enabled(&subsurface_tree->tree->node, false);
 }
@@ -164,14 +151,8 @@ static bool subsurface_tree_create_subsurface(
 	wlr_addon_init(&child->surface_addon, &subsurface->surface->addons,
 		parent, &subsurface_tree_addon_impl);
 
-	child->subsurface_destroy.notify = subsurface_tree_handle_subsurface_destroy;
-	wl_signal_add(&subsurface->events.destroy, &child->subsurface_destroy);
-
-	child->subsurface_map.notify = subsurface_tree_handle_subsurface_map;
-	wl_signal_add(&subsurface->events.map, &child->subsurface_map);
-
-	child->subsurface_unmap.notify = subsurface_tree_handle_subsurface_unmap;
-	wl_signal_add(&subsurface->events.unmap, &child->subsurface_unmap);
+	wl_signal_add(&subsurface->events.map, &child->surface_map);
+	wl_signal_add(&subsurface->events.unmap, &child->surface_unmap);
 
 	return true;
 }
@@ -233,6 +214,12 @@ static struct wlr_scene_subsurface_tree *scene_surface_tree_create(
 	subsurface_tree->surface_commit.notify = subsurface_tree_handle_surface_commit;
 	wl_signal_add(&surface->events.commit, &subsurface_tree->surface_commit);
 
+	subsurface_tree->surface_map.notify = subsurface_tree_handle_surface_map;
+	wl_list_init(&subsurface_tree->surface_map.link);
+
+	subsurface_tree->surface_unmap.notify = subsurface_tree_handle_surface_unmap;
+	wl_list_init(&subsurface_tree->surface_unmap.link);
+
 	subsurface_tree->surface_new_subsurface.notify =
 		subsurface_tree_handle_surface_new_subsurface;
 	wl_signal_add(&surface->events.new_subsurface,

types/scene/wlr_scene.c

@@ -130,7 +130,6 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
 		break;
 	case WLR_SCENE_NODE_BUFFER:;
 		struct wlr_scene_buffer *scene_buffer = scene_buffer_from_node(node);
-		wl_list_remove(&scene_buffer->pending_link);
 		wlr_texture_destroy(scene_buffer->texture);
 		wlr_buffer_unlock(scene_buffer->buffer);
 		free(scene_buffer);
@@ -146,7 +145,6 @@ struct wlr_scene *wlr_scene_create(void) {
 	scene_node_init(&scene->node, WLR_SCENE_NODE_ROOT, NULL);
 	wl_list_init(&scene->outputs);
 	wl_list_init(&scene->presentation_destroy.link);
-	wl_list_init(&scene->pending_buffers);
 	return scene;
 }
 
@@ -238,6 +236,10 @@ static void scene_surface_handle_surface_commit(struct wl_listener *listener,
 		wl_container_of(listener, scene_surface, surface_commit);
 	struct wlr_surface *surface = scene_surface->surface;
 
+	if (!pixman_region32_not_empty(&surface->buffer_damage)) {
+		return;
+	}
+
 	struct wlr_scene *scene = scene_node_get_root(&scene_surface->node);
 
 	int lx, ly;
@@ -254,17 +256,6 @@ static void scene_surface_handle_surface_commit(struct wl_listener *listener,
 		return;
 	}
 
-	// Even if the surface hasn't submitted damage, schedule a new frame if
-	// the client has requested a wl_surface.frame callback.
-	if (!wl_list_empty(&surface->current.frame_callback_list) &&
-			scene_surface->primary_output != NULL) {
-		wlr_output_schedule_frame(scene_surface->primary_output);
-	}
-
-	if (!pixman_region32_not_empty(&surface->buffer_damage)) {
-		return;
-	}
-
 	struct wlr_scene_output *scene_output;
 	wl_list_for_each(scene_output, &scene->outputs, link) {
 		struct wlr_output *output = scene_output->output;
@@ -362,9 +353,6 @@ struct wlr_scene_buffer *wlr_scene_buffer_create(struct wlr_scene_node *parent,
 
 	scene_node_damage_whole(&scene_buffer->node);
 
-	struct wlr_scene *scene = scene_node_get_root(parent);
-	wl_list_insert(&scene->pending_buffers, &scene_buffer->pending_link);
-
 	return scene_buffer;
 }
 
@@ -1118,15 +1106,6 @@ bool wlr_scene_output_commit(struct wlr_scene_output *scene_output) {
 		return true;
 	}
 
-	// Try to import new buffers as textures
-	struct wlr_scene_buffer *scene_buffer, *scene_buffer_tmp;
-	wl_list_for_each_safe(scene_buffer, scene_buffer_tmp,
-			&scene_output->scene->pending_buffers, pending_link) {
-		scene_buffer_get_texture(scene_buffer, renderer);
-		wl_list_remove(&scene_buffer->pending_link);
-		wl_list_init(&scene_buffer->pending_link);
-	}
-
 	wlr_renderer_begin(renderer, output->width, output->height);
 
 	int nrects;

types/wlr_foreign_toplevel_management_v1.c

@@ -256,23 +256,6 @@ static void toplevel_send_output(struct wlr_foreign_toplevel_handle_v1 *toplevel
 	toplevel_update_idle_source(toplevel);
 }
 
-static void toplevel_handle_output_bind(struct wl_listener *listener,
-		void *data) {
-	struct wlr_foreign_toplevel_handle_v1_output *toplevel_output =
-		wl_container_of(listener, toplevel_output, output_bind);
-	struct wlr_output_event_bind *event = data;
-	struct wl_client *client = wl_resource_get_client(event->resource);
-
-	struct wl_resource *resource;
-	wl_resource_for_each(resource, &toplevel_output->toplevel->resources) {
-		if (wl_resource_get_client(resource) == client) {
-		    send_output_to_resource(resource, toplevel_output->output, true);
-		}
-	}
-
-	toplevel_update_idle_source(toplevel_output->toplevel);
-}
-
 static void toplevel_handle_output_destroy(struct wl_listener *listener,
 		void *data) {
 	struct wlr_foreign_toplevel_handle_v1_output *toplevel_output =
@@ -302,9 +285,6 @@ void wlr_foreign_toplevel_handle_v1_output_enter(
 	toplevel_output->toplevel = toplevel;
 	wl_list_insert(&toplevel->outputs, &toplevel_output->link);
 
-	toplevel_output->output_bind.notify = toplevel_handle_output_bind;
-	wl_signal_add(&output->events.bind, &toplevel_output->output_bind);
-
 	toplevel_output->output_destroy.notify = toplevel_handle_output_destroy;
 	wl_signal_add(&output->events.destroy, &toplevel_output->output_destroy);
 
@@ -314,7 +294,6 @@ void wlr_foreign_toplevel_handle_v1_output_enter(
 static void toplevel_output_destroy(
 		struct wlr_foreign_toplevel_handle_v1_output *toplevel_output) {
 	wl_list_remove(&toplevel_output->link);
-	wl_list_remove(&toplevel_output->output_bind.link);
 	wl_list_remove(&toplevel_output->output_destroy.link);
 	free(toplevel_output);
 }

types/wlr_input_method_v2.c

@@ -157,22 +157,9 @@ static void popup_surface_surface_role_commit(struct wlr_surface *surface) {
 		&& popup_surface->input_method->client_active);
 }
 
-static void popup_surface_surface_role_precommit(struct wlr_surface *surface) {
-	struct wlr_input_popup_surface_v2 *popup_surface = surface->role_data;
-	if (popup_surface == NULL) {
-		return;
-	}
-	if (surface->pending.committed & WLR_SURFACE_STATE_BUFFER &&
-			surface->pending.buffer == NULL) {
-		// This is a NULL commit
-		popup_surface_set_mapped(popup_surface, false);
-	}
-}
-
 static const struct wlr_surface_role input_popup_surface_v2_role = {
 	.name = "zwp_input_popup_surface_v2",
 	.commit = popup_surface_surface_role_commit,
-	.precommit = popup_surface_surface_role_precommit,
 };
 
 bool wlr_surface_is_input_popup_surface_v2(struct wlr_surface *surface) {

types/wlr_layer_shell_v1.c

@@ -168,10 +168,10 @@ static void layer_surface_handle_set_margin(
 		return;
 	}
 
-	if (surface->current.margin.top == (uint32_t) top
-			&& surface->current.margin.right == (uint32_t) right
-			&& surface->current.margin.bottom == (uint32_t) bottom
-			&& surface->current.margin.left == (uint32_t) left) {
+	if (surface->current.margin.top == top
+			&& surface->current.margin.right == right
+			&& surface->current.margin.bottom == bottom
+			&& surface->current.margin.left == left) {
 		surface->pending.committed &= ~WLR_LAYER_SURFACE_V1_STATE_MARGIN;
 	} else {
 		surface->pending.committed |= WLR_LAYER_SURFACE_V1_STATE_MARGIN;

types/wlr_surface.c

@@ -207,12 +207,8 @@ static void surface_update_damage(pixman_region32_t *buffer_damage,
 	pixman_region32_clear(buffer_damage);
 
 	if (pending->width != current->width ||
-			pending->height != current->height ||
-			pending->viewport.src.x != current->viewport.src.x ||
-			pending->viewport.src.y != current->viewport.src.y ||
-			pending->viewport.src.width != current->viewport.src.width ||
-			pending->viewport.src.height != current->viewport.src.height) {
-		// Damage the whole buffer on resize or viewport source box change
+			pending->height != current->height) {
+		// Damage the whole buffer on resize
 		pixman_region32_union_rect(buffer_damage, buffer_damage, 0, 0,
 			pending->buffer_width, pending->buffer_height);
 	} else {
@@ -495,7 +491,7 @@ static void collect_subsurface_damage_iter(struct wlr_surface *surface,
 
 static void subsurface_parent_commit(struct wlr_subsurface *subsurface) {
 	struct wlr_surface *surface = subsurface->surface;
-
+	
 	bool moved = subsurface->current.x != subsurface->pending.x ||
 		subsurface->current.y != subsurface->pending.y;
 	if (subsurface->mapped && moved) {
@@ -534,9 +530,6 @@ static void subsurface_commit(struct wlr_subsurface *subsurface) {
 		}
 		subsurface->has_cache = true;
 		subsurface->cached_seq = wlr_surface_lock_pending(surface);
-	} else if (subsurface->has_cache) {
-		wlr_surface_unlock_cached(surface, subsurface->cached_seq);
-		subsurface->has_cache = false;
 	}
 }
 

types/wlr_xdg_foreign_v1.c

@@ -33,7 +33,7 @@ static bool verify_is_toplevel(struct wl_resource *client_resource,
 	if (wlr_surface_is_xdg_surface(surface)) {
 		struct wlr_xdg_surface *xdg_surface =
 			wlr_xdg_surface_from_wlr_surface(surface);
-		if (xdg_surface == NULL || xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+		if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
 			wl_resource_post_error(client_resource, -1,
 					"surface must be an xdg_toplevel");
 			return false;
@@ -151,10 +151,7 @@ static void destroy_imported(struct wlr_xdg_imported_v1 *imported) {
 	wl_list_for_each_safe(child, child_tmp, &imported->children, link) {
 		struct wlr_xdg_surface *xdg_child =
 			wlr_xdg_surface_from_wlr_surface(child->surface);
-
-		if (xdg_child != NULL) {
-			wlr_xdg_toplevel_set_parent(xdg_child, NULL);
-		}
+		wlr_xdg_toplevel_set_parent(xdg_child, NULL);
 	}
 
 	wl_list_remove(&imported->exported_destroyed.link);

types/wlr_xdg_foreign_v2.c

@@ -42,7 +42,7 @@ static bool verify_is_toplevel(struct wl_resource *client_resource,
 
 	struct wlr_xdg_surface *xdg_surface =
 		wlr_xdg_surface_from_wlr_surface(surface);
-	if (xdg_surface == NULL || xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
+	if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
 		wl_resource_post_error(client_resource,
 			ZXDG_EXPORTER_V2_ERROR_INVALID_SURFACE,
 			"surface must be an xdg_toplevel");
@@ -157,10 +157,7 @@ static void destroy_imported(struct wlr_xdg_imported_v2 *imported) {
 	wl_list_for_each_safe(child, child_tmp, &imported->children, link) {
 		struct wlr_xdg_surface *xdg_child =
 			wlr_xdg_surface_from_wlr_surface(child->surface);
-
-		if (xdg_child != NULL) {
-			wlr_xdg_toplevel_set_parent(xdg_child, NULL);
-		}
+		wlr_xdg_toplevel_set_parent(xdg_child, NULL);
 	}
 
 	wl_list_remove(&imported->exported_destroyed.link);

types/xdg_shell/wlr_xdg_surface.c

@@ -11,11 +11,6 @@ bool wlr_surface_is_xdg_surface(struct wlr_surface *surface) {
 		surface->role == &xdg_popup_surface_role;
 }
 
-static bool xdg_surface_is_inert_popup(struct wlr_xdg_surface* surface) {
-	return surface->role == WLR_XDG_SURFACE_ROLE_NONE &&
-		surface->surface->role == &xdg_popup_surface_role;
-}
-
 struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
 		struct wlr_surface *surface) {
 	assert(wlr_surface_is_xdg_surface(surface));
@@ -95,7 +90,7 @@ void unmap_xdg_surface(struct wlr_xdg_surface *surface) {
 static void xdg_surface_handle_ack_configure(struct wl_client *client,
 		struct wl_resource *resource, uint32_t serial) {
 	struct wlr_xdg_surface *surface = wlr_xdg_surface_from_resource(resource);
-	if (surface == NULL || xdg_surface_is_inert_popup(surface)) {
+	if (surface == NULL) {
 		return;
 	}
 
@@ -232,7 +227,7 @@ static void xdg_surface_handle_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 = wlr_xdg_surface_from_resource(resource);
-	if (surface == NULL || xdg_surface_is_inert_popup(surface)) {
+	if (surface == NULL) {
 		return;
 	}
 
@@ -293,8 +288,6 @@ static void xdg_surface_handle_surface_commit(struct wl_listener *listener,
 	struct wlr_xdg_surface *surface =
 		wl_container_of(listener, surface, surface_commit);
 
-	if (xdg_surface_is_inert_popup(surface)) return;
-
 	if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
 		wl_resource_post_error(surface->resource,
 			XDG_SURFACE_ERROR_UNCONFIGURED_BUFFER,
@@ -302,7 +295,9 @@ static void xdg_surface_handle_surface_commit(struct wl_listener *listener,
 		return;
 	}
 
-	if (surface->role == WLR_XDG_SURFACE_ROLE_NONE) {
+	// surface->role might be NONE for inert popups
+	// So we check surface->surface->role
+	if (surface->surface->role == NULL) {
 		wl_resource_post_error(surface->resource,
 			XDG_SURFACE_ERROR_NOT_CONSTRUCTED,
 			"xdg_surface must have a role");
@@ -313,7 +308,7 @@ static void xdg_surface_handle_surface_commit(struct wl_listener *listener,
 void handle_xdg_surface_commit(struct wlr_surface *wlr_surface) {
 	struct wlr_xdg_surface *surface =
 		wlr_xdg_surface_from_wlr_surface(wlr_surface);
-	if (surface == NULL || xdg_surface_is_inert_popup(surface)) {
+	if (surface == NULL) {
 		return;
 	}
 
@@ -321,9 +316,7 @@ void handle_xdg_surface_commit(struct wlr_surface *wlr_surface) {
 
 	switch (surface->role) {
 	case WLR_XDG_SURFACE_ROLE_NONE:
-		wl_resource_post_error(surface->resource,
-			XDG_SURFACE_ERROR_NOT_CONSTRUCTED,
-			"xdg_surface must have a role");
+		// inert toplevel or popup
 		return;
 	case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
 		handle_xdg_surface_toplevel_committed(surface);