|
|
|
/*
|
|
|
|
* Copyright © 2011 Intel Corporation
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <math.h>
|
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
|
|
|
#include "compositor.h"
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_spring_init(struct weston_spring *spring,
|
|
|
|
double k, double current, double target)
|
|
|
|
{
|
|
|
|
spring->k = k;
|
|
|
|
spring->friction = 400.0;
|
|
|
|
spring->current = current;
|
|
|
|
spring->previous = current;
|
|
|
|
spring->target = target;
|
|
|
|
}
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_spring_update(struct weston_spring *spring, uint32_t msec)
|
|
|
|
{
|
|
|
|
double force, v, current, step;
|
|
|
|
|
|
|
|
step = 0.01;
|
|
|
|
while (4 < msec - spring->timestamp) {
|
|
|
|
current = spring->current;
|
|
|
|
v = current - spring->previous;
|
|
|
|
force = spring->k * (spring->target - current) / 10.0 +
|
|
|
|
(spring->previous - current) - v * spring->friction;
|
|
|
|
|
|
|
|
spring->current =
|
|
|
|
current + (current - spring->previous) +
|
|
|
|
force * step * step;
|
|
|
|
spring->previous = current;
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
if (spring->current >= 1.0) {
|
|
|
|
#ifdef TWEENER_BOUNCE
|
|
|
|
spring->current = 2.0 - spring->current;
|
|
|
|
spring->previous = 2.0 - spring->previous;
|
|
|
|
#else
|
|
|
|
spring->current = 1.0;
|
|
|
|
spring->previous = 1.0;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (spring->current <= 0.0) {
|
|
|
|
spring->current = 0.0;
|
|
|
|
spring->previous = 0.0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
spring->timestamp += 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_spring_done(struct weston_spring *spring)
|
|
|
|
{
|
|
|
|
return fabs(spring->previous - spring->target) < 0.0002 &&
|
|
|
|
fabs(spring->current - spring->target) < 0.0002;
|
|
|
|
}
|
|
|
|
|
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.
13 years ago
|
|
|
struct weston_zoom {
|
|
|
|
struct weston_surface *surface;
|
|
|
|
struct weston_animation animation;
|
|
|
|
struct weston_spring spring;
|
|
|
|
struct weston_transform transform;
|
|
|
|
struct wl_listener listener;
|
|
|
|
GLfloat start, stop;
|
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.
13 years ago
|
|
|
void (*done)(struct weston_zoom *zoom, void *data);
|
|
|
|
void *data;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct weston_fade {
|
|
|
|
struct weston_surface *surface;
|
|
|
|
struct weston_animation animation;
|
|
|
|
struct weston_spring spring;
|
|
|
|
struct wl_listener listener;
|
|
|
|
void (*done)(struct weston_fade *fade, void *data);
|
|
|
|
void *data;
|
|
|
|
};
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_zoom_destroy(struct weston_zoom *zoom)
|
|
|
|
{
|
|
|
|
wl_list_remove(&zoom->animation.link);
|
|
|
|
wl_list_remove(&zoom->listener.link);
|
|
|
|
wl_list_remove(&zoom->transform.link);
|
|
|
|
zoom->surface->geometry.dirty = 1;
|
|
|
|
if (zoom->done)
|
|
|
|
zoom->done(zoom, zoom->data);
|
|
|
|
free(zoom);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
handle_zoom_surface_destroy(struct wl_listener *listener, 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.
13 years ago
|
|
|
struct weston_zoom *zoom =
|
|
|
|
container_of(listener, struct weston_zoom, listener);
|
|
|
|
|
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.
13 years ago
|
|
|
weston_zoom_destroy(zoom);
|
|
|
|
}
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_zoom_frame(struct weston_animation *animation,
|
|
|
|
struct weston_output *output, uint32_t msecs)
|
|
|
|
{
|
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.
13 years ago
|
|
|
struct weston_zoom *zoom =
|
|
|
|
container_of(animation, struct weston_zoom, animation);
|
|
|
|
struct weston_surface *es = zoom->surface;
|
|
|
|
GLfloat scale;
|
|
|
|
|
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.
13 years ago
|
|
|
weston_spring_update(&zoom->spring, msecs);
|
|
|
|
|
|
|
|
if (weston_spring_done(&zoom->spring)) {
|
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.
13 years ago
|
|
|
weston_zoom_destroy(zoom);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
scale = zoom->start +
|
|
|
|
(zoom->stop - zoom->start) * zoom->spring.current;
|
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.
13 years ago
|
|
|
weston_matrix_init(&zoom->transform.matrix);
|
|
|
|
weston_matrix_translate(&zoom->transform.matrix,
|
|
|
|
-0.5f * es->geometry.width,
|
|
|
|
-0.5f * es->geometry.height, 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.
13 years ago
|
|
|
weston_matrix_scale(&zoom->transform.matrix, scale, scale, scale);
|
|
|
|
weston_matrix_translate(&zoom->transform.matrix,
|
|
|
|
0.5f * es->geometry.width,
|
|
|
|
0.5f * es->geometry.height, 0);
|
|
|
|
|
|
|
|
es->alpha = zoom->spring.current;
|
|
|
|
if (es->alpha > 1.0)
|
|
|
|
es->alpha = 1.0;
|
|
|
|
|
|
|
|
zoom->surface->geometry.dirty = 1;
|
|
|
|
weston_compositor_schedule_repaint(es->compositor);
|
|
|
|
}
|
|
|
|
|
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.
13 years ago
|
|
|
WL_EXPORT struct weston_zoom *
|
|
|
|
weston_zoom_run(struct weston_surface *surface, GLfloat start, GLfloat stop,
|
|
|
|
weston_zoom_done_func_t done, 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.
13 years ago
|
|
|
struct weston_zoom *zoom;
|
|
|
|
|
|
|
|
zoom = malloc(sizeof *zoom);
|
|
|
|
if (!zoom)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
zoom->surface = surface;
|
|
|
|
zoom->done = done;
|
|
|
|
zoom->data = data;
|
|
|
|
zoom->start = start;
|
|
|
|
zoom->stop = stop;
|
|
|
|
wl_list_insert(&surface->geometry.transformation_list,
|
|
|
|
&zoom->transform.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.
13 years ago
|
|
|
weston_spring_init(&zoom->spring, 200.0, 0.0, 1.0);
|
|
|
|
zoom->spring.friction = 700;
|
|
|
|
zoom->animation.frame_counter = 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.
13 years ago
|
|
|
zoom->spring.timestamp = weston_compositor_get_time();
|
|
|
|
zoom->animation.frame = weston_zoom_frame;
|
|
|
|
weston_zoom_frame(&zoom->animation, NULL, zoom->spring.timestamp);
|
|
|
|
|
|
|
|
zoom->listener.notify = handle_zoom_surface_destroy;
|
|
|
|
wl_signal_add(&surface->surface.resource.destroy_signal,
|
|
|
|
&zoom->listener);
|
|
|
|
|
|
|
|
wl_list_insert(&surface->output->animation_list,
|
|
|
|
&zoom->animation.link);
|
|
|
|
|
|
|
|
return zoom;
|
|
|
|
}
|
|
|
|
|
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.
13 years ago
|
|
|
struct weston_binding {
|
|
|
|
uint32_t key;
|
|
|
|
uint32_t button;
|
|
|
|
uint32_t axis;
|
|
|
|
uint32_t modifier;
|
|
|
|
void *handler;
|
|
|
|
void *data;
|
|
|
|
struct wl_list link;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct weston_binding *
|
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.
13 years ago
|
|
|
weston_compositor_add_binding(struct weston_compositor *compositor,
|
|
|
|
uint32_t key, uint32_t button, uint32_t axis,
|
|
|
|
uint32_t modifier, void *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.
13 years ago
|
|
|
struct weston_binding *binding;
|
|
|
|
|
|
|
|
binding = malloc(sizeof *binding);
|
|
|
|
if (binding == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
binding->key = key;
|
|
|
|
binding->button = button;
|
|
|
|
binding->axis = axis;
|
|
|
|
binding->modifier = modifier;
|
|
|
|
binding->handler = handler;
|
|
|
|
binding->data = data;
|
|
|
|
|
|
|
|
return binding;
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT struct weston_binding *
|
|
|
|
weston_compositor_add_key_binding(struct weston_compositor *compositor,
|
|
|
|
uint32_t key, uint32_t modifier,
|
|
|
|
weston_key_binding_handler_t handler,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct weston_binding *binding;
|
|
|
|
|
|
|
|
binding = weston_compositor_add_binding(compositor, key, 0, 0,
|
|
|
|
modifier, handler, data);
|
|
|
|
if (binding == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
wl_list_insert(compositor->key_binding_list.prev, &binding->link);
|
|
|
|
|
|
|
|
return binding;
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT struct weston_binding *
|
|
|
|
weston_compositor_add_button_binding(struct weston_compositor *compositor,
|
|
|
|
uint32_t button, uint32_t modifier,
|
|
|
|
weston_button_binding_handler_t handler,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct weston_binding *binding;
|
|
|
|
|
|
|
|
binding = weston_compositor_add_binding(compositor, 0, button, 0,
|
|
|
|
modifier, handler, data);
|
|
|
|
if (binding == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
wl_list_insert(compositor->button_binding_list.prev, &binding->link);
|
|
|
|
|
|
|
|
return binding;
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT struct weston_binding *
|
|
|
|
weston_compositor_add_axis_binding(struct weston_compositor *compositor,
|
|
|
|
uint32_t axis, uint32_t modifier,
|
|
|
|
weston_axis_binding_handler_t handler,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct weston_binding *binding;
|
|
|
|
|
|
|
|
binding = weston_compositor_add_binding(compositor, 0, 0, axis,
|
|
|
|
modifier, handler, data);
|
|
|
|
if (binding == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
wl_list_insert(compositor->axis_binding_list.prev, &binding->link);
|
|
|
|
|
|
|
|
return binding;
|
|
|
|
}
|
|
|
|
|
|
|
|
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.
13 years ago
|
|
|
weston_binding_destroy(struct weston_binding *binding)
|
|
|
|
{
|
|
|
|
wl_list_remove(&binding->link);
|
|
|
|
free(binding);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_binding_list_destroy_all(struct wl_list *list)
|
|
|
|
{
|
|
|
|
struct weston_binding *binding, *tmp;
|
|
|
|
|
|
|
|
wl_list_for_each_safe(binding, tmp, list, link)
|
|
|
|
weston_binding_destroy(binding);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct binding_keyboard_grab {
|
|
|
|
uint32_t key;
|
|
|
|
struct wl_keyboard_grab grab;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
binding_key(struct wl_keyboard_grab *grab,
|
|
|
|
uint32_t time, uint32_t key, uint32_t state_w)
|
|
|
|
{
|
|
|
|
struct binding_keyboard_grab *b =
|
|
|
|
container_of(grab, struct binding_keyboard_grab, grab);
|
|
|
|
struct wl_resource *resource;
|
|
|
|
struct wl_display *display;
|
|
|
|
enum wl_keyboard_key_state state = state_w;
|
|
|
|
uint32_t serial;
|
|
|
|
|
|
|
|
resource = grab->keyboard->focus_resource;
|
|
|
|
if (key == b->key) {
|
|
|
|
if (state == WL_KEYBOARD_KEY_STATE_RELEASED) {
|
|
|
|
wl_keyboard_end_grab(grab->keyboard);
|
|
|
|
free(b);
|
|
|
|
}
|
|
|
|
} else if (resource) {
|
|
|
|
display = wl_client_get_display(resource->client);
|
|
|
|
serial = wl_display_next_serial(display);
|
|
|
|
wl_keyboard_send_key(resource, serial, time, key, state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
binding_modifiers(struct wl_keyboard_grab *grab, uint32_t serial,
|
|
|
|
uint32_t mods_depressed, uint32_t mods_latched,
|
|
|
|
uint32_t mods_locked, uint32_t group)
|
|
|
|
{
|
|
|
|
struct wl_resource *resource;
|
|
|
|
|
|
|
|
resource = grab->keyboard->focus_resource;
|
|
|
|
if (!resource)
|
|
|
|
return;
|
|
|
|
|
|
|
|
wl_keyboard_send_modifiers(resource, serial, mods_depressed,
|
|
|
|
mods_latched, mods_locked, group);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct wl_keyboard_grab_interface binding_grab = {
|
|
|
|
binding_key,
|
|
|
|
binding_modifiers,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
install_binding_grab(struct wl_seat *seat,
|
|
|
|
uint32_t time, uint32_t key)
|
|
|
|
{
|
|
|
|
struct binding_keyboard_grab *grab;
|
|
|
|
|
|
|
|
grab = malloc(sizeof *grab);
|
|
|
|
grab->key = key;
|
|
|
|
grab->grab.interface = &binding_grab;
|
|
|
|
wl_keyboard_start_grab(seat->keyboard, &grab->grab);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_compositor_run_key_binding(struct weston_compositor *compositor,
|
|
|
|
struct weston_seat *seat,
|
|
|
|
uint32_t time, uint32_t key,
|
|
|
|
enum wl_keyboard_key_state 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.
13 years ago
|
|
|
struct weston_binding *b;
|
|
|
|
|
|
|
|
if (state == WL_KEYBOARD_KEY_STATE_RELEASED)
|
|
|
|
return;
|
|
|
|
|
|
|
|
wl_list_for_each(b, &compositor->key_binding_list, link) {
|
|
|
|
if (b->key == key && b->modifier == seat->modifier_state) {
|
|
|
|
weston_key_binding_handler_t handler = b->handler;
|
|
|
|
handler(&seat->seat, time, key, b->data);
|
|
|
|
|
|
|
|
/* If this was a key binding and it didn't
|
|
|
|
* install a keyboard grab, install one now to
|
|
|
|
* swallow the key release. */
|
|
|
|
if (seat->seat.keyboard->grab ==
|
|
|
|
&seat->seat.keyboard->default_grab)
|
|
|
|
install_binding_grab(&seat->seat, time, key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_compositor_run_button_binding(struct weston_compositor *compositor,
|
|
|
|
struct weston_seat *seat,
|
|
|
|
uint32_t time, uint32_t button,
|
|
|
|
enum wl_pointer_button_state state)
|
|
|
|
{
|
|
|
|
struct weston_binding *b;
|
|
|
|
|
|
|
|
if (state == WL_POINTER_BUTTON_STATE_RELEASED)
|
|
|
|
return;
|
|
|
|
|
|
|
|
wl_list_for_each(b, &compositor->button_binding_list, link) {
|
|
|
|
if (b->button == button && b->modifier == seat->modifier_state) {
|
|
|
|
weston_button_binding_handler_t handler = b->handler;
|
|
|
|
handler(&seat->seat, time, button, b->data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT void
|
|
|
|
weston_compositor_run_axis_binding(struct weston_compositor *compositor,
|
|
|
|
struct weston_seat *seat,
|
|
|
|
uint32_t time, uint32_t axis,
|
|
|
|
wl_fixed_t value)
|
|
|
|
{
|
|
|
|
struct weston_binding *b;
|
|
|
|
|
|
|
|
wl_list_for_each(b, &compositor->axis_binding_list, link) {
|
|
|
|
if (b->axis == axis && b->modifier == seat->modifier_state) {
|
|
|
|
weston_axis_binding_handler_t handler = b->handler;
|
|
|
|
handler(&seat->seat, time, axis, value, b->data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT int
|
|
|
|
weston_environment_get_fd(const char *env)
|
|
|
|
{
|
|
|
|
char *e, *end;
|
|
|
|
int fd, flags;
|
|
|
|
|
|
|
|
e = getenv(env);
|
|
|
|
if (!e)
|
|
|
|
return -1;
|
|
|
|
fd = strtol(e, &end, 0);
|
|
|
|
if (*end != '\0')
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
flags = fcntl(fd, F_GETFD);
|
|
|
|
if (flags == -1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
|
|
|
|
unsetenv(env);
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
/*fade in and fade out animation*/
|
|
|
|
static void
|
|
|
|
weston_fade_destroy(struct weston_fade *fade)
|
|
|
|
{
|
|
|
|
wl_list_remove(&fade->animation.link);
|
|
|
|
wl_list_remove(&fade->listener.link);
|
|
|
|
fade->surface->geometry.dirty = 1;
|
|
|
|
if (fade->done)
|
|
|
|
fade->done(fade, fade->data);
|
|
|
|
free(fade);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
handle_fade_surface_destroy(struct wl_listener *listener, void *data)
|
|
|
|
{
|
|
|
|
struct weston_fade *fade =
|
|
|
|
container_of(listener, struct weston_fade, listener);
|
|
|
|
|
|
|
|
weston_fade_destroy(fade);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
weston_fade_frame(struct weston_animation *animation,
|
|
|
|
struct weston_output *output, uint32_t msecs)
|
|
|
|
{
|
|
|
|
struct weston_fade *fade =
|
|
|
|
container_of(animation, struct weston_fade, animation);
|
|
|
|
struct weston_surface *es = fade->surface;
|
|
|
|
float fade_factor;
|
|
|
|
|
|
|
|
weston_spring_update(&fade->spring, msecs);
|
|
|
|
|
|
|
|
if (weston_spring_done(&fade->spring)) {
|
|
|
|
weston_fade_destroy(fade);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (fade->spring.current > 1)
|
|
|
|
fade_factor = 1;
|
|
|
|
else if (fade->spring.current < 0 )
|
|
|
|
fade_factor = 0;
|
|
|
|
else
|
|
|
|
fade_factor = fade->spring.current;
|
|
|
|
es->alpha = fade_factor;
|
|
|
|
|
|
|
|
fade->surface->geometry.dirty = 1;
|
|
|
|
weston_compositor_schedule_repaint(es->compositor);
|
|
|
|
}
|
|
|
|
|
|
|
|
WL_EXPORT struct weston_fade *
|
|
|
|
weston_fade_run(struct weston_surface *surface,
|
|
|
|
weston_fade_done_func_t done, void *data)
|
|
|
|
{
|
|
|
|
struct weston_fade *fade;
|
|
|
|
|
|
|
|
fade = malloc(sizeof *fade);
|
|
|
|
if (!fade)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
fade->surface = surface;
|
|
|
|
fade->done = done;
|
|
|
|
fade->data = data;
|
|
|
|
weston_spring_init(&fade->spring, 200.0, 0, 1.0);
|
|
|
|
fade->spring.friction = 700;
|
|
|
|
fade->animation.frame_counter = 0;
|
|
|
|
fade->spring.timestamp = weston_compositor_get_time();
|
|
|
|
fade->animation.frame = weston_fade_frame;
|
|
|
|
weston_fade_frame(&fade->animation, NULL, fade->spring.timestamp);
|
|
|
|
|
|
|
|
fade->listener.notify = handle_fade_surface_destroy;
|
|
|
|
wl_signal_add(&surface->surface.resource.destroy_signal,
|
|
|
|
&fade->listener);
|
|
|
|
|
|
|
|
wl_list_insert(&surface->output->animation_list,
|
|
|
|
&fade->animation.link);
|
|
|
|
|
|
|
|
return fade;
|
|
|
|
}
|