commit a8a9baf873a5fcfa8af3272e42d2a648c5e6fd26
author Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Wed Jan 29 18:47:52 2014 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Wed Feb 05 17:32:35 2014 -0800
tree 90e1ba22f873df02d30437c5b251328f411d0b19
parent 7908bffdf93059ddcb4e290cc597bd1c262a2a1f

compositor: Remove weston_output::move_signal

Since that signal is per output, it is necessary to track in which
output a view is in so that the signal is handled properly.

Instead, add a compositor wide output moved signal, that is handled by
the shell. The shell iterates over the layers it owns to move views
appropriately.

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 9ef3c4e..1968c7b 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -347,26 +347,6 @@
 weston_surface_to_subsurface(struct weston_surface *surface);
 
 static void
-weston_view_output_move_handler(struct wl_listener *listener,
-				void *data)
-{
-	struct weston_view *ev;
-	struct weston_output *output = data;
-
-	ev = container_of(listener, struct weston_view,
-			  output_move_listener);
-
-	/* the child window's view->geometry is a relative coordinate to
-	 * parent view, no need to move child_view. */
-	if (ev->geometry.parent)
-		return;
-
-	weston_view_set_position(ev,
-				 ev->geometry.x + output->move_x,
-				 ev->geometry.y + output->move_y);
-}
-
-static void
 weston_view_output_destroy_handler(struct wl_listener *listener,
 				   void *data)
 {
@@ -414,10 +394,8 @@
 	if (ev->surface->output_destroyed)
 		ev->surface->output_destroyed(ev->surface);
 
-	wl_list_remove(&ev->output_move_listener.link);
 	wl_list_remove(&ev->output_destroy_listener.link);
 
-	wl_list_init(&ev->output_move_listener.link);
 	wl_list_init(&ev->output_destroy_listener.link);
 }
 
@@ -456,8 +434,6 @@
 
 	view->output = NULL;
 
-	view->output_move_listener.notify = weston_view_output_move_handler;
-	wl_list_init(&view->output_move_listener.link);
 	view->output_destroy_listener.notify =
 		weston_view_output_destroy_handler;
 	wl_list_init(&view->output_destroy_listener.link);
@@ -911,20 +887,14 @@
 	}
 	pixman_region32_fini(&region);
 
-	if (ev->output_mask != 0) {
-		wl_list_remove(&ev->output_move_listener.link);
+	if (ev->output_mask != 0)
 		wl_list_remove(&ev->output_destroy_listener.link);
-	}
 
-	if (mask != 0) {
-		wl_signal_add(&new_output->move_signal,
-			      &ev->output_move_listener);
+	if (mask != 0)
 		wl_signal_add(&new_output->destroy_signal,
 			      &ev->output_destroy_listener);
-	} else {
-		wl_list_init(&ev->output_move_listener.link);
+	else
 		wl_list_init(&ev->output_destroy_listener.link);
-	}
 
 	ev->output = new_output;
 	ev->output_mask = mask;
@@ -1379,8 +1349,6 @@
 	wl_list_init(&view->layer_link);
 	wl_list_remove(&view->link);
 	wl_list_init(&view->link);
-	wl_list_remove(&view->output_move_listener.link);
-	wl_list_init(&view->output_move_listener.link);
 	wl_list_remove(&view->output_destroy_listener.link);
 	wl_list_init(&view->output_destroy_listener.link);
 	view->output_mask = 0;
@@ -3342,7 +3310,7 @@
 	output->dirty = 1;
 
 	/* Move views on this output. */
-	wl_signal_emit(&output->move_signal, output);
+	wl_signal_emit(&output->compositor->output_moved_signal, output);
 
 	/* Notify clients of the change for output position. */
 	wl_resource_for_each(resource, &output->resource_list)
@@ -3378,7 +3346,6 @@
 
 	wl_signal_init(&output->frame_signal);
 	wl_signal_init(&output->destroy_signal);
-	wl_signal_init(&output->move_signal);
 	wl_list_init(&output->animation_list);
 	wl_list_init(&output->resource_list);
 
@@ -3641,6 +3608,7 @@
 	wl_signal_init(&ec->seat_created_signal);
 	wl_signal_init(&ec->output_created_signal);
 	wl_signal_init(&ec->output_destroyed_signal);
+	wl_signal_init(&ec->output_moved_signal);
 	wl_signal_init(&ec->session_signal);
 	ec->session_active = 1;