mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: apply full transformation to input coordinates

Browse Source 
When converting input coordinates from global to surface-local system,
apply the full inverse surface transformation instead of just
translation.

Move weston_surface_update_transform() implementation realier in the
file, no changes.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-01-20 14:24:25 +02:00
parent b13e84f4e9
commit 2a5ceccd57
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+35 -26
View File
@@ -227,6 +227,32 @@ weston_surface_set_color(struct weston_surface *surface,
surface->shader = &surface->compositor->solid_shader; surface->shader = &surface->compositor->solid_shader;
} }
static void
weston_surface_update_transform(struct weston_surface *surface)
{
struct weston_matrix *matrix = &surface->transform.matrix;
struct weston_matrix *inverse = &surface->transform.inverse;
struct weston_transform *tform;
if (!surface->transform.dirty)
return;
surface->transform.dirty = 0;
if (wl_list_empty(&surface->transform.list)) {
surface->transform.enabled = 0;
return;
}
surface->transform.enabled = 1;
weston_matrix_init(matrix);
wl_list_for_each(tform, &surface->transform.list, link)
weston_matrix_multiply(matrix, &tform->matrix);
weston_matrix_invert(inverse, matrix);
}
WL_EXPORT void WL_EXPORT void
weston_surface_damage_rectangle(struct weston_surface *surface, weston_surface_damage_rectangle(struct weston_surface *surface,
int32_t x, int32_t y, int32_t x, int32_t y,
@@ -310,6 +336,15 @@ static void
weston_surface_transform(struct weston_surface *surface, weston_surface_transform(struct weston_surface *surface,
int32_t x, int32_t y, int32_t *sx, int32_t *sy) int32_t x, int32_t y, int32_t *sx, int32_t *sy)
{ {
weston_surface_update_transform(surface);
if (surface->transform.enabled) {
struct weston_vector v = { { x, y, 0.0f, 1.0f } };
weston_matrix_transform(&surface->transform.inverse, &v);
x = floorf(v.f[0] / v.f[3]);
y = floorf(v.f[1] / v.f[3]);
}
*sx = x - surface->x; *sx = x - surface->x;
*sy = y - surface->y; *sy = y - surface->y;
} }
@@ -541,32 +576,6 @@ texture_transformed_surface(struct weston_surface *es)
return 1; return 1;
} }
static void
weston_surface_update_transform(struct weston_surface *surface)
{
struct weston_matrix *matrix = &surface->transform.matrix;
struct weston_matrix *inverse = &surface->transform.inverse;
struct weston_transform *tform;
if (!surface->transform.dirty)
return;
surface->transform.dirty = 0;
if (wl_list_empty(&surface->transform.list)) {
surface->transform.enabled = 0;
return;
}
surface->transform.enabled = 1;
weston_matrix_init(matrix);
wl_list_for_each(tform, &surface->transform.list, link)
weston_matrix_multiply(matrix, &tform->matrix);
weston_matrix_invert(inverse, matrix);
}
WL_EXPORT void WL_EXPORT void
weston_surface_draw(struct weston_surface *es, struct weston_output *output) weston_surface_draw(struct weston_surface *es, struct weston_output *output)
{ {