Skip to content
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
desktop-shell/shell.c
View file @ 8ac621d6
......@@ -3880,16 +3880,15 @@ unlock(struct desktop_shell *shell)
}
static void
shell_fade_done_for_output(struct weston_view_animation *animation, void *data)
shell_fade_done(struct weston_view_animation *animation, void *data)
{
struct shell_output *shell_output = data;
struct desktop_shell *shell = shell_output->shell;
struct desktop_shell *shell = data;
shell_output->fade.animation = NULL;
switch (shell_output->fade.type) {
shell->fade.animation = NULL;
switch (shell->fade.type) {
case FADE_IN:
weston_shell_utils_curtain_destroy(shell_output->fade.curtain);
shell_output->fade.curtain = NULL;
weston_shell_utils_curtain_destroy(shell->fade.curtain);
shell->fade.curtain = NULL;
break;
case FADE_OUT:
lock(shell);
......@@ -3903,33 +3902,51 @@ static int
fade_surface_get_label(struct weston_surface *surface,
char *buf, size_t len)
{
struct shell_output *output = surface->committed_private;
return snprintf(buf, len, "desktop shell fade surface for %s",
output->output->name);
return snprintf(buf, len, "desktop shell fade surface");
}
static struct weston_curtain *
shell_fade_create_view_for_output(struct desktop_shell *shell,
struct shell_output *shell_output)
shell_fade_create_view(struct desktop_shell *shell)
{
struct weston_compositor *compositor = shell->compositor;
struct weston_output *output = shell_output->output;
struct shell_output *shell_output;
struct weston_curtain_params curtain_params = {
.r = 0.0, .g = 0.0, .b = 0.0, .a = 1.0,
.x = output->pos.c.x, .y = output->pos.c.y,
.width = output->width, .height = output->height,
.x = 0, .y = 0,
.width = 8192, .height = 8192,
.surface_committed = black_surface_committed,
.get_label = fade_surface_get_label,
.surface_private = shell_output,
.surface_private = shell,
.capture_input = false,
};
struct weston_curtain *curtain;
bool first = true;
int x1, y1, x2, y2;
wl_list_for_each(shell_output, &shell->output_list, link) {
struct weston_output *op = shell_output->output;
if (first) {
first = false;
x1 = op->pos.c.x;
y1 = op->pos.c.y;
x2 = op->pos.c.x + op->width;
y2 = op->pos.c.y + op->height;
continue;
}
x1 = MIN(x1, op->pos.c.x);
y1 = MIN(y1, op->pos.c.y);
x2 = MAX(x2, op->pos.c.x + op->width);
y2 = MAX(y2, op->pos.c.y + op->height);
}
curtain_params.x = x1;
curtain_params.y = y1;
curtain_params.width = x2 - x1;
curtain_params.height = y2 - y1;
curtain = weston_shell_utils_curtain_create(compositor, &curtain_params);
assert(curtain);
weston_view_set_output(curtain->view, output);
weston_view_move_to_layer(curtain->view, &compositor->fade_layer.view_list);
return curtain;
......@@ -3939,7 +3956,6 @@ static void
shell_fade(struct desktop_shell *shell, enum fade_type type)
{
float tint;
struct shell_output *shell_output;
switch (type) {
case FADE_IN:
......@@ -3953,36 +3969,23 @@ shell_fade(struct desktop_shell *shell, enum fade_type type)
return;
}
/* Create a separate fade surface for each output */
wl_list_for_each(shell_output, &shell->output_list, link) {
shell_output->fade.type = type;
shell->fade.type = type;
if (shell_output->fade.curtain == NULL) {
shell_output->fade.curtain =
shell_fade_create_view_for_output(shell, shell_output);
if (!shell_output->fade.curtain)
continue;
if (shell->fade.curtain == NULL) {
shell->fade.curtain = shell_fade_create_view(shell);
if (!shell->fade.curtain)
return;
weston_view_set_alpha(shell_output->fade.curtain->view,
1.0 - tint);
}
weston_view_set_alpha(shell->fade.curtain->view, 1.0 - tint);
}
if (shell_output->fade.curtain->view->output == NULL) {
/* If the black view gets a NULL output, we lost the
* last output and we'll just cancel the fade. This
* happens when you close the last window under the
* X11 or Wayland backends. */
shell->locked = false;
weston_shell_utils_curtain_destroy(shell_output->fade.curtain);
shell_output->fade.curtain = NULL;
} else if (shell_output->fade.animation) {
weston_fade_update(shell_output->fade.animation, tint);
} else {
shell_output->fade.animation =
weston_fade_run(shell_output->fade.curtain->view,
1.0 - tint, tint, 300.0,
shell_fade_done_for_output, shell_output);
}
if (shell->fade.animation) {
weston_fade_update(shell->fade.animation, tint);
} else {
shell->fade.animation =
weston_fade_run(shell->fade.curtain->view,
1.0 - tint, tint, 300.0,
shell_fade_done, shell);
}
}
......@@ -3990,36 +3993,26 @@ static void
do_shell_fade_startup(void *data)
{
struct desktop_shell *shell = data;
struct shell_output *shell_output;
if (shell->startup_animation_type == ANIMATION_FADE) {
assert(shell->startup_animation_type == ANIMATION_FADE ||
shell->startup_animation_type == ANIMATION_NONE);
if (shell->startup_animation_type == ANIMATION_FADE)
shell_fade(shell, FADE_IN);
} else {
weston_log("desktop shell: "
"unexpected fade-in animation type %d\n",
shell->startup_animation_type);
wl_list_for_each(shell_output, &shell->output_list, link) {
weston_shell_utils_curtain_destroy(shell_output->fade.curtain);
shell_output->fade.curtain = NULL;
}
}
}
static void
shell_fade_startup(struct desktop_shell *shell)
{
struct wl_event_loop *loop;
struct shell_output *shell_output;
bool has_fade = false;
wl_list_for_each(shell_output, &shell->output_list, link) {
if (!shell_output->fade.startup_timer)
continue;
if (!shell->fade.startup_timer)
return;
wl_event_source_remove(shell_output->fade.startup_timer);
shell_output->fade.startup_timer = NULL;
has_fade = true;
}
wl_event_source_remove(shell->fade.startup_timer);
shell->fade.startup_timer = NULL;
has_fade = true;
if (has_fade) {
loop = wl_display_get_event_loop(shell->compositor->wl_display);
......@@ -4045,31 +4038,27 @@ shell_fade_init(struct desktop_shell *shell)
*/
struct wl_event_loop *loop;
struct shell_output *shell_output;
if (shell->startup_animation_type == ANIMATION_NONE)
return;
wl_list_for_each(shell_output, &shell->output_list, link) {
if (shell_output->fade.curtain != NULL) {
weston_log("%s: warning: fade surface already exists\n",
__func__);
continue;
}
if (shell->fade.curtain != NULL) {
weston_log("%s: warning: fade surface already exists\n",
__func__);
return;
}
shell_output->fade.curtain =
shell_fade_create_view_for_output(shell, shell_output);
if (!shell_output->fade.curtain)
continue;
shell->fade.curtain = shell_fade_create_view(shell);
if (!shell->fade.curtain)
return;
weston_view_update_transform(shell_output->fade.curtain->view);
weston_surface_damage(shell_output->fade.curtain->view->surface);
weston_view_update_transform(shell->fade.curtain->view);
weston_surface_damage(shell->fade.curtain->view->surface);
loop = wl_display_get_event_loop(shell->compositor->wl_display);
shell_output->fade.startup_timer =
wl_event_loop_add_timer(loop, fade_startup_timeout, shell);
wl_event_source_timer_update(shell_output->fade.startup_timer, 15000);
}
loop = wl_display_get_event_loop(shell->compositor->wl_display);
shell->fade.startup_timer =
wl_event_loop_add_timer(loop, fade_startup_timeout, shell);
wl_event_source_timer_update(shell->fade.startup_timer, 15000);
}
static void
......@@ -4084,7 +4073,7 @@ idle_handler(struct wl_listener *listener, void *data)
weston_seat_break_desktop_grabs(seat);
shell_fade(shell, FADE_OUT);
/* lock() is called from shell_fade_done_for_output() */
/* lock() is called from shell_fade_done() */
}
static void
......@@ -4631,17 +4620,6 @@ shell_output_destroy(struct shell_output *shell_output)
shell_for_each_layer(shell, shell_output_changed_move_layer, NULL);
if (shell_output->fade.animation) {
weston_view_animation_destroy(shell_output->fade.animation);
shell_output->fade.animation = NULL;
}
if (shell_output->fade.curtain)
weston_shell_utils_curtain_destroy(shell_output->fade.curtain);
if (shell_output->fade.startup_timer)
wl_event_source_remove(shell_output->fade.startup_timer);
if (shell_output->panel_surface)
wl_list_remove(&shell_output->panel_surface_listener.link);
if (shell_output->background_surface)
......@@ -4860,6 +4838,17 @@ shell_destroy(struct wl_listener *listener, void *data)
text_backend_destroy(shell->text_backend);
input_panel_destroy(shell);
if (shell->fade.animation) {
weston_view_animation_destroy(shell->fade.animation);
shell->fade.animation = NULL;
}
if (shell->fade.curtain)
weston_shell_utils_curtain_destroy(shell->fade.curtain);
if (shell->fade.startup_timer)
wl_event_source_remove(shell->fade.startup_timer);
wl_list_for_each_safe(shell_output, tmp, &shell->output_list, link)
shell_output_destroy(shell_output);
......
desktop-shell/shell.h
View file @ 8ac621d6
......@@ -71,13 +71,6 @@ struct shell_output {
struct weston_surface *background_surface;
struct wl_listener background_surface_listener;
struct {
struct weston_curtain *curtain;
struct weston_view_animation *animation;
enum fade_type type;
struct wl_event_source *startup_timer;
} fade;
};
struct weston_desktop;
......@@ -134,6 +127,13 @@ struct desktop_shell {
struct wl_list surfaces;
} input_panel;
struct {
struct weston_curtain *curtain;
struct weston_view_animation *animation;
enum fade_type type;
struct wl_event_source *startup_timer;
} fade;
bool allow_zap;
uint32_t binding_modifier;
enum animation_type win_animation_type;
......