/*
- * Copyright © 2019, 2022 Collabora, Ltd.
+ * Copyright © 2019, 2022, 2024 Collabora, Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
wl_list_for_each(output, &ivi->outputs, link) {
if (output->fullscreen_view.fs &&
output->fullscreen_view.fs->view) {
- weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+ weston_surface_unref(output->fullscreen_view.fs->view->surface);
output->fullscreen_view.fs->view = NULL;
}
}
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;
}
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;
wl_list_remove(&p->link);
wl_list_init(&p->link);
- p->cleanup(p, status);
+ p->cleanup(p, status, NULL);
}
if (pid < 0 && errno != ECHILD)
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);
}
+int
+curtain_get_label(struct weston_surface *surface, char *buf, size_t len)
+{
+ return snprintf(buf, len, "%s", "black curtain");
+}
+
+static void
+curtain_surface_committed(struct weston_surface *es, struct weston_coord_surface new_origin)
+{
+
+}
+
+
static void
create_black_curtain_view(struct ivi_output *output)
{
struct weston_surface *surface = NULL;
struct weston_view *view;
struct ivi_compositor *ivi = output->ivi;
- struct weston_compositor *wc= ivi->compositor;
+ struct weston_compositor *ec = ivi->compositor;
struct weston_output *woutput = output->output;
+ struct weston_buffer_reference *buffer_ref;
if (!woutput)
return;
- surface = weston_surface_create(wc);
+ surface = weston_surface_create(ec);
if (!surface)
return;
+
view = weston_view_create(surface);
- if (!view) {
- weston_surface_destroy(surface);
- return;
- }
+ if (!view)
+ goto err_surface;
+
+ buffer_ref = weston_buffer_create_solid_rgba(ec, 0.0, 0.0, 0.0, 1.0);
+ if (buffer_ref == NULL)
+ goto err_view;
- weston_surface_set_color(surface, 0.0, 0.0, 0.0, 1);
+ surface->committed = curtain_surface_committed;
+ surface->committed_private = NULL;
weston_surface_set_size(surface, woutput->width, woutput->height);
- weston_view_set_position(view, woutput->x, woutput->y);
+
+ weston_surface_attach_solid(surface, buffer_ref,
+ woutput->width, woutput->height);
+
+ weston_surface_set_label_func(surface, curtain_get_label);
+ weston_view_set_position(view, woutput->pos);
output->fullscreen_view.fs = zalloc(sizeof(struct ivi_surface));
- if (!output->fullscreen_view.fs) {
- weston_surface_destroy(surface);
- return;
- }
+ if (!output->fullscreen_view.fs)
+ goto err_view;
+
output->fullscreen_view.fs->view = view;
+ output->fullscreen_view.buffer_ref = buffer_ref;
- output->fullscreen_view.fs_destroy.notify = destroy_black_curtain_view;
+ output->fullscreen_view.fs_destroy.notify =
+ destroy_black_curtain_view;
wl_signal_add(&woutput->destroy_signal,
&output->fullscreen_view.fs_destroy);
+
+ return;
+
+err_view:
+ weston_view_destroy(view);
+err_surface:
+ weston_surface_unref(surface);
}
bool
remove_black_curtain(struct ivi_output *output)
{
struct weston_view *view;
+ struct weston_surface *wsurface;
if ((!output &&
!output->fullscreen_view.fs &&
}
view = output->fullscreen_view.fs->view;
+ wsurface = view->surface;
assert(view->is_mapped == true ||
view->surface->is_mapped == true);
- view->is_mapped = false;
- view->surface->is_mapped = false;
-
- weston_layer_entry_remove(&view->layer_link);
- weston_view_update_transform(view);
-
- weston_view_damage_below(view);
+ weston_surface_unmap(wsurface);
+ weston_view_move_to_layer(view, NULL);
weston_log("Removed black curtain from output %s\n", output->output->name);
}
insert_black_curtain(struct ivi_output *output)
{
struct weston_view *view;
+ struct weston_surface *wsurface;
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;
}
view = output->fullscreen_view.fs->view;
+ wsurface = view->surface;
if (view->is_mapped || view->surface->is_mapped)
return;
- weston_layer_entry_remove(&view->layer_link);
- weston_layer_entry_insert(&output->ivi->fullscreen.view_list,
- &view->layer_link);
-
- view->is_mapped = true;
- view->surface->is_mapped = true;
-
- weston_view_update_transform(view);
- weston_view_damage_below(view);
-
+ weston_surface_map(wsurface);
+ weston_view_move_to_layer(view, &output->ivi->fullscreen.view_list);
weston_log("Added black curtain to output %s\n", output->output->name);
}
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);
}
struct weston_view *ev = surface->view;
struct weston_geometry geom = {};
struct ivi_output *output = NULL;
+ struct weston_coord_global pos;
int new_width, new_height;
int x, y;
ivi_shell_activate_surface(surface, ivi_seat, WESTON_ACTIVATE_FLAG_NONE);
}
- weston_view_set_position(surface->view, x, y);
+ pos.c.x = x;
+ pos.c.y = y;
+
+ weston_view_set_position(surface->view, pos);
weston_desktop_surface_set_size(surface->dsurface, new_width, new_height);
weston_desktop_surface_set_orientation(surface->dsurface, orientation);
surface->orientation = orientation;