#include <stdint.h>
#include <limits.h>
#include <stdarg.h>
+#include <assert.h>
#include <sys/ioctl.h>
+#include <sys/wait.h>
#include <fcntl.h>
#include <unistd.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
#include <math.h>
#include <linux/input.h>
+#include <dlfcn.h>
+#include <getopt.h>
+#include <signal.h>
#include "wayland-server.h"
#include "compositor.h"
-struct wlsc_switcher {
- struct wlsc_compositor *compositor;
- struct wlsc_surface *current;
- struct wl_listener listener;
-};
-
/* The plan here is to generate a random anonymous socket name and
* advertise that through a service on the session dbus.
*/
static const char *option_socket_name = NULL;
-static const char *option_background = "background.jpg";
-static const char *option_geometry = "1024x640";
-static int option_connector = 0;
-
-static const GOptionEntry option_entries[] = {
- { "background", 'b', 0, G_OPTION_ARG_STRING,
- &option_background, "Background image" },
- { "connector", 'c', 0, G_OPTION_ARG_INT,
- &option_connector, "KMS connector" },
- { "geometry", 'g', 0, G_OPTION_ARG_STRING,
- &option_geometry, "Geometry" },
- { "socket", 's', 0, G_OPTION_ARG_STRING,
- &option_socket_name, "Socket Name" },
- { NULL }
-};
+static const char *option_background = "background.png";
+static int option_idle_time = 300;
-static void
+static struct wl_list child_process_list;
+
+static int
+sigchld_handler(int signal_number, void *data)
+{
+ struct wlsc_process *p;
+ int status;
+ pid_t pid;
+
+ pid = wait(&status);
+ wl_list_for_each(p, &child_process_list, link) {
+ if (p->pid == pid)
+ break;
+ }
+
+ if (&p->link == &child_process_list) {
+ fprintf(stderr, "unknown child process exited\n");
+ return 1;
+ }
+
+ wl_list_remove(&p->link);
+ p->cleanup(p, status);
+
+ return 1;
+}
+
+WL_EXPORT void
+wlsc_watch_process(struct wlsc_process *process)
+{
+ wl_list_insert(&child_process_list, &process->link);
+}
+
+WL_EXPORT void
wlsc_matrix_init(struct wlsc_matrix *matrix)
{
static const struct wlsc_matrix identity = {
memcpy(m, &tmp, sizeof tmp);
}
-static void
+WL_EXPORT void
wlsc_matrix_translate(struct wlsc_matrix *matrix, GLfloat x, GLfloat y, GLfloat z)
{
struct wlsc_matrix translate = {
wlsc_matrix_multiply(matrix, &translate);
}
-static void
+WL_EXPORT void
wlsc_matrix_scale(struct wlsc_matrix *matrix, GLfloat x, GLfloat y, GLfloat z)
{
struct wlsc_matrix scale = {
*v = t;
}
-static struct wlsc_surface *
+WL_EXPORT void
+wlsc_spring_init(struct wlsc_spring *spring,
+ double k, double current, double target)
+{
+ spring->k = k;
+ spring->friction = 100.0;
+ spring->current = current;
+ spring->previous = current;
+ spring->target = target;
+}
+
+WL_EXPORT void
+wlsc_spring_update(struct wlsc_spring *spring, uint32_t msec)
+{
+ double force, v, current, step;
+
+ step = (msec - spring->timestamp) / 300.0;
+ spring->timestamp = msec;
+
+ current = spring->current;
+ v = current - spring->previous;
+ force = spring->k * (spring->target - current) / 10.0 +
+ (spring->previous - current) - v * spring->friction;
+
+ spring->current =
+ current + (current - spring->previous) + force * step * step;
+ spring->previous = current;
+
+#if 0
+ if (spring->current >= 1.0) {
+#ifdef TWEENER_BOUNCE
+ spring->current = 2.0 - spring->current;
+ spring->previous = 2.0 - spring->previous;
+#else
+ spring->current = 1.0;
+ spring->previous = 1.0;
+#endif
+ }
+
+ if (spring->current <= 0.0) {
+ spring->current = 0.0;
+ spring->previous = 0.0;
+ }
+#endif
+}
+
+WL_EXPORT int
+wlsc_spring_done(struct wlsc_spring *spring)
+{
+ return fabs(spring->previous - spring->target) < 0.0002 &&
+ fabs(spring->current - spring->target) < 0.0002;
+}
+
+static void
+surface_handle_buffer_destroy(struct wl_listener *listener,
+ struct wl_resource *resource, uint32_t time)
+{
+ struct wlsc_surface *es = container_of(listener, struct wlsc_surface,
+ buffer_destroy_listener);
+ struct wl_buffer *buffer = (struct wl_buffer *) resource;
+
+ if (es->buffer == buffer)
+ es->buffer = NULL;
+}
+
+static void
+output_handle_scanout_buffer_destroy(struct wl_listener *listener,
+ struct wl_resource *resource,
+ uint32_t time)
+{
+ struct wlsc_output *output =
+ container_of(listener, struct wlsc_output,
+ scanout_buffer_destroy_listener);
+ struct wl_buffer *buffer = (struct wl_buffer *) resource;
+
+ if (output->scanout_buffer == buffer)
+ output->scanout_buffer = NULL;
+}
+
+WL_EXPORT struct wlsc_surface *
wlsc_surface_create(struct wlsc_compositor *compositor,
int32_t x, int32_t y, int32_t width, int32_t height)
{
if (surface == NULL)
return NULL;
- wl_list_init(&surface->surface.destroy_listener_list);
wl_list_init(&surface->link);
+ wl_list_init(&surface->buffer_link);
surface->map_type = WLSC_SURFACE_MAP_UNMAPPED;
glGenTextures(1, &surface->texture);
glBindTexture(GL_TEXTURE_2D, surface->texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ surface->surface.client = NULL;
surface->compositor = compositor;
surface->visual = NULL;
+ surface->image = EGL_NO_IMAGE_KHR;
+ surface->saved_texture = 0;
surface->x = x;
surface->y = y;
surface->width = width;
surface->height = height;
- wlsc_matrix_init(&surface->matrix);
- wlsc_matrix_scale(&surface->matrix, width, height, 1);
- wlsc_matrix_translate(&surface->matrix, x, y, 0);
- wlsc_matrix_init(&surface->matrix_inv);
- wlsc_matrix_translate(&surface->matrix_inv, -x, -y, 0);
- wlsc_matrix_scale(&surface->matrix_inv, 1.0 / width, 1.0 / height, 1);
+ surface->buffer = NULL;
+
+ pixman_region32_init(&surface->damage);
+ pixman_region32_init(&surface->opaque);
+
+ surface->buffer_destroy_listener.func = surface_handle_buffer_destroy;
+ wl_list_init(&surface->buffer_destroy_listener.link);
+
+ surface->transform = NULL;
return surface;
}
-void
+WL_EXPORT void
wlsc_surface_damage_rectangle(struct wlsc_surface *surface,
int32_t x, int32_t y,
int32_t width, int32_t height)
{
struct wlsc_compositor *compositor = surface->compositor;
- pixman_region32_union_rect(&compositor->damage_region,
- &compositor->damage_region,
+ pixman_region32_union_rect(&surface->damage,
+ &surface->damage,
surface->x + x, surface->y + y,
width, height);
wlsc_compositor_schedule_repaint(compositor);
}
-void
+WL_EXPORT void
wlsc_surface_damage(struct wlsc_surface *surface)
{
wlsc_surface_damage_rectangle(surface, 0, 0,
surface->width, surface->height);
}
-uint32_t
-get_time(void)
+WL_EXPORT void
+wlsc_surface_damage_below(struct wlsc_surface *surface)
+{
+ struct wlsc_surface *below;
+
+ if (surface->link.next == &surface->compositor->surface_list)
+ return;
+
+ below = container_of(surface->link.next, struct wlsc_surface, link);
+
+ pixman_region32_union_rect(&below->damage,
+ &below->damage,
+ surface->x, surface->y,
+ surface->width, surface->height);
+ wlsc_compositor_schedule_repaint(surface->compositor);
+}
+
+WL_EXPORT void
+wlsc_surface_configure(struct wlsc_surface *surface,
+ int x, int y, int width, int height)
+{
+ struct wlsc_compositor *compositor = surface->compositor;
+
+ wlsc_surface_damage_below(surface);
+
+ surface->x = x;
+ surface->y = y;
+ surface->width = width;
+ surface->height = height;
+
+ wlsc_surface_assign_output(surface);
+ wlsc_surface_damage(surface);
+
+ pixman_region32_fini(&surface->opaque);
+ if (surface->visual == &compositor->compositor.rgb_visual)
+ pixman_region32_init_rect(&surface->opaque,
+ surface->x, surface->y,
+ surface->width, surface->height);
+ else
+ pixman_region32_init(&surface->opaque);
+}
+
+WL_EXPORT uint32_t
+wlsc_compositor_get_time(void)
{
struct timeval tv;
{
struct wlsc_surface *surface =
container_of(resource, struct wlsc_surface, surface.resource);
- struct wl_listener *l, *next;
- uint32_t time;
+ struct wlsc_compositor *compositor = surface->compositor;
- wlsc_surface_damage(surface);
+ wlsc_surface_damage_below(surface);
wl_list_remove(&surface->link);
- glDeleteTextures(1, &surface->texture);
+ if (surface->saved_texture == 0)
+ glDeleteTextures(1, &surface->texture);
+ else
+ glDeleteTextures(1, &surface->saved_texture);
+
+ if (surface->buffer)
+ wl_list_remove(&surface->buffer_destroy_listener.link);
- time = get_time();
- wl_list_for_each_safe(l, next,
- &surface->surface.destroy_listener_list, link)
- l->func(l, &surface->surface, time);
+ if (surface->image != EGL_NO_IMAGE_KHR)
+ compositor->destroy_image(compositor->display,
+ surface->image);
+
+ wl_list_remove(&surface->buffer_link);
free(surface);
}
-uint32_t *
-wlsc_load_image(const char *filename, int width, int height)
+static void
+wlsc_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
{
- GdkPixbuf *pixbuf;
- GError *error = NULL;
- int stride, i, n_channels;
- unsigned char *pixels, *end, *argb_pixels, *s, *d;
+ struct wlsc_surface *es = (struct wlsc_surface *) surface;
+ struct wlsc_compositor *ec = es->compositor;
+ struct wl_list *surfaces_attached_to;
- pixbuf = gdk_pixbuf_new_from_file_at_scale(filename,
- width, height,
- FALSE, &error);
- if (error != NULL) {
- fprintf(stderr, "failed to load image: %s\n", error->message);
- g_error_free(error);
- return NULL;
- }
+ if (es->saved_texture != 0)
+ es->texture = es->saved_texture;
- stride = gdk_pixbuf_get_rowstride(pixbuf);
- pixels = gdk_pixbuf_get_pixels(pixbuf);
- n_channels = gdk_pixbuf_get_n_channels(pixbuf);
+ glBindTexture(GL_TEXTURE_2D, es->texture);
- argb_pixels = malloc (height * width * 4);
- if (argb_pixels == NULL) {
- g_object_unref(pixbuf);
- return NULL;
- }
+ if (wl_buffer_is_shm(buffer)) {
+ /* Unbind any EGLImage texture that may be bound, so we don't
+ * overwrite it.*/
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+ 0, 0, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
+ es->pitch = wl_shm_buffer_get_stride(buffer) / 4;
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+ es->pitch, buffer->height, 0,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+ wl_shm_buffer_get_data(buffer));
+ es->visual = buffer->visual;
- if (n_channels == 4) {
- for (i = 0; i < height; i++) {
- s = pixels + i * stride;
- end = s + width * 4;
- d = argb_pixels + i * width * 4;
- while (s < end) {
- unsigned int t;
+ surfaces_attached_to = buffer->user_data;
-#define MULT(_d,c,a,t) \
- do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)
-
- MULT(d[0], s[2], s[3], t);
- MULT(d[1], s[1], s[3], t);
- MULT(d[2], s[0], s[3], t);
- d[3] = s[3];
- s += 4;
- d += 4;
- }
- }
- } else if (n_channels == 3) {
- for (i = 0; i < height; i++) {
- s = pixels + i * stride;
- end = s + width * 3;
- d = argb_pixels + i * width * 4;
- while (s < end) {
- d[0] = s[2];
- d[1] = s[1];
- d[2] = s[0];
- d[3] = 0xff;
- s += 3;
- d += 4;
- }
- }
+ wl_list_remove(&es->buffer_link);
+ wl_list_insert(surfaces_attached_to, &es->buffer_link);
+ } else {
+ if (es->image != EGL_NO_IMAGE_KHR)
+ ec->destroy_image(ec->display, es->image);
+ es->image = ec->create_image(ec->display, NULL,
+ EGL_WAYLAND_BUFFER_WL,
+ buffer, NULL);
+
+ ec->image_target_texture_2d(GL_TEXTURE_2D, es->image);
+ es->visual = buffer->visual;
+ es->pitch = es->width;
}
-
- g_object_unref(pixbuf);
-
- return (uint32_t *) argb_pixels;
}
static void
-wlsc_buffer_attach(struct wl_buffer *buffer, struct wl_surface *surface)
+wlsc_sprite_attach(struct wlsc_sprite *sprite, struct wl_surface *surface)
{
struct wlsc_surface *es = (struct wlsc_surface *) surface;
struct wlsc_compositor *ec = es->compositor;
- EGLImageKHR *image;
-
- if (buffer->attach) {
- buffer->attach(buffer, surface);
- } else {
- image = eglCreateImageKHR(ec->display, ec->context,
- EGL_WAYLAND_BUFFER_WL,
- buffer, NULL);
+ es->pitch = es->width;
+ es->image = sprite->image;
+ if (sprite->image != EGL_NO_IMAGE_KHR) {
glBindTexture(GL_TEXTURE_2D, es->texture);
- glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
- es->visual = buffer->visual;
- eglDestroyImageKHR(ec->display, image);
+ ec->image_target_texture_2d(GL_TEXTURE_2D, es->image);
+ } else {
+ if (es->saved_texture == 0)
+ es->saved_texture = es->texture;
+ es->texture = sprite->texture;
}
+
+ es->visual = sprite->visual;
+
+ if (es->buffer)
+ es->buffer = NULL;
}
-static struct wl_buffer *
-create_buffer_from_png(struct wlsc_compositor *ec,
- const char *filename, int width, int height)
+enum sprite_usage {
+ SPRITE_USE_CURSOR = (1 << 0),
+};
+
+static struct wlsc_sprite *
+create_sprite_from_png(struct wlsc_compositor *ec,
+ const char *filename, uint32_t usage)
{
uint32_t *pixels;
- struct wl_buffer *buffer;
+ struct wlsc_sprite *sprite;
+ int32_t width, height;
+ uint32_t stride;
- pixels = wlsc_load_image(filename, width, height);
- if(pixels == NULL)
- return NULL;
+ pixels = wlsc_load_image(filename, &width, &height, &stride);
+ if (pixels == NULL)
+ return NULL;
- buffer = ec->create_buffer(ec, width, height, width * 4,
- &ec->compositor.premultiplied_argb_visual,
- pixels);
+ sprite = malloc(sizeof *sprite);
+ if (sprite == NULL) {
+ free(pixels);
+ return NULL;
+ }
+
+ sprite->visual = &ec->compositor.premultiplied_argb_visual;
+ sprite->width = width;
+ sprite->height = height;
+ sprite->image = EGL_NO_IMAGE_KHR;
+
+ if (usage & SPRITE_USE_CURSOR && ec->create_cursor_image != NULL)
+ sprite->image = ec->create_cursor_image(ec, width, height);
+
+ glGenTextures(1, &sprite->texture);
+ glBindTexture(GL_TEXTURE_2D, sprite->texture);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+ if (sprite->image != EGL_NO_IMAGE_KHR) {
+ ec->image_target_texture_2d(GL_TEXTURE_2D, sprite->image);
+ glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixels);
+ } else {
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, width, height, 0,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE, pixels);
+ }
free(pixels);
- return buffer;
+ return sprite;
}
static const struct {
create_pointer_images(struct wlsc_compositor *ec)
{
int i, count;
- const int width = 32, height = 32;
count = ARRAY_LENGTH(pointer_images);
- ec->pointer_buffers = malloc(count * sizeof *ec->pointer_buffers);
+ ec->pointer_sprites = malloc(count * sizeof *ec->pointer_sprites);
for (i = 0; i < count; i++) {
- ec->pointer_buffers[i] =
- create_buffer_from_png(ec,
+ ec->pointer_sprites[i] =
+ create_sprite_from_png(ec,
pointer_images[i].filename,
- width, height);
+ SPRITE_USE_CURSOR);
}
}
background_create(struct wlsc_output *output, const char *filename)
{
struct wlsc_surface *background;
- struct wl_buffer *buffer;
+ struct wlsc_sprite *sprite;
background = wlsc_surface_create(output->compositor,
output->x, output->y,
- output->width, output->height);
+ output->current->width,
+ output->current->height);
if (background == NULL)
return NULL;
- buffer = create_buffer_from_png(output->compositor,
- filename,
- output->width, output->height);
- if (buffer == NULL) {
+ sprite = create_sprite_from_png(output->compositor, filename, 0);
+ if (sprite == NULL) {
free(background);
return NULL;
}
- wlsc_buffer_attach(buffer, &background->surface);
+ wlsc_sprite_attach(sprite, &background->surface);
return background;
}
-static void
-wlsc_surface_draw(struct wlsc_surface *es,
- struct wlsc_output *output, pixman_region32_t *clip)
+static int
+texture_region(struct wlsc_surface *es, pixman_region32_t *region)
{
struct wlsc_compositor *ec = es->compositor;
GLfloat *v, inv_width, inv_height;
- unsigned int *p;
- pixman_region32_t repaint;
pixman_box32_t *rectangles;
+ unsigned int *p;
int i, n;
- pixman_region32_init_rect(&repaint,
- es->x, es->y, es->width, es->height);
- pixman_region32_intersect(&repaint, &repaint, clip);
- if (!pixman_region32_not_empty(&repaint))
- return;
-
- if (es->visual == &ec->compositor.argb_visual) {
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glEnable(GL_BLEND);
- } else if (es->visual == &ec->compositor.premultiplied_argb_visual) {
- glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
- glEnable(GL_BLEND);
- } else {
- glDisable(GL_BLEND);
- }
-
- rectangles = pixman_region32_rectangles(&repaint, &n);
+ rectangles = pixman_region32_rectangles(region, &n);
v = wl_array_add(&ec->vertices, n * 16 * sizeof *v);
p = wl_array_add(&ec->indices, n * 6 * sizeof *p);
- inv_width = 1.0 / es->width;
+ inv_width = 1.0 / es->pitch;
inv_height = 1.0 / es->height;
+
for (i = 0; i < n; i++, v += 16, p += 6) {
v[ 0] = rectangles[i].x1;
v[ 1] = rectangles[i].y1;
p[5] = i * 4 + 3;
}
+ return n;
+}
+
+static void
+transform_vertex(struct wlsc_surface *surface,
+ GLfloat x, GLfloat y, GLfloat u, GLfloat v, GLfloat *r)
+{
+ struct wlsc_vector t;
+
+ t.f[0] = x;
+ t.f[1] = y;
+ t.f[2] = 0.0;
+ t.f[3] = 1.0;
+
+ wlsc_matrix_transform(&surface->transform->matrix, &t);
+
+ r[ 0] = t.f[0];
+ r[ 1] = t.f[1];
+ r[ 2] = u;
+ r[ 3] = v;
+}
+
+static int
+texture_transformed_surface(struct wlsc_surface *es)
+{
+ struct wlsc_compositor *ec = es->compositor;
+ GLfloat *v;
+ unsigned int *p;
+
+ v = wl_array_add(&ec->vertices, 16 * sizeof *v);
+ p = wl_array_add(&ec->indices, 6 * sizeof *p);
+
+ transform_vertex(es, es->x, es->y, 0.0, 0.0, &v[0]);
+ transform_vertex(es, es->x, es->y + es->height, 0.0, 1.0, &v[4]);
+ transform_vertex(es, es->x + es->width, es->y, 1.0, 0.0, &v[8]);
+ transform_vertex(es, es->x + es->width, es->y + es->height,
+ 1.0, 1.0, &v[12]);
+
+ p[0] = 0;
+ p[1] = 1;
+ p[2] = 2;
+ p[3] = 2;
+ p[4] = 1;
+ p[5] = 3;
+
+ return 1;
+}
+
+static void
+wlsc_surface_draw(struct wlsc_surface *es,
+ struct wlsc_output *output, pixman_region32_t *clip)
+{
+ struct wlsc_compositor *ec = es->compositor;
+ GLfloat *v;
+ pixman_region32_t repaint;
+ GLint filter;
+ int n;
+
+ pixman_region32_init_rect(&repaint,
+ es->x, es->y, es->width, es->height);
+ pixman_region32_intersect(&repaint, &repaint, clip);
+ if (!pixman_region32_not_empty(&repaint))
+ return;
+
+ if (es->visual == &ec->compositor.argb_visual) {
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ } else if (es->visual == &ec->compositor.premultiplied_argb_visual) {
+ glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+ glEnable(GL_BLEND);
+ } else {
+ glDisable(GL_BLEND);
+ }
+
+ if (es->transform == NULL) {
+ filter = GL_NEAREST;
+ n = texture_region(es, &repaint);
+ } else {
+ filter = GL_LINEAR;
+ n = texture_transformed_surface(es);
+ }
+
glBindTexture(GL_TEXTURE_2D, es->texture);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
+
v = ec->vertices.data;
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[0]);
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4 * sizeof *v, &v[2]);
wl_list_remove(&surface->link);
wl_list_insert(&compositor->surface_list, &surface->link);
+ wlsc_surface_damage(surface);
}
-void
-wlsc_surface_update_matrix(struct wlsc_surface *es)
+WL_EXPORT void
+wlsc_compositor_damage_all(struct wlsc_compositor *compositor)
{
- wlsc_matrix_init(&es->matrix);
- wlsc_matrix_scale(&es->matrix, es->width, es->height, 1);
- wlsc_matrix_translate(&es->matrix, es->x, es->y, 0);
+ struct wlsc_output *output;
- wlsc_matrix_init(&es->matrix_inv);
- wlsc_matrix_translate(&es->matrix_inv, -es->x, -es->y, 0);
- wlsc_matrix_scale(&es->matrix_inv,
- 1.0 / es->width, 1.0 / es->height, 1);
+ wl_list_for_each(output, &compositor->output_list, link)
+ wlsc_output_damage(output);
}
-void
-wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
+static inline void
+wlsc_buffer_post_release(struct wl_buffer *buffer)
+{
+ if (buffer == NULL || --buffer->busy_count > 0)
+ return;
+
+ assert(buffer->client != NULL);
+ wl_client_post_event(buffer->client,
+ &buffer->resource.object,
+ WL_BUFFER_RELEASE);
+}
+
+WL_EXPORT void
+wlsc_output_damage(struct wlsc_output *output)
{
struct wlsc_compositor *compositor = output->compositor;
- struct wlsc_surface *es;
- wl_list_for_each(es, &compositor->surface_list, link) {
- if (es->output == output) {
- wl_display_post_frame(compositor->wl_display,
- &es->surface, msecs);
+ pixman_region32_union(&compositor->damage,
+ &compositor->damage, &output->region);
+ wlsc_compositor_schedule_repaint(compositor);
+}
+
+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_spring_update(&compositor->fade.spring, msecs);
+ if (wlsc_spring_done(&compositor->fade.spring)) {
+ if (compositor->fade.spring.current > 0.999) {
+ compositor->state = WLSC_COMPOSITOR_SLEEPING;
+ compositor->shell->lock(compositor->shell);
}
+ compositor->fade.spring.current =
+ compositor->fade.spring.target;
+ wl_list_remove(&animation->link);
+ wl_list_init(&animation->link);
}
- output->finished = 1;
+ wlsc_output_damage(output);
+}
- wl_event_source_timer_update(compositor->timer_source, 5);
- compositor->repaint_on_timeout = 1;
+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->current->width;
+ surface.height = output->current->height;
+ surface.texture = GL_NONE;
+ surface.transform = NULL;
+
+ if (tint <= 1.0)
+ surface.visual =
+ &compositor->compositor.premultiplied_argb_visual;
+ else
+ surface.visual = &compositor->compositor.rgb_visual;
+
+ 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_set_cursor(struct wlsc_output *output,
+ struct wl_input_device *dev, int force_sw)
+{
+ struct wlsc_compositor *ec = output->compositor;
+ struct wlsc_input_device *device = (struct wlsc_input_device *) dev;
+ pixman_region32_t cursor_region;
+ int use_hardware_cursor = 1, prior_was_hardware;
+
+ pixman_region32_init_rect(&cursor_region,
+ device->sprite->x, device->sprite->y,
+ device->sprite->width,
+ device->sprite->height);
+
+ pixman_region32_intersect(&cursor_region, &cursor_region, &output->region);
+
+ if (!pixman_region32_not_empty(&cursor_region)) {
+ output->set_hardware_cursor(output, NULL);
+ goto out;
+ }
+
+ prior_was_hardware = wl_list_empty(&device->sprite->link);
+ if (force_sw || output->set_hardware_cursor(output, device) < 0) {
+ if (prior_was_hardware)
+ wlsc_surface_damage(device->sprite);
+ use_hardware_cursor = 0;
+ } else if (!prior_was_hardware) {
+ wlsc_surface_damage_below(device->sprite);
+ }
+
+ /* Remove always to be on top. */
+ wl_list_remove(&device->sprite->link);
+ if (!use_hardware_cursor)
+ wl_list_insert(&ec->surface_list, &device->sprite->link);
+ else
+ wl_list_init(&device->sprite->link);
+
+out:
+ pixman_region32_fini(&cursor_region);
}
static void
{
struct wlsc_compositor *ec = output->compositor;
struct wlsc_surface *es;
- struct wlsc_input_device *eid;
- pixman_region32_t new_damage, total_damage, repaint;
+ pixman_region32_t opaque, new_damage, total_damage, repaint;
output->prepare_render(output);
- glViewport(0, 0, output->width, output->height);
+ glViewport(0, 0, output->current->width, output->current->height);
- glUniformMatrix4fv(ec->proj_uniform, 1, GL_FALSE, output->matrix.d);
- glUniform1i(ec->tex_uniform, 0);
+ glUseProgram(ec->texture_shader.program);
+ glUniformMatrix4fv(ec->texture_shader.proj_uniform,
+ 1, GL_FALSE, output->matrix.d);
+ glUniform1i(ec->texture_shader.tex_uniform, 0);
+
+ wlsc_output_set_cursor(output, ec->input_device,
+ !(ec->focus && ec->fade.spring.current < 0.001));
pixman_region32_init(&new_damage);
+ pixman_region32_copy(&new_damage, &ec->damage);
+ pixman_region32_init(&opaque);
+
+ wl_list_for_each(es, &ec->surface_list, link) {
+ pixman_region32_subtract(&es->damage, &es->damage, &opaque);
+ pixman_region32_union(&new_damage, &new_damage, &es->damage);
+ pixman_region32_union(&opaque, &opaque, &es->opaque);
+ }
+
+ pixman_region32_subtract(&ec->damage, &ec->damage, &output->region);
+
pixman_region32_init(&total_damage);
- pixman_region32_intersect_rect(&new_damage,
- &ec->damage_region,
- output->x, output->y,
- output->width, output->height);
- pixman_region32_subtract(&ec->damage_region,
- &ec->damage_region, &new_damage);
pixman_region32_union(&total_damage, &new_damage,
- &output->previous_damage_region);
- pixman_region32_copy(&output->previous_damage_region, &new_damage);
+ &output->previous_damage);
+ pixman_region32_intersect(&output->previous_damage,
+ &new_damage, &output->region);
+
+ pixman_region32_fini(&opaque);
+ pixman_region32_fini(&new_damage);
es = container_of(ec->surface_list.next, struct wlsc_surface, link);
- if (es->map_type == WLSC_SURFACE_MAP_FULLSCREEN &&
- es->fullscreen_output == output) {
- if (es->width < output->width || es->height < output->height)
+
+ if (es->visual == &ec->compositor.rgb_visual &&
+ output->prepare_scanout_surface(output, es) == 0) {
+ /* We're drawing nothing now,
+ * draw the damaged regions later. */
+ pixman_region32_union(&ec->damage, &ec->damage, &total_damage);
+
+ output->scanout_buffer = es->buffer;
+ output->scanout_buffer->busy_count++;
+
+ wl_list_remove(&output->scanout_buffer_destroy_listener.link);
+ wl_list_insert(output->scanout_buffer->resource.destroy_listener_list.prev,
+ &output->scanout_buffer_destroy_listener.link);
+
+ return;
+ }
+
+ if (es->fullscreen_output == output) {
+ if (es->width < output->current->width ||
+ es->height < output->current->height)
glClear(GL_COLOR_BUFFER_BIT);
wlsc_surface_draw(es, output, &total_damage);
} else {
wl_list_for_each(es, &ec->surface_list, link) {
- if (es->visual != &ec->compositor.rgb_visual)
- continue;
-
- pixman_region32_init_rect(&repaint,
- es->x, es->y,
- es->width, es->height);
- wlsc_surface_draw(es, output, &total_damage);
- pixman_region32_subtract(&total_damage,
- &total_damage, &repaint);
+ pixman_region32_copy(&es->damage, &total_damage);
+ pixman_region32_subtract(&total_damage, &total_damage, &es->opaque);
}
- if (output->background)
- wlsc_surface_draw(output->background,
- output, &total_damage);
- else
- glClear(GL_COLOR_BUFFER_BIT);
-
wl_list_for_each_reverse(es, &ec->surface_list, link) {
- if (ec->switcher &&
- ec->switcher->current == es)
- continue;
-
- if (es->visual == &ec->compositor.rgb_visual) {
- pixman_region32_union_rect(&total_damage,
- &total_damage,
- es->x, es->y,
- es->width, es->height);
- continue;
- }
-
- wlsc_surface_draw(es, output, &total_damage);
+ pixman_region32_init(&repaint);
+ pixman_region32_intersect(&repaint, &output->region,
+ &es->damage);
+ wlsc_surface_draw(es, output, &repaint);
+ pixman_region32_subtract(&es->damage,
+ &es->damage, &output->region);
}
}
- if (ec->switcher)
- wlsc_surface_draw(ec->switcher->current,
- output, &total_damage);
-
- if (ec->focus)
- wl_list_for_each(eid, &ec->input_device_list, link)
- wlsc_surface_draw(eid->sprite, output, &total_damage);
+ if (ec->fade.spring.current > 0.001)
+ fade_output(output, ec->fade.spring.current, &total_damage);
}
static void
-repaint(void *data)
+repaint(void *data, int msecs)
{
- struct wlsc_compositor *ec = data;
- struct wlsc_output *output;
- int repainted_all_outputs = 1;
+ struct wlsc_output *output = data;
+ struct wlsc_compositor *compositor = output->compositor;
+ struct wlsc_surface *es;
+ struct wlsc_animation *animation, *next;
- wl_list_for_each(output, &ec->output_list, link) {
- if (!output->repaint_needed)
- continue;
+ wlsc_output_repaint(output);
+ output->repaint_needed = 0;
+ output->repaint_scheduled = 1;
+ output->present(output);
- if (!output->finished) {
- repainted_all_outputs = 0;
- continue;
+ /* FIXME: Keep the surfaces in an per-output list. */
+ wl_list_for_each(es, &compositor->surface_list, link) {
+ if (es->output == output) {
+ wl_display_post_frame(compositor->wl_display,
+ &es->surface, msecs);
}
-
- wlsc_output_repaint(output);
- output->finished = 0;
- output->repaint_needed = 0;
- output->present(output);
}
- if (repainted_all_outputs)
- ec->repaint_on_timeout = 0;
- else
- wl_event_source_timer_update(ec->timer_source, 1);
+ wl_list_for_each_safe(animation, next,
+ &compositor->animation_list, link)
+ animation->frame(animation, output, msecs);
+}
+
+static void
+idle_repaint(void *data)
+{
+ repaint(data, wlsc_compositor_get_time());
+}
+
+WL_EXPORT void
+wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
+{
+ wlsc_buffer_post_release(output->scanout_buffer);
+ output->scanout_buffer = NULL;
+ output->repaint_scheduled = 0;
+
+ if (output->repaint_needed)
+ repaint(output, msecs);
}
-void
+WL_EXPORT void
wlsc_compositor_schedule_repaint(struct wlsc_compositor *compositor)
{
struct wlsc_output *output;
+ struct wl_event_loop *loop;
- wl_list_for_each(output, &compositor->output_list, link)
+ if (compositor->state == WLSC_COMPOSITOR_SLEEPING)
+ return;
+
+ loop = wl_display_get_event_loop(compositor->wl_display);
+ wl_list_for_each(output, &compositor->output_list, link) {
output->repaint_needed = 1;
+ if (output->repaint_scheduled)
+ continue;
- if (compositor->repaint_on_timeout)
+ wl_event_loop_add_idle(loop, idle_repaint, output);
+ output->repaint_scheduled = 1;
+ }
+}
+
+WL_EXPORT void
+wlsc_compositor_fade(struct wlsc_compositor *compositor, float tint)
+{
+ int done;
+
+ done = wlsc_spring_done(&compositor->fade.spring);
+ compositor->fade.spring.target = tint;
+ if (wlsc_spring_done(&compositor->fade.spring))
return;
- wl_event_source_timer_update(compositor->timer_source, 1);
- compositor->repaint_on_timeout = 1;
+ if (done)
+ compositor->fade.spring.timestamp =
+ wlsc_compositor_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)
{
- wl_resource_destroy(&surface->resource, client);
+ wl_resource_destroy(&surface->resource, client,
+ wlsc_compositor_get_time());
}
-void
+WL_EXPORT void
wlsc_surface_assign_output(struct wlsc_surface *es)
{
struct wlsc_compositor *ec = es->compositor;
es->output = NULL;
wl_list_for_each(output, &ec->output_list, link) {
- if (output->x < es->x && es->x < output->x + output->width &&
- output->y < es->y && es->y < output->y + output->height) {
+ if (pixman_region32_contains_point(&output->region,
+ es->x, es->y, NULL)) {
if (output != tmp)
printf("assiging surface %p to output %p\n",
es, output);
{
struct wlsc_surface *es = (struct wlsc_surface *) surface;
- /* FIXME: This damages the entire old surface, but we should
- * really just damage the part that's no longer covered by the
- * surface. Anything covered by the new surface will be
- * damaged by the client. */
- wlsc_surface_damage(es);
-
- wlsc_buffer_attach(buffer, surface);
+ buffer->busy_count++;
+ wlsc_buffer_post_release(es->buffer);
es->buffer = buffer;
- es->x += x;
- es->y += y;
- es->width = buffer->width;
- es->height = buffer->height;
- if (x != 0 || y != 0)
- wlsc_surface_assign_output(es);
- wlsc_surface_update_matrix(es);
-}
+ wl_list_remove(&es->buffer_destroy_listener.link);
+ wl_list_insert(es->buffer->resource.destroy_listener_list.prev,
+ &es->buffer_destroy_listener.link);
-static void
-surface_map_toplevel(struct wl_client *client,
- struct wl_surface *surface)
-{
- struct wlsc_surface *es = (struct wlsc_surface *) surface;
- struct wlsc_compositor *ec = es->compositor;
+ if (es->visual == NULL)
+ fprintf(stderr, "initial attach for surface %p\n", surface);
- switch (es->map_type) {
- case WLSC_SURFACE_MAP_UNMAPPED:
- es->x = 10 + random() % 400;
- es->y = 10 + random() % 400;
- wlsc_surface_update_matrix(es);
- /* assign to first output */
- es->output = container_of(ec->output_list.next,
- struct wlsc_output, link);
+ if (es->visual == NULL)
wl_list_insert(&es->compositor->surface_list, &es->link);
- break;
- case WLSC_SURFACE_MAP_TOPLEVEL:
- return;
- case WLSC_SURFACE_MAP_FULLSCREEN:
- es->fullscreen_output = NULL;
- es->x = es->saved_x;
- es->y = es->saved_y;
- wlsc_surface_update_matrix(es);
- break;
- default:
- break;
- }
-
- wlsc_surface_damage(es);
- es->map_type = WLSC_SURFACE_MAP_TOPLEVEL;
-}
-static void
-surface_map_transient(struct wl_client *client,
- struct wl_surface *surface, struct wl_surface *parent,
- int x, int y, uint32_t flags)
-{
- struct wlsc_surface *es = (struct wlsc_surface *) surface;
- struct wlsc_surface *pes = (struct wlsc_surface *) parent;
-
- switch (es->map_type) {
- case WLSC_SURFACE_MAP_UNMAPPED:
- wl_list_insert(&es->compositor->surface_list, &es->link);
- /* assign to parents output */
- es->output = pes->output;
- break;
- case WLSC_SURFACE_MAP_FULLSCREEN:
- es->fullscreen_output = NULL;
- break;
- default:
- break;
- }
+ es->visual = buffer->visual;
+ wlsc_surface_configure(es, es->x + x, es->y + y,
+ buffer->width, buffer->height);
- es->x = pes->x + x;
- es->y = pes->y + y;
-
- wlsc_surface_update_matrix(es);
- wlsc_surface_damage(es);
- es->map_type = WLSC_SURFACE_MAP_TRANSIENT;
-}
-
-static void
-surface_map_fullscreen(struct wl_client *client, struct wl_surface *surface)
-{
- struct wlsc_surface *es = (struct wlsc_surface *) surface;
- struct wlsc_output *output;
-
- /* FIXME: Fullscreen on first output */
- /* FIXME: Handle output going away */
- output = container_of(es->compositor->output_list.next,
- struct wlsc_output, link);
-
- switch (es->map_type) {
- case WLSC_SURFACE_MAP_UNMAPPED:
- es->x = 10 + random() % 400;
- es->y = 10 + random() % 400;
- /* assign to first output */
- es->output = output;
- wl_list_insert(&es->compositor->surface_list, &es->link);
- break;
- case WLSC_SURFACE_MAP_FULLSCREEN:
- return;
- default:
- break;
- }
+ wlsc_buffer_attach(buffer, surface);
- es->saved_x = es->x;
- es->saved_y = es->y;
- es->x = (output->width - es->width) / 2;
- es->y = (output->height - es->height) / 2;
- es->fullscreen_output = output;
- wlsc_surface_update_matrix(es);
- wlsc_surface_damage(es);
- es->map_type = WLSC_SURFACE_MAP_FULLSCREEN;
+ es->compositor->shell->attach(es->compositor->shell, es);
}
static void
{
struct wlsc_surface *es = (struct wlsc_surface *) surface;
- es->buffer->damage(es->buffer, surface, x, y, width, height);
-
wlsc_surface_damage_rectangle(es, x, y, width, height);
}
const static struct wl_surface_interface surface_interface = {
surface_destroy,
surface_attach,
- surface_map_toplevel,
- surface_map_transient,
- surface_map_fullscreen,
surface_damage
};
static void
wlsc_input_device_attach(struct wlsc_input_device *device,
- struct wl_buffer *buffer, int x, int y)
+ int x, int y, int width, int height)
{
- wlsc_surface_damage(device->sprite);
+ wlsc_surface_damage_below(device->sprite);
- wlsc_buffer_attach(buffer, &device->sprite->surface);
device->hotspot_x = x;
device->hotspot_y = y;
device->sprite->x = device->input_device.x - device->hotspot_x;
device->sprite->y = device->input_device.y - device->hotspot_y;
- device->sprite->width = buffer->width;
- device->sprite->height = buffer->height;
- wlsc_surface_update_matrix(device->sprite);
+ device->sprite->width = width;
+ device->sprite->height = height;
wlsc_surface_damage(device->sprite);
}
+static void
+wlsc_input_device_attach_buffer(struct wlsc_input_device *device,
+ struct wl_buffer *buffer, int x, int y)
+{
+ wlsc_buffer_attach(buffer, &device->sprite->surface);
+ wlsc_input_device_attach(device, x, y, buffer->width, buffer->height);
+}
+
+static void
+wlsc_input_device_attach_sprite(struct wlsc_input_device *device,
+ struct wlsc_sprite *sprite, int x, int y)
+{
+ wlsc_sprite_attach(sprite, &device->sprite->surface);
+ wlsc_input_device_attach(device, x, y, sprite->width, sprite->height);
+}
-void
+WL_EXPORT void
wlsc_input_device_set_pointer_image(struct wlsc_input_device *device,
enum wlsc_pointer_type type)
{
struct wlsc_compositor *compositor =
(struct wlsc_compositor *) device->input_device.compositor;
- wlsc_input_device_attach(device,
- compositor->pointer_buffers[type],
- pointer_images[type].hotspot_x,
- pointer_images[type].hotspot_y);
+ wlsc_input_device_attach_sprite(device,
+ compositor->pointer_sprites[type],
+ pointer_images[type].hotspot_x,
+ pointer_images[type].hotspot_y);
}
static void
wlsc_surface_transform(struct wlsc_surface *surface,
int32_t x, int32_t y, int32_t *sx, int32_t *sy)
{
- struct wlsc_vector v = { { x, y, 0, 1 } };
-
- wlsc_matrix_transform(&surface->matrix_inv, &v);
- *sx = v.f[0] * surface->width;
- *sy = v.f[1] * surface->height;
+ *sx = x - surface->x;
+ *sy = y - surface->y;
}
-struct wlsc_surface *
+WL_EXPORT struct wlsc_surface *
pick_surface(struct wl_input_device *device, int32_t *sx, int32_t *sy)
{
struct wlsc_compositor *ec =
struct wlsc_surface *es;
wl_list_for_each(es, &ec->surface_list, link) {
+ if (es->surface.client == NULL)
+ continue;
wlsc_surface_transform(es, device->x, device->y, sx, sy);
if (0 <= *sx && *sx < es->width &&
0 <= *sy && *sy < es->height)
motion_grab_end
};
-void
+WL_EXPORT void
+wlsc_compositor_wake(struct wlsc_compositor *compositor)
+{
+ if (compositor->idle_inhibit)
+ return;
+
+ wlsc_compositor_fade(compositor, 0.0);
+ compositor->state = WLSC_COMPOSITOR_ACTIVE;
+
+ wl_event_source_timer_update(compositor->idle_source,
+ option_idle_time * 1000);
+}
+
+static void
+wlsc_compositor_idle_inhibit(struct wlsc_compositor *compositor)
+{
+ wlsc_compositor_wake(compositor);
+ compositor->idle_inhibit++;
+}
+
+static void
+wlsc_compositor_idle_release(struct wlsc_compositor *compositor)
+{
+ compositor->idle_inhibit--;
+ wlsc_compositor_wake(compositor);
+}
+
+static int
+idle_handler(void *data)
+{
+ struct wlsc_compositor *compositor = data;
+
+ if (compositor->idle_inhibit)
+ return 1;
+
+ wlsc_compositor_fade(compositor, 1.0);
+
+ return 1;
+}
+
+WL_EXPORT void
notify_motion(struct wl_input_device *device, uint32_t time, int x, int y)
{
struct wlsc_surface *es;
int x_valid = 0, y_valid = 0;
int min_x = INT_MAX, min_y = INT_MAX, max_x = INT_MIN, max_y = INT_MIN;
+ wlsc_compositor_wake(ec);
+
wl_list_for_each(output, &ec->output_list, link) {
- if (output->x <= x && x <= output->x + output->width)
+ if (output->x <= x && x <= output->x + output->current->width)
x_valid = 1;
- if (output->y <= y && y <= output->y + output->height)
+ if (output->y <= y && y <= output->y + output->current->height)
y_valid = 1;
/* FIXME: calculate this only on output addition/deletion */
if (output->y < min_y)
min_y = output->y;
- if (output->x + output->width > max_x)
- max_x = output->x + output->width;
- if (output->y + output->height > max_y)
- max_y = output->y + output->height;
+ if (output->x + output->current->width > max_x)
+ max_x = output->x + output->current->width;
+ if (output->y + output->current->height > max_y)
+ max_y = output->y + output->current->height;
}
if (!x_valid) {
time, x, y, sx, sy);
}
- wlsc_surface_damage(wd->sprite);
+ wlsc_surface_damage_below(wd->sprite);
wd->sprite->x = device->x - wd->hotspot_x;
wd->sprite->y = device->y - wd->hotspot_y;
- wlsc_surface_update_matrix(wd->sprite);
wlsc_surface_damage(wd->sprite);
}
-static void
+WL_EXPORT void
wlsc_surface_activate(struct wlsc_surface *surface,
struct wlsc_input_device *device, uint32_t time)
{
+ struct wlsc_shell *shell = surface->compositor->shell;
+
wlsc_surface_raise(surface);
if (device->selection)
- wlsc_selection_set_focus(device->selection,
- &surface->surface, time);
+ shell->set_selection_focus(shell,
+ device->selection,
+ &surface->surface, time);
wl_input_device_set_keyboard_focus(&device->input_device,
&surface->surface,
time);
}
-void
+struct wlsc_binding {
+ uint32_t key;
+ uint32_t button;
+ uint32_t modifier;
+ wlsc_binding_handler_t handler;
+ void *data;
+ struct wl_list link;
+};
+
+WL_EXPORT void
notify_button(struct wl_input_device *device,
uint32_t time, int32_t button, int32_t state)
{
struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
- struct wlsc_surface *surface;
struct wlsc_compositor *compositor =
(struct wlsc_compositor *) device->compositor;
+ struct wlsc_binding *b;
+ struct wlsc_surface *surface =
+ (struct wlsc_surface *) device->pointer_focus;
- surface = (struct wlsc_surface *) device->pointer_focus;
- uint32_t edges = 0;
- int32_t x, y;
+ if (state)
+ wlsc_compositor_idle_inhibit(compositor);
+ else
+ wlsc_compositor_idle_release(compositor);
if (state && surface && device->grab == NULL) {
wlsc_surface_activate(surface, wd, time);
button, time);
}
- if (state && surface && button == BTN_LEFT &&
- (wd->modifier_state & MODIFIER_SUPER))
- shell_move(NULL,
- (struct wl_shell *) &compositor->shell,
- &surface->surface, device, time);
- else if (state && surface && button == BTN_MIDDLE &&
- (wd->modifier_state & MODIFIER_SUPER)) {
-
- x = device->grab_x - surface->x;
- y = device->grab_y - surface->y;
-
- if (x < surface->width / 3)
- edges |= WL_SHELL_RESIZE_LEFT;
- else if (x < 2 * surface->width / 3)
- edges |= 0;
- else
- edges |= WL_SHELL_RESIZE_RIGHT;
-
- if (y < surface->height / 3)
- edges |= WL_SHELL_RESIZE_TOP;
- else if (y < 2 * surface->height / 3)
- edges |= 0;
- else
- edges |= WL_SHELL_RESIZE_BOTTOM;
-
- shell_resize(NULL,
- (struct wl_shell *) &compositor->shell,
- &surface->surface, device, time, edges);
+ wl_list_for_each(b, &compositor->binding_list, link) {
+ if (b->button == button &&
+ b->modifier == wd->modifier_state && state) {
+ b->handler(&wd->input_device,
+ time, 0, button, state, b->data);
+ break;
+ }
}
if (device->grab)
}
static void
-wlsc_switcher_next(struct wlsc_switcher *switcher)
-{
- struct wl_list *l;
-
- wlsc_surface_damage(switcher->current);
- l = switcher->current->link.next;
- if (l == &switcher->compositor->surface_list)
- l = switcher->compositor->surface_list.next;
- switcher->current = container_of(l, struct wlsc_surface, link);
- wl_list_remove(&switcher->listener.link);
- wl_list_insert(switcher->current->surface.destroy_listener_list.prev,
- &switcher->listener.link);
- wlsc_surface_damage(switcher->current);
-}
-
-static void
-switcher_handle_surface_destroy(struct wl_listener *listener,
- struct wl_surface *surface, uint32_t time)
-{
- struct wlsc_switcher *switcher =
- container_of(listener, struct wlsc_switcher, listener);
-
- wlsc_switcher_next(switcher);
-}
-
-static struct wlsc_switcher *
-wlsc_switcher_create(struct wlsc_compositor *compositor)
-{
- struct wlsc_switcher *switcher;
-
- switcher = malloc(sizeof *switcher);
- switcher->compositor = compositor;
- switcher->current = container_of(compositor->surface_list.next,
- struct wlsc_surface, link);
- switcher->listener.func = switcher_handle_surface_destroy;
- wl_list_init(&switcher->listener.link);
-
- return switcher;
-}
-
-static void
-wlsc_switcher_destroy(struct wlsc_switcher *switcher)
-{
- wl_list_remove(&switcher->listener.link);
- free(switcher);
-}
-
-static void
-switcher_next_binding(struct wlsc_input_device *device,
- uint32_t time, uint32_t key, uint32_t state, void *data)
-{
- struct wlsc_compositor *compositor = data;
-
- if (!state)
- return;
- if (wl_list_empty(&compositor->surface_list))
- return;
- if (compositor->switcher == NULL)
- compositor->switcher = wlsc_switcher_create(compositor);
-
- wlsc_switcher_next(compositor->switcher);
-}
-
-static void
-switcher_terminate_binding(struct wlsc_input_device *device,
- uint32_t time, uint32_t key, uint32_t state,
- void *data)
-{
- struct wlsc_compositor *compositor = data;
-
- if (compositor->switcher && !state) {
- wlsc_surface_activate(compositor->switcher->current,
- device, time);
- wlsc_switcher_destroy(compositor->switcher);
- compositor->switcher = NULL;
- }
-}
-
-struct wlsc_binding {
- uint32_t key;
- uint32_t modifier;
- wlsc_binding_handler_t handler;
- void *data;
- struct wl_list link;
-};
-
-static void
-terminate_binding(struct wlsc_input_device *device,
- uint32_t time, uint32_t key, uint32_t state, void *data)
+terminate_binding(struct wl_input_device *device, uint32_t time,
+ uint32_t key, uint32_t button, uint32_t state, void *data)
{
struct wlsc_compositor *compositor = data;
- wl_display_terminate(compositor->wl_display);
+ if (state)
+ wl_display_terminate(compositor->wl_display);
}
-struct wlsc_binding *
+WL_EXPORT struct wlsc_binding *
wlsc_compositor_add_binding(struct wlsc_compositor *compositor,
- uint32_t key, uint32_t modifier,
+ uint32_t key, uint32_t button, uint32_t modifier,
wlsc_binding_handler_t handler, void *data)
{
struct wlsc_binding *binding;
return NULL;
binding->key = key;
+ binding->button = button;
binding->modifier = modifier;
binding->handler = handler;
binding->data = data;
return binding;
}
-void
+WL_EXPORT void
wlsc_binding_destroy(struct wlsc_binding *binding)
{
wl_list_remove(&binding->link);
free(binding);
}
-void
-notify_key(struct wl_input_device *device,
- uint32_t time, uint32_t key, uint32_t state)
+static void
+update_modifier_state(struct wlsc_input_device *device,
+ uint32_t key, uint32_t state)
{
- struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
- struct wlsc_compositor *compositor =
- (struct wlsc_compositor *) device->compositor;
- uint32_t *k, *end;
uint32_t modifier;
- struct wlsc_binding *b;
-
- wl_list_for_each(b, &compositor->binding_list, link) {
- if (b->key == key &&
- b->modifier == wd->modifier_state && state) {
- b->handler(wd, time, key, state, b->data);
- break;
- }
- }
switch (key) {
case KEY_LEFTCTRL:
}
if (state)
- wd->modifier_state |= modifier;
+ device->modifier_state |= modifier;
+ else
+ device->modifier_state &= ~modifier;
+}
+
+WL_EXPORT void
+notify_key(struct wl_input_device *device,
+ uint32_t time, uint32_t key, uint32_t state)
+{
+ struct wlsc_input_device *wd = (struct wlsc_input_device *) device;
+ struct wlsc_compositor *compositor =
+ (struct wlsc_compositor *) device->compositor;
+ uint32_t *k, *end;
+ struct wlsc_binding *b;
+
+ if (state)
+ wlsc_compositor_idle_inhibit(compositor);
else
- wd->modifier_state &= ~modifier;
+ wlsc_compositor_idle_release(compositor);
+
+ wl_list_for_each(b, &compositor->binding_list, link) {
+ if (b->key == key &&
+ b->modifier == wd->modifier_state) {
+ b->handler(&wd->input_device,
+ time, key, 0, state, b->data);
+ break;
+ }
+ }
+ update_modifier_state(wd, key, state);
end = device->keys.data + device->keys.size;
for (k = device->keys.data; k < end; k++) {
if (*k == key)
WL_INPUT_DEVICE_KEY, time, key, state);
}
-void
+WL_EXPORT void
notify_pointer_focus(struct wl_input_device *device,
uint32_t time, struct wlsc_output *output,
int32_t x, int32_t y)
wd->sprite->x = device->x - wd->hotspot_x;
wd->sprite->y = device->y - wd->hotspot_y;
- wlsc_surface_update_matrix(wd->sprite);
} else {
wl_input_device_set_pointer_focus(device, NULL,
time, 0, 0, 0, 0);
wlsc_surface_damage(wd->sprite);
}
-void
+WL_EXPORT void
notify_keyboard_focus(struct wl_input_device *device,
uint32_t time, struct wlsc_output *output,
struct wl_array *keys)
struct wlsc_compositor *compositor =
(struct wlsc_compositor *) device->compositor;
struct wlsc_surface *es;
+ uint32_t *k, *end;
if (!wl_list_empty(&compositor->surface_list))
es = container_of(compositor->surface_list.next,
if (output) {
wl_array_copy(&wd->input_device.keys, keys);
- wl_input_device_set_keyboard_focus(&wd->input_device,
- &es->surface, time);
+ wd->modifier_state = 0;
+ end = device->keys.data + device->keys.size;
+ for (k = device->keys.data; k < end; k++) {
+ wlsc_compositor_idle_inhibit(compositor);
+ update_modifier_state(wd, *k, 1);
+ }
+
+ if (es->surface.client)
+ wl_input_device_set_keyboard_focus(&wd->input_device,
+ &es->surface, time);
} else {
+ end = device->keys.data + device->keys.size;
+ for (k = device->keys.data; k < end; k++)
+ wlsc_compositor_idle_release(compositor);
+
+ wd->modifier_state = 0;
wl_input_device_set_keyboard_focus(&wd->input_device,
NULL, time);
}
return;
}
- wlsc_input_device_attach(device, buffer, x, y);
+ wlsc_input_device_attach_buffer(device, buffer, x, y);
}
const static struct wl_input_device_interface input_device_interface = {
input_device_attach,
};
-void
+WL_EXPORT void
wlsc_input_device_init(struct wlsc_input_device *device,
struct wlsc_compositor *ec)
{
device->sprite = wlsc_surface_create(ec,
device->input_device.x,
device->input_device.y, 32, 32);
+ wl_list_insert(&ec->surface_list, &device->sprite->link);
+
device->hotspot_x = 16;
device->hotspot_y = 16;
+ device->modifier_state = 0;
device->input_device.motion_grab.interface = &motion_grab_interface;
}
static void
-wlsc_output_post_geometry(struct wl_client *client, struct wl_object *global)
+wlsc_output_post_geometry(struct wl_client *client,
+ struct wl_object *global, uint32_t version)
{
struct wlsc_output *output =
container_of(global, struct wlsc_output, object);
+ struct wlsc_mode *mode;
wl_client_post_event(client, global,
WL_OUTPUT_GEOMETRY,
- output->x, output->y,
- output->width, output->height);
+ output->x,
+ output->y,
+ output->mm_width,
+ output->mm_height,
+ output->subpixel,
+ output->make, output->model);
+
+ wl_list_for_each (mode, &output->mode_list, link) {
+ wl_client_post_event(client, global,
+ WL_OUTPUT_MODE,
+ mode->flags,
+ mode->width, mode->height, mode->refresh);
+ }
}
static const char vertex_shader[] =
" v_texcoord = texcoord;\n"
"}\n";
-static const char fragment_shader[] =
+static const char texture_fragment_shader[] =
"precision mediump float;\n"
"varying vec2 v_texcoord;\n"
"uniform sampler2D tex;\n"
" gl_FragColor = texture2D(tex, v_texcoord)\n;"
"}\n";
+static const char solid_fragment_shader[] =
+ "precision mediump float;\n"
+ "uniform vec4 color;\n"
+ "void main()\n"
+ "{\n"
+ " gl_FragColor = color\n;"
+ "}\n";
+
static int
-init_shaders(struct wlsc_compositor *ec)
+compile_shader(GLenum type, const char *source)
{
- GLuint v, f, program;
- const char *p;
+ GLuint s;
char msg[512];
GLint status;
- p = vertex_shader;
- v = glCreateShader(GL_VERTEX_SHADER);
- glShaderSource(v, 1, &p, NULL);
- glCompileShader(v);
- glGetShaderiv(v, GL_COMPILE_STATUS, &status);
+ s = glCreateShader(type);
+ glShaderSource(s, 1, &source, NULL);
+ glCompileShader(s);
+ glGetShaderiv(s, GL_COMPILE_STATUS, &status);
if (!status) {
- glGetShaderInfoLog(v, sizeof msg, NULL, msg);
- fprintf(stderr, "vertex shader info: %s\n", msg);
- return -1;
+ glGetShaderInfoLog(s, sizeof msg, NULL, msg);
+ fprintf(stderr, "shader info: %s\n", msg);
+ return GL_NONE;
}
- p = fragment_shader;
- f = glCreateShader(GL_FRAGMENT_SHADER);
- glShaderSource(f, 1, &p, NULL);
- glCompileShader(f);
- glGetShaderiv(f, GL_COMPILE_STATUS, &status);
- if (!status) {
- glGetShaderInfoLog(f, sizeof msg, NULL, msg);
- fprintf(stderr, "fragment shader info: %s\n", msg);
- return -1;
- }
+ return s;
+}
+
+static int
+wlsc_shader_init(struct wlsc_shader *shader,
+ const char *vertex_source, const char *fragment_source)
+{
+ char msg[512];
+ GLint status;
+
+ shader->vertex_shader =
+ compile_shader(GL_VERTEX_SHADER, vertex_source);
+ shader->fragment_shader =
+ compile_shader(GL_FRAGMENT_SHADER, fragment_source);
- program = glCreateProgram();
- glAttachShader(program, v);
- glAttachShader(program, f);
- glBindAttribLocation(program, 0, "position");
- glBindAttribLocation(program, 1, "texcoord");
+ 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(program);
- glGetProgramiv(program, GL_LINK_STATUS, &status);
+ glLinkProgram(shader->program);
+ glGetProgramiv(shader->program, GL_LINK_STATUS, &status);
if (!status) {
- glGetProgramInfoLog(program, sizeof msg, NULL, msg);
+ glGetProgramInfoLog(shader->program, sizeof msg, NULL, msg);
fprintf(stderr, "link info: %s\n", msg);
return -1;
}
- glUseProgram(program);
- ec->proj_uniform = glGetUniformLocation(program, "proj");
- ec->tex_uniform = glGetUniformLocation(program, "tex");
+ shader->proj_uniform = glGetUniformLocation(shader->program, "proj");
+ shader->tex_uniform = glGetUniformLocation(shader->program, "tex");
+
+ 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
+WL_EXPORT void
wlsc_output_destroy(struct wlsc_output *output)
{
+ pixman_region32_fini(&output->region);
+ pixman_region32_fini(&output->previous_damage);
destroy_surface(&output->background->surface.resource, NULL);
}
-void
+WL_EXPORT void
wlsc_output_move(struct wlsc_output *output, int x, int y)
{
struct wlsc_compositor *c = output->compositor;
if (output->background) {
output->background->x = x;
output->background->y = y;
- wlsc_surface_update_matrix(output->background);
}
- pixman_region32_init(&output->previous_damage_region);
+ pixman_region32_init(&output->previous_damage);
+ pixman_region32_init_rect(&output->region, x, y,
+ output->current->width,
+ output->current->height);
wlsc_matrix_init(&output->matrix);
wlsc_matrix_translate(&output->matrix,
- -output->x - output->width / 2.0,
- -output->y - output->height / 2.0, 0);
+ -output->x - output->current->width / 2.0,
+ -output->y - output->current->height / 2.0, 0);
flip = (output->flags & WL_OUTPUT_FLIPPED) ? -1 : 1;
wlsc_matrix_scale(&output->matrix,
- 2.0 / output->width,
- flip * 2.0 / output->height, 1);
+ 2.0 / output->current->width,
+ flip * 2.0 / output->current->height, 1);
- pixman_region32_union_rect(&c->damage_region,
- &c->damage_region,
- x, y, output->width, output->height);
+ pixman_region32_union(&c->damage, &c->damage, &output->region);
}
-void
+WL_EXPORT void
wlsc_output_init(struct wlsc_output *output, struct wlsc_compositor *c,
int x, int y, int width, int height, uint32_t flags)
{
output->compositor = c;
output->x = x;
output->y = y;
- output->width = width;
- output->height = height;
+ output->mm_width = width;
+ output->mm_height = height;
output->background =
background_create(output, option_background);
+
+ if (output->background != NULL)
+ wl_list_insert(c->surface_list.prev,
+ &output->background->link);
output->flags = flags;
- output->finished = 1;
wlsc_output_move(output, x, y);
+ output->scanout_buffer_destroy_listener.func =
+ output_handle_scanout_buffer_destroy;
+ wl_list_init(&output->scanout_buffer_destroy_listener.link);
+
output->object.interface = &wl_output_interface;
wl_display_add_object(c->wl_display, &output->object);
wl_display_add_global(c->wl_display, &output->object,
wlsc_output_post_geometry);
}
-int
+static void
+shm_buffer_created(struct wl_buffer *buffer)
+{
+ struct wl_list *surfaces_attached_to;
+
+ surfaces_attached_to = malloc(sizeof *surfaces_attached_to);
+ if (!surfaces_attached_to) {
+ buffer->user_data = NULL;
+ return;
+ }
+
+ wl_list_init(surfaces_attached_to);
+
+ buffer->user_data = surfaces_attached_to;
+}
+
+static void
+shm_buffer_damaged(struct wl_buffer *buffer,
+ int32_t x, int32_t y, int32_t width, int32_t height)
+{
+ struct wl_list *surfaces_attached_to = buffer->user_data;
+ struct wlsc_surface *es;
+ GLsizei tex_width = wl_shm_buffer_get_stride(buffer) / 4;
+
+ wl_list_for_each(es, surfaces_attached_to, buffer_link) {
+ glBindTexture(GL_TEXTURE_2D, es->texture);
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+ tex_width, buffer->height, 0,
+ GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+ wl_shm_buffer_get_data(buffer));
+ /* Hmm, should use glTexSubImage2D() here but GLES2 doesn't
+ * support any unpack attributes except GL_UNPACK_ALIGNMENT. */
+ }
+}
+
+static void
+shm_buffer_destroyed(struct wl_buffer *buffer)
+{
+ struct wl_list *surfaces_attached_to = buffer->user_data;
+ struct wlsc_surface *es, *next;
+
+ wl_list_for_each_safe(es, next, surfaces_attached_to, buffer_link) {
+ wl_list_remove(&es->buffer_link);
+ wl_list_init(&es->buffer_link);
+ }
+
+ free(surfaces_attached_to);
+}
+
+const static struct wl_shm_callbacks shm_callbacks = {
+ shm_buffer_created,
+ shm_buffer_damaged,
+ shm_buffer_destroyed
+};
+
+WL_EXPORT int
wlsc_compositor_init(struct wlsc_compositor *ec, struct wl_display *display)
{
struct wl_event_loop *loop;
wl_compositor_init(&ec->compositor, &compositor_interface, display);
- wlsc_shm_init(ec);
- eglBindWaylandDisplayWL(ec->display, ec->wl_display);
+ ec->shm = wl_shm_init(display, &shm_callbacks);
+
+ ec->image_target_texture_2d =
+ (void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
+ ec->image_target_renderbuffer_storage = (void *)
+ eglGetProcAddress("glEGLImageTargetRenderbufferStorageOES");
+ ec->create_image = (void *) eglGetProcAddress("eglCreateImageKHR");
+ ec->destroy_image = (void *) eglGetProcAddress("eglDestroyImageKHR");
+ ec->bind_display =
+ (void *) eglGetProcAddress("eglBindWaylandDisplayWL");
+ ec->unbind_display =
+ (void *) eglGetProcAddress("eglUnbindWaylandDisplayWL");
+
+ extensions = (const char *) glGetString(GL_EXTENSIONS);
+ if (!strstr(extensions, "GL_EXT_texture_format_BGRA8888")) {
+ fprintf(stderr,
+ "GL_EXT_texture_format_BGRA8888 not available\n");
+ return -1;
+ }
- wlsc_shell_init(ec);
+ extensions =
+ (const char *) eglQueryString(ec->display, EGL_EXTENSIONS);
+ if (strstr(extensions, "EGL_WL_bind_wayland_display"))
+ ec->has_bind_display = 1;
+ if (ec->has_bind_display)
+ ec->bind_display(ec->display, ec->wl_display);
wl_list_init(&ec->surface_list);
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_spring_init(&ec->fade.spring, 0.8, 0.0, 0.0);
+ ec->fade.animation.frame = fade_frame;
+ wl_list_init(&ec->fade.animation.link);
- wlsc_compositor_add_binding(ec, KEY_BACKSPACE,
+ wlsc_compositor_add_binding(ec, KEY_BACKSPACE, 0,
MODIFIER_CTRL | MODIFIER_ALT,
terminate_binding, ec);
- wlsc_compositor_add_binding(ec, KEY_TAB, MODIFIER_SUPER,
- switcher_next_binding, ec);
- wlsc_compositor_add_binding(ec, KEY_LEFTMETA, MODIFIER_SUPER,
- switcher_terminate_binding, ec);
- wlsc_compositor_add_binding(ec, KEY_RIGHTMETA, MODIFIER_SUPER,
- switcher_terminate_binding, ec);
create_pointer_images(ec);
screenshooter_create(ec);
- extensions = (const char *) glGetString(GL_EXTENSIONS);
- if (!strstr(extensions, "GL_EXT_texture_format_BGRA8888")) {
- fprintf(stderr,
- "GL_EXT_texture_format_BGRA8888 not available\n");
- return -1;
- }
-
glActiveTexture(GL_TEXTURE0);
- if (init_shaders(ec) < 0)
+
+ 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->timer_source = wl_event_loop_add_timer(loop, repaint, ec);
- pixman_region32_init(&ec->damage_region);
+ ec->idle_source = wl_event_loop_add_timer(loop, idle_handler, ec);
+ wl_event_source_timer_update(ec->idle_source, option_idle_time * 1000);
+
+ pixman_region32_init(&ec->damage);
wlsc_compositor_schedule_repaint(ec);
return 0;
}
-static void on_term_signal(int signal_number, void *data)
+static int on_term_signal(int signal_number, void *data)
{
struct wlsc_compositor *ec = data;
+ fprintf(stderr, "caught signal %d\n", signal_number);
wl_display_terminate(ec->wl_display);
+
+ return 1;
+}
+
+static void *
+load_module(const char *name, const char *entrypoint, void **handle)
+{
+ char path[PATH_MAX];
+ void *module, *init;
+
+ if (name[0] != '/')
+ snprintf(path, sizeof path, MODULEDIR "/%s", name);
+ else
+ snprintf(path, sizeof path, "%s", name);
+
+ module = dlopen(path, RTLD_LAZY);
+ if (!module) {
+ fprintf(stderr,
+ "failed to load module: %s\n", dlerror());
+ return NULL;
+ }
+
+ init = dlsym(module, entrypoint);
+ if (!init) {
+ fprintf(stderr,
+ "failed to lookup init function: %s\n", dlerror());
+ return NULL;
+ }
+
+ return init;
}
int main(int argc, char *argv[])
struct wl_display *display;
struct wlsc_compositor *ec;
struct wl_event_loop *loop;
- GError *error = NULL;
- GOptionContext *context;
- int width, height;
-
- g_type_init(); /* GdkPixbuf needs this, it seems. */
+ int o, xserver = 0;
+ void *shell_module, *backend_module;
+ int (*shell_init)(struct wlsc_compositor *ec);
+ struct wlsc_compositor
+ *(*backend_init)(struct wl_display *display, char *options);
+ char *backend = NULL;
+ char *backend_options = "";
+ char *shell = NULL;
+ char *p;
+
+ static const char opts[] = "B:b:o:S:i:s:x";
+ static const struct option longopts[ ] = {
+ { "backend", 1, NULL, 'B' },
+ { "backend-options", 1, NULL, 'o' },
+ { "background", 1, NULL, 'b' },
+ { "socket", 1, NULL, 'S' },
+ { "idle-time", 1, NULL, 'i' },
+ { "shell", 1, NULL, 's' },
+ { "xserver", 0, NULL, 'x' },
+ { NULL, }
+ };
- context = g_option_context_new(NULL);
- g_option_context_add_main_entries(context, option_entries, "Wayland");
- if (!g_option_context_parse(context, &argc, &argv, &error)) {
- fprintf(stderr, "option parsing failed: %s\n", error->message);
- exit(EXIT_FAILURE);
- }
- if (sscanf(option_geometry, "%dx%d", &width, &height) != 2) {
- fprintf(stderr, "invalid geometry option: %s \n",
- option_geometry);
- exit(EXIT_FAILURE);
+ while (o = getopt_long(argc, argv, opts, longopts, &o), o > 0) {
+ switch (o) {
+ case 'b':
+ option_background = optarg;
+ break;
+ case 'B':
+ backend = optarg;
+ break;
+ case 'o':
+ backend_options = optarg;
+ break;
+ case 'S':
+ option_socket_name = optarg;
+ break;
+ case 'i':
+ option_idle_time = strtol(optarg, &p, 0);
+ if (*p != '\0') {
+ fprintf(stderr,
+ "invalid idle time option: %s\n",
+ optarg);
+ exit(EXIT_FAILURE);
+ }
+ break;
+ case 's':
+ shell = optarg;
+ break;
+ case 'x':
+ xserver = 1;
+ break;
+ }
}
display = wl_display_create();
ec = NULL;
-#if BUILD_WAYLAND_COMPOSITOR
- if (getenv("WAYLAND_DISPLAY"))
- ec = wayland_compositor_create(display, width, height);
-#endif
+ if (!backend) {
+ if (getenv("WAYLAND_DISPLAY"))
+ backend = "wayland-backend.so";
+ else if (getenv("DISPLAY"))
+ backend = "x11-backend.so";
+ else if (getenv("OPENWFD"))
+ backend = "openwfd-backend.so";
+ else
+ backend = "drm-backend.so";
+ }
-#if BUILD_X11_COMPOSITOR
- if (ec == NULL && getenv("DISPLAY"))
- ec = x11_compositor_create(display, width, height);
-#endif
+ if (!shell)
+ shell = "desktop-shell.so";
-#if BUILD_DRM_COMPOSITOR
- if (ec == NULL)
- ec = drm_compositor_create(display, option_connector);
-#endif
+ backend_init = load_module(backend, "backend_init", &backend_module);
+ if (!backend_init)
+ exit(EXIT_FAILURE);
+
+ shell_init = load_module(shell, "shell_init", &shell_module);
+ if (!shell_init)
+ exit(EXIT_FAILURE);
+ ec = backend_init(display, backend_options);
if (ec == NULL) {
fprintf(stderr, "failed to create compositor\n");
exit(EXIT_FAILURE);
}
+ if (shell_init(ec) < 0)
+ exit(EXIT_FAILURE);
+
+ if (xserver)
+ wlsc_xserver_init(ec);
+
if (wl_display_add_socket(display, option_socket_name)) {
fprintf(stderr, "failed to add socket: %m\n");
exit(EXIT_FAILURE);
loop = wl_display_get_event_loop(ec->wl_display);
wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, ec);
wl_event_loop_add_signal(loop, SIGINT, on_term_signal, ec);
+ wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, ec);
+
+ wl_list_init(&child_process_list);
+ wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL);
wl_display_run(display);
- eglUnbindWaylandDisplayWL(ec->display, display);
+ if (xserver)
+ wlsc_xserver_destroy(ec);
+
+ if (ec->has_bind_display)
+ ec->unbind_display(ec->display, display);
wl_display_destroy(display);
ec->destroy(ec);
projects / profile / ivi / weston.git / blobdiff