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

backends/x11: factor out the scroll method property changes

Browse Source 
Let's not duplicate this given how complicated it is.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1431
This commit is contained in:
Peter Hutterer 2020-09-08 16:27:34 +10:00 committed by Florian Müllner
parent 453e02b779
commit e04e003fd5
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,13 +50,13 @@ typedef struct _MetaInputSettingsX11Private
G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettingsX11, meta_input_settings_x11, G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettingsX11, meta_input_settings_x11,
META_TYPE_INPUT_SETTINGS) META_TYPE_INPUT_SETTINGS)
enum typedef enum
{ {
SCROLL_METHOD_FIELD_2FG, SCROLL_METHOD_FIELD_2FG,
SCROLL_METHOD_FIELD_EDGE, SCROLL_METHOD_FIELD_EDGE,
SCROLL_METHOD_FIELD_BUTTON, SCROLL_METHOD_FIELD_BUTTON,
SCROLL_METHOD_NUM_FIELDS SCROLL_METHOD_NUM_FIELDS
}; } ScrollMethod;
static void static void
device_free_xdevice (gpointer user_data) device_free_xdevice (gpointer user_data)
@ -312,9 +312,9 @@ meta_input_settings_x11_set_invert_scroll (MetaInputSettings *settings,
} }
static void static void
meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings, change_scroll_method (ClutterInputDevice *device,
ClutterInputDevice *device, ScrollMethod method,
gboolean edge_scroll_enabled) gboolean enabled)
{ {
guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */ guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */
guchar *current = NULL; guchar *current = NULL;
@ -322,7 +322,7 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings,
available = get_property (device, "libinput Scroll Methods Available", available = get_property (device, "libinput Scroll Methods Available",
XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS); XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
if (!available || !available[SCROLL_METHOD_FIELD_EDGE]) if (!available || !available[method])
goto out; goto out;
current = get_property (device, "libinput Scroll Method Enabled", current = get_property (device, "libinput Scroll Method Enabled",
@ -332,7 +332,7 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings,
memcpy (values, current, SCROLL_METHOD_NUM_FIELDS); memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
values[SCROLL_METHOD_FIELD_EDGE] = !!edge_scroll_enabled; values[method] = !!enabled;
change_property (device, "libinput Scroll Method Enabled", change_property (device, "libinput Scroll Method Enabled",
XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS); XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
out: out:
@ -340,33 +340,20 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings,
meta_XFree (available); meta_XFree (available);
} }
static void
meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings,
ClutterInputDevice *device,
gboolean edge_scroll_enabled)
{
change_scroll_method (device, SCROLL_METHOD_FIELD_EDGE, edge_scroll_enabled);
}
static void static void
meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings *settings, meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings *settings,
ClutterInputDevice *device, ClutterInputDevice *device,
gboolean two_finger_scroll_enabled) gboolean two_finger_scroll_enabled)
{ {
guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */ change_scroll_method (device, SCROLL_METHOD_FIELD_2FG, two_finger_scroll_enabled);
guchar *current = NULL;
guchar *available = NULL;
available = get_property (device, "libinput Scroll Methods Available",
XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
if (!available || !available[SCROLL_METHOD_FIELD_2FG])
goto out;
current = get_property (device, "libinput Scroll Method Enabled",
XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
if (!current)
goto out;
memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
values[SCROLL_METHOD_FIELD_2FG] = !!two_finger_scroll_enabled;
change_property (device, "libinput Scroll Method Enabled",
XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
out:
meta_XFree (current);
meta_XFree (available);
} }
static gboolean static gboolean