2008-12-02 23:15:01 +03:00
|
|
|
/*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* Copyright © 2010-2011 Intel Corporation
|
|
|
|
* Copyright © 2008-2011 Kristian Høgsberg
|
2012-01-27 18:25:16 +04:00
|
|
|
* Copyright © 2012 Collabora, Ltd.
|
2008-12-02 23:15:01 +03:00
|
|
|
*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* 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.
|
2008-12-02 23:15:01 +03:00
|
|
|
*
|
Change remaining GPLv2 headers to MIT
The files in question are copyright Benjamin Franzke (who agrees),
Intel Corporation, Red Hat and myself. On behalf of Red Hat,
Richard Fontana says:
"Therefore, to the extent that Red Hat, Inc. has any copyright
interest in the files you cited as of this date (compositor-drm.c,
compositor.c, compositor.h, screenshooter.c in
http://cgit.freedesktop.org/wayland/wayland-demos/tree/compositor),
Red Hat hereby elects to apply the CC0 1.0 Universal Public Domain
Dedication to such copyrighted material. See:
http://creativecommons.org/publicdomain/zero/1.0/legalcode .
Thanks,
Richard E. Fontana
Open Source Licensing and Patent Counsel
Red Hat, Inc."
2011-09-15 23:43:14 +04:00
|
|
|
* 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.
|
2008-12-02 23:15:01 +03:00
|
|
|
*/
|
|
|
|
|
2010-12-01 17:50:16 +03:00
|
|
|
#define _GNU_SOURCE
|
|
|
|
|
2011-01-15 01:22:35 +03:00
|
|
|
#include "config.h"
|
|
|
|
|
2008-10-09 06:51:32 +04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdint.h>
|
2011-03-11 18:39:20 +03:00
|
|
|
#include <limits.h>
|
2008-11-09 08:22:51 +03:00
|
|
|
#include <stdarg.h>
|
2011-06-21 21:34:19 +04:00
|
|
|
#include <assert.h>
|
2008-10-09 06:51:32 +04:00
|
|
|
#include <sys/ioctl.h>
|
2011-06-22 01:32:25 +04:00
|
|
|
#include <sys/wait.h>
|
2011-12-02 17:30:21 +04:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
2008-10-09 06:51:32 +04:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
2008-11-24 01:07:32 +03:00
|
|
|
#include <math.h>
|
2010-06-11 20:56:24 +04:00
|
|
|
#include <linux/input.h>
|
2011-04-23 21:04:11 +04:00
|
|
|
#include <dlfcn.h>
|
2011-05-02 20:11:07 +04:00
|
|
|
#include <signal.h>
|
2012-01-16 20:53:54 +04:00
|
|
|
#include <setjmp.h>
|
|
|
|
#include <execinfo.h>
|
2008-12-30 22:31:33 +03:00
|
|
|
|
2011-11-22 16:18:50 +04:00
|
|
|
#include <wayland-server.h>
|
2010-06-05 05:52:02 +04:00
|
|
|
#include "compositor.h"
|
2008-12-12 07:18:45 +03:00
|
|
|
|
2011-06-22 01:32:25 +04:00
|
|
|
static struct wl_list child_process_list;
|
2012-01-16 20:53:54 +04:00
|
|
|
static jmp_buf segv_jmp_buf;
|
2011-06-22 01:32:25 +04:00
|
|
|
|
|
|
|
static int
|
|
|
|
sigchld_handler(int signal_number, void *data)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_process *p;
|
2011-06-22 01:32:25 +04:00
|
|
|
int status;
|
|
|
|
pid_t pid;
|
|
|
|
|
2012-03-18 02:22:03 +04:00
|
|
|
pid = waitpid(-1, &status, WNOHANG);
|
|
|
|
if (!pid)
|
|
|
|
return 1;
|
|
|
|
|
2011-06-22 01:32:25 +04:00
|
|
|
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
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_watch_process(struct weston_process *process)
|
2011-06-22 01:32:25 +04:00
|
|
|
{
|
|
|
|
wl_list_insert(&child_process_list, &process->link);
|
|
|
|
}
|
|
|
|
|
2011-12-02 17:30:21 +04:00
|
|
|
static void
|
|
|
|
child_client_exec(int sockfd, const char *path)
|
|
|
|
{
|
2011-12-08 19:19:40 +04:00
|
|
|
int clientfd;
|
2011-12-02 17:30:21 +04:00
|
|
|
char s[32];
|
2011-12-08 12:44:56 +04:00
|
|
|
sigset_t allsigs;
|
|
|
|
|
|
|
|
/* do not give our signal mask to the new process */
|
|
|
|
sigfillset(&allsigs);
|
|
|
|
sigprocmask(SIG_UNBLOCK, &allsigs, NULL);
|
2011-12-02 17:30:21 +04:00
|
|
|
|
2012-02-01 07:17:25 +04:00
|
|
|
/* Launch clients as the user. */
|
|
|
|
seteuid(getuid());
|
|
|
|
|
2011-12-08 19:19:40 +04:00
|
|
|
/* SOCK_CLOEXEC closes both ends, so we dup the fd to get a
|
|
|
|
* non-CLOEXEC fd to pass through exec. */
|
|
|
|
clientfd = dup(sockfd);
|
|
|
|
if (clientfd == -1) {
|
|
|
|
fprintf(stderr, "compositor: dup failed: %m\n");
|
|
|
|
return;
|
|
|
|
}
|
2011-12-02 17:30:21 +04:00
|
|
|
|
2011-12-08 19:19:40 +04:00
|
|
|
snprintf(s, sizeof s, "%d", clientfd);
|
2011-12-02 17:30:21 +04:00
|
|
|
setenv("WAYLAND_SOCKET", s, 1);
|
|
|
|
|
|
|
|
if (execl(path, path, NULL) < 0)
|
|
|
|
fprintf(stderr, "compositor: executing '%s' failed: %m\n",
|
|
|
|
path);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT struct wl_client *
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_client_launch(struct weston_compositor *compositor,
|
|
|
|
struct weston_process *proc,
|
|
|
|
const char *path,
|
|
|
|
weston_process_cleanup_func_t cleanup)
|
2011-12-02 17:30:21 +04:00
|
|
|
{
|
|
|
|
int sv[2];
|
|
|
|
pid_t pid;
|
|
|
|
struct wl_client *client;
|
|
|
|
|
|
|
|
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sv) < 0) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
fprintf(stderr, "weston_client_launch: "
|
2011-12-02 17:30:21 +04:00
|
|
|
"socketpair failed while launching '%s': %m\n",
|
|
|
|
path);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
pid = fork();
|
|
|
|
if (pid == -1) {
|
|
|
|
close(sv[0]);
|
|
|
|
close(sv[1]);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
fprintf(stderr, "weston_client_launch: "
|
2011-12-02 17:30:21 +04:00
|
|
|
"fork failed while launching '%s': %m\n", path);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pid == 0) {
|
|
|
|
child_client_exec(sv[1], path);
|
|
|
|
exit(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
close(sv[1]);
|
|
|
|
|
|
|
|
client = wl_client_create(compositor->wl_display, sv[0]);
|
|
|
|
if (!client) {
|
|
|
|
close(sv[0]);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
fprintf(stderr, "weston_client_launch: "
|
2011-12-02 17:30:21 +04:00
|
|
|
"wl_client_create failed while launching '%s'.\n",
|
|
|
|
path);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
proc->pid = pid;
|
|
|
|
proc->cleanup = cleanup;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_watch_process(proc);
|
2011-12-02 17:30:21 +04:00
|
|
|
|
|
|
|
return client;
|
|
|
|
}
|
|
|
|
|
2011-05-06 21:12:33 +04:00
|
|
|
static void
|
|
|
|
surface_handle_buffer_destroy(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_surface *es =
|
|
|
|
container_of(listener, struct weston_surface,
|
|
|
|
buffer_destroy_listener);
|
2011-05-06 21:12:33 +04:00
|
|
|
|
2011-10-25 01:51:02 +04:00
|
|
|
es->buffer = NULL;
|
2011-05-06 21:12:33 +04:00
|
|
|
}
|
|
|
|
|
2012-02-24 01:11:59 +04:00
|
|
|
static const pixman_region32_data_t undef_region_data;
|
|
|
|
|
|
|
|
static void
|
|
|
|
undef_region(pixman_region32_t *region)
|
|
|
|
{
|
|
|
|
pixman_region32_fini(region);
|
|
|
|
region->data = (pixman_region32_data_t *) &undef_region_data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
region_is_undefined(pixman_region32_t *region)
|
|
|
|
{
|
|
|
|
return region->data == &undef_region_data;
|
|
|
|
}
|
|
|
|
|
2012-02-28 19:59:33 +04:00
|
|
|
static void
|
|
|
|
empty_region(pixman_region32_t *region)
|
|
|
|
{
|
|
|
|
if (!region_is_undefined(region))
|
|
|
|
pixman_region32_fini(region);
|
|
|
|
|
|
|
|
pixman_region32_init(region);
|
|
|
|
}
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
WL_EXPORT struct weston_surface *
|
2012-01-27 20:58:31 +04:00
|
|
|
weston_surface_create(struct weston_compositor *compositor)
|
2009-02-10 22:20:26 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_surface *surface;
|
2010-08-16 18:38:29 +04:00
|
|
|
|
2011-11-23 18:14:12 +04:00
|
|
|
surface = calloc(1, sizeof *surface);
|
2010-08-16 18:38:29 +04:00
|
|
|
if (surface == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2012-02-24 02:38:33 +04:00
|
|
|
wl_list_init(&surface->surface.resource.destroy_listener_list);
|
|
|
|
|
2011-01-06 23:32:14 +03:00
|
|
|
wl_list_init(&surface->link);
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_init(&surface->layer_link);
|
2010-12-07 00:43:16 +03:00
|
|
|
|
2011-08-19 01:55:30 +04:00
|
|
|
surface->surface.resource.client = NULL;
|
2011-06-23 23:44:14 +04:00
|
|
|
|
2009-02-10 22:20:26 +03:00
|
|
|
surface->compositor = compositor;
|
2011-04-10 18:49:52 +04:00
|
|
|
surface->image = EGL_NO_IMAGE_KHR;
|
2011-12-14 18:24:11 +04:00
|
|
|
surface->alpha = 255;
|
2012-03-19 21:48:46 +04:00
|
|
|
surface->pitch = 1;
|
2010-06-07 06:23:21 +04:00
|
|
|
|
2011-05-06 21:12:33 +04:00
|
|
|
surface->buffer = NULL;
|
2011-08-30 00:09:32 +04:00
|
|
|
surface->output = NULL;
|
2011-05-06 21:12:33 +04:00
|
|
|
|
2011-06-24 04:29:12 +04:00
|
|
|
pixman_region32_init(&surface->damage);
|
2012-02-24 01:11:59 +04:00
|
|
|
pixman_region32_init(&surface->opaque);
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_init(&surface->clip);
|
2012-02-24 01:11:59 +04:00
|
|
|
undef_region(&surface->input);
|
2012-02-09 18:39:38 +04:00
|
|
|
pixman_region32_init(&surface->transform.opaque);
|
2011-11-15 22:50:21 +04:00
|
|
|
wl_list_init(&surface->frame_callback_list);
|
2011-06-24 04:29:12 +04:00
|
|
|
|
2011-05-06 21:12:33 +04:00
|
|
|
surface->buffer_destroy_listener.func = surface_handle_buffer_destroy;
|
|
|
|
|
2012-01-24 11:53:37 +04:00
|
|
|
wl_list_init(&surface->geometry.transformation_list);
|
2012-01-25 15:37:39 +04:00
|
|
|
wl_list_insert(&surface->geometry.transformation_list,
|
|
|
|
&surface->transform.position.link);
|
|
|
|
weston_matrix_init(&surface->transform.position.matrix);
|
2012-01-25 17:17:40 +04:00
|
|
|
pixman_region32_init(&surface->transform.boundingbox);
|
2012-01-24 11:53:37 +04:00
|
|
|
surface->geometry.dirty = 1;
|
2008-11-24 01:07:32 +03:00
|
|
|
|
2010-08-16 18:38:29 +04:00
|
|
|
return surface;
|
2008-11-24 01:07:32 +03:00
|
|
|
}
|
|
|
|
|
2012-02-28 14:07:54 +04:00
|
|
|
WL_EXPORT void
|
2012-01-26 19:00:23 +04:00
|
|
|
weston_surface_set_color(struct weston_surface *surface,
|
|
|
|
GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
|
|
|
|
{
|
|
|
|
surface->color[0] = red;
|
|
|
|
surface->color[1] = green;
|
|
|
|
surface->color[2] = blue;
|
|
|
|
surface->color[3] = alpha;
|
|
|
|
surface->shader = &surface->compositor->solid_shader;
|
|
|
|
}
|
|
|
|
|
2012-02-08 17:23:15 +04:00
|
|
|
static void
|
|
|
|
surface_to_global_float(struct weston_surface *surface,
|
|
|
|
int32_t sx, int32_t sy, GLfloat *x, GLfloat *y)
|
|
|
|
{
|
|
|
|
if (surface->transform.enabled) {
|
|
|
|
struct weston_vector v = { { sx, sy, 0.0f, 1.0f } };
|
|
|
|
|
|
|
|
weston_matrix_transform(&surface->transform.matrix, &v);
|
|
|
|
|
|
|
|
if (fabsf(v.f[3]) < 1e-6) {
|
|
|
|
fprintf(stderr, "warning: numerical instability in "
|
|
|
|
"weston_surface_to_global(), divisor = %g\n",
|
|
|
|
v.f[3]);
|
|
|
|
*x = 0;
|
|
|
|
*y = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*x = v.f[0] / v.f[3];
|
|
|
|
*y = v.f[1] / v.f[3];
|
|
|
|
} else {
|
|
|
|
*x = sx + surface->geometry.x;
|
|
|
|
*y = sy + surface->geometry.y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-24 08:03:14 +04:00
|
|
|
WL_EXPORT void
|
2012-02-17 21:45:43 +04:00
|
|
|
weston_surface_damage_below(struct weston_surface *surface)
|
2012-02-08 16:49:37 +04:00
|
|
|
{
|
2012-02-29 07:47:14 +04:00
|
|
|
struct weston_compositor *compositor = surface->compositor;
|
|
|
|
pixman_region32_t damage;
|
|
|
|
|
|
|
|
pixman_region32_init(&damage);
|
|
|
|
pixman_region32_subtract(&damage, &surface->transform.boundingbox,
|
|
|
|
&surface->clip);
|
|
|
|
pixman_region32_union(&compositor->damage,
|
|
|
|
&compositor->damage, &damage);
|
|
|
|
pixman_region32_fini(&damage);
|
2012-02-08 16:49:37 +04:00
|
|
|
}
|
|
|
|
|
2012-01-25 17:17:40 +04:00
|
|
|
static void
|
|
|
|
surface_compute_bbox(struct weston_surface *surface, int32_t sx, int32_t sy,
|
|
|
|
int32_t width, int32_t height,
|
|
|
|
pixman_region32_t *bbox)
|
|
|
|
{
|
2012-02-08 17:38:37 +04:00
|
|
|
GLfloat min_x = HUGE_VALF, min_y = HUGE_VALF;
|
|
|
|
GLfloat max_x = -HUGE_VALF, max_y = -HUGE_VALF;
|
2012-01-25 17:17:40 +04:00
|
|
|
int32_t s[4][2] = {
|
|
|
|
{ sx, sy },
|
|
|
|
{ sx, sy + height },
|
|
|
|
{ sx + width, sy },
|
|
|
|
{ sx + width, sy + height }
|
|
|
|
};
|
2012-02-08 17:38:37 +04:00
|
|
|
GLfloat int_x, int_y;
|
2012-01-25 17:17:40 +04:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 4; ++i) {
|
2012-02-08 17:38:37 +04:00
|
|
|
GLfloat x, y;
|
|
|
|
surface_to_global_float(surface, s[i][0], s[i][1], &x, &y);
|
2012-01-25 17:17:40 +04:00
|
|
|
if (x < min_x)
|
|
|
|
min_x = x;
|
|
|
|
if (x > max_x)
|
|
|
|
max_x = x;
|
|
|
|
if (y < min_y)
|
|
|
|
min_y = y;
|
|
|
|
if (y > max_y)
|
|
|
|
max_y = y;
|
|
|
|
}
|
|
|
|
|
2012-02-08 17:38:37 +04:00
|
|
|
int_x = floorf(min_x);
|
|
|
|
int_y = floorf(min_y);
|
|
|
|
pixman_region32_init_rect(bbox, int_x, int_y,
|
|
|
|
ceilf(max_x) - int_x, ceilf(max_y) - int_y);
|
2012-01-25 17:17:40 +04:00
|
|
|
}
|
|
|
|
|
2012-02-08 17:14:17 +04:00
|
|
|
static void
|
|
|
|
weston_surface_update_transform_disable(struct weston_surface *surface)
|
|
|
|
{
|
|
|
|
surface->transform.enabled = 0;
|
|
|
|
|
2012-02-13 12:34:04 +04:00
|
|
|
/* round off fractions when not transformed */
|
|
|
|
surface->geometry.x = roundf(surface->geometry.x);
|
|
|
|
surface->geometry.y = roundf(surface->geometry.y);
|
|
|
|
|
2012-02-08 17:14:17 +04:00
|
|
|
pixman_region32_init_rect(&surface->transform.boundingbox,
|
|
|
|
surface->geometry.x,
|
|
|
|
surface->geometry.y,
|
|
|
|
surface->geometry.width,
|
|
|
|
surface->geometry.height);
|
2012-02-24 01:11:59 +04:00
|
|
|
|
2012-02-28 18:19:39 +04:00
|
|
|
if (surface->alpha == 255) {
|
|
|
|
pixman_region32_copy(&surface->transform.opaque,
|
|
|
|
&surface->opaque);
|
|
|
|
pixman_region32_translate(&surface->transform.opaque,
|
|
|
|
surface->geometry.x,
|
|
|
|
surface->geometry.y);
|
|
|
|
}
|
2012-02-08 17:14:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
weston_surface_update_transform_enable(struct weston_surface *surface)
|
2012-01-20 16:24:25 +04:00
|
|
|
{
|
|
|
|
struct weston_matrix *matrix = &surface->transform.matrix;
|
|
|
|
struct weston_matrix *inverse = &surface->transform.inverse;
|
|
|
|
struct weston_transform *tform;
|
|
|
|
|
|
|
|
surface->transform.enabled = 1;
|
|
|
|
|
2012-02-08 17:14:17 +04:00
|
|
|
/* Otherwise identity matrix, but with x and y translation. */
|
2012-01-25 18:22:05 +04:00
|
|
|
surface->transform.position.matrix.d[12] = surface->geometry.x;
|
|
|
|
surface->transform.position.matrix.d[13] = surface->geometry.y;
|
2012-01-25 15:37:39 +04:00
|
|
|
|
2012-01-20 16:24:25 +04:00
|
|
|
weston_matrix_init(matrix);
|
2012-01-24 11:53:37 +04:00
|
|
|
wl_list_for_each(tform, &surface->geometry.transformation_list, link)
|
2012-01-20 16:24:25 +04:00
|
|
|
weston_matrix_multiply(matrix, &tform->matrix);
|
|
|
|
|
2012-01-23 12:02:47 +04:00
|
|
|
if (weston_matrix_invert(inverse, matrix) < 0) {
|
|
|
|
/* Oops, bad total transformation, not invertible */
|
|
|
|
fprintf(stderr, "error: weston_surface %p"
|
|
|
|
" transformation not invertible.\n", surface);
|
2012-02-08 17:14:17 +04:00
|
|
|
return -1;
|
2012-01-23 12:02:47 +04:00
|
|
|
}
|
2012-01-25 17:17:40 +04:00
|
|
|
|
2012-01-25 17:55:43 +04:00
|
|
|
surface_compute_bbox(surface, 0, 0, surface->geometry.width,
|
|
|
|
surface->geometry.height,
|
2012-01-25 17:17:40 +04:00
|
|
|
&surface->transform.boundingbox);
|
2012-02-24 01:11:59 +04:00
|
|
|
|
2012-02-08 17:14:17 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_update_transform(struct weston_surface *surface)
|
|
|
|
{
|
|
|
|
if (!surface->geometry.dirty)
|
|
|
|
return;
|
|
|
|
|
|
|
|
surface->geometry.dirty = 0;
|
|
|
|
|
2012-02-17 21:45:43 +04:00
|
|
|
weston_surface_damage_below(surface);
|
2012-02-09 17:32:15 +04:00
|
|
|
|
2012-02-08 17:14:17 +04:00
|
|
|
pixman_region32_fini(&surface->transform.boundingbox);
|
2012-02-24 01:11:59 +04:00
|
|
|
pixman_region32_fini(&surface->transform.opaque);
|
|
|
|
pixman_region32_init(&surface->transform.opaque);
|
|
|
|
|
|
|
|
if (region_is_undefined(&surface->input))
|
|
|
|
pixman_region32_init_rect(&surface->input, 0, 0,
|
|
|
|
surface->geometry.width,
|
|
|
|
surface->geometry.height);
|
2012-02-08 17:14:17 +04:00
|
|
|
|
|
|
|
/* transform.position is always in transformation_list */
|
|
|
|
if (surface->geometry.transformation_list.next ==
|
|
|
|
&surface->transform.position.link &&
|
|
|
|
surface->geometry.transformation_list.prev ==
|
|
|
|
&surface->transform.position.link) {
|
|
|
|
weston_surface_update_transform_disable(surface);
|
|
|
|
} else {
|
|
|
|
if (weston_surface_update_transform_enable(surface) < 0)
|
|
|
|
weston_surface_update_transform_disable(surface);
|
|
|
|
}
|
2012-02-09 17:32:15 +04:00
|
|
|
|
|
|
|
/* weston_surface_damage() without update */
|
|
|
|
pixman_region32_union(&surface->damage, &surface->damage,
|
|
|
|
&surface->transform.boundingbox);
|
|
|
|
|
2012-03-27 18:36:36 +04:00
|
|
|
if (weston_surface_is_mapped(surface))
|
2012-02-10 15:34:36 +04:00
|
|
|
weston_surface_assign_output(surface);
|
|
|
|
|
2012-02-09 17:32:15 +04:00
|
|
|
weston_compositor_schedule_repaint(surface->compositor);
|
2012-01-20 16:24:25 +04:00
|
|
|
}
|
|
|
|
|
2012-03-27 18:36:37 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_to_global_float(struct weston_surface *surface,
|
|
|
|
int32_t sx, int32_t sy, GLfloat *x, GLfloat *y)
|
|
|
|
{
|
|
|
|
weston_surface_update_transform(surface);
|
|
|
|
|
|
|
|
surface_to_global_float(surface, sx, sy, x, y);
|
|
|
|
}
|
|
|
|
|
2012-02-06 16:54:20 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_to_global(struct weston_surface *surface,
|
|
|
|
int32_t sx, int32_t sy, int32_t *x, int32_t *y)
|
|
|
|
{
|
|
|
|
GLfloat xf, yf;
|
|
|
|
|
2012-03-27 18:36:37 +04:00
|
|
|
weston_surface_to_global_float(surface, sx, sy, &xf, &yf);
|
2012-02-06 16:54:20 +04:00
|
|
|
*x = floorf(xf);
|
|
|
|
*y = floorf(yf);
|
|
|
|
}
|
|
|
|
|
2012-01-24 16:47:37 +04:00
|
|
|
static void
|
|
|
|
surface_from_global_float(struct weston_surface *surface,
|
|
|
|
int32_t x, int32_t y, GLfloat *sx, GLfloat *sy)
|
2012-01-24 11:59:29 +04:00
|
|
|
{
|
|
|
|
if (surface->transform.enabled) {
|
|
|
|
struct weston_vector v = { { x, y, 0.0f, 1.0f } };
|
|
|
|
|
|
|
|
weston_matrix_transform(&surface->transform.inverse, &v);
|
|
|
|
|
|
|
|
if (fabsf(v.f[3]) < 1e-6) {
|
|
|
|
fprintf(stderr, "warning: numerical instability in "
|
|
|
|
"weston_surface_from_global(), divisor = %g\n",
|
|
|
|
v.f[3]);
|
|
|
|
*sx = 0;
|
|
|
|
*sy = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-01-25 15:37:39 +04:00
|
|
|
*sx = v.f[0] / v.f[3];
|
|
|
|
*sy = v.f[1] / v.f[3];
|
2012-01-24 11:59:29 +04:00
|
|
|
} else {
|
2012-01-25 18:22:05 +04:00
|
|
|
*sx = x - surface->geometry.x;
|
|
|
|
*sy = y - surface->geometry.y;
|
2012-01-24 11:59:29 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-24 16:47:37 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_from_global(struct weston_surface *surface,
|
|
|
|
int32_t x, int32_t y, int32_t *sx, int32_t *sy)
|
|
|
|
{
|
|
|
|
GLfloat sxf, syf;
|
|
|
|
|
|
|
|
weston_surface_update_transform(surface);
|
|
|
|
|
|
|
|
surface_from_global_float(surface, x, y, &sxf, &syf);
|
|
|
|
*sx = floorf(sxf);
|
|
|
|
*sy = floorf(syf);
|
|
|
|
}
|
|
|
|
|
2012-02-10 18:26:19 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_damage_rectangle(struct weston_surface *surface,
|
2012-01-26 15:12:45 +04:00
|
|
|
int32_t sx, int32_t sy,
|
|
|
|
int32_t width, int32_t height)
|
2011-02-13 21:00:51 +03:00
|
|
|
{
|
2012-01-26 15:12:45 +04:00
|
|
|
weston_surface_update_transform(surface);
|
|
|
|
|
|
|
|
if (surface->transform.enabled) {
|
|
|
|
pixman_region32_t box;
|
|
|
|
surface_compute_bbox(surface, sx, sy, width, height, &box);
|
|
|
|
pixman_region32_union(&surface->damage, &surface->damage,
|
|
|
|
&box);
|
|
|
|
pixman_region32_fini(&box);
|
|
|
|
} else {
|
|
|
|
pixman_region32_union_rect(&surface->damage, &surface->damage,
|
2012-02-09 17:27:45 +04:00
|
|
|
surface->geometry.x + sx,
|
|
|
|
surface->geometry.y + sy,
|
|
|
|
width, height);
|
2012-01-26 15:12:45 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
weston_compositor_schedule_repaint(surface->compositor);
|
2011-02-13 21:00:51 +03:00
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_damage(struct weston_surface *surface)
|
2011-02-13 21:00:51 +03:00
|
|
|
{
|
2012-01-26 15:12:45 +04:00
|
|
|
weston_surface_update_transform(surface);
|
|
|
|
|
|
|
|
pixman_region32_union(&surface->damage, &surface->damage,
|
|
|
|
&surface->transform.boundingbox);
|
|
|
|
|
|
|
|
weston_compositor_schedule_repaint(surface->compositor);
|
2011-02-13 21:00:51 +03:00
|
|
|
}
|
|
|
|
|
2011-06-24 05:43:50 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_configure(struct weston_surface *surface,
|
2012-02-06 16:54:20 +04:00
|
|
|
GLfloat x, GLfloat y, int width, int height)
|
2011-06-24 05:43:50 +04:00
|
|
|
{
|
2012-01-25 18:22:05 +04:00
|
|
|
surface->geometry.x = x;
|
|
|
|
surface->geometry.y = y;
|
2012-01-25 17:55:43 +04:00
|
|
|
surface->geometry.width = width;
|
|
|
|
surface->geometry.height = height;
|
2012-01-25 15:37:39 +04:00
|
|
|
surface->geometry.dirty = 1;
|
2011-06-24 05:43:50 +04:00
|
|
|
}
|
|
|
|
|
2012-02-13 15:03:59 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_set_position(struct weston_surface *surface,
|
|
|
|
GLfloat x, GLfloat y)
|
|
|
|
{
|
|
|
|
surface->geometry.x = x;
|
|
|
|
surface->geometry.y = y;
|
|
|
|
surface->geometry.dirty = 1;
|
|
|
|
}
|
|
|
|
|
2012-03-27 18:36:36 +04:00
|
|
|
WL_EXPORT int
|
|
|
|
weston_surface_is_mapped(struct weston_surface *surface)
|
|
|
|
{
|
|
|
|
if (surface->output)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT uint32_t
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_get_time(void)
|
2010-12-07 05:41:10 +03:00
|
|
|
{
|
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
gettimeofday(&tv, NULL);
|
|
|
|
|
|
|
|
return tv.tv_sec * 1000 + tv.tv_usec / 1000;
|
|
|
|
}
|
|
|
|
|
2012-02-10 18:26:19 +04:00
|
|
|
static struct weston_surface *
|
|
|
|
weston_compositor_pick_surface(struct weston_compositor *compositor,
|
|
|
|
int32_t x, int32_t y, int32_t *sx, int32_t *sy)
|
|
|
|
{
|
|
|
|
struct weston_surface *surface;
|
|
|
|
|
|
|
|
wl_list_for_each(surface, &compositor->surface_list, link) {
|
|
|
|
weston_surface_from_global(surface, x, y, sx, sy);
|
2012-02-24 01:11:59 +04:00
|
|
|
if (pixman_region32_contains_point(&surface->input,
|
|
|
|
*sx, *sy, NULL))
|
2012-02-10 18:26:19 +04:00
|
|
|
return surface;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-01-05 06:30:29 +04:00
|
|
|
weston_device_repick(struct wl_input_device *device, uint32_t time)
|
|
|
|
{
|
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
2012-02-18 16:05:29 +04:00
|
|
|
const struct wl_pointer_grab_interface *interface;
|
2012-01-05 06:30:29 +04:00
|
|
|
struct weston_surface *surface, *focus;
|
|
|
|
|
|
|
|
surface = weston_compositor_pick_surface(wd->compositor,
|
|
|
|
device->x, device->y,
|
|
|
|
&device->current_x,
|
|
|
|
&device->current_y);
|
|
|
|
|
|
|
|
if (&surface->surface != device->current) {
|
2012-02-18 16:05:29 +04:00
|
|
|
interface = device->pointer_grab->interface;
|
|
|
|
interface->focus(device->pointer_grab, time, &surface->surface,
|
2012-01-05 06:30:29 +04:00
|
|
|
device->current_x, device->current_y);
|
|
|
|
device->current = &surface->surface;
|
|
|
|
}
|
|
|
|
|
2012-02-18 16:05:29 +04:00
|
|
|
focus = (struct weston_surface *) device->pointer_grab->focus;
|
2012-01-05 06:30:29 +04:00
|
|
|
if (focus)
|
2012-01-24 11:59:29 +04:00
|
|
|
weston_surface_from_global(focus, device->x, device->y,
|
2012-02-18 16:05:29 +04:00
|
|
|
&device->pointer_grab->x, &device->pointer_grab->y);
|
2012-01-05 06:30:29 +04:00
|
|
|
}
|
|
|
|
|
2011-11-15 15:34:54 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_repick(struct weston_compositor *compositor)
|
2011-10-12 06:20:37 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *device;
|
2011-10-12 06:20:37 +04:00
|
|
|
uint32_t time;
|
|
|
|
|
2011-11-16 01:39:55 +04:00
|
|
|
if (!compositor->focus)
|
|
|
|
return;
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
time = weston_compositor_get_time();
|
2012-01-05 06:30:29 +04:00
|
|
|
wl_list_for_each(device, &compositor->input_device_list, link)
|
|
|
|
weston_device_repick(&device->input_device, time);
|
2011-10-12 06:20:37 +04:00
|
|
|
}
|
|
|
|
|
2012-02-17 21:43:56 +04:00
|
|
|
static void
|
|
|
|
weston_surface_unmap(struct weston_surface *surface)
|
|
|
|
{
|
2012-03-02 02:09:37 +04:00
|
|
|
struct wl_input_device *device = surface->compositor->input_device;
|
|
|
|
|
2012-02-17 21:43:56 +04:00
|
|
|
weston_surface_damage_below(surface);
|
|
|
|
surface->output = NULL;
|
|
|
|
wl_list_remove(&surface->link);
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_remove(&surface->layer_link);
|
2012-03-02 02:09:37 +04:00
|
|
|
|
|
|
|
if (device->keyboard_focus == &surface->surface)
|
|
|
|
wl_input_device_set_keyboard_focus(device, NULL,
|
|
|
|
weston_compositor_get_time());
|
2012-03-12 00:35:16 +04:00
|
|
|
if (device->pointer_focus == &surface->surface)
|
|
|
|
wl_input_device_set_pointer_focus(device, NULL, 0, 0,
|
|
|
|
weston_compositor_get_time());
|
2012-03-02 02:09:37 +04:00
|
|
|
|
2012-02-17 21:43:56 +04:00
|
|
|
weston_compositor_schedule_repaint(surface->compositor);
|
|
|
|
}
|
|
|
|
|
2008-11-24 01:07:32 +03:00
|
|
|
static void
|
2011-08-19 01:55:30 +04:00
|
|
|
destroy_surface(struct wl_resource *resource)
|
2008-11-24 01:07:32 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_surface *surface =
|
|
|
|
container_of(resource,
|
|
|
|
struct weston_surface, surface.resource);
|
|
|
|
struct weston_compositor *compositor = surface->compositor;
|
2009-03-11 06:17:00 +03:00
|
|
|
|
2012-03-27 18:36:36 +04:00
|
|
|
if (weston_surface_is_mapped(surface))
|
2012-02-17 21:43:56 +04:00
|
|
|
weston_surface_unmap(surface);
|
2011-10-12 06:20:37 +04:00
|
|
|
|
2012-02-17 21:15:27 +04:00
|
|
|
if (surface->texture)
|
|
|
|
glDeleteTextures(1, &surface->texture);
|
2011-04-20 13:02:58 +04:00
|
|
|
|
2011-05-06 21:12:33 +04:00
|
|
|
if (surface->buffer)
|
|
|
|
wl_list_remove(&surface->buffer_destroy_listener.link);
|
2009-09-19 01:05:13 +04:00
|
|
|
|
2011-04-10 18:49:52 +04:00
|
|
|
if (surface->image != EGL_NO_IMAGE_KHR)
|
2011-04-25 23:08:20 +04:00
|
|
|
compositor->destroy_image(compositor->display,
|
|
|
|
surface->image);
|
2011-04-10 18:49:52 +04:00
|
|
|
|
2012-01-25 17:17:40 +04:00
|
|
|
pixman_region32_fini(&surface->transform.boundingbox);
|
2012-01-03 12:23:24 +04:00
|
|
|
pixman_region32_fini(&surface->damage);
|
2012-02-24 01:11:59 +04:00
|
|
|
pixman_region32_fini(&surface->opaque);
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_fini(&surface->clip);
|
2012-02-24 01:20:38 +04:00
|
|
|
if (!region_is_undefined(&surface->input))
|
2012-02-24 01:11:59 +04:00
|
|
|
pixman_region32_fini(&surface->input);
|
2012-01-03 12:23:24 +04:00
|
|
|
|
2009-03-11 06:17:00 +03:00
|
|
|
free(surface);
|
2008-11-24 01:07:32 +03:00
|
|
|
}
|
|
|
|
|
2012-02-28 14:07:54 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_destroy(struct weston_surface *surface)
|
|
|
|
{
|
|
|
|
/* Not a valid way to destroy a client surface */
|
|
|
|
assert(surface->surface.resource.client == NULL);
|
|
|
|
|
|
|
|
destroy_surface(&surface->surface.resource);
|
|
|
|
}
|
|
|
|
|
2011-02-21 18:24:53 +03:00
|
|
|
static void
|
2012-03-28 01:04:59 +04:00
|
|
|
weston_surface_attach(struct wl_surface *surface, struct wl_buffer *buffer)
|
2011-02-21 18:24:53 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_surface *es = (struct weston_surface *) surface;
|
|
|
|
struct weston_compositor *ec = es->compositor;
|
2011-02-21 18:24:53 +03:00
|
|
|
|
2012-03-27 18:36:40 +04:00
|
|
|
if (es->buffer) {
|
|
|
|
weston_buffer_post_release(es->buffer);
|
|
|
|
wl_list_remove(&es->buffer_destroy_listener.link);
|
|
|
|
}
|
|
|
|
|
|
|
|
es->buffer = buffer;
|
|
|
|
|
|
|
|
if (!buffer) {
|
|
|
|
if (weston_surface_is_mapped(es))
|
|
|
|
weston_surface_unmap(es);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer->busy_count++;
|
|
|
|
wl_list_insert(es->buffer->resource.destroy_listener_list.prev,
|
|
|
|
&es->buffer_destroy_listener.link);
|
|
|
|
|
|
|
|
if (es->geometry.width != buffer->width ||
|
|
|
|
es->geometry.height != buffer->height) {
|
|
|
|
undef_region(&es->input);
|
|
|
|
pixman_region32_fini(&es->opaque);
|
|
|
|
pixman_region32_init(&es->opaque);
|
|
|
|
}
|
|
|
|
|
2012-01-26 19:00:23 +04:00
|
|
|
if (!es->texture) {
|
|
|
|
glGenTextures(1, &es->texture);
|
|
|
|
glBindTexture(GL_TEXTURE_2D, es->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);
|
|
|
|
es->shader = &ec->texture_shader;
|
|
|
|
} else {
|
|
|
|
glBindTexture(GL_TEXTURE_2D, es->texture);
|
|
|
|
}
|
2011-03-08 13:32:57 +03:00
|
|
|
|
|
|
|
if (wl_buffer_is_shm(buffer)) {
|
2011-04-25 21:44:47 +04:00
|
|
|
es->pitch = wl_shm_buffer_get_stride(buffer) / 4;
|
2012-03-28 01:10:13 +04:00
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
|
|
|
|
es->pitch, es->buffer->height, 0,
|
|
|
|
GL_BGRA_EXT, GL_UNSIGNED_BYTE, NULL);
|
2011-02-21 18:24:53 +03:00
|
|
|
} else {
|
2011-06-21 12:44:37 +04:00
|
|
|
if (es->image != EGL_NO_IMAGE_KHR)
|
|
|
|
ec->destroy_image(ec->display, es->image);
|
2011-04-25 23:08:20 +04:00
|
|
|
es->image = ec->create_image(ec->display, NULL,
|
|
|
|
EGL_WAYLAND_BUFFER_WL,
|
|
|
|
buffer, NULL);
|
2012-03-27 18:36:40 +04:00
|
|
|
|
2011-04-25 23:08:20 +04:00
|
|
|
ec->image_target_texture_2d(GL_TEXTURE_2D, es->image);
|
2011-09-01 00:21:38 +04:00
|
|
|
|
2012-03-27 18:36:38 +04:00
|
|
|
es->pitch = buffer->width;
|
2011-02-21 18:24:53 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-05-02 21:47:51 +04:00
|
|
|
static int
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
texture_region(struct weston_surface *es, pixman_region32_t *region)
|
2008-11-22 03:25:44 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec = es->compositor;
|
2011-02-14 18:39:54 +03:00
|
|
|
GLfloat *v, inv_width, inv_height;
|
2012-01-24 16:47:37 +04:00
|
|
|
GLfloat sx, sy;
|
2011-02-14 18:39:54 +03:00
|
|
|
pixman_box32_t *rectangles;
|
2011-05-02 21:47:51 +04:00
|
|
|
unsigned int *p;
|
2011-02-14 18:39:54 +03:00
|
|
|
int i, n;
|
|
|
|
|
2011-05-02 21:47:51 +04:00
|
|
|
rectangles = pixman_region32_rectangles(region, &n);
|
2011-02-14 18:39:54 +03:00
|
|
|
v = wl_array_add(&ec->vertices, n * 16 * sizeof *v);
|
|
|
|
p = wl_array_add(&ec->indices, n * 6 * sizeof *p);
|
2011-04-25 21:44:47 +04:00
|
|
|
inv_width = 1.0 / es->pitch;
|
2012-01-25 17:55:43 +04:00
|
|
|
inv_height = 1.0 / es->geometry.height;
|
2011-05-02 21:47:51 +04:00
|
|
|
|
2011-02-14 18:39:54 +03:00
|
|
|
for (i = 0; i < n; i++, v += 16, p += 6) {
|
2012-01-24 16:47:37 +04:00
|
|
|
surface_from_global_float(es, rectangles[i].x1,
|
|
|
|
rectangles[i].y1, &sx, &sy);
|
2011-02-14 18:39:54 +03:00
|
|
|
v[ 0] = rectangles[i].x1;
|
|
|
|
v[ 1] = rectangles[i].y1;
|
2012-01-24 16:47:37 +04:00
|
|
|
v[ 2] = sx * inv_width;
|
|
|
|
v[ 3] = sy * inv_height;
|
2011-02-14 18:39:54 +03:00
|
|
|
|
2012-01-24 16:47:37 +04:00
|
|
|
surface_from_global_float(es, rectangles[i].x1,
|
|
|
|
rectangles[i].y2, &sx, &sy);
|
2011-02-14 18:39:54 +03:00
|
|
|
v[ 4] = rectangles[i].x1;
|
|
|
|
v[ 5] = rectangles[i].y2;
|
2012-01-24 16:47:37 +04:00
|
|
|
v[ 6] = sx * inv_width;
|
|
|
|
v[ 7] = sy * inv_height;
|
2011-02-14 18:39:54 +03:00
|
|
|
|
2012-01-24 16:47:37 +04:00
|
|
|
surface_from_global_float(es, rectangles[i].x2,
|
|
|
|
rectangles[i].y1, &sx, &sy);
|
2011-02-14 18:39:54 +03:00
|
|
|
v[ 8] = rectangles[i].x2;
|
|
|
|
v[ 9] = rectangles[i].y1;
|
2012-01-24 16:47:37 +04:00
|
|
|
v[10] = sx * inv_width;
|
|
|
|
v[11] = sy * inv_height;
|
2011-02-14 18:39:54 +03:00
|
|
|
|
2012-01-24 16:47:37 +04:00
|
|
|
surface_from_global_float(es, rectangles[i].x2,
|
|
|
|
rectangles[i].y2, &sx, &sy);
|
2011-02-14 18:39:54 +03:00
|
|
|
v[12] = rectangles[i].x2;
|
|
|
|
v[13] = rectangles[i].y2;
|
2012-01-24 16:47:37 +04:00
|
|
|
v[14] = sx * inv_width;
|
|
|
|
v[15] = sy * inv_height;
|
2011-02-14 18:39:54 +03:00
|
|
|
|
|
|
|
p[0] = i * 4 + 0;
|
|
|
|
p[1] = i * 4 + 1;
|
|
|
|
p[2] = i * 4 + 2;
|
|
|
|
p[3] = i * 4 + 2;
|
|
|
|
p[4] = i * 4 + 1;
|
|
|
|
p[5] = i * 4 + 3;
|
|
|
|
}
|
2011-02-13 21:44:55 +03:00
|
|
|
|
2011-05-02 21:47:51 +04:00
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2012-01-26 08:32:28 +04:00
|
|
|
WL_EXPORT void
|
2012-02-29 07:31:58 +04:00
|
|
|
weston_surface_draw(struct weston_surface *es, struct weston_output *output,
|
|
|
|
pixman_region32_t *damage)
|
2011-05-02 21:47:51 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec = es->compositor;
|
2011-05-02 21:47:51 +04:00
|
|
|
GLfloat *v;
|
|
|
|
pixman_region32_t repaint;
|
2011-06-21 03:48:16 +04:00
|
|
|
GLint filter;
|
2011-05-02 21:47:51 +04:00
|
|
|
int n;
|
|
|
|
|
2012-01-26 13:28:08 +04:00
|
|
|
pixman_region32_init(&repaint);
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_intersect(&repaint,
|
|
|
|
&es->transform.boundingbox, damage);
|
|
|
|
pixman_region32_subtract(&repaint, &repaint, &es->clip);
|
2012-02-06 14:16:07 +04:00
|
|
|
|
2011-05-02 21:47:51 +04:00
|
|
|
if (!pixman_region32_not_empty(&repaint))
|
2012-01-26 13:28:08 +04:00
|
|
|
goto out;
|
2011-05-02 21:47:51 +04:00
|
|
|
|
2012-02-17 19:45:16 +04:00
|
|
|
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
glEnable(GL_BLEND);
|
2011-05-02 21:47:51 +04:00
|
|
|
|
2012-01-26 08:02:06 +04:00
|
|
|
if (ec->current_shader != es->shader) {
|
|
|
|
glUseProgram(es->shader->program);
|
|
|
|
ec->current_shader = es->shader;
|
|
|
|
}
|
|
|
|
|
2012-02-01 00:38:36 +04:00
|
|
|
glUniformMatrix4fv(es->shader->proj_uniform,
|
|
|
|
1, GL_FALSE, output->matrix.d);
|
compositor: fix and simplify shader uniform handling
The uniform location variables should be signed, according to the OpenGL
ES 2 specification. Moreover, GL_NONE, i.e. 0, is not an invalid nor
special location; it is actually used as a valid uniform location.
Change struct weston_shader uniform members to signed.
Stop using 0 for identifying a non-existing uniform, use -1 instead.
Furthermore, as the spec says a) glGetUniformLocation() will return -1
for non-active/existing uniforms, and b) glUniform*() function will
simply ignore all calls with location -1, we can simplify the code. We
don't have to avoid locating uniforms that don't exist, and we don't
need to test for them in weston_surface_draw() either.
Remove the micro-optimisation that avoids setting 'alpha' uniform if it
has not changed, in the name of simplification.
Unify shader creation by dropping init_solid_shader(), and calling
weston_shader_init() instead. The downside is that we compile the vertex
shader twice at startup now.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-02-02 18:49:05 +04:00
|
|
|
glUniform1i(es->shader->tex_uniform, 0);
|
|
|
|
glUniform4fv(es->shader->color_uniform, 1, es->color);
|
|
|
|
glUniform1f(es->shader->alpha_uniform, es->alpha / 255.0);
|
|
|
|
glUniform1f(es->shader->texwidth_uniform,
|
|
|
|
(GLfloat)es->geometry.width / es->pitch);
|
2012-01-24 16:47:37 +04:00
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
if (es->transform.enabled || output->zoom.active)
|
2011-06-21 03:48:16 +04:00
|
|
|
filter = GL_LINEAR;
|
2012-01-24 16:47:37 +04:00
|
|
|
else
|
2012-01-06 16:10:06 +04:00
|
|
|
filter = GL_NEAREST;
|
2012-01-24 16:47:37 +04:00
|
|
|
|
|
|
|
n = texture_region(es, &repaint);
|
2011-05-02 21:47:51 +04:00
|
|
|
|
2008-11-22 05:31:54 +03:00
|
|
|
glBindTexture(GL_TEXTURE_2D, es->texture);
|
2011-06-21 03:48:16 +04:00
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
|
|
|
|
|
2011-02-14 18:39:54 +03:00
|
|
|
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]);
|
2010-06-07 06:23:21 +04:00
|
|
|
glEnableVertexAttribArray(0);
|
|
|
|
glEnableVertexAttribArray(1);
|
2012-01-24 17:53:35 +04:00
|
|
|
|
2011-02-14 18:39:54 +03:00
|
|
|
glDrawElements(GL_TRIANGLES, n * 6, GL_UNSIGNED_INT, ec->indices.data);
|
|
|
|
|
2012-01-24 17:53:35 +04:00
|
|
|
glDisableVertexAttribArray(1);
|
|
|
|
glDisableVertexAttribArray(0);
|
|
|
|
|
2011-02-14 18:39:54 +03:00
|
|
|
ec->vertices.size = 0;
|
|
|
|
ec->indices.size = 0;
|
2012-01-26 13:28:08 +04:00
|
|
|
|
|
|
|
out:
|
2011-02-14 18:39:54 +03:00
|
|
|
pixman_region32_fini(&repaint);
|
2008-11-22 03:25:44 +03:00
|
|
|
}
|
|
|
|
|
2012-02-29 21:42:35 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_surface_restack(struct weston_surface *surface, struct wl_list *below)
|
2009-03-17 23:12:51 +03:00
|
|
|
{
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_remove(&surface->layer_link);
|
|
|
|
wl_list_insert(below, &surface->layer_link);
|
|
|
|
weston_surface_damage_below(surface);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_damage(surface);
|
2009-03-17 23:12:51 +03:00
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_damage_all(struct weston_compositor *compositor)
|
2011-04-22 22:01:18 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *output;
|
2011-04-22 22:01:18 +04:00
|
|
|
|
|
|
|
wl_list_for_each(output, &compositor->output_list, link)
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_damage(output);
|
2011-04-22 22:01:18 +04:00
|
|
|
}
|
|
|
|
|
2012-01-26 09:11:01 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_buffer_post_release(struct wl_buffer *buffer)
|
2011-05-06 21:12:33 +04:00
|
|
|
{
|
2011-10-25 01:51:02 +04:00
|
|
|
if (--buffer->busy_count > 0)
|
2011-05-06 21:12:33 +04:00
|
|
|
return;
|
|
|
|
|
2011-08-19 01:55:30 +04:00
|
|
|
assert(buffer->resource.client != NULL);
|
2011-11-18 01:46:19 +04:00
|
|
|
wl_resource_queue_event(&buffer->resource, WL_BUFFER_RELEASE);
|
2011-05-06 21:12:33 +04:00
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_damage(struct weston_output *output)
|
2011-04-22 22:01:18 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *compositor = output->compositor;
|
2011-11-11 20:48:12 +04:00
|
|
|
|
2012-02-29 08:07:47 +04:00
|
|
|
pixman_region32_union(&compositor->damage,
|
|
|
|
&compositor->damage, &output->region);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_schedule_repaint(compositor);
|
2011-04-22 22:01:18 +04:00
|
|
|
}
|
|
|
|
|
2011-04-22 23:38:14 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
fade_frame(struct weston_animation *animation,
|
|
|
|
struct weston_output *output, uint32_t msecs)
|
2011-04-22 23:38:14 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *compositor =
|
2011-04-22 23:38:14 +04:00
|
|
|
container_of(animation,
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor, fade.animation);
|
2012-01-26 19:55:10 +04:00
|
|
|
struct weston_surface *surface;
|
2011-04-22 23:38:14 +04:00
|
|
|
|
2012-01-26 19:55:10 +04:00
|
|
|
surface = compositor->fade.surface;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_spring_update(&compositor->fade.spring, msecs);
|
2012-01-26 19:55:10 +04:00
|
|
|
weston_surface_set_color(surface, 0.0, 0.0, 0.0,
|
|
|
|
compositor->fade.spring.current);
|
|
|
|
weston_surface_damage(surface);
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
if (weston_spring_done(&compositor->fade.spring)) {
|
2011-05-02 22:38:18 +04:00
|
|
|
compositor->fade.spring.current =
|
|
|
|
compositor->fade.spring.target;
|
2011-04-22 23:38:14 +04:00
|
|
|
wl_list_remove(&animation->link);
|
|
|
|
wl_list_init(&animation->link);
|
2011-12-02 12:39:49 +04:00
|
|
|
|
2012-01-26 19:55:10 +04:00
|
|
|
if (compositor->fade.spring.current < 0.001) {
|
|
|
|
destroy_surface(&surface->surface.resource);
|
|
|
|
compositor->fade.surface = NULL;
|
|
|
|
} else if (compositor->fade.spring.current > 0.999) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
compositor->state = WESTON_COMPOSITOR_SLEEPING;
|
2011-12-02 12:39:49 +04:00
|
|
|
compositor->shell->lock(compositor->shell);
|
|
|
|
}
|
2011-04-22 23:38:14 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-26 17:40:37 +04:00
|
|
|
struct weston_frame_callback {
|
|
|
|
struct wl_resource resource;
|
|
|
|
struct wl_list link;
|
|
|
|
};
|
|
|
|
|
2008-11-24 09:12:46 +03:00
|
|
|
static void
|
2012-01-26 17:40:37 +04:00
|
|
|
weston_output_repaint(struct weston_output *output, int msecs)
|
2008-10-12 05:21:39 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec = output->compositor;
|
2012-01-26 19:55:10 +04:00
|
|
|
struct weston_surface *es;
|
2012-02-29 21:42:35 +04:00
|
|
|
struct weston_layer *layer;
|
2012-01-26 17:40:37 +04:00
|
|
|
struct weston_animation *animation, *next;
|
|
|
|
struct weston_frame_callback *cb, *cnext;
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_t opaque, new_damage, output_damage;
|
2012-02-01 16:45:51 +04:00
|
|
|
int32_t width, height;
|
2008-11-29 01:06:06 +03:00
|
|
|
|
2012-02-15 19:02:57 +04:00
|
|
|
weston_compositor_update_drag_surfaces(ec);
|
|
|
|
|
2012-02-01 16:45:51 +04:00
|
|
|
width = output->current->width +
|
|
|
|
output->border.left + output->border.right;
|
|
|
|
height = output->current->height +
|
|
|
|
output->border.top + output->border.bottom;
|
|
|
|
glViewport(0, 0, width, height);
|
2001-01-02 06:23:51 +03:00
|
|
|
|
2012-02-29 21:42:35 +04:00
|
|
|
/* Rebuild the surface list and update surface transforms up front. */
|
|
|
|
wl_list_init(&ec->surface_list);
|
|
|
|
wl_list_for_each(layer, &ec->layer_list, link) {
|
|
|
|
wl_list_for_each(es, &layer->surface_list, layer_link) {
|
|
|
|
weston_surface_update_transform(es);
|
|
|
|
wl_list_insert(ec->surface_list.prev, &es->link);
|
|
|
|
}
|
|
|
|
}
|
2012-01-27 16:38:33 +04:00
|
|
|
|
2012-02-10 01:12:57 +04:00
|
|
|
if (output->assign_planes)
|
|
|
|
/*
|
|
|
|
* This will queue flips for the fbs and sprites where
|
|
|
|
* applicable and clear the damage for those surfaces.
|
|
|
|
* The repaint loop below will repaint everything
|
|
|
|
* else.
|
|
|
|
*/
|
|
|
|
output->assign_planes(output);
|
|
|
|
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_init(&new_damage);
|
|
|
|
pixman_region32_init(&opaque);
|
|
|
|
|
2012-01-26 10:03:58 +04:00
|
|
|
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);
|
2012-02-29 07:31:58 +04:00
|
|
|
empty_region(&es->damage);
|
|
|
|
pixman_region32_copy(&es->clip, &opaque);
|
2012-02-09 18:39:38 +04:00
|
|
|
pixman_region32_union(&opaque, &opaque, &es->transform.opaque);
|
2012-01-26 10:03:58 +04:00
|
|
|
}
|
|
|
|
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_union(&ec->damage, &ec->damage, &new_damage);
|
|
|
|
|
|
|
|
pixman_region32_init(&output_damage);
|
|
|
|
pixman_region32_union(&output_damage,
|
|
|
|
&ec->damage, &output->previous_damage);
|
|
|
|
pixman_region32_copy(&output->previous_damage, &ec->damage);
|
|
|
|
pixman_region32_intersect(&output_damage,
|
|
|
|
&output_damage, &output->region);
|
|
|
|
pixman_region32_subtract(&ec->damage, &ec->damage, &output->region);
|
2011-02-13 21:00:51 +03:00
|
|
|
|
2011-07-02 06:12:11 +04:00
|
|
|
pixman_region32_fini(&opaque);
|
2011-06-24 05:11:19 +04:00
|
|
|
pixman_region32_fini(&new_damage);
|
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
if (output->dirty)
|
|
|
|
weston_output_update_matrix(output);
|
|
|
|
|
2012-02-29 07:31:58 +04:00
|
|
|
output->repaint(output, &output_damage);
|
2008-10-12 05:21:39 +04:00
|
|
|
|
2012-02-29 07:31:58 +04:00
|
|
|
pixman_region32_fini(&output_damage);
|
2009-01-01 00:18:42 +03:00
|
|
|
|
2011-06-21 23:02:12 +04:00
|
|
|
output->repaint_needed = 0;
|
2011-03-14 14:07:26 +03:00
|
|
|
|
2012-03-12 00:35:16 +04:00
|
|
|
weston_compositor_repick(ec);
|
|
|
|
wl_event_loop_dispatch(ec->input_loop, 0);
|
|
|
|
|
2011-08-17 07:01:28 +04:00
|
|
|
wl_list_for_each_safe(cb, cnext, &output->frame_callback_list, link) {
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_callback_send_done(&cb->resource, msecs);
|
2011-08-19 01:55:30 +04:00
|
|
|
wl_resource_destroy(&cb->resource, 0);
|
2011-03-14 14:07:26 +03:00
|
|
|
}
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2012-01-26 17:40:37 +04:00
|
|
|
wl_list_for_each_safe(animation, next, &ec->animation_list, link)
|
2011-06-21 23:02:12 +04:00
|
|
|
animation->frame(animation, output, msecs);
|
|
|
|
}
|
2011-04-22 20:27:57 +04:00
|
|
|
|
2012-03-06 04:50:08 +04:00
|
|
|
static int
|
|
|
|
weston_compositor_read_input(int fd, uint32_t mask, void *data)
|
2011-06-21 23:02:12 +04:00
|
|
|
{
|
2012-03-06 04:50:08 +04:00
|
|
|
struct weston_compositor *compositor = data;
|
2012-01-18 20:50:31 +04:00
|
|
|
|
2012-03-06 04:50:08 +04:00
|
|
|
wl_event_loop_dispatch(compositor->input_loop, 0);
|
|
|
|
|
|
|
|
return 1;
|
2011-06-21 23:02:12 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_finish_frame(struct weston_output *output, int msecs)
|
2011-06-21 23:02:12 +04:00
|
|
|
{
|
2012-03-06 04:50:08 +04:00
|
|
|
struct weston_compositor *compositor = output->compositor;
|
|
|
|
struct wl_event_loop *loop =
|
|
|
|
wl_display_get_event_loop(compositor->wl_display);
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
if (output->repaint_needed) {
|
2012-01-26 17:40:37 +04:00
|
|
|
weston_output_repaint(output, msecs);
|
2012-03-06 04:50:08 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
output->repaint_scheduled = 0;
|
|
|
|
if (compositor->input_loop_source)
|
|
|
|
return;
|
|
|
|
|
|
|
|
fd = wl_event_loop_get_fd(compositor->input_loop);
|
|
|
|
compositor->input_loop_source =
|
|
|
|
wl_event_loop_add_fd(loop, fd, WL_EVENT_READABLE,
|
|
|
|
weston_compositor_read_input, compositor);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
idle_repaint(void *data)
|
|
|
|
{
|
|
|
|
struct weston_output *output = data;
|
|
|
|
|
|
|
|
weston_output_finish_frame(output, weston_compositor_get_time());
|
2008-10-12 05:21:39 +04:00
|
|
|
}
|
|
|
|
|
2012-02-29 21:42:35 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
weston_layer_init(struct weston_layer *layer, struct wl_list *below)
|
|
|
|
{
|
|
|
|
wl_list_init(&layer->surface_list);
|
|
|
|
wl_list_insert(below, &layer->link);
|
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_schedule_repaint(struct weston_compositor *compositor)
|
2008-10-12 05:21:39 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *output;
|
2011-06-21 23:02:12 +04:00
|
|
|
struct wl_event_loop *loop;
|
2011-03-14 14:07:26 +03:00
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
if (compositor->state == WESTON_COMPOSITOR_SLEEPING)
|
2011-04-22 22:01:18 +04:00
|
|
|
return;
|
|
|
|
|
2011-06-21 23:02:12 +04:00
|
|
|
loop = wl_display_get_event_loop(compositor->wl_display);
|
|
|
|
wl_list_for_each(output, &compositor->output_list, link) {
|
2011-03-14 14:07:26 +03:00
|
|
|
output->repaint_needed = 1;
|
2011-06-21 23:02:12 +04:00
|
|
|
if (output->repaint_scheduled)
|
|
|
|
continue;
|
2011-03-14 14:07:26 +03:00
|
|
|
|
2011-06-21 23:02:12 +04:00
|
|
|
wl_event_loop_add_idle(loop, idle_repaint, output);
|
|
|
|
output->repaint_scheduled = 1;
|
|
|
|
}
|
2012-03-06 04:50:08 +04:00
|
|
|
|
|
|
|
if (compositor->input_loop_source) {
|
|
|
|
wl_event_source_remove(compositor->input_loop_source);
|
|
|
|
compositor->input_loop_source = NULL;
|
|
|
|
}
|
2008-10-12 05:21:39 +04:00
|
|
|
}
|
2009-02-09 23:17:46 +03:00
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_fade(struct weston_compositor *compositor, float tint)
|
2011-04-22 23:38:14 +04:00
|
|
|
{
|
2012-01-26 19:55:10 +04:00
|
|
|
struct weston_surface *surface;
|
2011-04-22 23:38:14 +04:00
|
|
|
int done;
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
done = weston_spring_done(&compositor->fade.spring);
|
2011-05-02 22:38:18 +04:00
|
|
|
compositor->fade.spring.target = tint;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
if (weston_spring_done(&compositor->fade.spring))
|
2011-04-22 23:38:14 +04:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (done)
|
2011-05-02 22:38:18 +04:00
|
|
|
compositor->fade.spring.timestamp =
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_get_time();
|
2011-04-22 23:38:14 +04:00
|
|
|
|
2012-01-26 19:55:10 +04:00
|
|
|
if (compositor->fade.surface == NULL) {
|
2012-01-27 20:58:31 +04:00
|
|
|
surface = weston_surface_create(compositor);
|
|
|
|
weston_surface_configure(surface, 0, 0, 8192, 8192);
|
2012-01-26 19:55:10 +04:00
|
|
|
weston_surface_set_color(surface, 0.0, 0.0, 0.0, 0.0);
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_insert(&compositor->fade_layer.surface_list,
|
|
|
|
&surface->layer_link);
|
2012-02-10 15:34:36 +04:00
|
|
|
weston_surface_assign_output(surface);
|
2012-01-26 19:55:10 +04:00
|
|
|
compositor->fade.surface = surface;
|
2012-02-29 21:22:38 +04:00
|
|
|
pixman_region32_init(&surface->input);
|
2012-01-26 19:55:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
weston_surface_damage(compositor->fade.surface);
|
2011-04-22 23:38:14 +04:00
|
|
|
if (wl_list_empty(&compositor->fade.animation.link))
|
|
|
|
wl_list_insert(compositor->animation_list.prev,
|
|
|
|
&compositor->fade.animation.link);
|
|
|
|
}
|
|
|
|
|
2008-11-06 18:38:17 +03:00
|
|
|
static void
|
2011-08-19 01:55:30 +04:00
|
|
|
surface_destroy(struct wl_client *client, struct wl_resource *resource)
|
2008-10-09 06:51:32 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
wl_resource_destroy(resource, weston_compositor_get_time());
|
2008-10-09 06:51:32 +04:00
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_assign_output(struct weston_surface *es)
|
2011-03-14 14:07:26 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec = es->compositor;
|
|
|
|
struct weston_output *output, *new_output;
|
2011-07-21 22:30:22 +04:00
|
|
|
pixman_region32_t region;
|
|
|
|
uint32_t max, area;
|
|
|
|
pixman_box32_t *e;
|
2011-03-14 14:07:26 +03:00
|
|
|
|
2012-01-26 13:34:16 +04:00
|
|
|
weston_surface_update_transform(es);
|
|
|
|
|
2011-11-15 22:50:21 +04:00
|
|
|
new_output = NULL;
|
2011-07-21 22:30:22 +04:00
|
|
|
max = 0;
|
2012-01-26 13:34:16 +04:00
|
|
|
pixman_region32_init(®ion);
|
2011-03-14 14:07:26 +03:00
|
|
|
wl_list_for_each(output, &ec->output_list, link) {
|
2012-01-26 13:34:16 +04:00
|
|
|
pixman_region32_intersect(®ion, &es->transform.boundingbox,
|
|
|
|
&output->region);
|
2011-07-21 22:30:22 +04:00
|
|
|
|
|
|
|
e = pixman_region32_extents(®ion);
|
|
|
|
area = (e->x2 - e->x1) * (e->y2 - e->y1);
|
|
|
|
|
|
|
|
if (area >= max) {
|
2011-11-15 22:50:21 +04:00
|
|
|
new_output = output;
|
2011-07-21 22:30:22 +04:00
|
|
|
max = area;
|
2011-03-14 14:07:26 +03:00
|
|
|
}
|
|
|
|
}
|
2012-01-26 13:34:16 +04:00
|
|
|
pixman_region32_fini(®ion);
|
2011-11-15 22:50:21 +04:00
|
|
|
|
|
|
|
es->output = new_output;
|
|
|
|
if (!wl_list_empty(&es->frame_callback_list)) {
|
|
|
|
wl_list_insert_list(new_output->frame_callback_list.prev,
|
|
|
|
&es->frame_callback_list);
|
|
|
|
wl_list_init(&es->frame_callback_list);
|
|
|
|
}
|
2011-03-14 14:07:26 +03:00
|
|
|
}
|
|
|
|
|
2012-03-27 18:36:40 +04:00
|
|
|
static void
|
|
|
|
surface_attach(struct wl_client *client,
|
|
|
|
struct wl_resource *resource,
|
|
|
|
struct wl_resource *buffer_resource, int32_t sx, int32_t sy)
|
|
|
|
{
|
|
|
|
struct weston_surface *es = resource->data;
|
|
|
|
struct wl_buffer *buffer = NULL;
|
|
|
|
|
|
|
|
if (buffer_resource)
|
|
|
|
buffer = buffer_resource->data;
|
2011-06-24 05:43:50 +04:00
|
|
|
|
2012-03-28 01:04:59 +04:00
|
|
|
weston_surface_attach(&es->surface, buffer);
|
2012-03-27 18:36:40 +04:00
|
|
|
|
2012-03-27 18:36:41 +04:00
|
|
|
if (buffer && es->configure)
|
|
|
|
es->configure(es, sx, sy);
|
2008-10-09 06:51:32 +04:00
|
|
|
}
|
|
|
|
|
2008-11-07 16:39:37 +03:00
|
|
|
static void
|
2008-12-16 04:35:24 +03:00
|
|
|
surface_damage(struct wl_client *client,
|
2011-08-19 01:55:30 +04:00
|
|
|
struct wl_resource *resource,
|
2008-12-16 04:35:24 +03:00
|
|
|
int32_t x, int32_t y, int32_t width, int32_t height)
|
2008-11-29 01:06:06 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_surface *es = resource->data;
|
2010-09-03 22:46:38 +04:00
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_damage_rectangle(es, x, y, width, height);
|
2012-03-26 23:56:39 +04:00
|
|
|
|
|
|
|
if (es->buffer && wl_buffer_is_shm(es->buffer)) {
|
|
|
|
glBindTexture(GL_TEXTURE_2D, es->texture);
|
2012-03-28 01:10:13 +04:00
|
|
|
glPixelStorei(GL_UNPACK_ROW_LENGTH, es->pitch);
|
|
|
|
glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
|
|
|
|
glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
|
2012-03-26 23:56:39 +04:00
|
|
|
|
2012-03-28 01:10:13 +04:00
|
|
|
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height,
|
|
|
|
GL_BGRA_EXT, GL_UNSIGNED_BYTE,
|
|
|
|
wl_shm_buffer_get_data(es->buffer));
|
2012-03-26 23:56:39 +04:00
|
|
|
}
|
2008-11-29 01:06:06 +03:00
|
|
|
}
|
|
|
|
|
2011-08-17 07:01:28 +04:00
|
|
|
static void
|
2011-08-19 01:55:30 +04:00
|
|
|
destroy_frame_callback(struct wl_resource *resource)
|
2011-08-17 07:01:28 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_frame_callback *cb = resource->data;
|
2011-08-19 01:55:30 +04:00
|
|
|
|
|
|
|
wl_list_remove(&cb->link);
|
2011-11-15 13:45:42 +04:00
|
|
|
free(cb);
|
2011-08-17 07:01:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
surface_frame(struct wl_client *client,
|
2011-08-19 01:55:30 +04:00
|
|
|
struct wl_resource *resource, uint32_t callback)
|
2011-08-17 07:01:28 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_frame_callback *cb;
|
|
|
|
struct weston_surface *es = resource->data;
|
2011-08-17 07:01:28 +04:00
|
|
|
|
|
|
|
cb = malloc(sizeof *cb);
|
|
|
|
if (cb == NULL) {
|
2011-09-01 17:54:57 +04:00
|
|
|
wl_resource_post_no_memory(resource);
|
2011-08-17 07:01:28 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
cb->resource.object.interface = &wl_callback_interface;
|
|
|
|
cb->resource.object.id = callback;
|
|
|
|
cb->resource.destroy = destroy_frame_callback;
|
2011-08-19 01:55:30 +04:00
|
|
|
cb->resource.client = client;
|
|
|
|
cb->resource.data = cb;
|
2011-08-17 07:01:28 +04:00
|
|
|
|
|
|
|
wl_client_add_resource(client, &cb->resource);
|
2011-08-30 00:09:32 +04:00
|
|
|
|
|
|
|
if (es->output) {
|
|
|
|
wl_list_insert(es->output->frame_callback_list.prev,
|
|
|
|
&cb->link);
|
|
|
|
} else {
|
2011-11-15 22:50:21 +04:00
|
|
|
wl_list_insert(es->frame_callback_list.prev, &cb->link);
|
2011-08-30 00:09:32 +04:00
|
|
|
}
|
2011-08-17 07:01:28 +04:00
|
|
|
}
|
|
|
|
|
2012-02-24 01:11:59 +04:00
|
|
|
static void
|
|
|
|
surface_set_opaque_region(struct wl_client *client,
|
|
|
|
struct wl_resource *resource,
|
|
|
|
struct wl_resource *region_resource)
|
|
|
|
{
|
|
|
|
struct weston_surface *surface = resource->data;
|
|
|
|
struct weston_region *region;
|
|
|
|
|
|
|
|
pixman_region32_fini(&surface->opaque);
|
|
|
|
|
|
|
|
if (region_resource) {
|
|
|
|
region = region_resource->data;
|
|
|
|
pixman_region32_init_rect(&surface->opaque, 0, 0,
|
|
|
|
surface->geometry.width,
|
|
|
|
surface->geometry.height);
|
|
|
|
pixman_region32_intersect(&surface->opaque,
|
|
|
|
&surface->opaque, ®ion->region);
|
|
|
|
} else {
|
|
|
|
pixman_region32_init(&surface->opaque);
|
|
|
|
}
|
|
|
|
|
|
|
|
surface->geometry.dirty = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
surface_set_input_region(struct wl_client *client,
|
|
|
|
struct wl_resource *resource,
|
|
|
|
struct wl_resource *region_resource)
|
|
|
|
{
|
|
|
|
struct weston_surface *surface = resource->data;
|
2012-02-24 02:30:45 +04:00
|
|
|
struct weston_region *region;
|
2012-02-24 01:11:59 +04:00
|
|
|
|
|
|
|
if (region_resource) {
|
|
|
|
region = region_resource->data;
|
|
|
|
pixman_region32_init_rect(&surface->input, 0, 0,
|
|
|
|
surface->geometry.width,
|
|
|
|
surface->geometry.height);
|
|
|
|
pixman_region32_intersect(&surface->input,
|
|
|
|
&surface->input, ®ion->region);
|
|
|
|
} else {
|
|
|
|
pixman_region32_init_rect(&surface->input, 0, 0,
|
|
|
|
surface->geometry.width,
|
|
|
|
surface->geometry.height);
|
|
|
|
}
|
|
|
|
|
2012-03-12 00:35:16 +04:00
|
|
|
weston_compositor_schedule_repaint(surface->compositor);
|
2012-02-24 01:11:59 +04:00
|
|
|
}
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
static const struct wl_surface_interface surface_interface = {
|
2008-12-16 04:35:24 +03:00
|
|
|
surface_destroy,
|
|
|
|
surface_attach,
|
2011-08-17 07:01:28 +04:00
|
|
|
surface_damage,
|
2012-02-24 01:11:59 +04:00
|
|
|
surface_frame,
|
|
|
|
surface_set_opaque_region,
|
|
|
|
surface_set_input_region
|
2008-12-16 04:35:24 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
compositor_create_surface(struct wl_client *client,
|
2011-08-19 01:55:30 +04:00
|
|
|
struct wl_resource *resource, uint32_t id)
|
2008-11-07 16:39:37 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec = resource->data;
|
|
|
|
struct weston_surface *surface;
|
2008-11-07 16:39:37 +03:00
|
|
|
|
2012-01-27 20:58:31 +04:00
|
|
|
surface = weston_surface_create(ec);
|
2010-08-09 22:43:33 +04:00
|
|
|
if (surface == NULL) {
|
2011-09-01 17:54:57 +04:00
|
|
|
wl_resource_post_no_memory(resource);
|
2008-12-16 04:35:24 +03:00
|
|
|
return;
|
2010-08-09 22:43:33 +04:00
|
|
|
}
|
2008-11-29 01:06:06 +03:00
|
|
|
|
2010-12-02 01:07:41 +03:00
|
|
|
surface->surface.resource.destroy = destroy_surface;
|
2010-09-03 04:27:16 +04:00
|
|
|
|
2010-12-02 01:07:41 +03:00
|
|
|
surface->surface.resource.object.id = id;
|
|
|
|
surface->surface.resource.object.interface = &wl_surface_interface;
|
|
|
|
surface->surface.resource.object.implementation =
|
2010-09-03 04:27:16 +04:00
|
|
|
(void (**)(void)) &surface_interface;
|
2011-08-19 01:55:30 +04:00
|
|
|
surface->surface.resource.data = surface;
|
2010-09-03 04:27:16 +04:00
|
|
|
|
2010-12-02 01:07:41 +03:00
|
|
|
wl_client_add_resource(client, &surface->surface.resource);
|
2008-12-16 04:35:24 +03:00
|
|
|
}
|
|
|
|
|
2012-02-24 01:11:59 +04:00
|
|
|
static void
|
|
|
|
destroy_region(struct wl_resource *resource)
|
|
|
|
{
|
|
|
|
struct weston_region *region =
|
|
|
|
container_of(resource, struct weston_region, resource);
|
|
|
|
|
|
|
|
pixman_region32_fini(®ion->region);
|
|
|
|
free(region);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
region_destroy(struct wl_client *client, struct wl_resource *resource)
|
|
|
|
{
|
|
|
|
wl_resource_destroy(resource, weston_compositor_get_time());
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
region_add(struct wl_client *client, struct wl_resource *resource,
|
|
|
|
int32_t x, int32_t y, int32_t width, int32_t height)
|
|
|
|
{
|
|
|
|
struct weston_region *region = resource->data;
|
|
|
|
|
|
|
|
pixman_region32_union_rect(®ion->region, ®ion->region,
|
|
|
|
x, y, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
region_subtract(struct wl_client *client, struct wl_resource *resource,
|
|
|
|
int32_t x, int32_t y, int32_t width, int32_t height)
|
|
|
|
{
|
|
|
|
struct weston_region *region = resource->data;
|
|
|
|
pixman_region32_t rect;
|
|
|
|
|
|
|
|
pixman_region32_init_rect(&rect, x, y, width, height);
|
|
|
|
pixman_region32_subtract(®ion->region, ®ion->region, &rect);
|
|
|
|
pixman_region32_fini(&rect);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct wl_region_interface region_interface = {
|
|
|
|
region_destroy,
|
|
|
|
region_add,
|
|
|
|
region_subtract
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
compositor_create_region(struct wl_client *client,
|
|
|
|
struct wl_resource *resource, uint32_t id)
|
|
|
|
{
|
|
|
|
struct weston_region *region;
|
|
|
|
|
|
|
|
region = malloc(sizeof *region);
|
|
|
|
if (region == NULL) {
|
|
|
|
wl_resource_post_no_memory(resource);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
region->resource.destroy = destroy_region;
|
|
|
|
|
|
|
|
region->resource.object.id = id;
|
|
|
|
region->resource.object.interface = &wl_region_interface;
|
|
|
|
region->resource.object.implementation =
|
|
|
|
(void (**)(void)) ®ion_interface;
|
|
|
|
region->resource.data = region;
|
|
|
|
|
|
|
|
pixman_region32_init(®ion->region);
|
|
|
|
|
|
|
|
wl_client_add_resource(client, ®ion->resource);
|
|
|
|
}
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
static const struct wl_compositor_interface compositor_interface = {
|
2008-12-16 04:35:24 +03:00
|
|
|
compositor_create_surface,
|
2012-02-24 01:11:59 +04:00
|
|
|
compositor_create_region
|
2008-12-16 04:35:24 +03:00
|
|
|
};
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_wake(struct weston_compositor *compositor)
|
2011-04-22 22:01:18 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
compositor->state = WESTON_COMPOSITOR_ACTIVE;
|
|
|
|
weston_compositor_fade(compositor, 0.0);
|
2011-04-22 22:01:18 +04:00
|
|
|
|
|
|
|
wl_event_source_timer_update(compositor->idle_source,
|
2011-12-07 18:22:00 +04:00
|
|
|
compositor->idle_time * 1000);
|
2011-04-22 22:01:18 +04:00
|
|
|
}
|
|
|
|
|
2012-02-29 21:53:50 +04:00
|
|
|
static void
|
|
|
|
weston_compositor_dpms_on(struct weston_compositor *compositor)
|
|
|
|
{
|
|
|
|
struct weston_output *output;
|
|
|
|
|
|
|
|
wl_list_for_each(output, &compositor->output_list, link)
|
|
|
|
if (output->set_dpms)
|
|
|
|
output->set_dpms(output, WESTON_DPMS_ON);
|
|
|
|
}
|
|
|
|
|
2011-11-15 15:34:49 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_activity(struct weston_compositor *compositor)
|
2011-11-15 15:34:49 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
if (compositor->state == WESTON_COMPOSITOR_ACTIVE) {
|
|
|
|
weston_compositor_wake(compositor);
|
2011-11-15 15:34:49 +04:00
|
|
|
} else {
|
2012-02-29 21:53:50 +04:00
|
|
|
weston_compositor_dpms_on(compositor);
|
2011-11-15 15:34:49 +04:00
|
|
|
compositor->shell->unlock(compositor->shell);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:01:18 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_inhibit(struct weston_compositor *compositor)
|
2011-04-22 22:01:18 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_activity(compositor);
|
2011-04-22 22:01:18 +04:00
|
|
|
compositor->idle_inhibit++;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_release(struct weston_compositor *compositor)
|
2011-04-22 22:01:18 +04:00
|
|
|
{
|
|
|
|
compositor->idle_inhibit--;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_activity(compositor);
|
2011-04-22 22:01:18 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
idle_handler(void *data)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *compositor = data;
|
2011-04-22 22:01:18 +04:00
|
|
|
|
|
|
|
if (compositor->idle_inhibit)
|
|
|
|
return 1;
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_fade(compositor, 1.0);
|
2011-04-22 22:01:18 +04:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-02-15 19:02:57 +04:00
|
|
|
static void
|
|
|
|
weston_input_update_drag_surface(struct wl_input_device *input_device,
|
|
|
|
int dx, int dy);
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2010-12-08 17:48:52 +03:00
|
|
|
notify_motion(struct wl_input_device *device, uint32_t time, int x, int y)
|
2008-12-10 18:42:04 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *output;
|
2012-02-18 16:05:29 +04:00
|
|
|
const struct wl_pointer_grab_interface *interface;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *ec = wd->compositor;
|
2011-03-11 18:39:20 +03:00
|
|
|
int x_valid = 0, y_valid = 0;
|
|
|
|
int min_x = INT_MAX, min_y = INT_MAX, max_x = INT_MIN, max_y = INT_MIN;
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_activity(ec);
|
2011-04-22 22:01:18 +04:00
|
|
|
|
2011-03-11 18:39:20 +03:00
|
|
|
wl_list_for_each(output, &ec->output_list, link) {
|
2012-02-23 00:57:51 +04:00
|
|
|
if (output->x <= x && x < output->x + output->current->width)
|
2011-03-11 18:39:20 +03:00
|
|
|
x_valid = 1;
|
|
|
|
|
2012-02-23 00:57:51 +04:00
|
|
|
if (output->y <= y && y < output->y + output->current->height)
|
2011-03-11 18:39:20 +03:00
|
|
|
y_valid = 1;
|
|
|
|
|
|
|
|
/* FIXME: calculate this only on output addition/deletion */
|
|
|
|
if (output->x < min_x)
|
|
|
|
min_x = output->x;
|
|
|
|
if (output->y < min_y)
|
|
|
|
min_y = output->y;
|
|
|
|
|
2011-06-21 19:16:58 +04:00
|
|
|
if (output->x + output->current->width > max_x)
|
2012-02-23 00:57:51 +04:00
|
|
|
max_x = output->x + output->current->width - 1;
|
2011-06-21 19:16:58 +04:00
|
|
|
if (output->y + output->current->height > max_y)
|
2012-02-23 00:57:51 +04:00
|
|
|
max_y = output->y + output->current->height - 1;
|
2011-03-11 18:39:20 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!x_valid) {
|
|
|
|
if (x < min_x)
|
|
|
|
x = min_x;
|
|
|
|
else if (x >= max_x)
|
|
|
|
x = max_x;
|
|
|
|
}
|
|
|
|
if (!y_valid) {
|
|
|
|
if (y < min_y)
|
|
|
|
y = min_y;
|
|
|
|
else if (y >= max_y)
|
|
|
|
y = max_y;
|
|
|
|
}
|
2008-12-19 07:05:43 +03:00
|
|
|
|
2012-02-15 19:02:57 +04:00
|
|
|
weston_input_update_drag_surface(device,
|
|
|
|
x - device->x, y - device->y);
|
|
|
|
|
2008-12-22 03:30:01 +03:00
|
|
|
device->x = x;
|
|
|
|
device->y = y;
|
2009-02-23 05:51:24 +03:00
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
wl_list_for_each(output, &ec->output_list, link)
|
|
|
|
if (output->zoom.active &&
|
|
|
|
pixman_region32_contains_point(&output->region, x, y, NULL))
|
|
|
|
weston_output_update_zoom(output, x, y);
|
|
|
|
|
2012-01-05 06:30:29 +04:00
|
|
|
weston_device_repick(device, time);
|
2012-02-18 16:05:29 +04:00
|
|
|
interface = device->pointer_grab->interface;
|
|
|
|
interface->motion(device->pointer_grab, time,
|
|
|
|
device->pointer_grab->x, device->pointer_grab->y);
|
2008-12-10 18:42:04 +03:00
|
|
|
|
2011-12-15 18:14:34 +04:00
|
|
|
if (wd->sprite) {
|
2012-02-13 15:03:59 +04:00
|
|
|
weston_surface_set_position(wd->sprite,
|
|
|
|
device->x - wd->hotspot_x,
|
|
|
|
device->y - wd->hotspot_y);
|
2008-12-12 07:18:45 +03:00
|
|
|
|
2012-02-13 13:01:59 +04:00
|
|
|
weston_compositor_schedule_repaint(ec);
|
2011-12-15 18:14:34 +04:00
|
|
|
}
|
2008-12-10 18:42:04 +03:00
|
|
|
}
|
|
|
|
|
2011-04-23 21:04:11 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_surface_activate(struct weston_surface *surface,
|
|
|
|
struct weston_input_device *device, uint32_t time)
|
2011-02-07 00:54:59 +03:00
|
|
|
{
|
|
|
|
wl_input_device_set_keyboard_focus(&device->input_device,
|
2011-10-28 20:26:06 +04:00
|
|
|
&surface->surface, time);
|
2012-01-05 06:47:30 +04:00
|
|
|
wl_data_device_set_keyboard_focus(&device->input_device);
|
2011-02-07 00:54:59 +03:00
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2010-12-08 17:48:52 +03:00
|
|
|
notify_button(struct wl_input_device *device,
|
2010-07-21 01:06:19 +04:00
|
|
|
uint32_t time, int32_t button, int32_t state)
|
2008-12-10 08:24:18 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *compositor = wd->compositor;
|
2008-12-12 07:27:27 +03:00
|
|
|
|
2012-01-05 06:30:29 +04:00
|
|
|
if (state) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_inhibit(compositor);
|
2012-01-05 06:30:29 +04:00
|
|
|
if (device->button_count == 0) {
|
|
|
|
device->grab_button = button;
|
|
|
|
device->grab_time = time;
|
|
|
|
device->grab_x = device->x;
|
|
|
|
device->grab_y = device->y;
|
|
|
|
}
|
|
|
|
device->button_count++;
|
|
|
|
} else {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_release(compositor);
|
2012-01-05 06:30:29 +04:00
|
|
|
device->button_count--;
|
|
|
|
}
|
2011-04-22 22:01:18 +04:00
|
|
|
|
2012-03-20 18:47:59 +04:00
|
|
|
weston_compositor_run_binding(compositor, wd, time, 0, button, 0, state);
|
2010-12-08 19:07:57 +03:00
|
|
|
|
2012-02-18 16:05:29 +04:00
|
|
|
device->pointer_grab->interface->button(device->pointer_grab, time, button, state);
|
2011-12-19 23:54:11 +04:00
|
|
|
|
2008-12-10 08:24:18 +03:00
|
|
|
}
|
|
|
|
|
2012-03-22 20:47:01 +04:00
|
|
|
WL_EXPORT void
|
|
|
|
notify_axis(struct wl_input_device *device,
|
|
|
|
uint32_t time, uint32_t axis, int32_t value)
|
|
|
|
{
|
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *compositor = wd->compositor;
|
|
|
|
|
|
|
|
weston_compositor_activity(compositor);
|
|
|
|
|
2012-03-20 18:47:59 +04:00
|
|
|
if (value)
|
|
|
|
weston_compositor_run_binding(compositor, wd,
|
|
|
|
time, 0, 0, axis, value);
|
|
|
|
else
|
|
|
|
return;
|
|
|
|
|
2012-03-22 20:47:01 +04:00
|
|
|
if (device->pointer_focus_resource)
|
|
|
|
wl_resource_post_event(device->pointer_focus_resource,
|
|
|
|
WL_INPUT_DEVICE_AXIS, time, axis, value);
|
|
|
|
}
|
|
|
|
|
2011-04-13 01:16:00 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
update_modifier_state(struct weston_input_device *device,
|
2011-04-13 01:16:00 +04:00
|
|
|
uint32_t key, uint32_t state)
|
2008-11-24 08:31:49 +03:00
|
|
|
{
|
2009-09-19 01:29:49 +04:00
|
|
|
uint32_t modifier;
|
2001-01-02 06:24:24 +03:00
|
|
|
|
2009-09-19 01:29:49 +04:00
|
|
|
switch (key) {
|
|
|
|
case KEY_LEFTCTRL:
|
|
|
|
case KEY_RIGHTCTRL:
|
|
|
|
modifier = MODIFIER_CTRL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case KEY_LEFTALT:
|
|
|
|
case KEY_RIGHTALT:
|
|
|
|
modifier = MODIFIER_ALT;
|
|
|
|
break;
|
|
|
|
|
2010-08-05 07:21:41 +04:00
|
|
|
case KEY_LEFTMETA:
|
|
|
|
case KEY_RIGHTMETA:
|
|
|
|
modifier = MODIFIER_SUPER;
|
|
|
|
break;
|
|
|
|
|
2009-09-19 01:29:49 +04:00
|
|
|
default:
|
|
|
|
modifier = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (state)
|
2011-04-13 01:16:00 +04:00
|
|
|
device->modifier_state |= modifier;
|
2009-09-19 01:29:49 +04:00
|
|
|
else
|
2011-04-13 01:16:00 +04:00
|
|
|
device->modifier_state &= ~modifier;
|
|
|
|
}
|
2009-09-19 01:29:49 +04:00
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2011-04-13 01:16:00 +04:00
|
|
|
notify_key(struct wl_input_device *device,
|
|
|
|
uint32_t time, uint32_t key, uint32_t state)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *compositor = wd->compositor;
|
2011-04-13 01:16:00 +04:00
|
|
|
uint32_t *k, *end;
|
|
|
|
|
2012-02-18 16:05:30 +04:00
|
|
|
if (state) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_inhibit(compositor);
|
2012-02-18 16:05:30 +04:00
|
|
|
device->grab_key = key;
|
|
|
|
device->grab_time = time;
|
|
|
|
} else {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_release(compositor);
|
2012-02-18 16:05:30 +04:00
|
|
|
}
|
2011-04-22 22:01:18 +04:00
|
|
|
|
2011-04-13 01:16:00 +04:00
|
|
|
update_modifier_state(wd, key, state);
|
2010-12-08 17:48:52 +03:00
|
|
|
end = device->keys.data + device->keys.size;
|
|
|
|
for (k = device->keys.data; k < end; k++) {
|
2009-02-24 06:30:29 +03:00
|
|
|
if (*k == key)
|
|
|
|
*k = *--end;
|
|
|
|
}
|
2010-12-08 17:48:52 +03:00
|
|
|
device->keys.size = (void *) end - device->keys.data;
|
2009-02-24 06:30:29 +03:00
|
|
|
if (state) {
|
2010-12-08 17:48:52 +03:00
|
|
|
k = wl_array_add(&device->keys, sizeof *k);
|
2009-02-24 06:30:29 +03:00
|
|
|
*k = key;
|
|
|
|
}
|
2008-12-20 10:00:49 +03:00
|
|
|
|
2012-03-06 02:47:15 +04:00
|
|
|
if (device->keyboard_grab == &device->default_keyboard_grab)
|
|
|
|
weston_compositor_run_binding(compositor, wd,
|
2012-03-20 18:47:59 +04:00
|
|
|
time, key, 0, 0, state);
|
2012-03-06 02:47:15 +04:00
|
|
|
|
2012-02-18 16:05:30 +04:00
|
|
|
device->keyboard_grab->interface->key(device->keyboard_grab,
|
|
|
|
time, key, state);
|
2010-07-21 01:06:19 +04:00
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2011-01-27 04:35:07 +03:00
|
|
|
notify_pointer_focus(struct wl_input_device *device,
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
uint32_t time, struct weston_output *output,
|
2011-01-27 04:35:07 +03:00
|
|
|
int32_t x, int32_t y)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *compositor = wd->compositor;
|
2011-01-27 04:35:07 +03:00
|
|
|
|
|
|
|
if (output) {
|
2012-02-15 19:02:57 +04:00
|
|
|
weston_input_update_drag_surface(device, x - device->x,
|
|
|
|
y - device->y);
|
|
|
|
|
2011-01-27 04:35:07 +03:00
|
|
|
device->x = x;
|
|
|
|
device->y = y;
|
|
|
|
compositor->focus = 1;
|
2012-01-05 06:30:29 +04:00
|
|
|
weston_compositor_repick(compositor);
|
2011-01-27 04:35:07 +03:00
|
|
|
} else {
|
|
|
|
compositor->focus = 0;
|
2012-01-05 06:30:29 +04:00
|
|
|
weston_compositor_repick(compositor);
|
2011-01-27 04:35:07 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-16 19:25:11 +04:00
|
|
|
static void
|
|
|
|
destroy_device_saved_kbd_focus(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
|
|
|
struct weston_input_device *wd;
|
|
|
|
|
|
|
|
wd = container_of(listener, struct weston_input_device,
|
|
|
|
saved_kbd_focus_listener);
|
|
|
|
|
|
|
|
wd->saved_kbd_focus = NULL;
|
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2011-01-28 23:53:07 +03:00
|
|
|
notify_keyboard_focus(struct wl_input_device *device,
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
uint32_t time, struct weston_output *output,
|
2011-01-27 19:57:19 +03:00
|
|
|
struct wl_array *keys)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd =
|
|
|
|
(struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *compositor = wd->compositor;
|
2012-03-21 01:28:20 +04:00
|
|
|
struct wl_surface *surface;
|
2012-03-05 07:35:47 +04:00
|
|
|
uint32_t *k;
|
2011-01-28 23:53:07 +03:00
|
|
|
|
2011-01-27 19:57:19 +03:00
|
|
|
if (output) {
|
2011-01-28 23:53:07 +03:00
|
|
|
wl_array_copy(&wd->input_device.keys, keys);
|
2011-04-13 01:16:00 +04:00
|
|
|
wd->modifier_state = 0;
|
2012-03-05 07:35:47 +04:00
|
|
|
wl_array_for_each(k, &device->keys) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_inhibit(compositor);
|
2011-04-13 01:16:00 +04:00
|
|
|
update_modifier_state(wd, *k, 1);
|
|
|
|
}
|
|
|
|
|
2012-03-21 01:28:20 +04:00
|
|
|
surface = wd->saved_kbd_focus;
|
2012-03-16 19:25:11 +04:00
|
|
|
|
2012-03-21 01:28:20 +04:00
|
|
|
if (surface) {
|
2012-03-16 19:25:11 +04:00
|
|
|
wl_list_remove(&wd->saved_kbd_focus_listener.link);
|
2011-06-24 01:30:30 +04:00
|
|
|
wl_input_device_set_keyboard_focus(&wd->input_device,
|
2012-03-21 01:28:20 +04:00
|
|
|
surface, time);
|
2012-03-16 19:25:11 +04:00
|
|
|
wd->saved_kbd_focus = NULL;
|
|
|
|
}
|
2011-01-27 19:57:19 +03:00
|
|
|
} else {
|
2012-03-05 07:35:47 +04:00
|
|
|
wl_array_for_each(k, &device->keys)
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_release(compositor);
|
2011-04-22 22:01:18 +04:00
|
|
|
|
2011-04-13 01:16:00 +04:00
|
|
|
wd->modifier_state = 0;
|
2012-03-16 19:25:11 +04:00
|
|
|
|
2012-03-21 01:28:20 +04:00
|
|
|
surface = wd->input_device.keyboard_focus;
|
2012-03-16 19:25:11 +04:00
|
|
|
|
2012-03-21 01:28:20 +04:00
|
|
|
if (surface) {
|
|
|
|
wd->saved_kbd_focus = surface;
|
2012-03-16 19:25:11 +04:00
|
|
|
wd->saved_kbd_focus_listener.func =
|
|
|
|
destroy_device_saved_kbd_focus;
|
2012-03-21 01:28:20 +04:00
|
|
|
wl_list_insert(surface->resource.destroy_listener_list.prev,
|
2012-03-16 19:25:11 +04:00
|
|
|
&wd->saved_kbd_focus_listener.link);
|
|
|
|
}
|
|
|
|
|
2011-01-28 23:53:07 +03:00
|
|
|
wl_input_device_set_keyboard_focus(&wd->input_device,
|
2011-01-27 19:57:19 +03:00
|
|
|
NULL, time);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-21 21:34:10 +04:00
|
|
|
/* TODO: share this function with wayland-server.c */
|
|
|
|
static struct wl_resource *
|
|
|
|
find_resource_for_surface(struct wl_list *list, struct wl_surface *surface)
|
|
|
|
{
|
|
|
|
struct wl_resource *r;
|
|
|
|
|
|
|
|
if (!surface)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
wl_list_for_each(r, list, link) {
|
|
|
|
if (r->client == surface->resource.client)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-12-22 23:43:09 +04:00
|
|
|
static void
|
|
|
|
lose_touch_focus_resource(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *device =
|
|
|
|
container_of(listener, struct weston_input_device,
|
2011-12-22 23:43:09 +04:00
|
|
|
touch_focus_resource_listener);
|
|
|
|
|
|
|
|
device->touch_focus_resource = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
lose_touch_focus(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *device =
|
|
|
|
container_of(listener, struct weston_input_device,
|
2011-12-22 23:43:09 +04:00
|
|
|
touch_focus_listener);
|
|
|
|
|
|
|
|
device->touch_focus = NULL;
|
|
|
|
}
|
|
|
|
|
2011-12-21 21:34:10 +04:00
|
|
|
static void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
touch_set_focus(struct weston_input_device *device,
|
2011-12-21 21:34:10 +04:00
|
|
|
struct wl_surface *surface, uint32_t time)
|
|
|
|
{
|
|
|
|
struct wl_input_device *input_device = &device->input_device;
|
|
|
|
struct wl_resource *resource;
|
|
|
|
|
|
|
|
if (device->touch_focus == surface)
|
|
|
|
return;
|
|
|
|
|
2011-12-22 23:43:09 +04:00
|
|
|
if (surface) {
|
|
|
|
resource =
|
|
|
|
find_resource_for_surface(&input_device->resource_list,
|
|
|
|
surface);
|
|
|
|
if (!resource) {
|
|
|
|
fprintf(stderr, "couldn't find resource\n");
|
|
|
|
return;
|
|
|
|
}
|
2011-12-21 21:34:10 +04:00
|
|
|
|
2011-12-22 23:43:09 +04:00
|
|
|
device->touch_focus_resource_listener.func =
|
|
|
|
lose_touch_focus_resource;
|
|
|
|
wl_list_insert(resource->destroy_listener_list.prev,
|
|
|
|
&device->touch_focus_resource_listener.link);
|
|
|
|
device->touch_focus_listener.func = lose_touch_focus;
|
|
|
|
wl_list_insert(surface->resource.destroy_listener_list.prev,
|
|
|
|
&device->touch_focus_listener.link);
|
|
|
|
|
|
|
|
device->touch_focus = surface;
|
|
|
|
device->touch_focus_resource = resource;
|
|
|
|
} else {
|
|
|
|
if (device->touch_focus)
|
|
|
|
wl_list_remove(&device->touch_focus_listener.link);
|
|
|
|
if (device->touch_focus_resource)
|
|
|
|
wl_list_remove(&device->touch_focus_resource_listener.link);
|
|
|
|
device->touch_focus = NULL;
|
|
|
|
device->touch_focus_resource = NULL;
|
|
|
|
}
|
2011-12-21 21:34:10 +04:00
|
|
|
}
|
|
|
|
|
2011-12-21 21:34:09 +04:00
|
|
|
/**
|
|
|
|
* notify_touch - emulates button touches and notifies surfaces accordingly.
|
|
|
|
*
|
|
|
|
* It assumes always the correct cycle sequence until it gets here: touch_down
|
|
|
|
* → touch_update → ... → touch_update → touch_end. The driver is responsible
|
|
|
|
* for sending along such order.
|
2011-12-21 21:34:10 +04:00
|
|
|
*
|
2011-12-21 21:34:09 +04:00
|
|
|
*/
|
|
|
|
WL_EXPORT void
|
|
|
|
notify_touch(struct wl_input_device *device, uint32_t time, int touch_id,
|
|
|
|
int x, int y, int touch_type)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *wd = (struct weston_input_device *) device;
|
|
|
|
struct weston_compositor *ec = wd->compositor;
|
|
|
|
struct weston_surface *es;
|
2011-12-21 21:34:10 +04:00
|
|
|
int32_t sx, sy;
|
|
|
|
|
|
|
|
switch (touch_type) {
|
|
|
|
case WL_INPUT_DEVICE_TOUCH_DOWN:
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_inhibit(ec);
|
2011-12-21 21:34:10 +04:00
|
|
|
|
|
|
|
wd->num_tp++;
|
|
|
|
|
|
|
|
/* the first finger down picks the surface, and all further go
|
|
|
|
* to that surface for the remainder of the touch session i.e.
|
|
|
|
* until all touch points are up again. */
|
|
|
|
if (wd->num_tp == 1) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
es = weston_compositor_pick_surface(ec, x, y, &sx, &sy);
|
2011-12-21 21:34:10 +04:00
|
|
|
touch_set_focus(wd, &es->surface, time);
|
2011-12-22 23:43:09 +04:00
|
|
|
} else if (wd->touch_focus) {
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
es = (struct weston_surface *) wd->touch_focus;
|
2012-01-24 11:59:29 +04:00
|
|
|
weston_surface_from_global(es, x, y, &sx, &sy);
|
2011-12-21 21:34:10 +04:00
|
|
|
}
|
2011-12-22 23:43:09 +04:00
|
|
|
|
|
|
|
if (wd->touch_focus_resource && wd->touch_focus)
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_input_device_send_touch_down(wd->touch_focus_resource,
|
|
|
|
time, &wd->touch_focus->resource,
|
|
|
|
touch_id, sx, sy);
|
2011-12-21 21:34:10 +04:00
|
|
|
break;
|
|
|
|
case WL_INPUT_DEVICE_TOUCH_MOTION:
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
es = (struct weston_surface *) wd->touch_focus;
|
2011-12-22 23:43:09 +04:00
|
|
|
if (!es)
|
|
|
|
break;
|
|
|
|
|
2012-01-24 11:59:29 +04:00
|
|
|
weston_surface_from_global(es, x, y, &sx, &sy);
|
2011-12-21 21:34:10 +04:00
|
|
|
if (wd->touch_focus_resource)
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_input_device_send_touch_motion(wd->touch_focus_resource,
|
|
|
|
time, touch_id, sx, sy);
|
2011-12-21 21:34:10 +04:00
|
|
|
break;
|
|
|
|
case WL_INPUT_DEVICE_TOUCH_UP:
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_idle_release(ec);
|
2011-12-21 21:34:10 +04:00
|
|
|
wd->num_tp--;
|
|
|
|
|
2011-12-22 02:25:54 +04:00
|
|
|
if (wd->touch_focus_resource)
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_input_device_send_touch_up(wd->touch_focus_resource,
|
|
|
|
time, touch_id);
|
2011-12-22 23:43:09 +04:00
|
|
|
if (wd->num_tp == 0)
|
|
|
|
touch_set_focus(wd, NULL, time);
|
2011-12-21 21:34:10 +04:00
|
|
|
break;
|
|
|
|
}
|
2011-12-21 21:34:09 +04:00
|
|
|
}
|
2011-01-27 19:57:19 +03:00
|
|
|
|
2010-12-09 19:29:40 +03:00
|
|
|
static void
|
|
|
|
input_device_attach(struct wl_client *client,
|
2011-08-19 01:55:30 +04:00
|
|
|
struct wl_resource *resource,
|
2010-12-09 19:29:40 +03:00
|
|
|
uint32_t time,
|
2011-08-27 01:21:20 +04:00
|
|
|
struct wl_resource *buffer_resource, int32_t x, int32_t y)
|
2010-12-09 19:29:40 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_input_device *device = resource->data;
|
|
|
|
struct weston_compositor *compositor = device->compositor;
|
2012-03-27 18:36:40 +04:00
|
|
|
struct wl_buffer *buffer = NULL;
|
2010-12-09 19:29:40 +03:00
|
|
|
|
|
|
|
if (time < device->input_device.pointer_focus_time)
|
|
|
|
return;
|
|
|
|
if (device->input_device.pointer_focus == NULL)
|
|
|
|
return;
|
2011-08-19 01:55:30 +04:00
|
|
|
if (device->input_device.pointer_focus->resource.client != client)
|
2010-12-09 19:29:40 +03:00
|
|
|
return;
|
|
|
|
|
2012-03-27 18:36:40 +04:00
|
|
|
if (buffer_resource)
|
|
|
|
buffer = buffer_resource->data;
|
|
|
|
|
2012-03-28 01:04:59 +04:00
|
|
|
weston_surface_attach(&device->sprite->surface, buffer);
|
2012-03-26 23:56:39 +04:00
|
|
|
|
2012-03-27 18:36:40 +04:00
|
|
|
if (!buffer)
|
2010-12-09 19:29:40 +03:00
|
|
|
return;
|
2011-12-15 18:14:34 +04:00
|
|
|
|
2012-03-27 18:36:36 +04:00
|
|
|
if (!weston_surface_is_mapped(device->sprite)) {
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_insert(&compositor->cursor_layer.surface_list,
|
|
|
|
&device->sprite->layer_link);
|
2012-02-10 15:34:36 +04:00
|
|
|
weston_surface_assign_output(device->sprite);
|
|
|
|
}
|
2011-12-15 18:14:34 +04:00
|
|
|
|
2012-03-27 18:36:40 +04:00
|
|
|
|
2011-12-15 18:14:34 +04:00
|
|
|
device->hotspot_x = x;
|
|
|
|
device->hotspot_y = y;
|
2012-01-27 20:58:31 +04:00
|
|
|
weston_surface_configure(device->sprite,
|
|
|
|
device->input_device.x - device->hotspot_x,
|
|
|
|
device->input_device.y - device->hotspot_y,
|
|
|
|
buffer->width, buffer->height);
|
2011-12-15 18:14:34 +04:00
|
|
|
|
2012-03-26 23:56:39 +04:00
|
|
|
surface_damage(NULL, &device->sprite->surface.resource,
|
|
|
|
0, 0, buffer->width, buffer->height);
|
2010-12-09 19:29:40 +03:00
|
|
|
}
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
static const struct wl_input_device_interface input_device_interface = {
|
2010-12-09 19:29:40 +03:00
|
|
|
input_device_attach,
|
|
|
|
};
|
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
static void
|
|
|
|
handle_drag_surface_destroy(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
|
|
|
struct weston_input_device *device;
|
|
|
|
|
|
|
|
device = container_of(listener, struct weston_input_device,
|
|
|
|
drag_surface_destroy_listener);
|
|
|
|
|
|
|
|
device->drag_surface = NULL;
|
|
|
|
}
|
|
|
|
|
2011-10-12 06:20:37 +04:00
|
|
|
static void unbind_input_device(struct wl_resource *resource)
|
|
|
|
{
|
|
|
|
wl_list_remove(&resource->link);
|
|
|
|
free(resource);
|
|
|
|
}
|
|
|
|
|
2011-08-27 01:21:20 +04:00
|
|
|
static void
|
|
|
|
bind_input_device(struct wl_client *client,
|
|
|
|
void *data, uint32_t version, uint32_t id)
|
|
|
|
{
|
2011-08-30 00:04:39 +04:00
|
|
|
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);
|
2011-10-12 06:20:37 +04:00
|
|
|
resource->destroy = unbind_input_device;
|
2011-08-27 01:21:20 +04:00
|
|
|
}
|
|
|
|
|
2012-03-27 18:36:39 +04:00
|
|
|
static void
|
|
|
|
device_handle_new_drag_icon(struct wl_listener *listener,
|
|
|
|
struct wl_resource *resource, uint32_t time)
|
|
|
|
{
|
|
|
|
struct weston_input_device *device;
|
|
|
|
|
|
|
|
device = container_of(listener, struct weston_input_device,
|
|
|
|
new_drag_icon_listener);
|
|
|
|
|
|
|
|
weston_input_update_drag_surface(&device->input_device, 0, 0);
|
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_input_device_init(struct weston_input_device *device,
|
|
|
|
struct weston_compositor *ec)
|
2008-11-24 08:31:49 +03:00
|
|
|
{
|
2011-11-23 19:39:34 +04:00
|
|
|
wl_input_device_init(&device->input_device);
|
2010-12-07 05:35:19 +03:00
|
|
|
|
2011-08-27 01:21:20 +04:00
|
|
|
wl_display_add_global(ec->wl_display, &wl_input_device_interface,
|
|
|
|
device, bind_input_device);
|
2010-08-09 22:43:33 +04:00
|
|
|
|
2012-02-09 01:33:57 +04:00
|
|
|
device->sprite = weston_surface_create(ec);
|
2012-03-26 23:56:39 +04:00
|
|
|
device->sprite->surface.resource.data = device->sprite;
|
2011-06-23 23:44:14 +04:00
|
|
|
|
2011-11-23 19:39:34 +04:00
|
|
|
device->compositor = ec;
|
2010-08-16 18:38:29 +04:00
|
|
|
device->hotspot_x = 16;
|
|
|
|
device->hotspot_y = 16;
|
2011-04-13 01:22:49 +04:00
|
|
|
device->modifier_state = 0;
|
2011-12-21 21:34:10 +04:00
|
|
|
device->num_tp = 0;
|
2008-12-12 07:18:45 +03:00
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
device->drag_surface_destroy_listener.func = handle_drag_surface_destroy;
|
|
|
|
|
2008-12-12 20:00:02 +03:00
|
|
|
wl_list_insert(ec->input_device_list.prev, &device->link);
|
2012-03-27 18:36:39 +04:00
|
|
|
|
|
|
|
device->new_drag_icon_listener.func = device_handle_new_drag_icon;
|
|
|
|
wl_list_insert(device->input_device.drag_icon_listener_list.prev,
|
|
|
|
&device->new_drag_icon_listener.link);
|
2008-12-12 07:18:45 +03:00
|
|
|
}
|
|
|
|
|
2012-01-02 17:31:01 +04:00
|
|
|
WL_EXPORT void
|
2012-01-03 20:29:15 +04:00
|
|
|
weston_input_device_release(struct weston_input_device *device)
|
2012-01-02 17:31:01 +04:00
|
|
|
{
|
|
|
|
wl_list_remove(&device->link);
|
|
|
|
/* The global object is destroyed at wl_display_destroy() time. */
|
|
|
|
|
|
|
|
if (device->sprite)
|
|
|
|
destroy_surface(&device->sprite->surface.resource);
|
|
|
|
|
2012-01-03 20:29:15 +04:00
|
|
|
wl_input_device_release(&device->input_device);
|
2012-01-02 17:31:01 +04:00
|
|
|
}
|
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
static void
|
2012-03-27 18:36:41 +04:00
|
|
|
drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
|
|
|
|
{
|
|
|
|
weston_surface_configure(es,
|
|
|
|
es->geometry.x + sx, es->geometry.y + sy,
|
|
|
|
es->buffer->width, es->buffer->height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-03-01 16:09:44 +04:00
|
|
|
device_setup_new_drag_surface(struct weston_input_device *device,
|
|
|
|
struct weston_surface *surface)
|
|
|
|
{
|
|
|
|
struct wl_input_device *input_device = &device->input_device;
|
|
|
|
|
2012-03-27 18:36:41 +04:00
|
|
|
if (surface->configure) {
|
|
|
|
wl_resource_post_error(&surface->surface.resource,
|
|
|
|
WL_DISPLAY_ERROR_INVALID_OBJECT,
|
|
|
|
"surface->configure already set");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
device->drag_surface = surface;
|
|
|
|
|
|
|
|
weston_surface_set_position(device->drag_surface,
|
|
|
|
input_device->x, input_device->y);
|
|
|
|
|
2012-03-27 18:36:41 +04:00
|
|
|
surface->configure = drag_surface_configure;
|
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
wl_list_insert(surface->surface.resource.destroy_listener_list.prev,
|
|
|
|
&device->drag_surface_destroy_listener.link);
|
2012-03-27 18:36:41 +04:00
|
|
|
|
|
|
|
return 1;
|
2012-03-01 16:09:44 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
device_release_drag_surface(struct weston_input_device *device)
|
|
|
|
{
|
2012-03-27 18:36:41 +04:00
|
|
|
device->drag_surface->configure = NULL;
|
2012-03-01 16:09:44 +04:00
|
|
|
undef_region(&device->drag_surface->input);
|
|
|
|
wl_list_remove(&device->drag_surface_destroy_listener.link);
|
|
|
|
device->drag_surface = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
device_map_drag_surface(struct weston_input_device *device)
|
|
|
|
{
|
2012-03-27 18:36:36 +04:00
|
|
|
if (weston_surface_is_mapped(device->drag_surface) ||
|
2012-03-01 16:09:44 +04:00
|
|
|
!device->drag_surface->buffer)
|
|
|
|
return;
|
|
|
|
|
|
|
|
wl_list_insert(&device->sprite->layer_link,
|
|
|
|
&device->drag_surface->layer_link);
|
|
|
|
weston_surface_assign_output(device->drag_surface);
|
|
|
|
empty_region(&device->drag_surface->input);
|
|
|
|
}
|
|
|
|
|
2012-02-15 19:02:57 +04:00
|
|
|
static void
|
|
|
|
weston_input_update_drag_surface(struct wl_input_device *input_device,
|
|
|
|
int dx, int dy)
|
|
|
|
{
|
|
|
|
int surface_changed = 0;
|
|
|
|
struct weston_input_device *device = (struct weston_input_device *)
|
|
|
|
input_device;
|
|
|
|
|
|
|
|
if (!device->drag_surface && !input_device->drag_surface)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (device->drag_surface && input_device->drag_surface &&
|
|
|
|
(&device->drag_surface->surface.resource !=
|
|
|
|
&input_device->drag_surface->resource))
|
|
|
|
/* between calls to this funcion we got a new drag_surface */
|
|
|
|
surface_changed = 1;
|
|
|
|
|
|
|
|
if (!input_device->drag_surface || surface_changed) {
|
2012-03-01 16:09:44 +04:00
|
|
|
device_release_drag_surface(device);
|
2012-02-15 19:02:57 +04:00
|
|
|
if (!surface_changed)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!device->drag_surface || surface_changed) {
|
2012-03-01 16:09:44 +04:00
|
|
|
struct weston_surface *surface = (struct weston_surface *)
|
2012-02-15 19:02:57 +04:00
|
|
|
input_device->drag_surface;
|
2012-03-27 18:36:41 +04:00
|
|
|
if (!device_setup_new_drag_surface(device, surface))
|
|
|
|
return;
|
2012-02-15 19:02:57 +04:00
|
|
|
}
|
|
|
|
|
2012-03-01 16:09:44 +04:00
|
|
|
/* the client may not have attached a buffer to the drag surface
|
|
|
|
* when we setup it up, so check if map is needed on every update */
|
|
|
|
device_map_drag_surface(device);
|
2012-02-15 19:02:57 +04:00
|
|
|
|
2012-02-28 19:59:33 +04:00
|
|
|
/* the client may have attached a buffer with a different size to
|
|
|
|
* the drag surface, causing the input region to be reset */
|
|
|
|
if (region_is_undefined(&device->drag_surface->input))
|
|
|
|
empty_region(&device->drag_surface->input);
|
|
|
|
|
2012-02-15 19:02:57 +04:00
|
|
|
if (!dx && !dy)
|
|
|
|
return;
|
|
|
|
|
|
|
|
weston_surface_set_position(device->drag_surface,
|
|
|
|
device->drag_surface->geometry.x + dx,
|
|
|
|
device->drag_surface->geometry.y + dy);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_compositor_update_drag_surfaces(struct weston_compositor *compositor)
|
|
|
|
{
|
|
|
|
weston_input_update_drag_surface(compositor->input_device, 0, 0);
|
|
|
|
}
|
|
|
|
|
2009-01-01 00:18:42 +03:00
|
|
|
static void
|
2011-08-27 01:21:20 +04:00
|
|
|
bind_output(struct wl_client *client,
|
|
|
|
void *data, uint32_t version, uint32_t id)
|
2009-01-01 00:18:42 +03:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *output = data;
|
|
|
|
struct weston_mode *mode;
|
2011-08-29 23:03:09 +04:00
|
|
|
struct wl_resource *resource;
|
|
|
|
|
|
|
|
resource = wl_client_add_object(client,
|
|
|
|
&wl_output_interface, NULL, id, data);
|
2009-01-01 00:18:42 +03:00
|
|
|
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_output_send_geometry(resource,
|
|
|
|
output->x,
|
|
|
|
output->y,
|
|
|
|
output->mm_width,
|
|
|
|
output->mm_height,
|
|
|
|
output->subpixel,
|
|
|
|
output->make, output->model);
|
2011-06-21 19:16:58 +04:00
|
|
|
|
|
|
|
wl_list_for_each (mode, &output->mode_list, link) {
|
2012-03-05 06:57:37 +04:00
|
|
|
wl_output_send_mode(resource,
|
|
|
|
mode->flags,
|
|
|
|
mode->width,
|
|
|
|
mode->height,
|
|
|
|
mode->refresh);
|
2011-06-21 19:16:58 +04:00
|
|
|
}
|
2009-01-01 00:18:42 +03:00
|
|
|
}
|
|
|
|
|
2010-06-07 06:23:21 +04:00
|
|
|
static const char vertex_shader[] =
|
|
|
|
"uniform mat4 proj;\n"
|
2011-02-13 21:44:55 +03:00
|
|
|
"attribute vec2 position;\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
"attribute vec2 texcoord;\n"
|
|
|
|
"varying vec2 v_texcoord;\n"
|
|
|
|
"void main()\n"
|
|
|
|
"{\n"
|
2011-02-13 21:44:55 +03:00
|
|
|
" gl_Position = proj * vec4(position, 0.0, 1.0);\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
" v_texcoord = texcoord;\n"
|
|
|
|
"}\n";
|
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
static const char texture_fragment_shader[] =
|
2010-12-08 04:19:10 +03:00
|
|
|
"precision mediump float;\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
"varying vec2 v_texcoord;\n"
|
|
|
|
"uniform sampler2D tex;\n"
|
2011-12-14 18:24:11 +04:00
|
|
|
"uniform float alpha;\n"
|
2012-01-24 16:47:37 +04:00
|
|
|
"uniform float texwidth;\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
"void main()\n"
|
|
|
|
"{\n"
|
2012-01-24 16:47:37 +04:00
|
|
|
" if (v_texcoord.x < 0.0 || v_texcoord.x > texwidth ||\n"
|
|
|
|
" v_texcoord.y < 0.0 || v_texcoord.y > 1.0)\n"
|
|
|
|
" discard;\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
" gl_FragColor = texture2D(tex, v_texcoord)\n;"
|
2011-12-14 18:24:11 +04:00
|
|
|
" gl_FragColor = alpha * gl_FragColor;\n"
|
2010-06-07 06:23:21 +04:00
|
|
|
"}\n";
|
|
|
|
|
2011-04-22 23:38:14 +04:00
|
|
|
static const char solid_fragment_shader[] =
|
|
|
|
"precision mediump float;\n"
|
|
|
|
"uniform vec4 color;\n"
|
2012-03-29 19:34:39 +04:00
|
|
|
"uniform float alpha;\n"
|
2011-04-22 23:38:14 +04:00
|
|
|
"void main()\n"
|
|
|
|
"{\n"
|
2012-03-29 19:34:39 +04:00
|
|
|
" gl_FragColor = alpha * color\n;"
|
2011-04-22 23:38:14 +04:00
|
|
|
"}\n";
|
|
|
|
|
2010-06-15 05:03:11 +04:00
|
|
|
static int
|
2011-04-22 22:23:51 +04:00
|
|
|
compile_shader(GLenum type, const char *source)
|
2010-06-07 06:23:21 +04:00
|
|
|
{
|
2011-04-22 22:23:51 +04:00
|
|
|
GLuint s;
|
2010-06-26 02:58:24 +04:00
|
|
|
char msg[512];
|
|
|
|
GLint status;
|
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
s = glCreateShader(type);
|
|
|
|
glShaderSource(s, 1, &source, NULL);
|
|
|
|
glCompileShader(s);
|
|
|
|
glGetShaderiv(s, GL_COMPILE_STATUS, &status);
|
2010-06-26 02:58:24 +04:00
|
|
|
if (!status) {
|
2011-04-22 22:23:51 +04:00
|
|
|
glGetShaderInfoLog(s, sizeof msg, NULL, msg);
|
|
|
|
fprintf(stderr, "shader info: %s\n", msg);
|
|
|
|
return GL_NONE;
|
2010-06-26 02:58:24 +04:00
|
|
|
}
|
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_shader_init(struct weston_shader *shader,
|
|
|
|
const char *vertex_source, const char *fragment_source)
|
2011-04-22 22:23:51 +04:00
|
|
|
{
|
|
|
|
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);
|
2010-06-26 02:58:24 +04:00
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
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");
|
2010-06-26 02:58:24 +04:00
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
glLinkProgram(shader->program);
|
|
|
|
glGetProgramiv(shader->program, GL_LINK_STATUS, &status);
|
2010-06-26 02:58:24 +04:00
|
|
|
if (!status) {
|
2011-04-22 22:23:51 +04:00
|
|
|
glGetProgramInfoLog(shader->program, sizeof msg, NULL, msg);
|
2010-06-26 02:58:24 +04:00
|
|
|
fprintf(stderr, "link info: %s\n", msg);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:23:51 +04:00
|
|
|
shader->proj_uniform = glGetUniformLocation(shader->program, "proj");
|
|
|
|
shader->tex_uniform = glGetUniformLocation(shader->program, "tex");
|
2011-12-14 18:24:11 +04:00
|
|
|
shader->alpha_uniform = glGetUniformLocation(shader->program, "alpha");
|
compositor: fix and simplify shader uniform handling
The uniform location variables should be signed, according to the OpenGL
ES 2 specification. Moreover, GL_NONE, i.e. 0, is not an invalid nor
special location; it is actually used as a valid uniform location.
Change struct weston_shader uniform members to signed.
Stop using 0 for identifying a non-existing uniform, use -1 instead.
Furthermore, as the spec says a) glGetUniformLocation() will return -1
for non-active/existing uniforms, and b) glUniform*() function will
simply ignore all calls with location -1, we can simplify the code. We
don't have to avoid locating uniforms that don't exist, and we don't
need to test for them in weston_surface_draw() either.
Remove the micro-optimisation that avoids setting 'alpha' uniform if it
has not changed, in the name of simplification.
Unify shader creation by dropping init_solid_shader(), and calling
weston_shader_init() instead. The downside is that we compile the vertex
shader twice at startup now.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-02-02 18:49:05 +04:00
|
|
|
shader->color_uniform = glGetUniformLocation(shader->program, "color");
|
2012-01-24 16:47:37 +04:00
|
|
|
shader->texwidth_uniform = glGetUniformLocation(shader->program,
|
|
|
|
"texwidth");
|
2010-06-26 02:58:24 +04:00
|
|
|
|
|
|
|
return 0;
|
2010-06-07 06:23:21 +04:00
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_destroy(struct weston_output *output)
|
2008-10-09 06:51:32 +04:00
|
|
|
{
|
2011-06-21 23:27:41 +04:00
|
|
|
pixman_region32_fini(&output->region);
|
2011-06-24 04:46:34 +04:00
|
|
|
pixman_region32_fini(&output->previous_damage);
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
2012-02-23 01:21:41 +04:00
|
|
|
weston_output_update_zoom(struct weston_output *output, int x, int y)
|
2011-03-15 17:08:41 +03:00
|
|
|
{
|
2012-02-23 01:21:41 +04:00
|
|
|
float ratio;
|
2011-02-18 18:51:37 +03:00
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
if (output->zoom.level <= 0)
|
|
|
|
return;
|
2008-10-09 06:51:32 +04:00
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
output->zoom.magnification = 1 / output->zoom.level;
|
|
|
|
ratio = 1 - (1 / output->zoom.magnification);
|
|
|
|
|
|
|
|
output->zoom.trans_x = (((float)(x - output->x) / output->current->width) * (ratio * 2)) - ratio;
|
|
|
|
output->zoom.trans_y = (((float)(y - output->y) / output->current->height) * (ratio * 2)) - ratio;
|
|
|
|
|
|
|
|
output->dirty = 1;
|
|
|
|
weston_output_damage(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_output_update_matrix(struct weston_output *output)
|
|
|
|
{
|
|
|
|
int flip;
|
|
|
|
struct weston_matrix camera;
|
|
|
|
struct weston_matrix modelview;
|
2010-06-14 19:54:00 +04:00
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_matrix_init(&output->matrix);
|
|
|
|
weston_matrix_translate(&output->matrix,
|
2012-02-01 16:45:51 +04:00
|
|
|
-(output->x + (output->border.right + output->current->width - output->border.left) / 2.0),
|
|
|
|
-(output->y + (output->border.bottom + output->current->height - output->border.top) / 2.0), 0);
|
2011-02-18 18:51:37 +03:00
|
|
|
|
2011-03-15 17:08:41 +03:00
|
|
|
flip = (output->flags & WL_OUTPUT_FLIPPED) ? -1 : 1;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_matrix_scale(&output->matrix,
|
2012-02-01 16:45:51 +04:00
|
|
|
2.0 / (output->current->width + output->border.left + output->border.right),
|
|
|
|
flip * 2.0 / (output->current->height + output->border.top + output->border.bottom), 1);
|
2012-02-23 01:21:41 +04:00
|
|
|
if (output->zoom.active) {
|
|
|
|
weston_matrix_init(&camera);
|
|
|
|
weston_matrix_init(&modelview);
|
|
|
|
weston_matrix_translate(&camera, output->zoom.trans_x, flip * output->zoom.trans_y, 0);
|
|
|
|
weston_matrix_invert(&modelview, &camera);
|
|
|
|
weston_matrix_scale(&modelview, output->zoom.magnification, output->zoom.magnification, 1.0);
|
|
|
|
weston_matrix_multiply(&output->matrix, &modelview);
|
|
|
|
}
|
2010-06-14 19:54:00 +04:00
|
|
|
|
2012-02-23 01:21:41 +04:00
|
|
|
output->dirty = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_output_move(struct weston_output *output, int x, int y)
|
|
|
|
{
|
|
|
|
output->x = x;
|
|
|
|
output->y = y;
|
|
|
|
|
|
|
|
pixman_region32_init(&output->previous_damage);
|
|
|
|
pixman_region32_init_rect(&output->region, x, y,
|
|
|
|
output->current->width,
|
|
|
|
output->current->height);
|
2011-03-15 17:08:41 +03:00
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_init(struct weston_output *output, struct weston_compositor *c,
|
|
|
|
int x, int y, int width, int height, uint32_t flags)
|
2011-03-15 17:08:41 +03:00
|
|
|
{
|
|
|
|
output->compositor = c;
|
|
|
|
output->x = x;
|
|
|
|
output->y = y;
|
2012-02-01 16:45:51 +04:00
|
|
|
output->border.top = 0;
|
|
|
|
output->border.bottom = 0;
|
|
|
|
output->border.left = 0;
|
|
|
|
output->border.right = 0;
|
2011-06-21 19:16:58 +04:00
|
|
|
output->mm_width = width;
|
|
|
|
output->mm_height = height;
|
2012-02-23 01:21:41 +04:00
|
|
|
output->dirty = 1;
|
|
|
|
|
|
|
|
output->zoom.active = 0;
|
|
|
|
output->zoom.increment = 0.05;
|
|
|
|
output->zoom.level = 1.0;
|
|
|
|
output->zoom.magnification = 1.0;
|
|
|
|
output->zoom.trans_x = 0.0;
|
|
|
|
output->zoom.trans_y = 0.0;
|
2011-03-15 17:08:41 +03:00
|
|
|
|
|
|
|
output->flags = flags;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_output_move(output, x, y);
|
2011-03-15 17:08:41 +03:00
|
|
|
|
2011-08-17 07:01:28 +04:00
|
|
|
wl_list_init(&output->frame_callback_list);
|
2011-05-06 21:12:33 +04:00
|
|
|
|
2011-08-27 01:21:20 +04:00
|
|
|
wl_display_add_global(c->wl_display,
|
|
|
|
&wl_output_interface, output, bind_output);
|
2010-06-14 19:54:00 +04:00
|
|
|
}
|
|
|
|
|
2011-11-23 19:39:34 +04:00
|
|
|
static void
|
|
|
|
compositor_bind(struct wl_client *client,
|
|
|
|
void *data, uint32_t version, uint32_t id)
|
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *compositor = data;
|
2011-11-23 19:39:34 +04:00
|
|
|
|
|
|
|
wl_client_add_object(client, &wl_compositor_interface,
|
|
|
|
&compositor_interface, id, compositor);
|
|
|
|
}
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
WL_EXPORT int
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_init(struct weston_compositor *ec, struct wl_display *display)
|
2010-06-14 19:54:00 +04:00
|
|
|
{
|
|
|
|
struct wl_event_loop *loop;
|
2011-01-15 01:28:21 +03:00
|
|
|
const char *extensions;
|
2008-10-09 06:51:32 +04:00
|
|
|
|
2008-10-12 02:40:23 +04:00
|
|
|
ec->wl_display = display;
|
2008-10-09 06:51:32 +04:00
|
|
|
|
2011-11-23 19:39:34 +04:00
|
|
|
if (!wl_display_add_global(display, &wl_compositor_interface,
|
|
|
|
ec, compositor_bind))
|
|
|
|
return -1;
|
2008-12-22 07:37:12 +03:00
|
|
|
|
2012-03-26 23:56:39 +04:00
|
|
|
wl_display_init_shm(display);
|
2011-04-25 23:08:20 +04:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2012-03-27 23:25:46 +04:00
|
|
|
if (!strstr(extensions, "GL_EXT_read_format_bgra")) {
|
|
|
|
fprintf(stderr, "GL_EXT_read_format_bgra not available\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-03-28 01:10:13 +04:00
|
|
|
if (!strstr(extensions, "GL_EXT_unpack_subimage")) {
|
|
|
|
fprintf(stderr, "GL_EXT_unpack_subimage not available\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-04-25 23:08:20 +04:00
|
|
|
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);
|
2010-10-07 05:17:40 +04:00
|
|
|
|
2008-12-10 08:40:50 +03:00
|
|
|
wl_list_init(&ec->surface_list);
|
2012-02-29 21:42:35 +04:00
|
|
|
wl_list_init(&ec->layer_list);
|
2009-01-01 00:18:42 +03:00
|
|
|
wl_list_init(&ec->input_device_list);
|
|
|
|
wl_list_init(&ec->output_list);
|
2011-04-11 21:58:13 +04:00
|
|
|
wl_list_init(&ec->binding_list);
|
2011-04-22 23:38:14 +04:00
|
|
|
wl_list_init(&ec->animation_list);
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_spring_init(&ec->fade.spring, 30.0, 1.0, 1.0);
|
2011-04-22 23:38:14 +04:00
|
|
|
ec->fade.animation.frame = fade_frame;
|
|
|
|
wl_list_init(&ec->fade.animation.link);
|
2011-04-11 21:58:13 +04:00
|
|
|
|
2012-02-29 21:42:35 +04:00
|
|
|
weston_layer_init(&ec->fade_layer, &ec->layer_list);
|
|
|
|
weston_layer_init(&ec->cursor_layer, &ec->fade_layer.link);
|
|
|
|
|
2012-01-03 13:39:13 +04:00
|
|
|
ec->screenshooter = screenshooter_create(ec);
|
2010-06-11 20:56:24 +04:00
|
|
|
|
2012-01-05 06:47:30 +04:00
|
|
|
wl_data_device_manager_init(ec->wl_display);
|
2011-10-28 20:26:06 +04:00
|
|
|
|
2010-06-11 20:56:24 +04:00
|
|
|
glActiveTexture(GL_TEXTURE0);
|
2011-04-22 22:23:51 +04:00
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
if (weston_shader_init(&ec->texture_shader,
|
2011-04-22 22:23:51 +04:00
|
|
|
vertex_shader, texture_fragment_shader) < 0)
|
2010-06-15 05:03:11 +04:00
|
|
|
return -1;
|
compositor: fix and simplify shader uniform handling
The uniform location variables should be signed, according to the OpenGL
ES 2 specification. Moreover, GL_NONE, i.e. 0, is not an invalid nor
special location; it is actually used as a valid uniform location.
Change struct weston_shader uniform members to signed.
Stop using 0 for identifying a non-existing uniform, use -1 instead.
Furthermore, as the spec says a) glGetUniformLocation() will return -1
for non-active/existing uniforms, and b) glUniform*() function will
simply ignore all calls with location -1, we can simplify the code. We
don't have to avoid locating uniforms that don't exist, and we don't
need to test for them in weston_surface_draw() either.
Remove the micro-optimisation that avoids setting 'alpha' uniform if it
has not changed, in the name of simplification.
Unify shader creation by dropping init_solid_shader(), and calling
weston_shader_init() instead. The downside is that we compile the vertex
shader twice at startup now.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
2012-02-02 18:49:05 +04:00
|
|
|
if (weston_shader_init(&ec->solid_shader,
|
|
|
|
vertex_shader, solid_fragment_shader) < 0)
|
2011-04-22 23:38:14 +04:00
|
|
|
return -1;
|
2010-06-11 20:56:24 +04:00
|
|
|
|
|
|
|
loop = wl_display_get_event_loop(ec->wl_display);
|
2011-04-22 22:01:18 +04:00
|
|
|
ec->idle_source = wl_event_loop_add_timer(loop, idle_handler, ec);
|
2011-12-07 18:22:00 +04:00
|
|
|
wl_event_source_timer_update(ec->idle_source, ec->idle_time * 1000);
|
2011-04-22 22:01:18 +04:00
|
|
|
|
2012-03-06 02:49:30 +04:00
|
|
|
ec->input_loop = wl_event_loop_create();
|
|
|
|
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_schedule_repaint(ec);
|
2008-10-12 05:21:39 +04:00
|
|
|
|
2010-06-14 19:54:00 +04:00
|
|
|
return 0;
|
2008-12-05 19:13:50 +03:00
|
|
|
}
|
|
|
|
|
2011-08-30 13:32:47 +04:00
|
|
|
WL_EXPORT void
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_compositor_shutdown(struct weston_compositor *ec)
|
2011-08-30 00:52:23 +04:00
|
|
|
{
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_output *output, *next;
|
2011-08-30 00:52:23 +04:00
|
|
|
|
2012-01-02 18:06:56 +04:00
|
|
|
wl_event_source_remove(ec->idle_source);
|
2012-03-29 00:36:09 +04:00
|
|
|
if (ec->input_loop_source)
|
|
|
|
wl_event_source_remove(ec->input_loop_source);
|
2012-01-02 18:06:56 +04:00
|
|
|
|
2012-01-03 13:39:13 +04:00
|
|
|
if (ec->screenshooter)
|
|
|
|
screenshooter_destroy(ec->screenshooter);
|
|
|
|
|
2011-08-30 00:52:23 +04:00
|
|
|
/* Destroy all outputs associated with this compositor */
|
2011-12-19 00:27:40 +04:00
|
|
|
wl_list_for_each_safe(output, next, &ec->output_list, link)
|
2011-08-30 00:52:23 +04:00
|
|
|
output->destroy(output);
|
2012-01-02 17:47:07 +04:00
|
|
|
|
2012-01-03 20:29:15 +04:00
|
|
|
weston_binding_list_destroy_all(&ec->binding_list);
|
2012-01-02 18:06:56 +04:00
|
|
|
|
|
|
|
wl_array_release(&ec->vertices);
|
|
|
|
wl_array_release(&ec->indices);
|
2012-03-29 00:36:09 +04:00
|
|
|
|
|
|
|
wl_event_loop_destroy(ec->input_loop);
|
2011-08-30 00:52:23 +04:00
|
|
|
}
|
|
|
|
|
2011-04-22 20:27:57 +04:00
|
|
|
static int on_term_signal(int signal_number, void *data)
|
2010-12-02 00:43:56 +03:00
|
|
|
{
|
2011-08-12 22:55:07 +04:00
|
|
|
struct wl_display *display = data;
|
2010-12-02 00:43:56 +03:00
|
|
|
|
2011-07-16 05:09:24 +04:00
|
|
|
fprintf(stderr, "caught signal %d\n", signal_number);
|
2011-08-12 22:55:07 +04:00
|
|
|
wl_display_terminate(display);
|
2011-04-22 20:27:57 +04:00
|
|
|
|
|
|
|
return 1;
|
2010-12-02 00:43:56 +03:00
|
|
|
}
|
|
|
|
|
2012-01-16 20:53:54 +04:00
|
|
|
static void
|
|
|
|
on_segv_signal(int s, siginfo_t *siginfo, void *context)
|
|
|
|
{
|
|
|
|
void *buffer[32];
|
|
|
|
int i, count;
|
|
|
|
Dl_info info;
|
|
|
|
|
|
|
|
fprintf(stderr, "caught segv\n");
|
|
|
|
|
|
|
|
count = backtrace(buffer, ARRAY_LENGTH(buffer));
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
dladdr(buffer[i], &info);
|
|
|
|
fprintf(stderr, " [%016lx] %s (%s)\n",
|
|
|
|
(long) buffer[i],
|
|
|
|
info.dli_sname ? info.dli_sname : "--",
|
|
|
|
info.dli_fname);
|
|
|
|
}
|
|
|
|
|
|
|
|
longjmp(segv_jmp_buf, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
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
|
2011-05-07 01:19:22 +04:00
|
|
|
snprintf(path, sizeof path, "%s", name);
|
2011-05-03 06:09:20 +04:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2008-12-05 19:13:50 +03:00
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
struct wl_display *display;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
struct weston_compositor *ec;
|
2012-01-02 18:03:26 +04:00
|
|
|
struct wl_event_source *signals[4];
|
2010-12-02 00:43:56 +03:00
|
|
|
struct wl_event_loop *loop;
|
2012-01-16 20:53:54 +04:00
|
|
|
struct sigaction segv_action;
|
2011-05-03 06:09:20 +04:00
|
|
|
void *shell_module, *backend_module;
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
int (*shell_init)(struct weston_compositor *ec);
|
|
|
|
struct weston_compositor
|
2012-03-12 05:05:57 +04:00
|
|
|
*(*backend_init)(struct wl_display *display,
|
|
|
|
int argc, char *argv[]);
|
|
|
|
int i;
|
2011-05-03 06:09:20 +04:00
|
|
|
char *backend = NULL;
|
|
|
|
char *shell = NULL;
|
2012-03-12 05:05:57 +04:00
|
|
|
int32_t idle_time = 300;
|
|
|
|
int32_t xserver;
|
|
|
|
char *socket_name = NULL;
|
2012-03-21 21:49:18 +04:00
|
|
|
char *config_file;
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
const struct config_key shell_config_keys[] = {
|
2012-03-21 21:49:18 +04:00
|
|
|
{ "type", CONFIG_KEY_STRING, &shell },
|
|
|
|
};
|
|
|
|
|
2012-03-30 19:52:39 +04:00
|
|
|
const struct config_section cs[] = {
|
2012-03-21 21:49:18 +04:00
|
|
|
{ "shell",
|
|
|
|
shell_config_keys, ARRAY_LENGTH(shell_config_keys) },
|
|
|
|
};
|
2012-03-12 05:05:57 +04:00
|
|
|
|
|
|
|
const struct weston_option core_options[] = {
|
|
|
|
{ WESTON_OPTION_STRING, "backend", 'B', &backend },
|
|
|
|
{ WESTON_OPTION_STRING, "socket", 'S', &socket_name },
|
|
|
|
{ WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time },
|
|
|
|
{ WESTON_OPTION_BOOLEAN, "xserver", 0, &xserver },
|
2011-05-02 18:36:04 +04:00
|
|
|
};
|
2008-12-12 19:06:18 +03:00
|
|
|
|
2012-03-12 05:05:57 +04:00
|
|
|
argc = parse_options(core_options,
|
|
|
|
ARRAY_LENGTH(core_options), argc, argv);
|
2008-12-05 19:13:50 +03:00
|
|
|
|
|
|
|
display = wl_display_create();
|
|
|
|
|
2011-08-08 16:52:59 +04:00
|
|
|
loop = wl_display_get_event_loop(display);
|
2012-01-02 18:03:26 +04:00
|
|
|
signals[0] = wl_event_loop_add_signal(loop, SIGTERM, on_term_signal,
|
|
|
|
display);
|
|
|
|
signals[1] = wl_event_loop_add_signal(loop, SIGINT, on_term_signal,
|
|
|
|
display);
|
|
|
|
signals[2] = wl_event_loop_add_signal(loop, SIGQUIT, on_term_signal,
|
|
|
|
display);
|
2011-08-08 16:52:59 +04:00
|
|
|
|
|
|
|
wl_list_init(&child_process_list);
|
2012-01-02 18:03:26 +04:00
|
|
|
signals[3] = wl_event_loop_add_signal(loop, SIGCHLD, sigchld_handler,
|
|
|
|
NULL);
|
2011-01-15 01:22:35 +03:00
|
|
|
|
2012-01-16 20:53:54 +04:00
|
|
|
segv_action.sa_flags = SA_SIGINFO | SA_RESETHAND;
|
|
|
|
segv_action.sa_sigaction = on_segv_signal;
|
2012-01-19 18:48:37 +04:00
|
|
|
sigemptyset(&segv_action.sa_mask);
|
2012-01-16 20:53:54 +04:00
|
|
|
sigaction(SIGSEGV, &segv_action, NULL);
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
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";
|
2011-04-23 21:04:11 +04:00
|
|
|
}
|
|
|
|
|
2012-03-21 21:49:18 +04:00
|
|
|
config_file = config_file_path("weston.ini");
|
|
|
|
parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
|
|
|
|
free(config_file);
|
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
if (!shell)
|
|
|
|
shell = "desktop-shell.so";
|
2011-01-15 01:22:35 +03:00
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
backend_init = load_module(backend, "backend_init", &backend_module);
|
|
|
|
if (!backend_init)
|
|
|
|
exit(EXIT_FAILURE);
|
2011-04-04 02:30:25 +04:00
|
|
|
|
2011-05-03 06:09:20 +04:00
|
|
|
shell_init = load_module(shell, "shell_init", &shell_module);
|
|
|
|
if (!shell_init)
|
|
|
|
exit(EXIT_FAILURE);
|
2010-06-14 19:54:00 +04:00
|
|
|
|
2012-03-12 05:05:57 +04:00
|
|
|
ec = backend_init(display, argc, argv);
|
2008-12-05 19:19:56 +03:00
|
|
|
if (ec == NULL) {
|
|
|
|
fprintf(stderr, "failed to create compositor\n");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
2010-10-26 19:26:44 +04:00
|
|
|
|
2012-03-12 05:05:57 +04:00
|
|
|
for (i = 1; argv[i]; i++)
|
|
|
|
fprintf(stderr, "unhandled option: %s\n", argv[i]);
|
|
|
|
if (argv[1])
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
|
|
|
ec->option_idle_time = idle_time;
|
|
|
|
ec->idle_time = idle_time;
|
2011-12-07 18:22:00 +04:00
|
|
|
|
2012-03-07 22:42:10 +04:00
|
|
|
#ifdef BUILD_XSERVER_LAUNCHER
|
2011-06-22 01:32:25 +04:00
|
|
|
if (xserver)
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_xserver_init(ec);
|
2012-03-07 22:42:10 +04:00
|
|
|
#endif
|
2011-06-22 01:32:25 +04:00
|
|
|
|
2012-01-16 01:04:33 +04:00
|
|
|
if (shell_init(ec) < 0)
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
2012-03-12 05:05:57 +04:00
|
|
|
if (wl_display_add_socket(display, socket_name)) {
|
2008-12-05 19:13:50 +03:00
|
|
|
fprintf(stderr, "failed to add socket: %m\n");
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
|
2012-02-29 21:53:50 +04:00
|
|
|
weston_compositor_dpms_on(ec);
|
2012-01-05 18:28:21 +04:00
|
|
|
weston_compositor_wake(ec);
|
2012-01-16 20:53:54 +04:00
|
|
|
if (setjmp(segv_jmp_buf) == 0)
|
|
|
|
wl_display_run(display);
|
2008-12-05 19:13:50 +03:00
|
|
|
|
2012-01-03 12:01:20 +04:00
|
|
|
/* prevent further rendering while shutting down */
|
2012-01-03 20:29:15 +04:00
|
|
|
ec->state = WESTON_COMPOSITOR_SLEEPING;
|
2012-01-03 12:01:20 +04:00
|
|
|
|
2012-03-07 22:42:10 +04:00
|
|
|
#ifdef BUILD_XSERVER_LAUNCHER
|
2011-07-16 05:09:24 +04:00
|
|
|
if (xserver)
|
Rename wayland-compositor to weston
This rename addresses a few problems around the split between core
Wayland and the wayland-demos repository.
1) Initially, we had one big repository with protocol code, sample
compositor and sample clients. We split that repository to make it
possible to implement the protocol without pulling in the sample/demo
code. At this point, the compositor is more than just a "demo" and
wayland-demos doesn't send the right message. The sample compositor
is a useful, self-contained project in it's own right, and we want to
move away from the "demos" label.
2) Another problem is that the wayland-demos compositor is often
called "the wayland compsitor", but it's really just one possible
compositor. Existing X11 compositors are expected to add Wayland
support and then gradually phase out/modularize the X11 support, for
example. Conversely, it's hard to talk about the wayland-demos
compositor specifically as opposed to, eg, the wayland protocol or a
wayland compositor in general.
We are also renaming the repo to weston, and the compositor
subdirectory to src/, to emphasize that the main "output" is the
compositor.
2012-01-03 19:29:47 +04:00
|
|
|
weston_xserver_destroy(ec);
|
2012-03-07 22:42:10 +04:00
|
|
|
#endif
|
2011-07-16 05:09:24 +04:00
|
|
|
|
2011-12-22 15:43:43 +04:00
|
|
|
ec->shell->destroy(ec->shell);
|
|
|
|
|
2011-04-25 23:08:20 +04:00
|
|
|
if (ec->has_bind_display)
|
|
|
|
ec->unbind_display(ec->display, display);
|
2010-12-01 23:36:20 +03:00
|
|
|
|
2012-01-02 18:03:26 +04:00
|
|
|
for (i = ARRAY_LENGTH(signals); i;)
|
|
|
|
wl_event_source_remove(signals[--i]);
|
|
|
|
|
2010-12-02 00:52:15 +03:00
|
|
|
ec->destroy(ec);
|
2011-12-19 02:04:46 +04:00
|
|
|
wl_display_destroy(display);
|
2010-12-02 00:52:15 +03:00
|
|
|
|
2008-12-05 19:13:50 +03:00
|
|
|
return 0;
|
2008-10-09 06:51:32 +04:00
|
|
|
}
|