backport wl shell to 11

-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCAA4FiEEcDKHej6x6uPk3J379jQS5glH1u8FAmTKfCgaHG1hcml1cy52
 bGFkQGNvbGxhYm9yYS5jb20ACgkQ9jQS5glH1u+ihA//e09DRmit8rw2Gglk5N5G
 P/O4m0BukEcXZy4dEo9WEkhrJ/hGTyZ3iqUMtfdbWouEpEMR25ck8n3jTEtUj2QN
 T4Gm/Ljcr8zzmtljbjEBDfBOaE07tISa7aX+IPTg+imf/t54kg80WwuKrW4FbNz2
 azr2L+UAIiFZ4fJ5jA0uiGRiBo2gEwxylujZlt609SQiQCYND+XrFY3fWkHC8vyW
 JfR3IfrYER7KXlxkdJiFE36eIEpgYGIguVp6Uj6B35gxr0+npIrcjY38v/KJILGl
 5mbxnwblGQpLgnBRMb2JmffetK+puFrTSOzEQDSIaOTjuQ0hHX1Ocjg3NfiEoxfi
 eG25SNaqMMUE2U2+cdojP97vCscoU71rwTpuklY1MG37O50jWsjgcUpVKYwcoljA
 TBOhwIJ2jLIzs5Ax37V81Bh7zj95nGYHupHnZOcQ/+SPnjnQ5Je6RE4Me4d0JJdN
 aR/hj/mF+DU80/ySfQwN9/bFp9hbCsozjFClIKiJxnWi71wQZl2o8ZfA8oJZyG6K
 VwYkVTQMoQtTuyDdyD6lbNbbC8/uq8ZnX9qKVHuEZlHWigvGSvuDQLGExuK7Ksjy
 sQPYBdGGWoIJGbqwuJX+FQ/hJgSnY1/VBp82N4//OUYs65LW01ACxF7J8SIIp+nE
 EJhNfCTDnO1hrN5xhmhk+qs=
 =GzNE
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEofGjA2bfgEEMn0uvXN7tFPSPp50FAmaabqcACgkQXN7tFPSP
 p50v0BAAsdCgGDShsDYsBVUiZQMqEOzO15azad/bcuUtJCcDmCUmxtkJveTAUgEO
 akMRF+c61gMXCxN1KaQNWlMQ5RQfNY2spOa1Izp8Fza3qLbstOp6GkPCG1rJzvsy
 RrXOrWDxBaOGFVZnNCSfdX/1eIJuxmnui4H+g81fYYXTYm6qEUU+iaVP8pc8YeuU
 ZTx5GtwOc2TDHQuk2tEcM6KG1O830W/eIkb52pCj90FNb7PmhvNUUWP5UZEtVb1m
 X81B2HDP+0ItjAQvuN2FzGRG5cnfgCfBRJhW4RHEIynz+U2b5PUyF5hdz83LVSDi
 AwB/NOt9a6Q5frIyNFdGmOvjWcOs6uM0o5r6OtjZ/2CikLaWwMBQesvW++1o77cC
 eETr0k70HOAwYQ0UN8571sa+chLgVmbHw1f+1raSlmuh8n0xS+ZgR+Hbs6Sr161V
 rtXPRJytfhoi1LxqAmw6bh3AQOj7q110vovEuujEEc3KjuEkIIB+8RgHGu8HkuDo
 4W5GEdZvrTMmaXNGRPk14q2rIFkT70aVwkiW7bdvOG0pTZ7qGVXbgwo5+hTUptu3
 9Qcs6oLWaJSUC/S/CPP6yjYErt9abropDh1fdm1amqAwcl0pa7tC40VPAtlogSXL
 ZnFQlwD79nr3cyc4ZDZ0SMKcesAkFoyIUA2i9oSBJX8tFnBT2KA=
 =o+np
 -----END PGP SIGNATURE-----

Merge tag '11.0.3' into 1

11.0.3

# -----BEGIN PGP SIGNATURE-----
#
# iQJOBAABCAA4FiEEcDKHej6x6uPk3J379jQS5glH1u8FAmTKfCgaHG1hcml1cy52
# bGFkQGNvbGxhYm9yYS5jb20ACgkQ9jQS5glH1u+ihA//e09DRmit8rw2Gglk5N5G
# P/O4m0BukEcXZy4dEo9WEkhrJ/hGTyZ3iqUMtfdbWouEpEMR25ck8n3jTEtUj2QN
# T4Gm/Ljcr8zzmtljbjEBDfBOaE07tISa7aX+IPTg+imf/t54kg80WwuKrW4FbNz2
# azr2L+UAIiFZ4fJ5jA0uiGRiBo2gEwxylujZlt609SQiQCYND+XrFY3fWkHC8vyW
# JfR3IfrYER7KXlxkdJiFE36eIEpgYGIguVp6Uj6B35gxr0+npIrcjY38v/KJILGl
# 5mbxnwblGQpLgnBRMb2JmffetK+puFrTSOzEQDSIaOTjuQ0hHX1Ocjg3NfiEoxfi
# eG25SNaqMMUE2U2+cdojP97vCscoU71rwTpuklY1MG37O50jWsjgcUpVKYwcoljA
# TBOhwIJ2jLIzs5Ax37V81Bh7zj95nGYHupHnZOcQ/+SPnjnQ5Je6RE4Me4d0JJdN
# aR/hj/mF+DU80/ySfQwN9/bFp9hbCsozjFClIKiJxnWi71wQZl2o8ZfA8oJZyG6K
# VwYkVTQMoQtTuyDdyD6lbNbbC8/uq8ZnX9qKVHuEZlHWigvGSvuDQLGExuK7Ksjy
# sQPYBdGGWoIJGbqwuJX+FQ/hJgSnY1/VBp82N4//OUYs65LW01ACxF7J8SIIp+nE
# EJhNfCTDnO1hrN5xhmhk+qs=
# =GzNE
# -----END PGP SIGNATURE-----

libweston/backend-drm/drm-internal.h

@@ -519,6 +519,9 @@ struct drm_head {
 	drmModeModeInfo inherited_mode;	/**< Original mode on the connector */
 	uint32_t inherited_max_bpc;	/**< Original max_bpc on the connector */
 	uint32_t inherited_crtc_id;	/**< Original CRTC assignment */
+
+	/* drm_output::disable_head */
+	struct wl_list disable_head_link;
 };
 
 struct drm_crtc {
@@ -541,6 +544,9 @@ struct drm_output {
 	struct drm_device *device;
 	struct drm_crtc *crtc;
 
+	/* drm_head::disable_head_link */
+	struct wl_list disable_head;
+
 	bool page_flip_pending;
 	bool atomic_complete_pending;
 	bool destroy_pending;

libweston/backend-drm/drm.c

@@ -1299,10 +1299,14 @@ drm_output_attach_head(struct weston_output *output_base,
 {
 	struct drm_backend *b = to_drm_backend(output_base->compositor);
 	struct drm_device *device = b->drm;
+	struct drm_head *head = to_drm_head(head_base);
 
 	if (wl_list_length(&output_base->head_list) >= MAX_CLONED_CONNECTORS)
 		return -1;
 
+	wl_list_remove(&head->disable_head_link);
+	wl_list_init(&head->disable_head_link);
+
 	if (!output_base->enabled)
 		return 0;
 
@@ -1326,18 +1330,14 @@ static void
 drm_output_detach_head(struct weston_output *output_base,
 		       struct weston_head *head_base)
 {
-	struct drm_backend *b = to_drm_backend(output_base->compositor);
-	struct drm_device *device = b->drm;
+	struct drm_output *output = to_drm_output(output_base);
+	struct drm_head *head = to_drm_head(head_base);
 
 	if (!output_base->enabled)
 		return;
 
-	/* Need to go through modeset to drop connectors that should no longer
-	 * be driven. */
-	/* XXX: Ideally we'd do this per-output, not globally. */
-	device->state_invalid = true;
-
-	weston_output_schedule_repaint(output_base);
+	/* Drop connectors that should no longer be driven on next repaint. */
+	wl_list_insert(&output->disable_head, &head->disable_head_link);
 }
 
 int
@@ -2249,6 +2249,8 @@ drm_head_create(struct drm_device *device, drmModeConnector *conn,
 
 	head->base.backend_id = drm_head_destroy;
 
+	wl_list_init(&head->disable_head_link);
+
 	ret = drm_head_update_info(head, conn);
 	if (ret < 0)
 		goto err_update;
@@ -2322,6 +2324,8 @@ drm_output_create(struct weston_compositor *compositor, const char *name)
 	output->device = device;
 	output->crtc = NULL;
 
+	wl_list_init(&output->disable_head);
+
 	output->max_bpc = 16;
 	output->gbm_format = DRM_FORMAT_INVALID;
 #ifdef BUILD_DRM_GBM

libweston/backend-drm/kms.c

@@ -951,6 +951,7 @@ drm_output_apply_state_atomic(struct drm_output_state *state,
 	struct drm_plane_state *plane_state;
 	struct drm_mode *current_mode = to_drm_mode(output->base.current_mode);
 	struct drm_head *head;
+	struct drm_head *tmp;
 	int ret = 0;
 
 	drm_debug(b, "\t\t[atomic] %s output %lu (%s) state\n",
@@ -987,6 +988,14 @@ drm_output_apply_state_atomic(struct drm_output_state *state,
 		wl_list_for_each(head, &output->base.head_list, base.output_link)
 			ret |= connector_add_prop(req, &head->connector,
 						  WDRM_CONNECTOR_CRTC_ID, 0);
+
+		wl_list_for_each_safe(head, tmp, &output->disable_head,
+				      disable_head_link) {
+			ret |= connector_add_prop(req, &head->connector,
+						  WDRM_CONNECTOR_CRTC_ID, 0);
+			wl_list_remove(&head->disable_head_link);
+			wl_list_init(&head->disable_head_link);
+		}
 	}
 
 	wl_list_for_each(head, &output->base.head_list, base.output_link) {

libweston/backend-drm/meson.build

@@ -44,7 +44,7 @@ deps_drm = [
 ]
 
 if get_option('renderer-gl')
-	dep_gbm = dependency('gbm', required: false)
+	dep_gbm = dependency('gbm', required: false, version: '>= 21.1.1')
 	if not dep_gbm.found()
 		error('drm-backend with GL renderer requires gbm which was not found. Or, you can use \'-Drenderer-gl=false\'.')
 	endif

libweston/backend-wayland/wayland.c

@@ -76,6 +76,7 @@ struct wayland_backend {
 		struct wl_display *wl_display;
 		struct wl_registry *registry;
 		struct wl_compositor *compositor;
+		struct wl_shell *shell;
 		struct xdg_wm_base *xdg_wm_base;
 		struct zwp_fullscreen_shell_v1 *fshell;
 		struct wl_shm *shm;
@@ -111,6 +112,7 @@ struct wayland_output {
 		struct wl_output *output;
 		uint32_t global_id;
 
+		struct wl_shell_surface *shell_surface;
 		struct xdg_surface *xdg_surface;
 		struct xdg_toplevel *xdg_toplevel;
 		int configure_width, configure_height;
@@ -250,6 +252,7 @@ to_wayland_output(struct weston_output *base)
 {
 	if (base->destroy != wayland_output_destroy)
 		return NULL;
+
 	return container_of(base, struct wayland_output, base);
 }
 
@@ -387,7 +390,6 @@ wayland_output_get_shm_buffer(struct wayland_output *output)
 		area.height = output->base.current_mode->height;
 	}
 
-	/* Address only the interior, excluding output decorations */
 	sb->pm_image =
 		pixman_image_create_bits(PIXMAN_a8r8g8b8, area.width, area.height,
 					 (uint32_t *)(data + area.y * stride) + area.x,
@@ -715,6 +717,11 @@ wayland_backend_destroy_output_surface(struct wayland_output *output)
 		output->parent.xdg_surface = NULL;
 	}
 
+	if (output->parent.shell_surface) {
+		wl_shell_surface_destroy(output->parent.shell_surface);
+		output->parent.shell_surface = NULL;
+	}
+
 	wl_surface_destroy(output->parent.surface);
 	output->parent.surface = NULL;
 }
@@ -736,11 +743,7 @@ static int
 wayland_output_disable(struct weston_output *base)
 {
 	struct wayland_output *output = to_wayland_output(base);
-	struct wayland_backend *b;
-
-	assert(output);
-
-	b = to_wayland_backend(base->compositor);
+	struct wayland_backend *b = to_wayland_backend(base->compositor);
 
 	if (!output->base.enabled)
 		return 0;
@@ -774,8 +777,6 @@ wayland_output_destroy(struct weston_output *base)
 {
 	struct wayland_output *output = to_wayland_output(base);
 
-	assert(output);
-
 	wayland_output_disable(&output->base);
 
 	weston_output_release(&output->base);
@@ -787,6 +788,8 @@ wayland_output_destroy(struct weston_output *base)
 	free(output);
 }
 
+static const struct wl_shell_surface_listener shell_surface_listener;
+
 #ifdef ENABLE_EGL
 static int
 wayland_output_init_gl_renderer(struct wayland_output *output)
@@ -838,54 +841,64 @@ wayland_output_init_pixman_renderer(struct wayland_output *output)
 static void
 wayland_output_resize_surface(struct wayland_output *output)
 {
-	struct wayland_backend *b = to_wayland_backend(output->base.compositor);
-	/* Defaults for without frame: */
-	struct weston_size fb_size = {
-		.width = output->base.current_mode->width,
-		.height = output->base.current_mode->height
-	};
-	struct weston_geometry area = {
-		.x = 0,
-		.y = 0,
-		.width = fb_size.width,
-		.height = fb_size.height
-	};
-	struct weston_geometry inp = area;
-	struct weston_geometry opa = area;
+	struct wayland_backend *b =
+		to_wayland_backend(output->base.compositor);
+	int32_t ix, iy, iwidth, iheight;
+	int32_t width, height;
 	struct wl_region *region;
 
-	if (output->frame) {
-		frame_resize_inside(output->frame, area.width, area.height);
-		frame_interior(output->frame, &area.x, &area.y, NULL, NULL);
-		fb_size.width = frame_width(output->frame);
-		fb_size.height = frame_height(output->frame);
+	width = output->base.current_mode->width;
+	height = output->base.current_mode->height;
 
-		frame_input_rect(output->frame, &inp.x, &inp.y,
-				 &inp.width, &inp.height);
-		frame_opaque_rect(output->frame, &opa.x, &opa.y,
-				  &opa.width, &opa.height);
-	}
+	if (output->frame) {
+		frame_resize_inside(output->frame, width, height);
+
+		frame_input_rect(output->frame, &ix, &iy, &iwidth, &iheight);
+		region = wl_compositor_create_region(b->parent.compositor);
+		wl_region_add(region, ix, iy, iwidth, iheight);
+		wl_surface_set_input_region(output->parent.surface, region);
+		wl_region_destroy(region);
+
+		if (output->parent.xdg_surface) {
+			xdg_surface_set_window_geometry(output->parent.xdg_surface,
+							ix,
+							iy,
+							iwidth,
+							iheight);
+		}
 
-	region = wl_compositor_create_region(b->parent.compositor);
-	wl_region_add(region, inp.x, inp.y, inp.width, inp.height);
-	wl_surface_set_input_region(output->parent.surface, region);
-	wl_region_destroy(region);
+		frame_opaque_rect(output->frame, &ix, &iy, &iwidth, &iheight);
+		region = wl_compositor_create_region(b->parent.compositor);
+		wl_region_add(region, ix, iy, iwidth, iheight);
+		wl_surface_set_opaque_region(output->parent.surface, region);
+		wl_region_destroy(region);
 
-	if (output->parent.xdg_surface) {
-		xdg_surface_set_window_geometry(output->parent.xdg_surface,
-						inp.x, inp.y,
-						inp.width, inp.height);
+		width = frame_width(output->frame);
+		height = frame_height(output->frame);
+	} else {
+		region = wl_compositor_create_region(b->parent.compositor);
+		wl_region_add(region, 0, 0, width, height);
+		wl_surface_set_input_region(output->parent.surface, region);
+		wl_region_destroy(region);
+
+		region = wl_compositor_create_region(b->parent.compositor);
+		wl_region_add(region, 0, 0, width, height);
+		wl_surface_set_opaque_region(output->parent.surface, region);
+		wl_region_destroy(region);
+
+		if (output->parent.xdg_surface) {
+			xdg_surface_set_window_geometry(output->parent.xdg_surface,
+							0,
+							0,
+							width,
+							height);
+		}
 	}
 
-	region = wl_compositor_create_region(b->parent.compositor);
-	wl_region_add(region, opa.x, opa.y, opa.width, opa.height);
-	wl_surface_set_opaque_region(output->parent.surface, region);
-	wl_region_destroy(region);
-
 #ifdef ENABLE_EGL
 	if (output->gl.egl_window) {
 		wl_egl_window_resize(output->gl.egl_window,
-				     fb_size.width, fb_size.height, 0, 0);
+				     width, height, 0, 0);
 
 		/* These will need to be re-created due to the resize */
 		gl_renderer->output_set_border(&output->base,
@@ -940,6 +953,8 @@ wayland_output_set_windowed(struct wayland_output *output)
 
 	if (output->parent.xdg_toplevel) {
 		xdg_toplevel_unset_fullscreen(output->parent.xdg_toplevel);
+	} else if (output->parent.shell_surface) {
+		wl_shell_surface_set_toplevel(output->parent.shell_surface);
 	} else {
 		abort();
 	}
@@ -949,6 +964,7 @@ wayland_output_set_windowed(struct wayland_output *output)
 
 static void
 wayland_output_set_fullscreen(struct wayland_output *output,
+			      enum wl_shell_surface_fullscreen_method method,
 			      uint32_t framerate, struct wl_output *target)
 {
 	if (output->frame) {
@@ -960,6 +976,9 @@ wayland_output_set_fullscreen(struct wayland_output *output,
 
 	if (output->parent.xdg_toplevel) {
 		xdg_toplevel_set_fullscreen(output->parent.xdg_toplevel, target);
+	} else if (output->parent.shell_surface) {
+		wl_shell_surface_set_fullscreen(output->parent.shell_surface,
+						method, framerate, target);
 	} else {
 		abort();
 	}
@@ -1089,7 +1108,7 @@ wayland_output_switch_mode(struct weston_output *output_base,
 
 	b = to_wayland_backend(output_base->compositor);
 
-	if (output->parent.xdg_surface || !b->parent.fshell)
+	if (output->parent.xdg_surface || output->parent.shell_surface || !b->parent.fshell)
 		return -1;
 
 	mode = wayland_output_choose_mode(output, mode);
@@ -1230,6 +1249,20 @@ wayland_backend_create_output_surface(struct wayland_output *output)
 
 		weston_log("wayland-backend: Using xdg_wm_base\n");
 	}
+	else if (b->parent.shell) {
+		output->parent.shell_surface =
+			wl_shell_get_shell_surface(b->parent.shell,
+						   output->parent.surface);
+		if (!output->parent.shell_surface) {
+			wl_surface_destroy(output->parent.surface);
+			return -1;
+		}
+
+		wl_shell_surface_add_listener(output->parent.shell_surface,
+					      &shell_surface_listener, output);
+
+		weston_log("wayland-backend: Using wl_shell\n");
+	}
 
 	return 0;
 }
@@ -1294,9 +1327,13 @@ wayland_output_enable(struct weston_output *base)
 
 				output->parent.draw_initial_frame = true;
 			}
+		} else {
+			wayland_output_set_fullscreen(output,
+						      WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER,
+						      output->mode.refresh, output->parent.output);
 		}
 	} else if (b->fullscreen) {
-		wayland_output_set_fullscreen(output, 0, NULL);
+		wayland_output_set_fullscreen(output, 0, 0, NULL);
 	} else {
 		wayland_output_set_windowed(output);
 	}
@@ -1578,10 +1615,13 @@ wayland_output_setup_fullscreen(struct wayland_output *output,
 		return -1;
 
 	/* What should size be set if conditional is false? */
-	if (b->parent.xdg_wm_base) {
+	if (b->parent.xdg_wm_base || b->parent.shell) {
 		if (output->parent.xdg_toplevel)
 			xdg_toplevel_set_fullscreen(output->parent.xdg_toplevel,
 						    output->parent.output);
+		else if (output->parent.shell_surface)
+			wl_shell_surface_set_fullscreen(output->parent.shell_surface,
+							0, 0, NULL);
 
 		wl_display_roundtrip(b->parent.wl_display);
 
@@ -1605,6 +1645,36 @@ err_set_size:
 	return -1;
 }
 
+static void
+shell_surface_ping(void *data, struct wl_shell_surface *shell_surface,
+		   uint32_t serial)
+{
+	wl_shell_surface_pong(shell_surface, serial);
+}
+
+static void
+shell_surface_configure(void *data, struct wl_shell_surface *shell_surface,
+			uint32_t edges, int32_t width, int32_t height)
+{
+	struct wayland_output *output = data;
+
+	output->parent.configure_width = width;
+	output->parent.configure_height = height;
+
+	/* FIXME: implement resizing */
+}
+
+static void
+shell_surface_popup_done(void *data, struct wl_shell_surface *shell_surface)
+{
+}
+
+static const struct wl_shell_surface_listener shell_surface_listener = {
+	shell_surface_ping,
+	shell_surface_configure,
+	shell_surface_popup_done
+};
+
 /* Events received from the wayland-server this compositor is client of: */
 
 /* parent input interface */
@@ -1782,6 +1852,9 @@ input_handle_button(void *data, struct wl_pointer *pointer,
 			if (input->output->parent.xdg_toplevel)
 				xdg_toplevel_move(input->output->parent.xdg_toplevel,
 						  input->parent.seat, serial);
+			else if (input->output->parent.shell_surface)
+				wl_shell_surface_move(input->output->parent.shell_surface,
+						      input->parent.seat, serial);
 			frame_status_clear(input->output->frame,
 					   FRAME_STATUS_MOVE);
 			return;
@@ -2135,6 +2208,9 @@ input_handle_touch_down(void *data, struct wl_touch *wl_touch,
 			if (output->parent.xdg_toplevel)
 				xdg_toplevel_move(output->parent.xdg_toplevel,
 						  input->parent.seat, serial);
+			else if (output->parent.shell_surface)
+				wl_shell_surface_move(output->parent.shell_surface,
+						      input->parent.seat, serial);
 			frame_status_clear(output->frame,
 					   FRAME_STATUS_MOVE);
 			return;
@@ -2647,6 +2723,10 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
 					 &xdg_wm_base_interface, 1);
 		xdg_wm_base_add_listener(b->parent.xdg_wm_base,
 					 &wm_base_listener, b);
+	} else if (strcmp(interface, "wl_shell") == 0) {
+		b->parent.shell =
+			wl_registry_bind(registry, name,
+					 &wl_shell_interface, 1);
 	} else if (strcmp(interface, "zwp_fullscreen_shell_v1") == 0) {
 		b->parent.fshell =
 			wl_registry_bind(registry, name,
@@ -2741,6 +2821,9 @@ wayland_destroy(struct weston_compositor *ec)
 	if (b->parent.xdg_wm_base)
 		xdg_wm_base_destroy(b->parent.xdg_wm_base);
 
+	if (b->parent.shell)
+		wl_shell_destroy(b->parent.shell);
+
 	if (b->parent.fshell)
 		zwp_fullscreen_shell_v1_release(b->parent.fshell);
 
@@ -2808,7 +2891,7 @@ fullscreen_binding(struct weston_keyboard *keyboard,
 		return;
 
 	if (input->output->frame)
-		wayland_output_set_fullscreen(input->output, 0, NULL);
+		wayland_output_set_fullscreen(input->output, 0, 0, NULL);
 	else
 		wayland_output_set_windowed(input->output);
 

meson.build

@@ -1,6 +1,6 @@
 project('weston',
 	'c',
-	version: '11.0.2',
+	version: '11.0.3',
 	default_options: [
 		'warning_level=3',
 		'c_std=gnu99',

xwayland/window-manager.c

@@ -3048,7 +3048,9 @@ xserver_map_shell_surface(struct weston_wm_window *window,
 	} else if (window->override_redirect) {
 		xwayland_interface->set_xwayland(window->shsurf,
 						 window->x, window->y);
-	} else if (window->transient_for && window->transient_for->surface) {
+	} else if (window->transient_for &&
+		   !window->transient_for->override_redirect &&
+		   window->transient_for->surface) {
 		parent = window->transient_for;
 		if (weston_wm_window_type_inactive(window)) {
 			xwayland_interface->set_transient(window->shsurf,