X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fshell.c;h=f5dc3e3458e022733b20ca61a23b572e221a4948;hb=refs%2Fchanges%2F69%2F29069%2F2;hp=2f8a7224644fdfe07a56ce083852e356789c073a;hpb=0ed8064b0de235fa21fb961f0a8789e11ad7f1a4;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 2f8a722..f5dc3e3 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1664,6 +1664,35 @@ shell_set_app_output(struct wl_client *client, struct wl_resource *res,
 	shell_send_app_on_output(ivi, app_id, woutput->name);
 }
 
+static void
+shell_set_app_position(struct wl_client *client, struct wl_resource *res,
+		    const char *app_id, int32_t x, int32_t y)
+{
+	struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+	struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+
+	if (!surf || !app_id || surf->role != IVI_SURFACE_ROLE_POPUP)
+		return;
+
+	weston_view_set_position(surf->view, x, y);
+	weston_compositor_schedule_repaint(ivi->compositor);
+}
+
+static void
+shell_set_app_scale(struct wl_client *client, struct wl_resource *res,
+		    const char *app_id, int32_t width, int32_t height)
+{
+
+	struct ivi_compositor *ivi = wl_resource_get_user_data(res);
+	struct ivi_surface *surf = ivi_find_app(ivi, app_id);
+
+	if (!surf || !app_id || surf->role != IVI_SURFACE_ROLE_POPUP)
+		return;
+
+	weston_desktop_surface_set_size(surf->dsurface, width, height);
+	weston_compositor_schedule_repaint(ivi->compositor);
+}
+
 static void
 shell_ext_destroy(struct wl_client *client, struct wl_resource *res)
 {
@@ -1692,6 +1721,8 @@ static const struct agl_shell_interface agl_shell_implementation = {
 	.set_app_normal = shell_set_app_normal,
 	.set_app_fullscreen = shell_set_app_fullscreen,
 	.set_app_output = shell_set_app_output,
+	.set_app_position = shell_set_app_position,
+	.set_app_scale = shell_set_app_scale,
 };
 
 static const struct agl_shell_ext_interface agl_shell_ext_implementation = {
@@ -1795,18 +1826,20 @@ unbind_agl_shell(struct wl_resource *resource)
 	}
 
 	wl_list_for_each(output, &ivi->outputs, link) {
-		struct weston_geometry area = {};
 
 		/* reset the active surf if there's one present */
 		if (output->active) {
+			struct weston_geometry area = {};
+
 			output->active->view->is_mapped = false;
 			output->active->view->surface->is_mapped = false;
 
 			weston_layer_entry_remove(&output->active->view->layer_link);
 			output->active = NULL;
+
+			output->area_activation = area;
 		}
 
-		output->area_activation = area;
 		insert_black_curtain(output);
 	}
 
@@ -1991,7 +2024,7 @@ int
 ivi_shell_create_global(struct ivi_compositor *ivi)
 {
 	ivi->agl_shell = wl_global_create(ivi->compositor->wl_display,
-					  &agl_shell_interface, 8,
+					  &agl_shell_interface, 10,
 					  ivi, bind_agl_shell);
 	if (!ivi->agl_shell) {
 		weston_log("Failed to create wayland global.\n");