src: weston_process renamed to wet_process

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

diff --git a/src/shell.c b/src/shell.c
index 8a21ed8..a6c8a5b 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -803,9 +803,9 @@ ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource
 
 static struct wl_client *
 client_launch(struct weston_compositor *compositor,
-                    struct weston_process *proc,
+                    struct wet_process *proc,
                     const char *path,
-                    weston_process_cleanup_func_t cleanup)
+                    wet_process_cleanup_func_t cleanup)
 {
        struct wl_client *client = NULL;
        struct custom_env child_env;
@@ -910,14 +910,14 @@ client_launch(struct weston_compositor *compositor,
 }
 
 struct process_info {
-       struct weston_process proc;
+       struct wet_process proc;
        char *path;
 };
 
 int
 sigchld_handler(int signal_number, void *data)
 {
-       struct weston_process *p;
+       struct wet_process *p;
        struct ivi_compositor *ivi = data;
        int status;
        pid_t pid;
@@ -935,7 +935,7 @@ sigchld_handler(int signal_number, void *data)
 
                wl_list_remove(&p->link);
                wl_list_init(&p->link);
-               p->cleanup(p, status);
+               p->cleanup(p, status, NULL);
        }
 
        if (pid < 0 && errno != ECHILD)
@@ -946,7 +946,7 @@ sigchld_handler(int signal_number, void *data)
 
 
 static void
-process_handle_sigchld(struct weston_process *process, int status)
+process_handle_sigchld(struct wet_process *process, int status, void *data)
 {
        struct process_info *pinfo =
                container_of(process, struct process_info, proc);
@@ -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)
@@ -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);
 }