[PATCH weston] shell: remove remnants of screensaver surface list

Pekka Paalanen ppaalanen at gmail.com
Thu Dec 20 04:02:13 PST 2012


The list became stale probably when the lock_layer was introduced. Now
one less (ab)user of weston_surface::link.

Also add a comment on screensaver_configure(), that it is (and has been)
broken for pre-started screensavers.

Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
---
 src/shell.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/shell.c b/src/shell.c
index aa1c7c1..58f6257 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -124,7 +124,6 @@ struct desktop_shell {
 		char *path;
 		int duration;
 		struct wl_resource *binding;
-		struct wl_list surfaces;
 		struct weston_process process;
 	} screensaver;
 
@@ -2255,12 +2254,8 @@ desktop_shell_set_lock_surface(struct wl_client *client,
 static void
 resume_desktop(struct desktop_shell *shell)
 {
-	struct weston_surface *surface;
 	struct workspace *ws = get_current_workspace(shell);
 
-	wl_list_for_each(surface, &shell->screensaver.surfaces, link)
-		weston_surface_unmap(surface);
-
 	terminate_screensaver(shell);
 
 	wl_list_remove(&shell->lock_layer.link);
@@ -3154,6 +3149,7 @@ screensaver_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
 {
 	struct desktop_shell *shell = surface->private;
 
+	/* XXX: starting weston-screensaver beforehand does not work */
 	if (!shell->locked)
 		return;
 
@@ -3845,7 +3841,6 @@ module_init(struct weston_compositor *ec)
 	ec->shell_interface.move = surface_move;
 	ec->shell_interface.resize = surface_resize;
 
-	wl_list_init(&shell->screensaver.surfaces);
 	wl_list_init(&shell->input_panel.surfaces);
 
 	weston_layer_init(&shell->fullscreen_layer, &ec->cursor_layer.link);
-- 
1.7.8.6



More information about the wayland-devel mailing list