/*
- * 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
* advertise that through a service on the session dbus.
*/
static const char *option_socket_name = NULL;
-static const char *option_background = "background.png";
static int option_idle_time = 300;
static struct wl_list child_process_list;
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;
}
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);
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;
wlsc_surface_damage(surface);
pixman_region32_fini(&surface->opaque);
- if (surface->visual == &compositor->compositor.rgb_visual)
+ if (surface->visual == WLSC_RGB_VISUAL)
pixman_region32_init_rect(&surface->opaque,
surface->x, surface->y,
surface->width, surface->height);
}
static void
+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 =
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->current->width,
- output->current->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)
{
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) {
wl_list_remove(&surface->link);
wl_list_insert(&compositor->surface_list, &surface->link);
+ wlsc_compositor_repick(compositor);
wlsc_surface_damage(surface);
}
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,
prior_was_hardware = wl_list_empty(&device->sprite->link);
if (force_sw || output->set_hardware_cursor(output, device) < 0) {
- if (prior_was_hardware)
+ 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)
+ if (!use_hardware_cursor && ec->focus)
wl_list_insert(&ec->surface_list, &device->sprite->link);
else
wl_list_init(&device->sprite->link);
glUniform1i(ec->texture_shader.tex_uniform, 0);
wlsc_output_set_cursor(output, ec->input_device,
- !(ec->focus && ec->fade.spring.current < 0.001));
+ ec->fade.spring.current >= 0.001);
pixman_region32_init(&new_damage);
pixman_region32_copy(&new_damage, &ec->damage);
es = container_of(ec->surface_list.next, struct wlsc_surface, link);
- if (es->visual == &ec->compositor.rgb_visual &&
+ if (es->visual == WLSC_RGB_VISUAL &&
output->prepare_scanout_surface(output, es) == 0) {
/* We're drawing nothing now,
* draw the damaged regions later. */
{
struct wlsc_surface *es = resource->data;
struct wl_buffer *buffer = buffer_resource->data;
+ int repick = 0;
buffer->busy_count++;
wlsc_buffer_post_release(es->buffer);
wl_list_insert(es->buffer->resource.destroy_listener_list.prev,
&es->buffer_destroy_listener.link);
- if (es->visual == NULL)
+ if (es->visual == WLSC_NONE_VISUAL) {
wl_list_insert(&es->compositor->surface_list, &es->link);
+ repick = 1;
+ }
- es->visual = buffer->visual;
if (x != 0 || y != 0 ||
- es->width != buffer->width || es->height != buffer->height)
+ es->width != buffer->width || es->height != buffer->height) {
wlsc_surface_configure(es, es->x + x, es->y + y,
buffer->width, buffer->height);
+ repick = 1;
+ }
wlsc_buffer_attach(buffer, &es->surface);
es->compositor->shell->attach(es->compositor->shell, es);
+
+ if (repick)
+ wlsc_compositor_repick(es->compositor);
}
static void
cb = malloc(sizeof *cb);
if (cb == NULL) {
- wl_client_post_no_memory(client);
+ wl_resource_post_no_memory(resource);
return;
}
cb->resource.destroy = destroy_frame_callback;
cb->resource.client = client;
cb->resource.data = cb;
- wl_list_insert(es->output->frame_callback_list.prev, &cb->link);
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 = {
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);
}
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;
}
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;
}
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)
{
struct wl_resource *resource;
}
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
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
update_modifier_state(wd, *k, 1);
}
- if (es->surface.resource.client)
+ if (es && es->surface.resource.client)
wl_input_device_set_keyboard_focus(&wd->input_device,
&es->surface, time);
} else {
struct wl_resource *buffer_resource, int32_t x, int32_t y)
{
struct wlsc_input_device *device = resource->data;
- struct wl_buffer *buffer = buffer_resource->data;
+ struct wl_buffer *buffer;
if (time < device->input_device.pointer_focus_time)
return;
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)
{
- wl_client_add_object(client, &wl_display_interface,
- &input_device_interface, id, data);
+ 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
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);
{
pixman_region32_fini(&output->region);
pixman_region32_fini(&output->previous_damage);
- destroy_surface(&output->background->surface.resource);
}
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);
pixman_region32_init_rect(&output->region, x, y,
output->current->width,
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;
wlsc_output_move(output, x, y);
return 0;
}
-WL_EXPORT int
+WL_EXPORT void
wlsc_compositor_shutdown(struct wlsc_compositor *ec)
{
struct wlsc_output *output;
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' },
while (o = getopt_long(argc, argv, opts, longopts, &o), o > 0) {
switch (o) {
- case 'b':
- option_background = optarg;
- break;
case 'B':
backend = optarg;
break;
projects / profile / ivi / weston.git / blobdiff