brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/native: Implement get_dimensions() in native devices

Browse Source 
We already poked the libinput device size, so use that.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2617>
This commit is contained in:
Carlos Garnacho 2022-09-06 12:59:35 +02:00 committed by Marge Bot
parent c28ab9a5c1
commit 21fb6cc412
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,6 +204,23 @@ meta_input_device_native_get_pad_feature_group (ClutterInputDevice *de
return -1; return -1;
} }
static gboolean
meta_input_device_native_get_dimensions (ClutterInputDevice *device,
unsigned int *width,
unsigned int *height)
{
MetaInputDeviceNative *device_native = META_INPUT_DEVICE_NATIVE (device);
if (device_native->width > 0 && device_native->height > 0)
{
*width = device_native->width;
*height = device_native->height;
return TRUE;
}
return FALSE;
}
static void static void
meta_input_device_native_bell_notify (MetaInputDeviceNative *device) meta_input_device_native_bell_notify (MetaInputDeviceNative *device)
{ {
@ -1250,6 +1267,7 @@ meta_input_device_native_class_init (MetaInputDeviceNativeClass *klass)
device_class->get_group_n_modes = meta_input_device_native_get_group_n_modes; device_class->get_group_n_modes = meta_input_device_native_get_group_n_modes;
device_class->is_grouped = meta_input_device_native_is_grouped; device_class->is_grouped = meta_input_device_native_is_grouped;
device_class->get_pad_feature_group = meta_input_device_native_get_pad_feature_group; device_class->get_pad_feature_group = meta_input_device_native_get_pad_feature_group;
device_class->get_dimensions = meta_input_device_native_get_dimensions;
obj_props[PROP_DEVICE_MATRIX] = obj_props[PROP_DEVICE_MATRIX] =
g_param_spec_boxed ("device-matrix", g_param_spec_boxed ("device-matrix",
@ -1273,6 +1291,8 @@ meta_input_device_native_init (MetaInputDeviceNative *self)
cairo_matrix_init_identity (&self->device_matrix); cairo_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->height = -1;
} }
static void static void
@ -1469,7 +1489,11 @@ meta_input_device_native_new_in_impl (MetaSeatImpl *seat_impl,
update_pad_features (device); update_pad_features (device);
if (libinput_device_get_size (libinput_device, &width, &height) == 0) if (libinput_device_get_size (libinput_device, &width, &height) == 0)
{
device->device_aspect_ratio = width / height; device->device_aspect_ratio = width / height;
device->width = width;
device->height = height;
}
device->group = (intptr_t) libinput_device_get_device_group (libinput_device); device->group = (intptr_t) libinput_device_get_device_group (libinput_device);

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

@ -80,6 +80,8 @@ struct _MetaInputDeviceNative
intptr_t group; intptr_t group;
cairo_matrix_t device_matrix; cairo_matrix_t device_matrix;
int width;
int height;
double device_aspect_ratio; /* w:h */ double device_aspect_ratio; /* w:h */
double output_ratio; /* w:h */ double output_ratio; /* w:h */
MetaInputDeviceMapping mapping_mode; MetaInputDeviceMapping mapping_mode;