src: use weston_coord_* structures

[src/agl-compositor.git] / src / shell.c

diff --git a/src/shell.c b/src/shell.c
index 4fbd8d5..9b17353 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1029,7 +1029,7 @@ curtain_get_label(struct weston_surface *surface, char *buf, size_t len)
 }
 
 static void
-curtain_surface_committed(struct weston_surface *es, int32_t sx, int32_t sy)
+curtain_surface_committed(struct weston_surface *es, struct weston_coord_surface new_origin)
 {
 
 }
@@ -1068,7 +1068,7 @@ create_black_curtain_view(struct ivi_output *output)
                                    woutput->width, woutput->height);
 
        weston_surface_set_label_func(surface, curtain_get_label);
-       weston_view_set_position(view, woutput->x, woutput->y);
+       weston_view_set_position(view, woutput->pos);
 
        output->fullscreen_view.fs = zalloc(sizeof(struct ivi_surface));
        if (!output->fullscreen_view.fs)
@@ -1134,8 +1134,8 @@ insert_black_curtain(struct ivi_output *output)
 
        if ((!output &&
            !output->fullscreen_view.fs &&
-           !output->fullscreen_view.fs->view) || !output->output ||
-           !output->fullscreen_view.fs) {
+           !output->fullscreen_view.fs->view) ||
+           !output->output || !output->fullscreen_view.fs) {
                weston_log("Output %s doesn't have a surface installed!\n", output->name);
                return;
        }
@@ -1764,13 +1764,16 @@ 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 weston_coord_global pos;
        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);
+       pos.c.x = x;
+       pos.c.y = y;
+       weston_view_set_position(surf->view, pos);
        weston_compositor_schedule_repaint(ivi->compositor);
 }