isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-27 05:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Replace cairo_matrix_t with graphene_matrix_t

Browse Source 
Reduce cairo usage where graphene can do a much better job

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3243>
This commit is contained in:
Bilal Elmoussaoui 2023-09-04 21:51:50 +02:00 committed by Marge Bot
parent 379996a63e
commit 81a12a7db4
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backends/native/meta-input-device-native.c
View File

@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>
#include <cairo-gobject.h> #include <graphene-gobject.h>
#include "backends/meta-backend-private.h" #include "backends/meta-backend-private.h"
#include "backends/native/meta-input-thread.h" #include "backends/native/meta-input-thread.h"
@ -94,10 +94,10 @@ meta_input_device_native_set_property (GObject *object,
{ {
case PROP_DEVICE_MATRIX: case PROP_DEVICE_MATRIX:
{ {
const cairo_matrix_t *matrix = g_value_get_boxed (value); const graphene_matrix_t *matrix = g_value_get_boxed (value);
cairo_matrix_init_identity (&device->device_matrix); graphene_matrix_init_identity (&device->device_matrix);
cairo_matrix_multiply (&device->device_matrix, graphene_matrix_multiply (&device->device_matrix,
&device->device_matrix, matrix); matrix, &device->device_matrix);
break; break;
} }
case PROP_OUTPUT_ASPECT_RATIO: case PROP_OUTPUT_ASPECT_RATIO:
@ -1293,7 +1293,7 @@ meta_input_device_native_class_init (MetaInputDeviceNativeClass *klass)
obj_props[PROP_DEVICE_MATRIX] = obj_props[PROP_DEVICE_MATRIX] =
g_param_spec_boxed ("device-matrix", NULL, NULL, g_param_spec_boxed ("device-matrix", NULL, NULL,
CAIRO_GOBJECT_TYPE_MATRIX, GRAPHENE_TYPE_MATRIX,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
obj_props[PROP_OUTPUT_ASPECT_RATIO] = obj_props[PROP_OUTPUT_ASPECT_RATIO] =
g_param_spec_double ("output-aspect-ratio", NULL, NULL, g_param_spec_double ("output-aspect-ratio", NULL, NULL,
@ -1306,7 +1306,7 @@ meta_input_device_native_class_init (MetaInputDeviceNativeClass *klass)
static void static void
meta_input_device_native_init (MetaInputDeviceNative *self) meta_input_device_native_init (MetaInputDeviceNative *self)
{ {
cairo_matrix_init_identity (&self->device_matrix); graphene_matrix_init_identity (&self->device_matrix);
self->device_aspect_ratio = 0; self->device_aspect_ratio = 0;
self->output_ratio = 0; self->output_ratio = 0;
self->width = -1; self->width = -1;
@ -1609,6 +1609,7 @@ meta_input_device_native_translate_coordinates_in_impl (ClutterInputDevice *devi
double min_x = 0, min_y = 0, max_x = 1, max_y = 1; double min_x = 0, min_y = 0, max_x = 1, max_y = 1;
float stage_width, stage_height; float stage_width, stage_height;
double x_d, y_d; double x_d, y_d;
graphene_point_t min_point, max_point, pos_point;
if (device_evdev->mapping_mode == META_INPUT_DEVICE_MAPPING_RELATIVE) if (device_evdev->mapping_mode == META_INPUT_DEVICE_MAPPING_RELATIVE)
return; return;
@ -1629,9 +1630,18 @@ meta_input_device_native_translate_coordinates_in_impl (ClutterInputDevice *devi
y_d *= 1 / ratio; y_d *= 1 / ratio;
} }
cairo_matrix_transform_point (&device_evdev->device_matrix, &min_x, &min_y); graphene_matrix_transform_point (&device_evdev->device_matrix,
cairo_matrix_transform_point (&device_evdev->device_matrix, &max_x, &max_y); &GRAPHENE_POINT_INIT (min_x, min_y), &min_point);
cairo_matrix_transform_point (&device_evdev->device_matrix, &x_d, &y_d); min_x = min_point.x;
min_y = min_point.y;
graphene_matrix_transform_point (&device_evdev->device_matrix,
&GRAPHENE_POINT_INIT (max_x, max_y), &max_point);
max_x = max_point.x;
max_y = max_point.y;
graphene_matrix_transform_point (&device_evdev->device_matrix,
&GRAPHENE_POINT_INIT (x_d, y_d), &pos_point);
x_d = pos_point.x;
y_d = pos_point.y;
*x = CLAMP (x_d, MIN (min_x, max_x), MAX (min_x, max_x)) * stage_width; *x = CLAMP (x_d, MIN (min_x, max_x), MAX (min_x, max_x)) * stage_width;
*y = CLAMP (y_d, MIN (min_y, max_y), MAX (min_y, max_y)) * stage_height; *y = CLAMP (y_d, MIN (min_y, max_y), MAX (min_y, max_y)) * stage_height;

2
src/backends/native/meta-input-device-native.h
View File

@ -78,7 +78,7 @@ struct _MetaInputDeviceNative
GArray *modes; GArray *modes;
intptr_t group; intptr_t group;
cairo_matrix_t device_matrix; graphene_matrix_t device_matrix;
int width; int width;
int height; int height;
double device_aspect_ratio; /* w:h */ double device_aspect_ratio; /* w:h */

4
src/backends/native/meta-input-settings-native.c
View File

@ -134,9 +134,9 @@ set_matrix (GTask *task)
{ {
ClutterInputDevice *device = g_task_get_source_object (task); ClutterInputDevice *device = g_task_get_source_object (task);
float *matrix = g_task_get_task_data (task); float *matrix = g_task_get_task_data (task);
cairo_matrix_t dev_matrix; graphene_matrix_t dev_matrix;
cairo_matrix_init (&dev_matrix, graphene_matrix_init_from_2d (&dev_matrix,
matrix[0], matrix[3], matrix[1], matrix[0], matrix[3], matrix[1],
matrix[4], matrix[2], matrix[5]); matrix[4], matrix[2], matrix[5]);
g_object_set (device, "device-matrix", &dev_matrix, NULL); g_object_set (device, "device-matrix", &dev_matrix, NULL);