mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 08:00:42 -05:00
Revert "backends: Use g-s-d settings for tablet configuration"
This reverts commit b52f304f9d.
https://bugzilla.gnome.org/show_bug.cgi?id=773779
This commit is contained in:
Carlos Garnacho
parent
15db18901c
commit
db9d8fcc90
@ -52,7 +52,6 @@ struct _DeviceMappingInfo
|
||||
MetaInputSettings *input_settings;
|
||||
ClutterInputDevice *device;
|
||||
GSettings *settings;
|
||||
GSettings *gsd_settings;
|
||||
#ifdef HAVE_LIBWACOM
|
||||
WacomDevice *wacom_device;
|
||||
#endif
|
||||
@ -722,19 +721,6 @@ meta_input_settings_find_output (MetaInputSettings *input_settings,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static DeviceMappingInfo *
|
||||
lookup_mapping_info (ClutterInputDevice *device)
|
||||
{
|
||||
MetaInputSettings *settings;
|
||||
MetaInputSettingsPrivate *priv;
|
||||
|
||||
settings = meta_backend_get_input_settings (meta_get_backend ());
|
||||
if (!settings)
|
||||
return NULL;
|
||||
priv = meta_input_settings_get_instance_private (settings);
|
||||
return g_hash_table_lookup (priv->mappable_devices, device);
|
||||
}
|
||||
|
||||
static void
|
||||
update_tablet_keep_aspect (MetaInputSettings *input_settings,
|
||||
GSettings *settings,
|
||||
@ -765,12 +751,8 @@ update_tablet_keep_aspect (MetaInputSettings *input_settings,
|
||||
if (clutter_input_device_get_mapping_mode (device) ==
|
||||
CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
|
||||
{
|
||||
DeviceMappingInfo *info = NULL;
|
||||
|
||||
keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
|
||||
info = lookup_mapping_info (device);
|
||||
if (info)
|
||||
output = meta_input_settings_find_output (input_settings, info->settings, device);
|
||||
output = meta_input_settings_find_output (input_settings, settings, device);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -823,7 +805,6 @@ update_tablet_mapping (MetaInputSettings *input_settings,
|
||||
{
|
||||
MetaInputSettingsClass *input_settings_class;
|
||||
GDesktopTabletMapping mapping;
|
||||
DeviceMappingInfo *info;
|
||||
|
||||
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE)
|
||||
return;
|
||||
@ -842,8 +823,7 @@ update_tablet_mapping (MetaInputSettings *input_settings,
|
||||
#endif
|
||||
|
||||
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||
mapping = g_settings_get_boolean (settings, "is-absolute") ?
|
||||
G_DESKTOP_TABLET_MAPPING_ABSOLUTE : G_DESKTOP_TABLET_MAPPING_RELATIVE;
|
||||
mapping = g_settings_get_enum (settings, "mapping");
|
||||
|
||||
settings_device_set_uint_setting (input_settings, device,
|
||||
input_settings_class->set_tablet_mapping,
|
||||
@ -851,9 +831,7 @@ update_tablet_mapping (MetaInputSettings *input_settings,
|
||||
|
||||
/* Relative mapping disables keep-aspect/display */
|
||||
update_tablet_keep_aspect (input_settings, settings, device);
|
||||
info = lookup_mapping_info (device);
|
||||
if (info)
|
||||
update_device_display (input_settings, info->settings, device);
|
||||
update_device_display (input_settings, settings, device);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -863,7 +841,7 @@ update_tablet_area (MetaInputSettings *input_settings,
|
||||
{
|
||||
MetaInputSettingsClass *input_settings_class;
|
||||
GVariant *variant;
|
||||
const guint32 *area;
|
||||
const gdouble *area;
|
||||
gsize n_elems;
|
||||
|
||||
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE)
|
||||
@ -886,7 +864,7 @@ update_tablet_area (MetaInputSettings *input_settings,
|
||||
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||
variant = g_settings_get_value (settings, "area");
|
||||
|
||||
area = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
|
||||
area = g_variant_get_fixed_array (variant, &n_elems, sizeof (gdouble));
|
||||
if (n_elems == 4)
|
||||
{
|
||||
input_settings_class->set_tablet_area (input_settings, device,
|
||||
@ -922,7 +900,7 @@ update_tablet_left_handed (MetaInputSettings *input_settings,
|
||||
#endif
|
||||
|
||||
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
|
||||
enabled = g_settings_get_enum (settings, "rotation") != 0;
|
||||
enabled = g_settings_get_boolean (settings, "left-handed");
|
||||
|
||||
settings_device_set_bool_setting (input_settings, device,
|
||||
input_settings_class->set_left_handed,
|
||||
@ -990,20 +968,13 @@ mapped_device_changed_cb (GSettings *settings,
|
||||
{
|
||||
if (strcmp (key, "display") == 0)
|
||||
update_device_display (info->input_settings, settings, info->device);
|
||||
}
|
||||
|
||||
static void
|
||||
mapped_device_gsd_setting_changed_cb (GSettings *settings,
|
||||
const gchar *key,
|
||||
DeviceMappingInfo *info)
|
||||
{
|
||||
if (strcmp (key, "is-absolute") == 0)
|
||||
else if (strcmp (key, "mapping") == 0)
|
||||
update_tablet_mapping (info->input_settings, settings, info->device);
|
||||
else if (strcmp (key, "area") == 0)
|
||||
update_tablet_area (info->input_settings, settings, info->device);
|
||||
else if (strcmp (key, "keep-aspect") == 0)
|
||||
update_tablet_keep_aspect (info->input_settings, settings, info->device);
|
||||
else if (strcmp (key, "rotation") == 0)
|
||||
else if (strcmp (key, "left-handed") == 0)
|
||||
update_tablet_left_handed (info->input_settings, settings, info->device);
|
||||
}
|
||||
|
||||
@ -1013,14 +984,13 @@ apply_mappable_device_settings (MetaInputSettings *input_settings,
|
||||
{
|
||||
update_device_display (input_settings, info->settings, info->device);
|
||||
|
||||
if (info->gsd_settings &&
|
||||
(clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
|
||||
clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE))
|
||||
if (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
|
||||
clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE)
|
||||
{
|
||||
update_tablet_mapping (input_settings, info->gsd_settings, info->device);
|
||||
update_tablet_area (input_settings, info->gsd_settings, info->device);
|
||||
update_tablet_keep_aspect (input_settings, info->gsd_settings, info->device);
|
||||
update_tablet_left_handed (input_settings, info->gsd_settings, info->device);
|
||||
update_tablet_mapping (input_settings, info->settings, info->device);
|
||||
update_tablet_area (input_settings, info->settings, info->device);
|
||||
update_tablet_keep_aspect (input_settings, info->settings, info->device);
|
||||
update_tablet_left_handed (input_settings, info->settings, info->device);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1062,79 +1032,6 @@ lookup_device_settings (ClutterInputDevice *device)
|
||||
return settings;
|
||||
}
|
||||
|
||||
static gchar *
|
||||
get_tablet_settings_id (ClutterInputDevice *device,
|
||||
DeviceMappingInfo *info)
|
||||
{
|
||||
gchar *id = NULL, *machine_id;
|
||||
gsize length;
|
||||
|
||||
if (!g_file_get_contents ("/etc/machine-id", &machine_id, &length, NULL))
|
||||
return NULL;
|
||||
|
||||
machine_id = g_strstrip (machine_id);
|
||||
#ifdef HAVE_LIBWACOM
|
||||
if (info->wacom_device)
|
||||
id = g_strdup_printf ("%s-%s", machine_id, libwacom_get_match (info->wacom_device));
|
||||
#endif
|
||||
|
||||
if (!id)
|
||||
id = g_strdup_printf ("%s-%s:%s", machine_id,
|
||||
clutter_input_device_get_vendor_id (device),
|
||||
clutter_input_device_get_product_id (device));
|
||||
|
||||
g_free (machine_id);
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
has_gsd_schemas (void)
|
||||
{
|
||||
GSettingsSchema *schema;
|
||||
|
||||
schema = g_settings_schema_source_lookup (g_settings_schema_source_get_default (),
|
||||
"org.gnome.settings-daemon.peripherals.wacom",
|
||||
TRUE);
|
||||
if (!schema)
|
||||
return FALSE;
|
||||
|
||||
g_settings_schema_unref (schema);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static GSettings *
|
||||
lookup_device_gsd_settings (ClutterInputDevice *device,
|
||||
DeviceMappingInfo *info)
|
||||
{
|
||||
ClutterInputDeviceType type;
|
||||
GSettings *settings = NULL;
|
||||
|
||||
type = clutter_input_device_get_device_type (device);
|
||||
|
||||
if (type == CLUTTER_TABLET_DEVICE ||
|
||||
type == CLUTTER_PEN_DEVICE ||
|
||||
type == CLUTTER_ERASER_DEVICE ||
|
||||
type == CLUTTER_CURSOR_DEVICE ||
|
||||
type == CLUTTER_PAD_DEVICE)
|
||||
{
|
||||
gchar *device_id, *path;
|
||||
|
||||
if (!has_gsd_schemas ())
|
||||
return NULL;
|
||||
|
||||
device_id = get_tablet_settings_id (device, info);
|
||||
path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/",
|
||||
device_id);
|
||||
settings = g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom",
|
||||
path);
|
||||
g_free (device_id);
|
||||
g_free (path);
|
||||
}
|
||||
|
||||
return settings;
|
||||
}
|
||||
|
||||
static void
|
||||
tool_settings_cache_pressure_curve (ToolSettings *tool_settings)
|
||||
{
|
||||
@ -1142,7 +1039,11 @@ tool_settings_cache_pressure_curve (ToolSettings *tool_settings)
|
||||
const gint32 *curve;
|
||||
gsize n_elems;
|
||||
|
||||
variant = g_settings_get_value (tool_settings->settings, "pressurecurve");
|
||||
if (clutter_input_device_tool_get_tool_type (tool_settings->tool) ==
|
||||
CLUTTER_INPUT_DEVICE_TOOL_ERASER)
|
||||
variant = g_settings_get_value (tool_settings->settings, "eraser-pressure-curve");
|
||||
else
|
||||
variant = g_settings_get_value (tool_settings->settings, "pressure-curve");
|
||||
|
||||
curve = g_variant_get_fixed_array (variant, &n_elems, sizeof (gint32));
|
||||
if (n_elems == 4)
|
||||
@ -1161,41 +1062,22 @@ tool_settings_cache_pressure_curve (ToolSettings *tool_settings)
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
|
||||
static GDesktopStylusButtonAction
|
||||
translate_stylus_button_action (guint32 button_number)
|
||||
{
|
||||
switch (button_number)
|
||||
{
|
||||
case 2:
|
||||
return G_DESKTOP_STYLUS_BUTTON_ACTION_MIDDLE;
|
||||
case 3:
|
||||
return G_DESKTOP_STYLUS_BUTTON_ACTION_RIGHT;
|
||||
case 8:
|
||||
return G_DESKTOP_STYLUS_BUTTON_ACTION_BACK;
|
||||
case 9:
|
||||
return G_DESKTOP_STYLUS_BUTTON_ACTION_FORWARD;
|
||||
default:
|
||||
return G_DESKTOP_STYLUS_BUTTON_ACTION_DEFAULT;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
tool_settings_changed_cb (GSettings *settings,
|
||||
const gchar *key,
|
||||
ToolSettings *tool_settings)
|
||||
{
|
||||
if (strcmp (key, "buttonmapping") == 0)
|
||||
{
|
||||
GVariant *variant = g_settings_get_value (settings, "buttonmapping");
|
||||
const guint32 *mapping;
|
||||
gsize n_elems;
|
||||
|
||||
mapping = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
|
||||
tool_settings->button_action = translate_stylus_button_action (mapping[2]);
|
||||
tool_settings->secondary_button_action = translate_stylus_button_action (mapping[3]);
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
else if (strcmp (key, "pressurecurve") == 0)
|
||||
if (strcmp (key, "button-action") == 0)
|
||||
tool_settings->button_action = g_settings_get_enum (settings, "button-action");
|
||||
else if (strcmp (key, "secondary-button-action") == 0)
|
||||
tool_settings->secondary_button_action = g_settings_get_enum (settings, "secondary-button-action");
|
||||
else if (strcmp (key, "pressure-curve") == 0 &&
|
||||
clutter_input_device_tool_get_tool_type (tool_settings->tool) !=
|
||||
CLUTTER_INPUT_DEVICE_TOOL_ERASER)
|
||||
tool_settings_cache_pressure_curve (tool_settings);
|
||||
else if (strcmp (key, "eraser-pressure-curve") == 0 &&
|
||||
clutter_input_device_tool_get_tool_type (tool_settings->tool) ==
|
||||
CLUTTER_INPUT_DEVICE_TOOL_ERASER)
|
||||
tool_settings_cache_pressure_curve (tool_settings);
|
||||
}
|
||||
|
||||
@ -1204,33 +1086,22 @@ tool_settings_new (ClutterInputDeviceTool *tool,
|
||||
const gchar *schema_path)
|
||||
{
|
||||
ToolSettings *tool_settings;
|
||||
GVariant *variant;
|
||||
const guint32 *mapping;
|
||||
gsize n_elems;
|
||||
|
||||
tool_settings = g_new0 (ToolSettings, 1);
|
||||
tool_settings->tool = tool;
|
||||
tool_settings->curve[0] = tool_settings->curve[1] = 0;
|
||||
tool_settings->curve[2] = tool_settings->curve[3] = 1;
|
||||
tool_settings->settings =
|
||||
g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.stylus",
|
||||
schema_path);
|
||||
|
||||
if (has_gsd_schemas ())
|
||||
{
|
||||
tool_settings->settings =
|
||||
g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom.stylus",
|
||||
schema_path);
|
||||
g_signal_connect (tool_settings->settings, "changed",
|
||||
G_CALLBACK (tool_settings_changed_cb), tool_settings);
|
||||
|
||||
g_signal_connect (tool_settings->settings, "changed",
|
||||
G_CALLBACK (tool_settings_changed_cb), tool_settings);
|
||||
|
||||
/* Initialize values */
|
||||
variant = g_settings_get_value (tool_settings->settings, "buttonmapping");
|
||||
mapping = g_variant_get_fixed_array (variant, &n_elems, sizeof (guint32));
|
||||
tool_settings->button_action = translate_stylus_button_action (mapping[2]);
|
||||
tool_settings->secondary_button_action = translate_stylus_button_action (mapping[3]);
|
||||
tool_settings_cache_pressure_curve (tool_settings);
|
||||
|
||||
g_variant_unref (variant);
|
||||
}
|
||||
/* Initialize values */
|
||||
tool_settings->button_action =
|
||||
g_settings_get_enum (tool_settings->settings, "button-action");
|
||||
tool_settings->secondary_button_action =
|
||||
g_settings_get_enum (tool_settings->settings, "secondary-button-action");
|
||||
tool_settings_cache_pressure_curve (tool_settings);
|
||||
|
||||
return tool_settings;
|
||||
}
|
||||
@ -1247,17 +1118,26 @@ lookup_tool_settings (ClutterInputDeviceTool *tool,
|
||||
ClutterInputDevice *device)
|
||||
{
|
||||
ToolSettings *tool_settings;
|
||||
guint64 tool_id;
|
||||
gchar *device_id, *path;
|
||||
guint64 serial;
|
||||
gchar *path;
|
||||
|
||||
tool_settings = g_object_get_qdata (G_OBJECT (tool), quark_tool_settings);
|
||||
if (tool_settings)
|
||||
return tool_settings;
|
||||
|
||||
tool_id = clutter_input_device_tool_get_id (tool);
|
||||
device_id = get_tablet_settings_id (device, lookup_mapping_info (device));
|
||||
path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%" G_GUINT64_FORMAT "/",
|
||||
device_id, tool_id);
|
||||
serial = clutter_input_device_tool_get_serial (tool);
|
||||
|
||||
if (serial == 0)
|
||||
{
|
||||
path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/default-%s:%s/",
|
||||
clutter_input_device_get_vendor_id (device),
|
||||
clutter_input_device_get_product_id (device));
|
||||
}
|
||||
else
|
||||
{
|
||||
path = g_strdup_printf ("/org/gnome/desktop/peripherals/stylus/%lx/", serial);
|
||||
}
|
||||
|
||||
tool_settings = tool_settings_new (tool, path);
|
||||
g_object_set_qdata_full (G_OBJECT (tool), quark_tool_settings, tool_settings,
|
||||
(GDestroyNotify) tool_settings_free);
|
||||
@ -1270,15 +1150,16 @@ static GSettings *
|
||||
lookup_pad_button_settings (ClutterInputDevice *device,
|
||||
guint button)
|
||||
{
|
||||
const gchar *vendor, *product;
|
||||
GSettings *settings;
|
||||
gchar *device_id, *path;
|
||||
gchar *path;
|
||||
|
||||
device_id = get_tablet_settings_id (device, lookup_mapping_info (device));
|
||||
path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/button%c/",
|
||||
device_id, 'A' + button);
|
||||
settings = g_settings_new_with_path ("org.gnome.settings-daemon.peripherals.wacom.tablet-button",
|
||||
vendor = clutter_input_device_get_vendor_id (device);
|
||||
product = clutter_input_device_get_product_id (device);
|
||||
path = g_strdup_printf ("/org/gnome/desktop/peripherals/tablets/%s:%s/button%c/",
|
||||
vendor, product, 'A' + button);
|
||||
settings = g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.pad-button",
|
||||
path);
|
||||
g_free (device_id);
|
||||
g_free (path);
|
||||
|
||||
return settings;
|
||||
@ -1309,7 +1190,6 @@ device_mapping_info_free (DeviceMappingInfo *info)
|
||||
libwacom_destroy (info->wacom_device);
|
||||
#endif
|
||||
g_object_unref (info->settings);
|
||||
g_clear_object (&info->gsd_settings);
|
||||
g_slice_free (DeviceMappingInfo, info);
|
||||
}
|
||||
|
||||
@ -1358,13 +1238,6 @@ check_add_mappable_device (MetaInputSettings *input_settings,
|
||||
|
||||
g_hash_table_insert (priv->mappable_devices, device, info);
|
||||
|
||||
info->gsd_settings = lookup_device_gsd_settings (device, info);
|
||||
if (info->gsd_settings)
|
||||
{
|
||||
g_signal_connect (info->gsd_settings, "changed",
|
||||
G_CALLBACK (mapped_device_gsd_setting_changed_cb), info);
|
||||
}
|
||||
|
||||
apply_mappable_device_settings (input_settings, info);
|
||||
|
||||
return TRUE;
|
||||
@ -1612,18 +1485,8 @@ meta_input_settings_get_pad_button_action (MetaInputSettings *input_settings,
|
||||
ClutterInputDevice *pad,
|
||||
guint button)
|
||||
{
|
||||
/* GsdWacomActionType to GDesktopPadButtonAction map */
|
||||
GDesktopPadButtonAction action_map[4] = {
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_NONE,
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING,
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_SWITCH_MONITOR,
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_HELP
|
||||
};
|
||||
GDesktopPadButtonAction action;
|
||||
GSettings *settings;
|
||||
guint32 action;
|
||||
|
||||
if (!has_gsd_schemas ())
|
||||
return G_DESKTOP_PAD_BUTTON_ACTION_NONE;
|
||||
|
||||
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings),
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_NONE);
|
||||
@ -1631,10 +1494,10 @@ meta_input_settings_get_pad_button_action (MetaInputSettings *input_settings,
|
||||
G_DESKTOP_PAD_BUTTON_ACTION_NONE);
|
||||
|
||||
settings = lookup_pad_button_settings (pad, button);
|
||||
action = g_settings_get_enum (settings, "action-type");
|
||||
action = g_settings_get_enum (settings, "action");
|
||||
g_object_unref (settings);
|
||||
|
||||
return action_map[action];
|
||||
return action;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBWACOM
|
||||
@ -1849,7 +1712,7 @@ meta_input_settings_get_pad_button_action_label (MetaInputSettings *input_setti
|
||||
gchar *accel;
|
||||
|
||||
settings = lookup_pad_button_settings (pad, button);
|
||||
accel = g_settings_get_string (settings, "custom-action");
|
||||
accel = g_settings_get_string (settings, "keybinding");
|
||||
g_object_unref (settings);
|
||||
|
||||
return accel;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user