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

clutter/backends: Rename master and slave devices

Browse Source 
Just because X11/XI uses a particular terminology doesn't mean we
have to use the same terms in our own API. The replacement terms
are in line with gtk@1c856a208, which seems a better precedent
for consistency.

Follow-up to commit 17417a82a5.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1425
This commit is contained in:
Florian Müllner
2020-08-31 18:47:23 +02:00
parent c1c061140f
commit 6b04b2ff60
16 changed files with 136 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/meta-input-settings.c
View File

@ -138,7 +138,7 @@ meta_input_settings_get_devices (MetaInputSettings *settings,
ClutterInputDevice *device = l->data;
if (clutter_input_device_get_device_type (device) == type &&
clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER)
clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_LOGICAL)
list = g_slist_prepend (list, device);
}
@ -390,7 +390,7 @@ update_pointer_accel_profile (MetaInputSettings *input_settings,
device = l->data;
if (clutter_input_device_get_device_mode (device) ==
CLUTTER_INPUT_MODE_MASTER)
CLUTTER_INPUT_MODE_LOGICAL)
continue;
do_update_pointer_accel_profile (input_settings, settings,
@ -1880,7 +1880,7 @@ meta_input_settings_device_added (ClutterSeat *seat,
ClutterInputDevice *device,
MetaInputSettings *input_settings)
{
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL)
return;
evaluate_two_finger_scrolling (input_settings, device);
@ -1979,7 +1979,7 @@ check_mappable_devices (MetaInputSettings *input_settings)
{
ClutterInputDevice *device = l->data;
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL)
continue;
check_add_mappable_device (input_settings, device);