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

input-settings: Apply pointing stick settings

Browse Source 
Apply the pointing stick (TrackPoint) configuration -- speed,
acceleration profile, and scrolling method -- from the gsettings desktop
schema.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3089>
This commit is contained in:
Rohan Hendrik Jotz-Lean 2022-01-20 18:54:27 +01:00 committed by Marge Bot
parent 1802065953
commit 74b9d46d7c
5 changed files with 209 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backends/meta-input-settings-dummy.c
View File

@ -222,6 +222,20 @@ meta_input_settings_dummy_set_trackball_middle_click_emulation (MetaInputSetting
{
}
static void
meta_input_settings_dummy_set_pointing_stick_scroll_method (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointingStickScrollMethod method)
{
}
static void
meta_input_settings_dummy_set_pointing_stick_accel_profile (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile)
{
}
static gboolean
meta_input_settings_dummy_has_two_finger_scroll (MetaInputSettings *settings,
ClutterInputDevice *device)
@ -281,6 +295,10 @@ meta_input_settings_dummy_class_init (MetaInputSettingsDummyClass *klass)
meta_input_settings_dummy_set_touchpad_accel_profile;
input_settings_class->set_trackball_accel_profile =
meta_input_settings_dummy_set_trackball_accel_profile;
input_settings_class->set_pointing_stick_scroll_method =
meta_input_settings_dummy_set_pointing_stick_scroll_method;
input_settings_class->set_pointing_stick_accel_profile =
meta_input_settings_dummy_set_pointing_stick_accel_profile;
input_settings_class->set_stylus_pressure =
meta_input_settings_dummy_set_stylus_pressure;
input_settings_class->set_stylus_button_map =

8
src/backends/meta-input-settings-private.h
View File

@ -129,6 +129,12 @@ struct _MetaInputSettingsClass
void (* set_trackball_accel_profile) (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile);
void (* set_pointing_stick_accel_profile) (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile);
void (* set_pointing_stick_scroll_method) (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointingStickScrollMethod profile);
void (* set_stylus_pressure) (MetaInputSettings *settings,
ClutterInputDevice *device,
@ -153,6 +159,8 @@ struct _MetaInputSettingsClass
gboolean (* has_two_finger_scroll) (MetaInputSettings *settings,
ClutterInputDevice *device);
gboolean (* is_pointing_stick_device) (MetaInputSettings *settings,
ClutterInputDevice *device);
};
void meta_input_settings_maybe_save_numlock_state (MetaInputSettings *input_settings,

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

@ -85,6 +85,7 @@ struct _MetaInputSettingsPrivate
GSettings *mouse_settings;
GSettings *touchpad_settings;
GSettings *trackball_settings;
GSettings *pointing_stick_settings;
GSettings *keyboard_settings;
GSettings *keyboard_a11y_settings;
@ -177,6 +178,7 @@ meta_input_settings_dispose (GObject *object)
g_clear_object (&priv->mouse_settings);
g_clear_object (&priv->touchpad_settings);
g_clear_object (&priv->trackball_settings);
g_clear_object (&priv->pointing_stick_settings);
g_clear_object (&priv->keyboard_settings);
g_clear_object (&priv->keyboard_a11y_settings);
g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
@ -396,6 +398,10 @@ do_update_pointer_accel_profile (MetaInputSettings *input_settings,
input_settings_class->set_trackball_accel_profile (input_settings,
device,
profile);
else if (settings == priv->pointing_stick_settings)
input_settings_class->set_pointing_stick_accel_profile (input_settings,
device,
profile);
}
static void
@ -984,6 +990,51 @@ update_trackball_scroll_button (MetaInputSettings *input_settings,
}
}
static void
update_pointing_stick_scroll_method (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv =
meta_input_settings_get_instance_private (input_settings);
MetaInputSettingsClass *input_settings_class;
GDesktopPointingStickScrollMethod method;
ClutterInputCapabilities caps;
method = g_settings_get_enum (settings, "scroll-method");
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
if (device)
{
caps = clutter_input_device_get_capabilities (device);
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) == 0)
return;
}
if (device)
{
input_settings_class->set_pointing_stick_scroll_method (input_settings, device, method);
}
else if (!device)
{
GList *l;
for (l = priv->devices; l; l = l->next)
{
device = l->data;
caps = clutter_input_device_get_capabilities (device);
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) != 0)
{
input_settings_class->set_pointing_stick_scroll_method (input_settings,
device,
method);
}
}
}
}
static void
update_keyboard_repeat (MetaInputSettings *input_settings)
{
@ -1195,6 +1246,15 @@ meta_input_settings_changed_cb (GSettings *settings,
else if (strcmp (key, "middle-click-emulation") == 0)
update_middle_click_emulation (input_settings, settings, NULL);
}
else if (settings == priv->pointing_stick_settings)
{
if (strcmp (key, "speed") == 0)
update_device_speed (input_settings, NULL);
else if (strcmp (key, "accel-profile") == 0)
update_pointer_accel_profile (input_settings, settings, NULL);
else if (strcmp (key, "scroll-method") == 0)
update_pointing_stick_scroll_method (input_settings, settings, NULL);
}
else if (settings == priv->keyboard_settings)
{
if (strcmp (key, "repeat") == 0 ||
@ -1478,6 +1538,16 @@ apply_device_settings (MetaInputSettings *input_settings,
priv->trackball_settings,
device);
update_pointing_stick_scroll_method (input_settings,
priv->pointing_stick_settings,
device);
update_pointer_accel_profile (input_settings,
priv->pointing_stick_settings,
device);
load_keyboard_a11y_settings (input_settings);
update_middle_click_emulation (input_settings, priv->mouse_settings, device);
update_middle_click_emulation (input_settings, priv->touchpad_settings, device);
update_middle_click_emulation (input_settings, priv->trackball_settings, device);
@ -1773,6 +1843,10 @@ meta_input_settings_init (MetaInputSettings *settings)
g_signal_connect (priv->trackball_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings);
priv->pointing_stick_settings = g_settings_new ("org.gnome.desktop.peripherals.pointingstick");
g_signal_connect (priv->pointing_stick_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings);
priv->keyboard_settings = g_settings_new ("org.gnome.desktop.peripherals.keyboard");
g_signal_connect (priv->keyboard_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings);

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

@ -574,6 +574,52 @@ meta_input_settings_native_set_trackball_accel_profile (MetaInputSettings
set_device_accel_profile (device, profile);
}
static void
meta_input_settings_native_set_pointing_stick_accel_profile (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile)
{
ClutterInputCapabilities caps = clutter_input_device_get_capabilities (device);
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) == 0)
return;
set_device_accel_profile (device, profile);
}
static void
meta_input_settings_native_set_pointing_stick_scroll_method (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointingStickScrollMethod method)
{
ClutterInputCapabilities caps = clutter_input_device_get_capabilities (device);
struct libinput_device *libinput_device;
enum libinput_config_scroll_method libinput_method;
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) == 0)
return;
libinput_device = meta_input_device_native_get_libinput_device (device);
switch (method)
{
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_DEFAULT:
libinput_method = libinput_device_config_scroll_get_default_method (libinput_device);
break;
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_NONE:
libinput_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
break;
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_ON_BUTTON_DOWN:
libinput_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
break;
default:
g_assert_not_reached ();
return;
}
device_set_scroll_method (libinput_device, libinput_method);
}
static void
meta_input_settings_native_set_tablet_mapping (MetaInputSettings *settings,
ClutterInputDevice *device,
@ -803,6 +849,8 @@ meta_input_settings_native_class_init (MetaInputSettingsNativeClass *klass)
input_settings_class->set_mouse_accel_profile = meta_input_settings_native_set_mouse_accel_profile;
input_settings_class->set_touchpad_accel_profile = meta_input_settings_native_set_touchpad_accel_profile;
input_settings_class->set_trackball_accel_profile = meta_input_settings_native_set_trackball_accel_profile;
input_settings_class->set_pointing_stick_accel_profile = meta_input_settings_native_set_pointing_stick_accel_profile;
input_settings_class->set_pointing_stick_scroll_method = meta_input_settings_native_set_pointing_stick_scroll_method;
input_settings_class->set_stylus_pressure = meta_input_settings_native_set_stylus_pressure;
input_settings_class->set_stylus_button_map = meta_input_settings_native_set_stylus_button_map;

60
src/backends/x11/meta-input-settings-x11.c
View File

@ -595,6 +595,64 @@ meta_input_settings_x11_set_trackball_accel_profile (MetaInputSettings
set_device_accel_profile (settings, device, profile);
}
static void
meta_input_settings_x11_set_pointing_stick_accel_profile (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile)
{
ClutterInputCapabilities caps = clutter_input_device_get_capabilities (device);
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) == 0)
return;
set_device_accel_profile (settings, device, profile);
}
static void
meta_input_settings_x11_set_pointing_stick_scroll_method (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopPointingStickScrollMethod method)
{
ClutterInputCapabilities caps = clutter_input_device_get_capabilities (device);
guchar *defaults;
guchar values[3] = { 0 }; /* 2fg, edge, on-button */
if ((caps & CLUTTER_INPUT_CAPABILITY_TRACKPOINT) == 0)
return;
defaults = get_property (device, "libinput Scroll Method Enabled Default",
XA_INTEGER, 8, 3);
if (!defaults)
return;
switch (method)
{
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_DEFAULT:
values[0] = defaults[0];
values[1] = defaults[1];
values[2] = defaults[2];
break;
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_NONE:
values[0] = 0;
values[1] = 0;
values[2] = 0;
break;
case G_DESKTOP_POINTING_STICK_SCROLL_METHOD_ON_BUTTON_DOWN:
values[0] = 0;
values[1] = 0;
values[2] = 1;
break;
default:
g_assert_not_reached ();
return;
}
change_property (settings, device, "libinput Scroll Method Enabled",
XA_INTEGER, 8, &values, 3);
meta_XFree (defaults);
}
static void
meta_input_settings_x11_set_tablet_mapping (MetaInputSettings *settings,
ClutterInputDevice *device,
@ -866,6 +924,8 @@ meta_input_settings_x11_class_init (MetaInputSettingsX11Class *klass)
input_settings_class->set_mouse_accel_profile = meta_input_settings_x11_set_mouse_accel_profile;
input_settings_class->set_touchpad_accel_profile = meta_input_settings_x11_set_touchpad_accel_profile;
input_settings_class->set_trackball_accel_profile = meta_input_settings_x11_set_trackball_accel_profile;
input_settings_class->set_pointing_stick_accel_profile = meta_input_settings_x11_set_pointing_stick_accel_profile;
input_settings_class->set_pointing_stick_scroll_method = meta_input_settings_x11_set_pointing_stick_scroll_method;
input_settings_class->set_stylus_pressure = meta_input_settings_x11_set_stylus_pressure;
input_settings_class->set_stylus_button_map = meta_input_settings_x11_set_stylus_button_map;