/*
- * Copyright © 2008 Kristian Høgsberg
+ * Copyright © 2010-2011 Intel Corporation
+ * Copyright © 2008-2011 Kristian Høgsberg
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of the copyright holders not be used in
+ * advertising or publicity pertaining to distribution of the software
+ * without specific, written prior permission. The copyright holders make
+ * no representations about the suitability of this software for any
+ * purpose. It is provided "as is" without express or implied warranty.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#define _GNU_SOURCE
#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 <math.h>
* advertise that through a service on the session dbus.
*/
static const char *option_socket_name = NULL;
-static const char *option_background = "background.jpg";
static int option_idle_time = 300;
+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)
{
buffer_destroy_listener);
struct wl_buffer *buffer = (struct wl_buffer *) resource;
+ wl_list_init(&es->buffer_destroy_listener.link);
if (es->buffer == buffer)
es->buffer = NULL;
}
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.resource.client = NULL;
surface->compositor = compositor;
- surface->visual = NULL;
+ surface->visual = WLSC_NONE_VISUAL;
surface->image = EGL_NO_IMAGE_KHR;
surface->saved_texture = 0;
surface->x = x;
surface->width = width;
surface->height = height;
+ surface->fullscreen_output = NULL;
surface->buffer = NULL;
+ surface->output = 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);
{
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);
surface->width, surface->height);
}
+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)
+{
+ 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 == WLSC_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)
{
}
static void
-destroy_surface(struct wl_resource *resource, struct wl_client *client)
+wlsc_compositor_repick(struct wlsc_compositor *compositor)
+{
+ struct wlsc_input_device *device;
+ struct wlsc_surface *surface;
+ int32_t sx, sy;
+ uint32_t time;
+
+ time = wlsc_compositor_get_time();
+ wl_list_for_each(device, &compositor->input_device_list, link) {
+ if (device->input_device.grab)
+ continue;
+ surface = pick_surface(&device->input_device, &sx, &sy);
+ wl_input_device_set_pointer_focus(&device->input_device,
+ &surface->surface,
+ time,
+ device->input_device.x,
+ device->input_device.y,
+ sx, sy);
+ }
+}
+
+static void
+destroy_surface(struct wl_resource *resource)
{
struct wlsc_surface *surface =
container_of(resource, struct wlsc_surface, surface.resource);
struct wlsc_compositor *compositor = surface->compositor;
- wlsc_surface_damage(surface);
+ wlsc_surface_damage_below(surface);
wl_list_remove(&surface->link);
+ wlsc_compositor_repick(compositor);
+
if (surface->saved_texture == 0)
glDeleteTextures(1, &surface->texture);
else
es->pitch, buffer->height, 0,
GL_BGRA_EXT, GL_UNSIGNED_BYTE,
wl_shm_buffer_get_data(buffer));
- es->visual = buffer->visual;
+
+ switch (wl_shm_buffer_get_format(buffer)) {
+ case WL_SHM_FORMAT_ARGB32:
+ es->visual = WLSC_ARGB_VISUAL;
+ break;
+ case WL_SHM_FORMAT_PREMULTIPLIED_ARGB32:
+ es->visual = WLSC_PREMUL_ARGB_VISUAL;
+ break;
+ case WL_SHM_FORMAT_XRGB32:
+ es->visual = WLSC_RGB_VISUAL;
+ break;
+ }
surfaces_attached_to = buffer->user_data;
buffer, NULL);
ec->image_target_texture_2d(GL_TEXTURE_2D, es->image);
- es->visual = buffer->visual;
+
+ /* FIXME: we need to get the visual from the wl_buffer */
+ es->visual = WLSC_PREMUL_ARGB_VISUAL;
es->pitch = es->width;
}
}
return NULL;
}
- sprite->visual = &ec->compositor.premultiplied_argb_visual;
+ sprite->visual = WLSC_PREMUL_ARGB_VISUAL;
sprite->width = width;
sprite->height = height;
sprite->image = EGL_NO_IMAGE_KHR;
}
}
-static struct wlsc_surface *
-background_create(struct wlsc_output *output, const char *filename)
-{
- struct wlsc_surface *background;
- struct wlsc_sprite *sprite;
-
- background = wlsc_surface_create(output->compositor,
- output->x, output->y,
- output->width, output->height);
- if (background == NULL)
- return NULL;
-
- sprite = create_sprite_from_png(output->compositor, filename, 0);
- if (sprite == NULL) {
- free(background);
- return NULL;
- }
-
- wlsc_sprite_attach(sprite, &background->surface);
-
- return background;
-}
-
static int
texture_region(struct wlsc_surface *es, pixman_region32_t *region)
{
struct wlsc_compositor *ec = es->compositor;
GLfloat *v;
pixman_region32_t repaint;
+ GLint filter;
int n;
pixman_region32_init_rect(&repaint,
if (!pixman_region32_not_empty(&repaint))
return;
- if (es->visual == &ec->compositor.argb_visual) {
+ switch (es->visual) {
+ case WLSC_ARGB_VISUAL:
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
- } else if (es->visual == &ec->compositor.premultiplied_argb_visual) {
+ break;
+ case WLSC_PREMUL_ARGB_VISUAL:
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
- } else {
+ break;
+ case WLSC_RGB_VISUAL:
glDisable(GL_BLEND);
+ break;
+ default:
+ fprintf(stderr, "bogus visual\n");
+ break;
}
- if (es->transform == NULL)
+ if (es->transform == NULL) {
+ filter = GL_NEAREST;
n = texture_region(es, &repaint);
- else
+ } 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_compositor_repick(compositor);
+ wlsc_surface_damage(surface);
}
WL_EXPORT void
static inline void
wlsc_buffer_post_release(struct wl_buffer *buffer)
{
- if (buffer->client == NULL) {
- fprintf(stderr, "buffer.release warning: buffer.client: %p\n",
- buffer->client);
+ if (buffer == NULL || --buffer->busy_count > 0)
return;
- }
-
- wl_client_post_event(buffer->client,
- &buffer->resource.object,
- WL_BUFFER_RELEASE);
-}
-
-WL_EXPORT void
-wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
-{
- struct wlsc_compositor *compositor = output->compositor;
- struct wlsc_animation *animation, *next;
- if (output->scanout_buffer) {
- if (--output->scanout_buffer->busy_count == 0)
- wlsc_buffer_post_release(output->scanout_buffer);
-
- output->scanout_buffer = NULL;
- }
-
- output->finished = 1;
-
- 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);
-}
-
-static void
-wlsc_output_finish_redraw(struct wlsc_output *output, int msecs)
-{
- 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);
- }
- }
+ assert(buffer->resource.client != NULL);
+ wl_resource_post_event(&buffer->resource, WL_BUFFER_RELEASE);
}
WL_EXPORT void
{
struct wlsc_compositor *compositor = output->compositor;
- pixman_region32_union_rect(&compositor->damage_region,
- &compositor->damage_region,
- output->x, output->y,
- output->width, output->height);
+ pixman_region32_union(&compositor->damage,
+ &compositor->damage, &output->region);
wlsc_compositor_schedule_repaint(compositor);
}
surface.compositor = compositor;
surface.x = output->x;
surface.y = output->y;
- surface.width = output->width;
- surface.height = output->height;
+ surface.pitch = output->current->width;
+ 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;
+ surface.visual = WLSC_PREMUL_ARGB_VISUAL;
else
- surface.visual = &compositor->compositor.rgb_visual;
+ surface.visual = WLSC_RGB_VISUAL;
glUseProgram(compositor->solid_shader.program);
glUniformMatrix4fv(compositor->solid_shader.proj_uniform,
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);
+ output->set_hardware_cursor(output, NULL);
+ }
+ 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 && ec->focus)
+ wl_list_insert(&ec->surface_list, &device->sprite->link);
+ else
+ wl_list_init(&device->sprite->link);
+
+out:
+ pixman_region32_fini(&cursor_region);
+}
+
static void
wlsc_output_repaint(struct wlsc_output *output)
{
struct wlsc_compositor *ec = output->compositor;
struct wlsc_surface *es;
- struct wlsc_input_device *eid, *hw_cursor;
- pixman_region32_t new_damage, total_damage;
+ 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);
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->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);
-
- hw_cursor = NULL;
- if (ec->focus && ec->fade.spring.current < 0.001) {
- hw_cursor = (struct wlsc_input_device *) ec->input_device;
- if (output->set_hardware_cursor(output, hw_cursor) < 0)
- hw_cursor = NULL;
- } else {
- output->set_hardware_cursor(output, NULL);
- }
+ &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->visual == &ec->compositor.rgb_visual && hw_cursor) {
- if (output->prepare_scanout_surface(output, es) == 0) {
- /* We're drawing nothing now,
- * draw the damaged regions later. */
- pixman_region32_union(&ec->damage_region,
- &ec->damage_region,
- &total_damage);
+ if (es->visual == WLSC_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++;
+ 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);
+ 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);
- wlsc_output_finish_redraw(output,
- wlsc_compositor_get_time());
- return;
- }
+ return;
}
if (es->fullscreen_output == output) {
- if (es->width < output->width ||
- es->height < output->height)
+ if (es->width < output->current->width ||
+ es->height < output->current->height)
glClear(GL_COLOR_BUFFER_BIT);
wlsc_surface_draw(es, output, &total_damage);
} else {
- if (output->background)
- wlsc_surface_draw(output->background,
- output, &total_damage);
- else
- fade_output(output, 1.0, &total_damage);
+ wl_list_for_each(es, &ec->surface_list, link) {
+ pixman_region32_copy(&es->damage, &total_damage);
+ pixman_region32_subtract(&total_damage, &total_damage, &es->opaque);
+ }
- glUseProgram(ec->texture_shader.program);
wl_list_for_each_reverse(es, &ec->surface_list, link) {
- if (ec->overlay == es)
- 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->overlay)
- wlsc_surface_draw(ec->overlay, output, &total_damage);
-
- if (ec->focus)
- wl_list_for_each(eid, &ec->input_device_list, link) {
- if (&eid->input_device != ec->input_device ||
- eid != hw_cursor)
- wlsc_surface_draw(eid->sprite, output,
- &total_damage);
- }
-
if (ec->fade.spring.current > 0.001)
fade_output(output, ec->fade.spring.current, &total_damage);
-
- wlsc_output_finish_redraw(output, wlsc_compositor_get_time());
}
-static int
-repaint(void *data)
-{
- struct wlsc_compositor *ec = data;
- struct wlsc_output *output;
- int repainted_all_outputs = 1;
+struct wlsc_frame_callback {
+ struct wl_resource resource;
+ struct wl_list link;
+};
- wl_list_for_each(output, &ec->output_list, link) {
- if (!output->repaint_needed)
- continue;
+static void
+repaint(void *data, int msecs)
+{
+ struct wlsc_output *output = data;
+ struct wlsc_compositor *compositor = output->compositor;
+ struct wlsc_animation *animation, *next;
+ struct wlsc_frame_callback *cb, *cnext;
- if (!output->finished) {
- repainted_all_outputs = 0;
- continue;
- }
+ wlsc_output_repaint(output);
+ output->repaint_needed = 0;
+ output->repaint_scheduled = 1;
+ output->present(output);
- wlsc_output_repaint(output);
- output->finished = 0;
- output->repaint_needed = 0;
- output->present(output);
+ wl_list_for_each_safe(cb, cnext, &output->frame_callback_list, link) {
+ wl_resource_post_event(&cb->resource, WL_CALLBACK_DONE, msecs);
+ wl_resource_destroy(&cb->resource, 0);
}
- 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);
+}
- return 1;
+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);
}
WL_EXPORT void
wlsc_compositor_schedule_repaint(struct wlsc_compositor *compositor)
{
struct wlsc_output *output;
+ struct wl_event_loop *loop;
if (compositor->state == WLSC_COMPOSITOR_SLEEPING)
return;
- wl_list_for_each(output, &compositor->output_list, link)
+ 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)
- return;
-
- wl_event_source_timer_update(compositor->timer_source, 1);
- compositor->repaint_on_timeout = 1;
+ wl_event_loop_add_idle(loop, idle_repaint, output);
+ output->repaint_scheduled = 1;
+ }
}
WL_EXPORT void
}
static void
-surface_destroy(struct wl_client *client,
- struct wl_surface *surface)
+surface_destroy(struct wl_client *client, struct wl_resource *resource)
{
- wl_resource_destroy(&surface->resource, client,
- wlsc_compositor_get_time());
+ wl_resource_destroy(resource, wlsc_compositor_get_time());
}
WL_EXPORT void
{
struct wlsc_compositor *ec = es->compositor;
struct wlsc_output *output;
+ pixman_region32_t region;
+ uint32_t max, area;
+ pixman_box32_t *e;
- struct wlsc_output *tmp = es->output;
- es->output = NULL;
-
+ max = 0;
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 (output != tmp)
- printf("assiging surface %p to output %p\n",
- es, output);
+ pixman_region32_init_rect(®ion,
+ es->x, es->y, es->width, es->height);
+ pixman_region32_intersect(®ion, ®ion, &output->region);
+
+ e = pixman_region32_extents(®ion);
+ area = (e->x2 - e->x1) * (e->y2 - e->y1);
+
+ if (area >= max) {
es->output = output;
+ max = area;
}
}
-
- if (es->output == NULL) {
- printf("no output found\n");
- es->output = container_of(ec->output_list.next,
- struct wlsc_output, link);
- }
}
static void
surface_attach(struct wl_client *client,
- struct wl_surface *surface, struct wl_buffer *buffer,
- int32_t x, int32_t y)
+ struct wl_resource *resource,
+ struct wl_resource *buffer_resource, int32_t x, int32_t y)
{
- struct wlsc_surface *es = (struct wlsc_surface *) surface;
+ struct wlsc_surface *es = resource->data;
+ struct wl_buffer *buffer = buffer_resource->data;
+ int repick = 0;
buffer->busy_count++;
-
- if (es->buffer && es->buffer->busy_count > 0)
- if (--es->buffer->busy_count == 0)
- wlsc_buffer_post_release(es->buffer);
+ wlsc_buffer_post_release(es->buffer);
es->buffer = buffer;
wl_list_remove(&es->buffer_destroy_listener.link);
wl_list_insert(es->buffer->resource.destroy_listener_list.prev,
&es->buffer_destroy_listener.link);
- es->x += x;
- es->y += y;
- es->width = buffer->width;
- es->height = buffer->height;
- if (x != 0 || y != 0)
- wlsc_surface_assign_output(es);
- if (es->visual == NULL)
+ if (es->visual == WLSC_NONE_VISUAL) {
wl_list_insert(&es->compositor->surface_list, &es->link);
+ repick = 1;
+ }
- wlsc_buffer_attach(buffer, surface);
+ if (x != 0 || y != 0 ||
+ es->width != buffer->width || es->height != buffer->height) {
+ wlsc_surface_configure(es, es->x + x, es->y + y,
+ buffer->width, buffer->height);
+ repick = 1;
+ }
- /* 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, &es->surface);
es->compositor->shell->attach(es->compositor->shell, es);
+
+ if (repick)
+ wlsc_compositor_repick(es->compositor);
}
static void
surface_damage(struct wl_client *client,
- struct wl_surface *surface,
+ struct wl_resource *resource,
int32_t x, int32_t y, int32_t width, int32_t height)
{
- struct wlsc_surface *es = (struct wlsc_surface *) surface;
+ struct wlsc_surface *es = resource->data;
wlsc_surface_damage_rectangle(es, x, y, width, height);
}
+static void
+destroy_frame_callback(struct wl_resource *resource)
+{
+ struct wlsc_frame_callback *cb = resource->data;
+
+ wl_list_remove(&cb->link);
+ free(resource);
+}
+
+static void
+surface_frame(struct wl_client *client,
+ struct wl_resource *resource, uint32_t callback)
+{
+ struct wlsc_frame_callback *cb;
+ struct wlsc_surface *es = resource->data;
+
+ cb = malloc(sizeof *cb);
+ if (cb == NULL) {
+ wl_resource_post_no_memory(resource);
+ return;
+ }
+
+ cb->resource.object.interface = &wl_callback_interface;
+ cb->resource.object.id = callback;
+ cb->resource.destroy = destroy_frame_callback;
+ cb->resource.client = client;
+ cb->resource.data = cb;
+
+ wl_client_add_resource(client, &cb->resource);
+
+ if (es->output) {
+ wl_list_insert(es->output->frame_callback_list.prev,
+ &cb->link);
+ } else {
+ wl_list_init(&cb->link);
+ wl_resource_destroy(&cb->resource, 0);
+ }
+}
+
const static struct wl_surface_interface surface_interface = {
surface_destroy,
surface_attach,
- surface_damage
+ surface_damage,
+ surface_frame
};
static void
wlsc_input_device_attach(struct wlsc_input_device *device,
int x, int y, int width, int height)
{
- wlsc_surface_damage(device->sprite);
+ wlsc_surface_damage_below(device->sprite);
device->hotspot_x = x;
device->hotspot_y = y;
wlsc_input_device_attach_sprite(struct wlsc_input_device *device,
struct wlsc_sprite *sprite, int x, int y)
{
+ if (!sprite)
+ return;
+
wlsc_sprite_attach(sprite, &device->sprite->surface);
wlsc_input_device_attach(device, x, y, sprite->width, sprite->height);
}
static void
compositor_create_surface(struct wl_client *client,
- struct wl_compositor *compositor, uint32_t id)
+ struct wl_resource *resource, uint32_t id)
{
- struct wlsc_compositor *ec = (struct wlsc_compositor *) compositor;
+ struct wlsc_compositor *ec = resource->data;
struct wlsc_surface *surface;
surface = wlsc_surface_create(ec, 0, 0, 0, 0);
if (surface == NULL) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(resource);
return;
}
surface->surface.resource.object.interface = &wl_surface_interface;
surface->surface.resource.object.implementation =
(void (**)(void)) &surface_interface;
- surface->surface.client = client;
+ surface->surface.resource.data = surface;
wl_client_add_resource(client, &surface->surface.resource);
}
struct wlsc_surface *es;
wl_list_for_each(es, &ec->surface_list, link) {
+ if (es->surface.resource.client == NULL)
+ continue;
wlsc_surface_transform(es, device->x, device->y, sx, sy);
if (0 <= *sx && *sx < es->width &&
0 <= *sy && *sy < es->height)
static void
-motion_grab_motion(struct wl_grab *grab,
- uint32_t time, int32_t x, int32_t y)
+implicit_grab_motion(struct wl_grab *grab,
+ uint32_t time, int32_t x, int32_t y)
{
struct wlsc_input_device *device =
(struct wlsc_input_device *) grab->input_device;
struct wlsc_surface *es =
(struct wlsc_surface *) device->input_device.pointer_focus;
int32_t sx, sy;
+ struct wl_resource *resource;
- wlsc_surface_transform(es, x, y, &sx, &sy);
- wl_client_post_event(es->surface.client,
- &device->input_device.object,
- WL_INPUT_DEVICE_MOTION,
- time, x, y, sx, sy);
+ resource = grab->input_device->pointer_focus_resource;
+ if (resource) {
+ wlsc_surface_transform(es, x, y, &sx, &sy);
+ wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION,
+ time, x, y, sx, sy);
+ }
}
static void
-motion_grab_button(struct wl_grab *grab,
- uint32_t time, int32_t button, int32_t state)
+implicit_grab_button(struct wl_grab *grab,
+ uint32_t time, int32_t button, int32_t state)
{
- wl_client_post_event(grab->input_device->pointer_focus->client,
- &grab->input_device->object,
- WL_INPUT_DEVICE_BUTTON,
- time, button, state);
+ struct wl_resource *resource;
+
+ resource = grab->input_device->pointer_focus_resource;
+ if (resource)
+ wl_resource_post_event(resource, WL_INPUT_DEVICE_BUTTON,
+ time, button, state);
}
static void
-motion_grab_end(struct wl_grab *grab, uint32_t time)
+implicit_grab_end(struct wl_grab *grab, uint32_t time)
{
}
-static const struct wl_grab_interface motion_grab_interface = {
- motion_grab_motion,
- motion_grab_button,
- motion_grab_end
+static const struct wl_grab_interface implicit_grab_interface = {
+ implicit_grab_motion,
+ implicit_grab_button,
+ implicit_grab_end
};
WL_EXPORT void
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) {
wl_input_device_set_pointer_focus(device,
&es->surface,
time, x, y, sx, sy);
- if (es)
- wl_client_post_event(es->surface.client,
- &device->object,
- WL_INPUT_DEVICE_MOTION,
- time, x, y, sx, sy);
+ if (device->pointer_focus_resource)
+ wl_resource_post_event(device->pointer_focus_resource,
+ WL_INPUT_DEVICE_MOTION,
+ 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;
struct wlsc_binding *b;
struct wlsc_surface *surface =
(struct wlsc_surface *) device->pointer_focus;
+ int32_t sx, sy;
if (state)
wlsc_compositor_idle_inhibit(compositor);
wlsc_compositor_idle_release(compositor);
if (state && surface && device->grab == NULL) {
- wlsc_surface_activate(surface, wd, time);
+ compositor->shell->activate(compositor->shell,
+ surface, wd, time);
wl_input_device_start_grab(device,
- &device->motion_grab,
+ &device->implicit_grab,
button, time);
}
device->grab->interface->button(device->grab, time,
button, state);
- if (!state && device->grab && device->grab_button == button)
+ if (!state && device->grab && device->grab_button == button) {
wl_input_device_end_grab(device, time);
+ surface = pick_surface(device, &sx, &sy);
+ wl_input_device_set_pointer_focus(device, &surface->surface,
+ time, device->x, device->y,
+ sx, sy);
+ }
}
static void
*k = key;
}
- if (device->keyboard_focus != NULL)
- wl_client_post_event(device->keyboard_focus->client,
- &device->object,
- WL_INPUT_DEVICE_KEY, time, key, state);
+ if (device->keyboard_focus_resource)
+ wl_resource_post_event(device->keyboard_focus_resource,
+ WL_INPUT_DEVICE_KEY, time, key, state);
}
WL_EXPORT void
update_modifier_state(wd, *k, 1);
}
- wl_input_device_set_keyboard_focus(&wd->input_device,
- &es->surface, time);
+ if (es && es->surface.resource.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++)
static void
input_device_attach(struct wl_client *client,
- struct wl_input_device *device_base,
+ struct wl_resource *resource,
uint32_t time,
- struct wl_buffer *buffer, int32_t x, int32_t y)
+ struct wl_resource *buffer_resource, int32_t x, int32_t y)
{
- struct wlsc_input_device *device =
- (struct wlsc_input_device *) device_base;
+ struct wlsc_input_device *device = resource->data;
+ struct wl_buffer *buffer;
if (time < device->input_device.pointer_focus_time)
return;
if (device->input_device.pointer_focus == NULL)
return;
- if (device->input_device.pointer_focus->client != client)
+ if (device->input_device.pointer_focus->resource.client != client)
return;
- if (buffer == NULL) {
+ if (buffer_resource) {
+ buffer = buffer_resource->data;
+ wlsc_input_device_attach_buffer(device, buffer, x, y);
+ } else {
wlsc_input_device_set_pointer_image(device,
WLSC_POINTER_LEFT_PTR);
return;
}
-
- wlsc_input_device_attach_buffer(device, buffer, x, y);
}
const static struct wl_input_device_interface input_device_interface = {
input_device_attach,
};
+static void unbind_input_device(struct wl_resource *resource)
+{
+ wl_list_remove(&resource->link);
+ free(resource);
+}
+
+static void
+bind_input_device(struct wl_client *client,
+ void *data, uint32_t version, uint32_t id)
+{
+ struct wl_input_device *device = data;
+ struct wl_resource *resource;
+
+ resource = wl_client_add_object(client, &wl_input_device_interface,
+ &input_device_interface, id, data);
+ wl_list_insert(&device->resource_list, &resource->link);
+ resource->destroy = unbind_input_device;
+}
+
WL_EXPORT void
wlsc_input_device_init(struct wlsc_input_device *device,
struct wlsc_compositor *ec)
{
wl_input_device_init(&device->input_device, &ec->compositor);
- device->input_device.object.interface = &wl_input_device_interface;
- device->input_device.object.implementation =
- (void (**)(void)) &input_device_interface;
- wl_display_add_object(ec->wl_display, &device->input_device.object);
- wl_display_add_global(ec->wl_display, &device->input_device.object, NULL);
+ wl_display_add_global(ec->wl_display, &wl_input_device_interface,
+ device, bind_input_device);
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;
+ device->input_device.implicit_grab.interface = &implicit_grab_interface;
wl_list_insert(ec->input_device_list.prev, &device->link);
}
static void
-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);
-
- wl_client_post_event(client, global,
- WL_OUTPUT_GEOMETRY,
- output->x, output->y,
- output->width, output->height);
+bind_output(struct wl_client *client,
+ void *data, uint32_t version, uint32_t id)
+{
+ struct wlsc_output *output = data;
+ struct wlsc_mode *mode;
+ struct wl_resource *resource;
+
+ resource = wl_client_add_object(client,
+ &wl_output_interface, NULL, id, data);
+
+ wl_resource_post_event(resource,
+ WL_OUTPUT_GEOMETRY,
+ 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_resource_post_event(resource,
+ WL_OUTPUT_MODE,
+ mode->flags,
+ mode->width,
+ mode->height,
+ mode->refresh);
+ }
}
static const char vertex_shader[] =
WL_EXPORT void
wlsc_output_destroy(struct wlsc_output *output)
{
- destroy_surface(&output->background->surface.resource, NULL);
+ pixman_region32_fini(&output->region);
+ pixman_region32_fini(&output->previous_damage);
}
WL_EXPORT void
output->x = x;
output->y = y;
- if (output->background) {
- output->background->x = x;
- output->background->y = y;
- }
-
- 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);
}
WL_EXPORT void
output->compositor = c;
output->x = x;
output->y = y;
- output->width = width;
- output->height = height;
-
- output->background =
- background_create(output, option_background);
+ output->mm_width = width;
+ output->mm_height = height;
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);
+ wl_list_init(&output->frame_callback_list);
- 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);
+ output->resource.object.interface = &wl_output_interface;
+ wl_display_add_global(c->wl_display,
+ &wl_output_interface, output, bind_output);
}
static void
ec->idle_source = wl_event_loop_add_timer(loop, idle_handler, ec);
wl_event_source_timer_update(ec->idle_source, option_idle_time * 1000);
- ec->timer_source = wl_event_loop_add_timer(loop, repaint, ec);
- pixman_region32_init(&ec->damage_region);
+ pixman_region32_init(&ec->damage);
wlsc_compositor_schedule_repaint(ec);
return 0;
}
+WL_EXPORT void
+wlsc_compositor_shutdown(struct wlsc_compositor *ec)
+{
+ struct wlsc_output *output;
+
+ /* Destroy all outputs associated with this compositor */
+ wl_list_for_each(output, &ec->output_list, link)
+ output->destroy(output);
+}
+
static int on_term_signal(int signal_number, void *data)
{
- struct wlsc_compositor *ec = data;
+ struct wl_display *display = data;
- wl_display_terminate(ec->wl_display);
+ fprintf(stderr, "caught signal %d\n", signal_number);
+ wl_display_terminate(display);
return 1;
}
struct wl_display *display;
struct wlsc_compositor *ec;
struct wl_event_loop *loop;
- int o;
+ int o, xserver = 0;
void *shell_module, *backend_module;
int (*shell_init)(struct wlsc_compositor *ec);
struct wlsc_compositor
char *shell = NULL;
char *p;
- static const char opts[] = "B:b:o:S:i:s:";
+ 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, }
};
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 's':
shell = optarg;
break;
+ case 'x':
+ xserver = 1;
+ break;
}
}
display = wl_display_create();
- ec = NULL;
+ loop = wl_display_get_event_loop(display);
+ wl_event_loop_add_signal(loop, SIGTERM, on_term_signal, display);
+ wl_event_loop_add_signal(loop, SIGINT, on_term_signal, display);
+ wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal, display);
+
+ wl_list_init(&child_process_list);
+ wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler, NULL);
if (!backend) {
if (getenv("WAYLAND_DISPLAY"))
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_display_run(display);
+ if (xserver)
+ wlsc_xserver_destroy(ec);
+
if (ec->has_bind_display)
ec->unbind_display(ec->display, display);
wl_display_destroy(display);
projects / profile / ivi / weston.git / blobdiff