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

backends: Distinguish "no EDID" from "any EDID" mapping tablets

Browse Source 
Since the Wacom panel rewrite, the "output" setting is handled as
a kind of tri-state for display-integrated tablets:
- If the setting is unset, the device is automatically mapped
  to an output
- If the setting is set and not empty, the device is mapped to
  the output defined by the EDID data
- If the setting is ['', '', ''], the device is mapped to the
  span of all displays, like opaque tablets do.

This distinction for the unset setting fell through the cracks,
so both "Automatic" and "All displays" options were handled as
the former.

Add this distinction, so that display-integrated tablets can
be used like opaque tablets of sorts with no limitations.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2767>
This commit is contained in:
Carlos Garnacho 2022-12-16 23:12:25 +01:00 committed by Marge Bot
parent ba25271408
commit d15c6953d8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/meta-input-mapper.c
View File

@ -425,6 +425,8 @@ guess_candidates (MetaInputMapper *mapper,
GList *monitors, *l; GList *monitors, *l;
gboolean builtin = FALSE; gboolean builtin = FALSE;
gboolean integrated = TRUE; gboolean integrated = TRUE;
gboolean automatic;
g_autoptr (GVariant) user_value = NULL;
#ifdef HAVE_LIBWACOM #ifdef HAVE_LIBWACOM
if (clutter_input_device_get_device_type (input->device) != CLUTTER_TOUCHSCREEN_DEVICE) if (clutter_input_device_get_device_type (input->device) != CLUTTER_TOUCHSCREEN_DEVICE)
@ -446,6 +448,9 @@ guess_candidates (MetaInputMapper *mapper,
} }
#endif #endif
user_value = g_settings_get_user_value (input->settings, "output");
automatic = user_value == NULL;
monitors = meta_monitor_manager_get_monitors (mapper->monitor_manager); monitors = meta_monitor_manager_get_monitors (mapper->monitor_manager);
for (l = monitors; l; l = l->next) for (l = monitors; l; l = l->next)
@ -455,16 +460,16 @@ guess_candidates (MetaInputMapper *mapper,
g_assert (META_IS_MONITOR (l->data)); g_assert (META_IS_MONITOR (l->data));
if (integrated && match_edid (input, l->data, &edid_match)) if (automatic && integrated && match_edid (input, l->data, &edid_match))
match.score |= 1 << edid_match; match.score |= 1 << edid_match;
if (integrated && match_size (input, l->data)) if (automatic && integrated && match_size (input, l->data))
match.score |= 1 << META_MATCH_SIZE; match.score |= 1 << META_MATCH_SIZE;
if (builtin && match_builtin (mapper, l->data)) if (automatic && builtin && match_builtin (mapper, l->data))
match.score |= 1 << META_MATCH_IS_BUILTIN; match.score |= 1 << META_MATCH_IS_BUILTIN;
if (match_config (input, l->data)) if (!automatic && match_config (input, l->data))
match.score |= 1 << META_MATCH_CONFIG; match.score |= 1 << META_MATCH_CONFIG;
if (match.score > 0) if (match.score > 0)