compositor: Fade to black on idle timeout
diff --git a/compositor/compositor.c b/compositor/compositor.c
index ac308ff..9be57df 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -123,6 +123,50 @@
*v = t;
}
+void
+wlsc_tweener_init(struct wlsc_tweener *tweener,
+ double k, double current, double target)
+{
+ tweener->k = k;
+ tweener->current = current;
+ tweener->previous = current;
+ tweener->target = target;
+}
+
+void
+wlsc_tweener_update(struct wlsc_tweener *tweener, uint32_t msec)
+{
+ double force, current, step;
+
+ step = (msec - tweener->timestamp) / 100.0;
+ tweener->timestamp = msec;
+
+ current = tweener->current;
+ force = tweener->k * (tweener->target - current) / 10.0 +
+ (tweener->previous - current);
+
+ tweener->current =
+ current + (current - tweener->previous) + force * step * step;
+ tweener->previous = current;
+
+ if (tweener->current >= 1.0) {
+ tweener->current = 1.0;
+ tweener->previous = 1.0;
+ }
+
+ if (tweener->current <= 0.0) {
+ tweener->current = 0.0;
+ tweener->previous = 0.0;
+ }
+}
+
+int
+wlsc_tweener_done(struct wlsc_tweener *tweener)
+{
+ return fabs(tweener->previous - tweener->target) < 0.0002 &&
+ fabs(tweener->current - tweener->target) < 0.0002;
+}
+
struct wlsc_surface *
wlsc_surface_create(struct wlsc_compositor *compositor,
int32_t x, int32_t y, int32_t width, int32_t height)
@@ -569,6 +613,7 @@
{
struct wlsc_compositor *compositor = output->compositor;
struct wlsc_surface *es;
+ struct wlsc_animation *animation, *next;
wl_list_for_each(es, &compositor->surface_list, link) {
if (es->output == output) {
@@ -581,6 +626,10 @@
wl_event_source_timer_update(compositor->timer_source, 5);
compositor->repaint_on_timeout = 1;
+
+ wl_list_for_each_safe(animation, next,
+ &compositor->animation_list, link)
+ animation->frame(animation, output, msecs);
}
void
@@ -596,6 +645,49 @@
}
static void
+fade_frame(struct wlsc_animation *animation,
+ struct wlsc_output *output, uint32_t msecs)
+{
+ struct wlsc_compositor *compositor =
+ container_of(animation,
+ struct wlsc_compositor, fade.animation);
+
+ wlsc_tweener_update(&compositor->fade.tweener, msecs);
+ if (wlsc_tweener_done(&compositor->fade.tweener)) {
+ if (compositor->fade.tweener.current > 0.999)
+ compositor->state = WLSC_COMPOSITOR_SLEEPING;
+ compositor->fade.tweener.current =
+ compositor->fade.tweener.target;
+ wl_list_remove(&animation->link);
+ wl_list_init(&animation->link);
+ }
+
+ wlsc_output_damage(output);
+}
+
+static void
+fade_output(struct wlsc_output *output,
+ GLfloat tint, pixman_region32_t *region)
+{
+ struct wlsc_compositor *compositor = output->compositor;
+ struct wlsc_surface surface;
+ GLfloat color[4] = { 0.0, 0.0, 0.0, tint };
+
+ surface.compositor = compositor;
+ surface.x = output->x;
+ surface.y = output->y;
+ surface.width = output->width;
+ surface.height = output->height;
+ surface.visual = &compositor->compositor.premultiplied_argb_visual;
+ surface.texture = GL_NONE;
+ glUseProgram(compositor->solid_shader.program);
+ glUniformMatrix4fv(compositor->solid_shader.proj_uniform,
+ 1, GL_FALSE, output->matrix.d);
+ glUniform4fv(compositor->solid_shader.color_uniform, 1, color);
+ wlsc_surface_draw(&surface, output, region);
+}
+
+static void
wlsc_output_repaint(struct wlsc_output *output)
{
struct wlsc_compositor *ec = output->compositor;
@@ -633,6 +725,8 @@
if (ec->focus)
if (output->set_hardware_cursor(output, ec->input_device) < 0)
using_hardware_cursor = 0;
+ if (ec->fade.tweener.current > 0.001)
+ using_hardware_cursor = 0;
es = container_of(ec->surface_list.next, struct wlsc_surface, link);
if (es->map_type == WLSC_SURFACE_MAP_FULLSCREEN &&
@@ -698,6 +792,9 @@
wlsc_surface_draw(eid->sprite, output,
&total_damage);
}
+
+ if (ec->fade.tweener.current > 0.001)
+ fade_output(output, ec->fade.tweener.current, &total_damage);
}
static int
@@ -748,6 +845,25 @@
compositor->repaint_on_timeout = 1;
}
+void
+wlsc_compositor_fade(struct wlsc_compositor *compositor, float tint)
+{
+ int done;
+
+ done = wlsc_tweener_done(&compositor->fade.tweener);
+ compositor->fade.tweener.target = tint;
+ if (wlsc_tweener_done(&compositor->fade.tweener))
+ return;
+
+ if (done)
+ compositor->fade.tweener.timestamp = get_time();
+
+ wlsc_compositor_damage_all(compositor);
+ if (wl_list_empty(&compositor->fade.animation.link))
+ wl_list_insert(compositor->animation_list.prev,
+ &compositor->fade.animation.link);
+}
+
static void
surface_destroy(struct wl_client *client,
struct wl_surface *surface)
@@ -1070,10 +1186,8 @@
if (compositor->idle_inhibit)
return;
- if (compositor->state == WLSC_COMPOSITOR_SLEEPING) {
- compositor->state = WLSC_COMPOSITOR_ACTIVE;
- wlsc_compositor_damage_all(compositor);
- }
+ wlsc_compositor_fade(compositor, 0.0);
+ compositor->state = WLSC_COMPOSITOR_ACTIVE;
wl_event_source_timer_update(compositor->idle_source,
option_idle_time * 1000);
@@ -1101,8 +1215,7 @@
if (compositor->idle_inhibit)
return 1;
- wlsc_compositor_damage_all(compositor);
- compositor->state = WLSC_COMPOSITOR_SLEEPING;
+ wlsc_compositor_fade(compositor, 1.0);
return 1;
}
@@ -1519,6 +1632,15 @@
" gl_FragColor = texture2D(tex, v_texcoord)\n;"
"}\n";
+static const char solid_fragment_shader[] =
+ "precision mediump float;\n"
+ "varying vec2 v_texcoord;\n"
+ "uniform vec4 color;\n"
+ "void main()\n"
+ "{\n"
+ " gl_FragColor = color\n;"
+ "}\n";
+
static int
compile_shader(GLenum type, const char *source)
{
@@ -1571,6 +1693,37 @@
return 0;
}
+static int
+init_solid_shader(struct wlsc_shader *shader,
+ GLuint vertex_shader, const char *fragment_source)
+{
+ GLint status;
+ char msg[512];
+
+ shader->vertex_shader = vertex_shader;
+ shader->fragment_shader =
+ compile_shader(GL_FRAGMENT_SHADER, fragment_source);
+
+ shader->program = glCreateProgram();
+ glAttachShader(shader->program, shader->vertex_shader);
+ glAttachShader(shader->program, shader->fragment_shader);
+ glBindAttribLocation(shader->program, 0, "position");
+ glBindAttribLocation(shader->program, 1, "texcoord");
+
+ glLinkProgram(shader->program);
+ glGetProgramiv(shader->program, GL_LINK_STATUS, &status);
+ if (!status) {
+ glGetProgramInfoLog(shader->program, sizeof msg, NULL, msg);
+ fprintf(stderr, "link info: %s\n", msg);
+ return -1;
+ }
+
+ shader->proj_uniform = glGetUniformLocation(shader->program, "proj");
+ shader->color_uniform = glGetUniformLocation(shader->program, "color");
+
+ return 0;
+}
+
void
wlsc_output_destroy(struct wlsc_output *output)
{
@@ -1703,6 +1856,10 @@
wl_list_init(&ec->input_device_list);
wl_list_init(&ec->output_list);
wl_list_init(&ec->binding_list);
+ wl_list_init(&ec->animation_list);
+ wlsc_tweener_init(&ec->fade.tweener, 0.8, 0.0, 0.0);
+ ec->fade.animation.frame = fade_frame;
+ wl_list_init(&ec->fade.animation.link);
wlsc_shell_init(ec);
wlsc_switcher_init(ec);
@@ -1727,6 +1884,10 @@
if (wlsc_shader_init(&ec->texture_shader,
vertex_shader, texture_fragment_shader) < 0)
return -1;
+ if (init_solid_shader(&ec->solid_shader,
+ ec->texture_shader.vertex_shader,
+ solid_fragment_shader) < 0)
+ return -1;
loop = wl_display_get_event_loop(ec->wl_display);
ec->idle_source = wl_event_loop_add_timer(loop, idle_handler, ec);
diff --git a/compositor/compositor.h b/compositor/compositor.h
index 4facf1f..3c0d073 100644
--- a/compositor/compositor.h
+++ b/compositor/compositor.h
@@ -98,6 +98,20 @@
GLuint color_uniform;
};
+struct wlsc_animation {
+ void (*frame)(struct wlsc_animation *animation,
+ struct wlsc_output *output, uint32_t msecs);
+ struct wl_list link;
+};
+
+struct wlsc_tweener {
+ double k;
+ double current;
+ double target;
+ double previous;
+ uint32_t timestamp;
+};
+
enum {
WLSC_COMPOSITOR_ACTIVE,
WLSC_COMPOSITOR_SLEEPING
@@ -128,6 +142,11 @@
struct wl_list input_device_list;
struct wl_list surface_list;
struct wl_list binding_list;
+ struct wl_list animation_list;
+ struct {
+ struct wlsc_tweener tweener;
+ struct wlsc_animation animation;
+ } fade;
uint32_t state;
struct wl_event_source *idle_source;
@@ -189,6 +208,14 @@
};
void
+wlsc_tweener_init(struct wlsc_tweener *tweener,
+ double k, double current, double target);
+void
+wlsc_tweener_update(struct wlsc_tweener *tweener, uint32_t msec);
+int
+wlsc_tweener_done(struct wlsc_tweener *tweener);
+
+void
wlsc_surface_update_matrix(struct wlsc_surface *es);
void
@@ -223,6 +250,8 @@
void
wlsc_compositor_schedule_repaint(struct wlsc_compositor *compositor);
void
+wlsc_compositor_fade(struct wlsc_compositor *compositor, float tint);
+void
wlsc_compositor_damage_all(struct wlsc_compositor *compositor);
void
wlsc_compositor_unlock(struct wlsc_compositor *compositor);