sungmg/mutter-performance-source
1
0
Fork 0
Code Activity
mutter-performance-source/src/backends/meta-input-settings.c

2250 lines
75 KiB
C
Raw Normal View History

backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/*
* Copyright 2014 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Carlos Garnacho <carlosg@gnome.org>
*/
/**
* SECTION:input-settings
* @title: MetaInputSettings
* @short_description: Mutter input device configuration
*/
#include "config.h"
#include <string.h>
#include "meta-backend-private.h"
#include "meta-input-settings-private.h"
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
#include "backends/meta-logical-monitor.h"
#include "backends/meta-monitor.h"
backends/native: Add libinput-based MetaInputSettings implementation The libinput_device is fetched from the ClutterInputDevice, and configured through the libinput_device_*config* API. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:42:32 +00:00
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
#include <glib/gi18n-lib.h>
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
#include <meta/util.h>
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
static GQuark quark_tool_settings = 0;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
typedef struct _MetaInputSettingsPrivate MetaInputSettingsPrivate;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
typedef struct _DeviceMappingInfo DeviceMappingInfo;
struct _DeviceMappingInfo
{
MetaInputSettings *input_settings;
ClutterInputDevice *device;
GSettings *settings;
backends: Fix dangling callback not being disconnected This fixes possible crashes if configuration is changed on a device that was added and then removed. https://bugzilla.gnome.org/show_bug.cgi?id=784881
2017-07-12 10:24:16 +00:00
guint changed_id;
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
#ifdef HAVE_LIBWACOM
WacomDevice *wacom_device;
#endif
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
guint *group_modes;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
};
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
struct _MetaInputSettingsPrivate
{
ClutterDeviceManager *device_manager;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
MetaMonitorManager *monitor_manager;
guint monitors_changed_id;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
GSettings *mouse_settings;
GSettings *touchpad_settings;
GSettings *trackball_settings;
GSettings *keyboard_settings;
input-settings: Set double click timeout from gsettings Clutter's evdev input backend has no support for setting double click timeout set by gnome-settings-daemon. This results in touchpad click events timing out on wayland, because the default timeout value wasn't enough. This patch moves timeout setting to mutter and removes X11 backend specific setting from clutter. https://bugzilla.gnome.org/show_bug.cgi?id=771576
2017-03-21 14:32:35 +00:00
GSettings *gsd_settings;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
GHashTable *mappable_devices;
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
ClutterVirtualInputDevice *virtual_pad_keyboard;
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
#ifdef HAVE_LIBWACOM
WacomDeviceDatabase *wacom_db;
#endif
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
GHashTable *two_finger_devices;
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
/* Pad ring/strip emission */
struct {
ClutterInputDevice *pad;
MetaPadActionType action;
guint number;
gdouble value;
} last_pad_action_info;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
};
typedef void (*ConfigBoolFunc) (MetaInputSettings *input_settings,
ClutterInputDevice *device,
gboolean setting);
typedef void (*ConfigDoubleFunc) (MetaInputSettings *input_settings,
ClutterInputDevice *device,
gdouble value);
typedef void (*ConfigUintFunc) (MetaInputSettings *input_settings,
ClutterInputDevice *device,
guint value);
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
typedef enum {
META_PAD_DIRECTION_NONE = -1,
META_PAD_DIRECTION_UP = 0,
META_PAD_DIRECTION_DOWN,
META_PAD_DIRECTION_CW,
META_PAD_DIRECTION_CCW,
} MetaPadDirection;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettings, meta_input_settings, G_TYPE_OBJECT)
static GSList *
meta_input_settings_get_devices (MetaInputSettings *settings,
ClutterInputDeviceType type)
{
MetaInputSettingsPrivate *priv;
const GSList *devices;
GSList *list = NULL;
priv = meta_input_settings_get_instance_private (settings);
devices = clutter_device_manager_peek_devices (priv->device_manager);
while (devices)
{
ClutterInputDevice *device = devices->data;
if (clutter_input_device_get_device_type (device) == type &&
clutter_input_device_get_device_mode (device) != CLUTTER_INPUT_MODE_MASTER)
list = g_slist_prepend (list, device);
devices = devices->next;
}
return list;
}
static void
meta_input_settings_dispose (GObject *object)
{
MetaInputSettings *settings = META_INPUT_SETTINGS (object);
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (settings);
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
g_clear_object (&priv->virtual_pad_keyboard);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
g_clear_object (&priv->mouse_settings);
g_clear_object (&priv->touchpad_settings);
g_clear_object (&priv->trackball_settings);
g_clear_object (&priv->keyboard_settings);
input-settings: Set double click timeout from gsettings Clutter's evdev input backend has no support for setting double click timeout set by gnome-settings-daemon. This results in touchpad click events timing out on wayland, because the default timeout value wasn't enough. This patch moves timeout setting to mutter and removes X11 backend specific setting from clutter. https://bugzilla.gnome.org/show_bug.cgi?id=771576
2017-03-21 14:32:35 +00:00
g_clear_object (&priv->gsd_settings);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
g_clear_pointer (&priv->mappable_devices, g_hash_table_unref);
if (priv->monitors_changed_id && priv->monitor_manager)
{
g_signal_handler_disconnect (priv->monitor_manager,
priv->monitors_changed_id);
priv->monitors_changed_id = 0;
}
g_clear_object (&priv->monitor_manager);
backends: Add missing guards to libwacom calls
2016-07-22 21:05:18 +00:00
#ifdef HAVE_LIBWACOM
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
if (priv->wacom_db)
libwacom_database_destroy (priv->wacom_db);
backends: Add missing guards to libwacom calls
2016-07-22 21:05:18 +00:00
#endif
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
g_clear_pointer (&priv->two_finger_devices, g_hash_table_destroy);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
G_OBJECT_CLASS (meta_input_settings_parent_class)->dispose (object);
}
static void
settings_device_set_bool_setting (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ConfigBoolFunc func,
gboolean enabled)
{
func (input_settings, device, enabled);
}
static void
settings_set_bool_setting (MetaInputSettings *input_settings,
ClutterInputDeviceType type,
ConfigBoolFunc func,
gboolean enabled)
{
GSList *devices, *d;
devices = meta_input_settings_get_devices (input_settings, type);
for (d = devices; d; d = d->next)
settings_device_set_bool_setting (input_settings, d->data, func, enabled);
g_slist_free (devices);
}
static void
settings_device_set_double_setting (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ConfigDoubleFunc func,
gdouble value)
{
func (input_settings, device, value);
}
static void
settings_set_double_setting (MetaInputSettings *input_settings,
ClutterInputDeviceType type,
ConfigDoubleFunc func,
gdouble value)
{
GSList *devices, *d;
devices = meta_input_settings_get_devices (input_settings, type);
for (d = devices; d; d = d->next)
settings_device_set_double_setting (input_settings, d->data, func, value);
g_slist_free (devices);
}
static void
settings_device_set_uint_setting (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ConfigUintFunc func,
guint value)
{
(func) (input_settings, device, value);
}
static void
settings_set_uint_setting (MetaInputSettings *input_settings,
ClutterInputDeviceType type,
ConfigUintFunc func,
guint value)
{
GSList *devices, *d;
devices = meta_input_settings_get_devices (input_settings, type);
for (d = devices; d; d = d->next)
settings_device_set_uint_setting (input_settings, d->data, func, value);
g_slist_free (devices);
}
static void
update_touchpad_left_handed (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
GDesktopTouchpadHandedness handedness;
MetaInputSettingsPrivate *priv;
gboolean enabled = FALSE;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
handedness = g_settings_get_enum (priv->touchpad_settings, "left-handed");
switch (handedness)
{
case G_DESKTOP_TOUCHPAD_HANDEDNESS_RIGHT:
enabled = FALSE;
break;
case G_DESKTOP_TOUCHPAD_HANDEDNESS_LEFT:
enabled = TRUE;
break;
case G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE:
enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
break;
default:
g_assert_not_reached ();
}
if (device)
{
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_left_handed,
enabled);
}
else
{
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
input_settings_class->set_left_handed,
enabled);
}
}
static void
update_mouse_left_handed (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
gboolean enabled;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_POINTER_DEVICE)
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = g_settings_get_boolean (priv->mouse_settings, "left-handed");
if (device)
{
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_left_handed,
enabled);
}
else
{
GDesktopTouchpadHandedness touchpad_handedness;
settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE,
input_settings_class->set_left_handed,
enabled);
touchpad_handedness = g_settings_get_enum (priv->touchpad_settings,
"left-handed");
/* Also update touchpads if they're following mouse settings */
if (touchpad_handedness == G_DESKTOP_TOUCHPAD_HANDEDNESS_MOUSE)
update_touchpad_left_handed (input_settings, NULL);
}
}
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
static void
do_update_pointer_accel_profile (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device,
GDesktopPointerAccelProfile profile)
{
MetaInputSettingsPrivate *priv =
meta_input_settings_get_instance_private (input_settings);
MetaInputSettingsClass *input_settings_class =
META_INPUT_SETTINGS_GET_CLASS (input_settings);
if (settings == priv->mouse_settings)
input_settings_class->set_mouse_accel_profile (input_settings,
device,
profile);
else if (settings == priv->trackball_settings)
input_settings_class->set_trackball_accel_profile (input_settings,
device,
profile);
}
static void
update_pointer_accel_profile (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
GDesktopPointerAccelProfile profile;
profile = g_settings_get_enum (settings, "accel-profile");
if (device)
{
do_update_pointer_accel_profile (input_settings, settings,
device, profile);
}
else
{
MetaInputSettingsPrivate *priv =
meta_input_settings_get_instance_private (input_settings);
const GSList *devices;
const GSList *l;
devices = clutter_device_manager_peek_devices (priv->device_manager);
for (l = devices; l; l = l->next)
{
device = l->data;
if (clutter_input_device_get_device_mode (device) ==
CLUTTER_INPUT_MODE_MASTER)
continue;
do_update_pointer_accel_profile (input_settings, settings,
device, profile);
}
}
}
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
static GSettings *
get_settings_for_device_type (MetaInputSettings *input_settings,
ClutterInputDeviceType type)
{
MetaInputSettingsPrivate *priv;
priv = meta_input_settings_get_instance_private (input_settings);
switch (type)
{
case CLUTTER_POINTER_DEVICE:
return priv->mouse_settings;
case CLUTTER_TOUCHPAD_DEVICE:
return priv->touchpad_settings;
default:
return NULL;
}
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
update_device_speed (MetaInputSettings *input_settings,
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
ClutterInputDevice *device)
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
{
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
GSettings *settings;
ConfigDoubleFunc func;
const gchar *key = "speed";
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_speed;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
if (device)
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
{
settings = get_settings_for_device_type (input_settings,
clutter_input_device_get_device_type (device));
if (!settings)
return;
settings_device_set_double_setting (input_settings, device, func,
g_settings_get_double (settings, key));
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
else
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
{
settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
settings_set_double_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
g_settings_get_double (settings, key));
settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
settings_set_double_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
g_settings_get_double (settings, key));
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
static void
update_device_natural_scroll (MetaInputSettings *input_settings,
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
ClutterInputDevice *device)
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
{
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
GSettings *settings;
ConfigBoolFunc func;
const gchar *key = "natural-scroll";
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
func = META_INPUT_SETTINGS_GET_CLASS (input_settings)->set_invert_scroll;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
if (device)
{
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
settings = get_settings_for_device_type (input_settings,
clutter_input_device_get_device_type (device));
if (!settings)
return;
settings_device_set_bool_setting (input_settings, device, func,
g_settings_get_boolean (settings, key));
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
else
{
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
settings = get_settings_for_device_type (input_settings, CLUTTER_POINTER_DEVICE);
settings_set_bool_setting (input_settings, CLUTTER_POINTER_DEVICE, func,
g_settings_get_boolean (settings, key));
settings = get_settings_for_device_type (input_settings, CLUTTER_TOUCHPAD_DEVICE);
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE, func,
g_settings_get_boolean (settings, key));
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
}
Implements disable-while-typing in mutter. Disable-while-typing disables the touchpad while the user is typing. This patch introduces the necessary backend code to implement the org.gnome.desktop.peripherals.touchpad.disable-while-typing setting of gsettings-desktop-schemas which was implemented in commit 4c5b1c1df399d6afaaccb237e299ccd1d5d29ddd and released as part of 3.24. This is known as dwt in libinput. This patch has been tested on X11 and Wayland. https://bugzilla.gnome.org/show_bug.cgi?id=764852
2017-05-23 13:38:00 +00:00
static void
update_touchpad_disable_while_typing (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
GSettings *settings;
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
gboolean enabled;
const gchar *key = "disable-while-typing";
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = g_settings_get_boolean (priv->touchpad_settings, key);
if (device)
{
settings = get_settings_for_device_type (input_settings,
clutter_input_device_get_device_type (device));
if (!settings)
return;
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_disable_while_typing,
enabled);
}
else
{
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
input_settings_class->set_disable_while_typing,
enabled);
}
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
update_touchpad_tap_enabled (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
gboolean enabled;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-to-click");
if (device)
{
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_tap_enabled,
enabled);
}
else
{
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
input_settings_class->set_tap_enabled,
enabled);
}
}
Add tag-and-drag setting from libinput into mutter The problem is that libinput offers the possibility to not enabled dragging when tap-to-click is enabled but mutter doesn't. For people who have a sensitive touchpad and who like tap-to-click option, dragging is launched even when you don't want it : for example, when you select a folder, most of the time the folder is dragging whereas just selected or when you want to select some lines of a text file, several lines are moved as a cut-paste which is not expected and erase datas. To fix it, you need to have the possibility to desactivate the drag option when you use tap-to-click in mutter. Because it's already a specification of libinput, it remains to add it to mutter. Implementation with X11 is added too. https://bugzilla.gnome.org/show_bug.cgi?id=775755
2017-08-17 23:00:10 +00:00
static void
update_touchpad_tap_and_drag_enabled (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
gboolean enabled;
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-and-drag");
if (device)
{
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_tap_and_drag_enabled,
enabled);
}
else
{
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
input_settings_class->set_tap_and_drag_enabled,
enabled);
}
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
update_touchpad_edge_scroll (MetaInputSettings *input_settings,
ClutterInputDevice *device)
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
{
MetaInputSettingsClass *input_settings_class;
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
gboolean edge_scroll_enabled;
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
gboolean two_finger_scroll_enabled;
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
gboolean two_finger_scroll_available;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
MetaInputSettingsPrivate *priv;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
edge_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "edge-scrolling-enabled");
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
two_finger_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "two-finger-scrolling-enabled");
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
two_finger_scroll_available = g_hash_table_size (priv->two_finger_devices) > 0;
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
/* If both are enabled we prefer two finger. */
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
if (edge_scroll_enabled && two_finger_scroll_enabled && two_finger_scroll_available)
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
edge_scroll_enabled = FALSE;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
if (device)
{
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_edge_scroll,
edge_scroll_enabled);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
else
{
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
(ConfigBoolFunc) input_settings_class->set_edge_scroll,
edge_scroll_enabled);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
}
backends: Re-add support for edge scrolling with some touchpads Add support for setting edge-scrolling separately from two-finger scrolling. We now have 2 separate boolean settings for those, with the Mouse panel in gnome-control-center allowing to set only one of those at a time, but nothing precludes both being set in the configuration. We need to handle: - two-finger-scrolling-enabled and edge-scrolling-enabled settings both being set. - those 2 settings being change out-of-order - two-finger-scrolling being set on a device that doesn't support it - edge-scrolling-enabled on a device that doesn't support it And the combinations of one touchpad supporting just one of edge scrolling and two-finger scrolling and another vice-versa. https://bugzilla.gnome.org/show_bug.cgi?id=768245
2016-06-30 12:27:23 +00:00
static void
update_touchpad_two_finger_scroll (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
gboolean two_finger_scroll_enabled;
MetaInputSettingsPrivate *priv;
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
two_finger_scroll_enabled = g_settings_get_boolean (priv->touchpad_settings, "two-finger-scrolling-enabled");
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
/* Disable edge since they can't both be set. */
if (two_finger_scroll_enabled)
update_touchpad_edge_scroll (input_settings, device);
backends: Re-add support for edge scrolling with some touchpads Add support for setting edge-scrolling separately from two-finger scrolling. We now have 2 separate boolean settings for those, with the Mouse panel in gnome-control-center allowing to set only one of those at a time, but nothing precludes both being set in the configuration. We need to handle: - two-finger-scrolling-enabled and edge-scrolling-enabled settings both being set. - those 2 settings being change out-of-order - two-finger-scrolling being set on a device that doesn't support it - edge-scrolling-enabled on a device that doesn't support it And the combinations of one touchpad supporting just one of edge scrolling and two-finger scrolling and another vice-versa. https://bugzilla.gnome.org/show_bug.cgi?id=768245
2016-06-30 12:27:23 +00:00
if (device)
{
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_two_finger_scroll,
two_finger_scroll_enabled);
}
else
{
settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
(ConfigBoolFunc) input_settings_class->set_two_finger_scroll,
two_finger_scroll_enabled);
}
MetaInputSettings: fix two finger preference over edge scrolling logic Enabling edge scrolling before disabling two finger would result in edge scrolling not actually being enabled because two finger is still enabled at the time and we bail out. This patch moves this logic to common code for both the native and X backends and fixes it by ensuring that both settings are never set at the same time and still re-checking if edge scrolling should be enabled after two finger scrolling gets disabled. We also simplify the code by not checking for supported/available settings since the underlying devices will just reject those values and there isn't anything we can do about it here. It's the UI's job to only show supported/available settings to users. https://bugzilla.gnome.org/show_bug.cgi?id=771744
2016-10-27 17:25:16 +00:00
/* Edge might have been disabled because two finger was on. */
if (!two_finger_scroll_enabled)
update_touchpad_edge_scroll (input_settings, device);
backends: Re-add support for edge scrolling with some touchpads Add support for setting edge-scrolling separately from two-finger scrolling. We now have 2 separate boolean settings for those, with the Mouse panel in gnome-control-center allowing to set only one of those at a time, but nothing precludes both being set in the configuration. We need to handle: - two-finger-scrolling-enabled and edge-scrolling-enabled settings both being set. - those 2 settings being change out-of-order - two-finger-scrolling being set on a device that doesn't support it - edge-scrolling-enabled on a device that doesn't support it And the combinations of one touchpad supporting just one of edge scrolling and two-finger scrolling and another vice-versa. https://bugzilla.gnome.org/show_bug.cgi?id=768245
2016-06-30 12:27:23 +00:00
}
backend: Add set_click_method MetaInputSettings vfunc This will configure the libinput_config_click_method for touchpads. https://bugzilla.gnome.org/show_bug.cgi?id=746290
2015-03-16 14:25:59 +00:00
static void
update_touchpad_click_method (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
backends: Fix cut'n'paste error in click method setting GDesktopTouchpadScrollMethod was used instead of GDesktopTouchpadClickMethod which became visible now that the former has been removed from gsettings-desktop-schemas. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-15 13:40:29 +00:00
GDesktopTouchpadClickMethod method;
backend: Add set_click_method MetaInputSettings vfunc This will configure the libinput_config_click_method for touchpads. https://bugzilla.gnome.org/show_bug.cgi?id=746290
2015-03-16 14:25:59 +00:00
MetaInputSettingsPrivate *priv;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
backend: Add set_click_method MetaInputSettings vfunc This will configure the libinput_config_click_method for touchpads. https://bugzilla.gnome.org/show_bug.cgi?id=746290
2015-03-16 14:25:59 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
method = g_settings_get_enum (priv->touchpad_settings, "click-method");
if (device)
{
settings_device_set_uint_setting (input_settings, device,
input_settings_class->set_click_method,
method);
}
else
{
settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
(ConfigUintFunc) input_settings_class->set_click_method,
method);
}
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
update_touchpad_send_events (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
GDesktopDeviceSendEvents mode;
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device &&
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
mode = g_settings_get_enum (priv->touchpad_settings, "send-events");
if (device)
{
settings_device_set_uint_setting (input_settings, device,
input_settings_class->set_send_events,
mode);
}
else
{
settings_set_uint_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
input_settings_class->set_send_events,
mode);
}
}
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
gboolean
meta_input_device_is_trackball (ClutterInputDevice *device)
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
{
gboolean is_trackball;
char *name;
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
return FALSE;
name = g_ascii_strdown (clutter_input_device_get_device_name (device), -1);
is_trackball = strstr (name, "trackball") != NULL;
g_free (name);
return is_trackball;
}
static void
update_trackball_scroll_button (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
guint button;
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
if (device && !meta_input_device_is_trackball (device))
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
return;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
input-settings: Silence a glib critical The scroll-wheel-emulation-button key is 'i' in the schema but it also specifies a minimum range of 0 so using get_int() and casting is safe.
2015-04-14 16:27:52 +00:00
/* This key is 'i' in the schema but it also specifies a minimum
* range of 0 so the cast here is safe. */
button = (guint) g_settings_get_int (priv->trackball_settings, "scroll-wheel-emulation-button");
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
backend: Apply the right settings to the right input devices Since 8769b3d55, the checks performed on which update_* function was called for each device got quite more lax, leading to failed asserts on code that assumed the previous behavior. Change update_[mouse|touchpad|trackball]_* to bail out early if the device received has not the right type, and remove the asserts. https://bugzilla.gnome.org/show_bug.cgi?id=747886
2015-04-15 11:05:53 +00:00
if (device)
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
{
input_settings_class->set_scroll_button (input_settings, device, button);
}
else if (!device)
{
const GSList *devices;
devices = clutter_device_manager_peek_devices (priv->device_manager);
while (devices)
{
Avoid shadowing existing variables
2015-09-23 23:24:33 +00:00
device = devices->data;
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
if (meta_input_device_is_trackball (device))
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
input_settings_class->set_scroll_button (input_settings, device, button);
devices = devices->next;
}
}
}
static void
update_keyboard_repeat (MetaInputSettings *input_settings)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
guint delay, interval;
gboolean repeat;
priv = meta_input_settings_get_instance_private (input_settings);
repeat = g_settings_get_boolean (priv->keyboard_settings, "repeat");
delay = g_settings_get_uint (priv->keyboard_settings, "delay");
interval = g_settings_get_uint (priv->keyboard_settings, "repeat-interval");
meta-input-settings: Avoid setting key repeat delay or interval to 0 Since doing so causes either errors or misbehavior. https://bugzilla.gnome.org/show_bug.cgi?id=776919
2017-01-09 18:55:38 +00:00
delay = MAX (1, delay);
interval = MAX (1, interval);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
input_settings_class->set_keyboard_repeat (input_settings,
repeat, delay, interval);
}
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
static gboolean
logical_monitor_has_monitor (MetaMonitorManager *monitor_manager,
MetaLogicalMonitor *logical_monitor,
const char *vendor,
const char *product,
const char *serial)
{
GList *monitors;
GList *l;
backends: Fix typo Instead of checking all MetaMonitors in the monitor manager, we want to look (as the function name says) in the MetaMonitors contained in the given logical monitor. Otherwise, it will return TRUE for every logical monitor, given we are querying for an existing EDID. https://bugzilla.gnome.org/show_bug.cgi?id=782032
2017-06-16 17:17:44 +00:00
monitors = meta_logical_monitor_get_monitors (logical_monitor);
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
for (l = monitors; l; l = l->next)
{
MetaMonitor *monitor = l->data;
if (g_strcmp0 (meta_monitor_get_vendor (monitor), vendor) == 0 &&
g_strcmp0 (meta_monitor_get_product (monitor), product) == 0 &&
g_strcmp0 (meta_monitor_get_serial (monitor), serial) == 0)
return TRUE;
}
return FALSE;
}
static MetaLogicalMonitor *
meta_input_settings_find_logical_monitor (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
{
MetaInputSettingsPrivate *priv;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaMonitorManager *monitor_manager;
meta-input-settings: Fix strv memleak in find_logical_monitor() The return value from g_settings_get_strv must be g_strfreev-ed. https://bugzilla.gnome.org/show_bug.cgi?id=787836
2017-09-18 10:34:14 +00:00
MetaLogicalMonitor *ret = NULL;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
guint n_values;
GList *logical_monitors;
GList *l;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
gchar **edid;
priv = meta_input_settings_get_instance_private (input_settings);
edid = g_settings_get_strv (settings, "display");
n_values = g_strv_length (edid);
if (n_values != 3)
{
g_warning ("EDID configuration for device '%s' "
"is incorrect, must have 3 values",
clutter_input_device_get_device_name (device));
meta-input-settings: Fix strv memleak in find_logical_monitor() The return value from g_settings_get_strv must be g_strfreev-ed. https://bugzilla.gnome.org/show_bug.cgi?id=787836
2017-09-18 10:34:14 +00:00
goto out;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
if (!*edid[0] && !*edid[1] && !*edid[2])
meta-input-settings: Fix strv memleak in find_logical_monitor() The return value from g_settings_get_strv must be g_strfreev-ed. https://bugzilla.gnome.org/show_bug.cgi?id=787836
2017-09-18 10:34:14 +00:00
goto out;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
monitor_manager = priv->monitor_manager;
logical_monitors =
meta_monitor_manager_get_logical_monitors (monitor_manager);
for (l = logical_monitors; l; l = l->next)
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
{
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaLogicalMonitor *logical_monitor = l->data;
if (logical_monitor_has_monitor (monitor_manager,
logical_monitor,
edid[0],
edid[1],
edid[2]))
meta-input-settings: Fix strv memleak in find_logical_monitor() The return value from g_settings_get_strv must be g_strfreev-ed. https://bugzilla.gnome.org/show_bug.cgi?id=787836
2017-09-18 10:34:14 +00:00
{
ret = logical_monitor;
break;
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
meta-input-settings: Fix strv memleak in find_logical_monitor() The return value from g_settings_get_strv must be g_strfreev-ed. https://bugzilla.gnome.org/show_bug.cgi?id=787836
2017-09-18 10:34:14 +00:00
out:
g_strfreev (edid);
return ret;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
static void
update_tablet_keep_aspect (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaLogicalMonitor *logical_monitor = NULL;
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
gboolean keep_aspect;
backends: extend tablet device checks The Clutter X11 backend can't drop CLUTTER_PEN_DEVICE and CLUTTER_ERASER_DEVICE in favor of CLUTTER_TABLET_DEVICE without losing information (as the driver will create one device for each). So make MetaInputSettings cater for both sets of device types. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:57:01 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
return;
backends: Perform libwacom checks before applying settings Some settings make no sense on external tablets, and others make no sense in display/system-integrated tablets. Perform those checks so we don't end up with possibly broken configuration.
2016-06-22 13:44:14 +00:00
#ifdef HAVE_LIBWACOM
{
WacomDevice *wacom_device;
wacom_device = meta_input_settings_get_tablet_wacom_device (input_settings,
device);
/* Keep aspect only makes sense in external tablets */
if (wacom_device &&
libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE)
return;
}
#endif
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
backends: Disable keep-aspect and output mapping on relative devices Those settings make no sense there, so should be made ineffective.
2016-06-22 13:42:11 +00:00
if (clutter_input_device_get_mapping_mode (device) ==
CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
{
keep_aspect = g_settings_get_boolean (settings, "keep-aspect");
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor = meta_input_settings_find_logical_monitor (input_settings,
settings,
device);
backends: Disable keep-aspect and output mapping on relative devices Those settings make no sense there, so should be made ineffective.
2016-06-22 13:42:11 +00:00
}
else
{
keep_aspect = FALSE;
}
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
input_settings_class->set_tablet_keep_aspect (input_settings, device,
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor, keep_aspect);
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
static void
update_device_display (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
MetaInputSettingsPrivate *priv;
gfloat matrix[6] = { 1, 0, 0, 0, 1, 0 };
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaLogicalMonitor *logical_monitor;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
backends: extend tablet device checks The Clutter X11 backend can't drop CLUTTER_PEN_DEVICE and CLUTTER_ERASER_DEVICE in favor of CLUTTER_TABLET_DEVICE without losing information (as the driver will create one device for each). So make MetaInputSettings cater for both sets of device types. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:57:01 +00:00
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE &&
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
clutter_input_device_get_device_type (device) != CLUTTER_TOUCHSCREEN_DEVICE)
return;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
backends: Disable keep-aspect and output mapping on relative devices Those settings make no sense there, so should be made ineffective.
2016-06-22 13:42:11 +00:00
/* If mapping is relative, the device can move on all displays */
backend: Set mapping-mode on X11 pen/eraser devices And use it in the generic code for the checks about whether mapping to an specific display applies or not. https://bugzilla.gnome.org/show_bug.cgi?id=784402
2017-06-30 10:19:25 +00:00
if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
backends: Disable keep-aspect and output mapping on relative devices Those settings make no sense there, so should be made ineffective.
2016-06-22 13:42:11 +00:00
clutter_input_device_get_mapping_mode (device) ==
CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor = meta_input_settings_find_logical_monitor (input_settings,
settings,
device);
backends: Disable keep-aspect and output mapping on relative devices Those settings make no sense there, so should be made ineffective.
2016-06-22 13:42:11 +00:00
else
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor = NULL;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
if (logical_monitor)
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
meta_monitor_manager_get_monitor_matrix (priv->monitor_manager,
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor, matrix);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
input_settings_class->set_matrix (input_settings, device, matrix);
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
/* Ensure the keep-aspect mapping is updated */
update_tablet_keep_aspect (input_settings, settings, device);
}
static void
update_tablet_mapping (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
GDesktopTabletMapping mapping;
backends: extend tablet device checks The Clutter X11 backend can't drop CLUTTER_PEN_DEVICE and CLUTTER_ERASER_DEVICE in favor of CLUTTER_TABLET_DEVICE without losing information (as the driver will create one device for each). So make MetaInputSettings cater for both sets of device types. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:57:01 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
return;
backends: Perform libwacom checks before applying settings Some settings make no sense on external tablets, and others make no sense in display/system-integrated tablets. Perform those checks so we don't end up with possibly broken configuration.
2016-06-22 13:44:14 +00:00
#ifdef HAVE_LIBWACOM
{
WacomDevice *wacom_device;
wacom_device = meta_input_settings_get_tablet_wacom_device (input_settings,
device);
/* Tablet mapping only makes sense on external tablets */
if (wacom_device &&
(libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE))
return;
}
#endif
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
mapping = g_settings_get_enum (settings, "mapping");
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
settings_device_set_uint_setting (input_settings, device,
input_settings_class->set_tablet_mapping,
mapping);
/* Relative mapping disables keep-aspect/display */
update_tablet_keep_aspect (input_settings, settings, device);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
update_device_display (input_settings, settings, device);
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
}
static void
update_tablet_area (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
GVariant *variant;
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
const gdouble *area;
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
gsize n_elems;
backends: extend tablet device checks The Clutter X11 backend can't drop CLUTTER_PEN_DEVICE and CLUTTER_ERASER_DEVICE in favor of CLUTTER_TABLET_DEVICE without losing information (as the driver will create one device for each). So make MetaInputSettings cater for both sets of device types. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:57:01 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
return;
backends: Perform libwacom checks before applying settings Some settings make no sense on external tablets, and others make no sense in display/system-integrated tablets. Perform those checks so we don't end up with possibly broken configuration.
2016-06-22 13:44:14 +00:00
#ifdef HAVE_LIBWACOM
{
WacomDevice *wacom_device;
wacom_device = meta_input_settings_get_tablet_wacom_device (input_settings,
device);
/* Tablet area only makes sense on system/display integrated tablets */
if (wacom_device &&
(libwacom_get_integration_flags (wacom_device) &
(WACOM_DEVICE_INTEGRATED_SYSTEM | WACOM_DEVICE_INTEGRATED_DISPLAY)) == 0)
return;
}
#endif
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
variant = g_settings_get_value (settings, "area");
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
area = g_variant_get_fixed_array (variant, &n_elems, sizeof (gdouble));
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
if (n_elems == 4)
{
input_settings_class->set_tablet_area (input_settings, device,
area[0], area[1],
area[2], area[3]);
}
g_variant_unref (variant);
}
static void
update_tablet_left_handed (MetaInputSettings *input_settings,
GSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *input_settings_class;
gboolean enabled;
backends: extend tablet device checks The Clutter X11 backend can't drop CLUTTER_PEN_DEVICE and CLUTTER_ERASER_DEVICE in favor of CLUTTER_TABLET_DEVICE without losing information (as the driver will create one device for each). So make MetaInputSettings cater for both sets of device types. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:57:01 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PAD_DEVICE)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
return;
backends: Perform libwacom checks before applying settings Some settings make no sense on external tablets, and others make no sense in display/system-integrated tablets. Perform those checks so we don't end up with possibly broken configuration.
2016-06-22 13:44:14 +00:00
#ifdef HAVE_LIBWACOM
{
WacomDevice *wacom_device;
wacom_device = meta_input_settings_get_tablet_wacom_device (input_settings,
device);
/* Left handed mode only makes sense on external tablets */
if (wacom_device &&
(libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE))
return;
}
#endif
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
enabled = g_settings_get_boolean (settings, "left-handed");
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
settings_device_set_bool_setting (input_settings, device,
input_settings_class->set_left_handed,
enabled);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
meta_input_settings_changed_cb (GSettings *settings,
const char *key,
gpointer user_data)
{
MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
if (settings == priv->mouse_settings)
{
if (strcmp (key, "left-handed") == 0)
update_mouse_left_handed (input_settings, NULL);
else if (strcmp (key, "speed") == 0)
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_device_speed (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
else if (strcmp (key, "natural-scroll") == 0)
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_device_natural_scroll (input_settings, NULL);
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
else if (strcmp (key, "accel-profile") == 0)
update_pointer_accel_profile (input_settings, settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
else if (settings == priv->touchpad_settings)
{
if (strcmp (key, "left-handed") == 0)
update_touchpad_left_handed (input_settings, NULL);
else if (strcmp (key, "speed") == 0)
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_device_speed (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
else if (strcmp (key, "natural-scroll") == 0)
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_device_natural_scroll (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
else if (strcmp (key, "tap-to-click") == 0)
update_touchpad_tap_enabled (input_settings, NULL);
Add tag-and-drag setting from libinput into mutter The problem is that libinput offers the possibility to not enabled dragging when tap-to-click is enabled but mutter doesn't. For people who have a sensitive touchpad and who like tap-to-click option, dragging is launched even when you don't want it : for example, when you select a folder, most of the time the folder is dragging whereas just selected or when you want to select some lines of a text file, several lines are moved as a cut-paste which is not expected and erase datas. To fix it, you need to have the possibility to desactivate the drag option when you use tap-to-click in mutter. Because it's already a specification of libinput, it remains to add it to mutter. Implementation with X11 is added too. https://bugzilla.gnome.org/show_bug.cgi?id=775755
2017-08-17 23:00:10 +00:00
else if (strcmp (key, "tap-and_drag") == 0)
update_touchpad_tap_and_drag_enabled (input_settings, NULL);
Implements disable-while-typing in mutter. Disable-while-typing disables the touchpad while the user is typing. This patch introduces the necessary backend code to implement the org.gnome.desktop.peripherals.touchpad.disable-while-typing setting of gsettings-desktop-schemas which was implemented in commit 4c5b1c1df399d6afaaccb237e299ccd1d5d29ddd and released as part of 3.24. This is known as dwt in libinput. This patch has been tested on X11 and Wayland. https://bugzilla.gnome.org/show_bug.cgi?id=764852
2017-05-23 13:38:00 +00:00
else if (strcmp(key, "disable-while-typing") == 0)
update_touchpad_disable_while_typing (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
else if (strcmp (key, "send-events") == 0)
update_touchpad_send_events (input_settings, NULL);
backends: Force 2-finger scroll by default if available When the touchpad is two-finger scrolling capable, always enable it. When the touchpad only supports edge scrolling (usually older devices, and usually smaller devices), allow disabling the edge scrolling. This requires a newer gsettings-desktop-schemas as the scroll-method key was removed, and the edge-scroll-enabled key added. https://bugzilla.gnome.org/show_bug.cgi?id=759304
2015-12-11 11:32:46 +00:00
else if (strcmp (key, "edge-scrolling-enabled") == 0)
update_touchpad_edge_scroll (input_settings, NULL);
backends: Re-add support for edge scrolling with some touchpads Add support for setting edge-scrolling separately from two-finger scrolling. We now have 2 separate boolean settings for those, with the Mouse panel in gnome-control-center allowing to set only one of those at a time, but nothing precludes both being set in the configuration. We need to handle: - two-finger-scrolling-enabled and edge-scrolling-enabled settings both being set. - those 2 settings being change out-of-order - two-finger-scrolling being set on a device that doesn't support it - edge-scrolling-enabled on a device that doesn't support it And the combinations of one touchpad supporting just one of edge scrolling and two-finger scrolling and another vice-versa. https://bugzilla.gnome.org/show_bug.cgi?id=768245
2016-06-30 12:27:23 +00:00
else if (strcmp (key, "two-finger-scrolling-enabled") == 0)
update_touchpad_two_finger_scroll (input_settings, NULL);
backend: Add set_click_method MetaInputSettings vfunc This will configure the libinput_config_click_method for touchpads. https://bugzilla.gnome.org/show_bug.cgi?id=746290
2015-03-16 14:25:59 +00:00
else if (strcmp (key, "click-method") == 0)
update_touchpad_click_method (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
else if (settings == priv->trackball_settings)
{
if (strcmp (key, "scroll-wheel-emulation-button") == 0)
update_trackball_scroll_button (input_settings, NULL);
settings: Support mouse and trackball accel profile Support changing the mouse and trackball acceleration profile. This makes it possible to for example disable pointer acceleration by choosing the 'flat' profile. This adds an optional dependency on gudev. Gudev is used by the X11 backend to detect whether a device is a mouse or not. Without gudev support, the accel profile settings has have effect for mouse devices. Trackball still uses the "strstr" approach, since udev doesn't support tagging devices as trackball devices yet. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-04-07 07:44:28 +00:00
else if (strcmp (key, "accel-profile") == 0)
update_pointer_accel_profile (input_settings, settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
else if (settings == priv->keyboard_settings)
{
if (strcmp (key, "repeat") == 0 ||
strcmp (key, "repeat-interval") == 0 ||
strcmp (key, "delay") == 0)
update_keyboard_repeat (input_settings);
}
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
static void
mapped_device_changed_cb (GSettings *settings,
const gchar *key,
DeviceMappingInfo *info)
{
if (strcmp (key, "display") == 0)
update_device_display (info->input_settings, settings, info->device);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
else if (strcmp (key, "mapping") == 0)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
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);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
else if (strcmp (key, "left-handed") == 0)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
update_tablet_left_handed (info->input_settings, settings, info->device);
}
static void
apply_mappable_device_settings (MetaInputSettings *input_settings,
DeviceMappingInfo *info)
{
backends: Apply tablet settings on all tablet device types during startup This skipped the device types that are in use on X11. https://bugzilla.gnome.org/show_bug.cgi?id=782027
2017-06-30 09:45:48 +00:00
ClutterInputDeviceType device_type;
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
update_device_display (input_settings, info->settings, info->device);
backends: Apply tablet settings on all tablet device types during startup This skipped the device types that are in use on X11. https://bugzilla.gnome.org/show_bug.cgi?id=782027
2017-06-30 09:45:48 +00:00
device_type = clutter_input_device_get_device_type (info->device);
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
backends: Apply tablet settings on all tablet device types during startup This skipped the device types that are in use on X11. https://bugzilla.gnome.org/show_bug.cgi?id=782027
2017-06-30 09:45:48 +00:00
if (device_type == CLUTTER_TABLET_DEVICE ||
device_type == CLUTTER_PEN_DEVICE ||
device_type == CLUTTER_ERASER_DEVICE ||
device_type == CLUTTER_PAD_DEVICE)
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
{
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
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);
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
static GSettings *
lookup_device_settings (ClutterInputDevice *device)
{
const gchar *group, *schema, *vendor, *product;
ClutterInputDeviceType type;
GSettings *settings;
gchar *path;
type = clutter_input_device_get_device_type (device);
if (type == CLUTTER_TOUCHSCREEN_DEVICE)
{
group = "touchscreens";
schema = "org.gnome.desktop.peripherals.touchscreen";
}
else if (type == CLUTTER_TABLET_DEVICE ||
type == CLUTTER_PEN_DEVICE ||
type == CLUTTER_ERASER_DEVICE ||
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
type == CLUTTER_CURSOR_DEVICE ||
type == CLUTTER_PAD_DEVICE)
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
{
group = "tablets";
schema = "org.gnome.desktop.peripherals.tablet";
}
else
return NULL;
vendor = clutter_input_device_get_vendor_id (device);
product = clutter_input_device_get_product_id (device);
path = g_strdup_printf ("/org/gnome/desktop/peripherals/%s/%s:%s/",
group, vendor, product);
settings = g_settings_new_with_path (schema, path);
g_free (path);
return settings;
}
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
static GSettings *
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
lookup_tool_settings (ClutterInputDeviceTool *tool,
ClutterInputDevice *device)
{
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
GSettings *tool_settings;
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
guint64 serial;
gchar *path;
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
tool_settings = g_object_get_qdata (G_OBJECT (tool), quark_tool_settings);
if (tool_settings)
return tool_settings;
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
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);
}
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
tool_settings =
g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.stylus",
path);
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
g_object_set_qdata_full (G_OBJECT (tool), quark_tool_settings, tool_settings,
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
(GDestroyNotify) g_object_unref);
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
g_free (path);
return tool_settings;
}
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
static GSettings *
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
lookup_pad_action_settings (ClutterInputDevice *device,
MetaPadActionType action,
guint number,
MetaPadDirection direction,
gint mode)
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
{
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
const gchar *vendor, *product, *action_type, *detail_type = NULL;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
GSettings *settings;
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
GString *path;
gchar action_label;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
vendor = clutter_input_device_get_vendor_id (device);
product = clutter_input_device_get_product_id (device);
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
action_label = 'A' + number;
switch (action)
{
case META_PAD_ACTION_BUTTON:
action_type = "button";
break;
case META_PAD_ACTION_RING:
g_assert (direction == META_PAD_DIRECTION_CW ||
direction == META_PAD_DIRECTION_CCW);
action_type = "ring";
detail_type = (direction == META_PAD_DIRECTION_CW) ? "cw" : "ccw";
break;
case META_PAD_ACTION_STRIP:
g_assert (direction == META_PAD_DIRECTION_UP ||
direction == META_PAD_DIRECTION_DOWN);
action_type = "strip";
detail_type = (direction == META_PAD_DIRECTION_UP) ? "up" : "down";
break;
default:
return NULL;
}
path = g_string_new (NULL);
g_string_append_printf (path, "/org/gnome/desktop/peripherals/tablets/%s:%s/%s%c",
vendor, product, action_type, action_label);
if (detail_type)
g_string_append_printf (path, "-%s", detail_type);
if (mode >= 0)
g_string_append_printf (path, "-mode-%d", mode);
g_string_append_c (path, '/');
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
settings = g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.pad-button",
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
path->str);
g_string_free (path, TRUE);
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
return settings;
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
static void
monitors_changed_cb (MetaMonitorManager *monitor_manager,
MetaInputSettings *input_settings)
{
MetaInputSettingsPrivate *priv;
ClutterInputDevice *device;
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
DeviceMappingInfo *info;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
GHashTableIter iter;
priv = meta_input_settings_get_instance_private (input_settings);
g_hash_table_iter_init (&iter, priv->mappable_devices);
while (g_hash_table_iter_next (&iter, (gpointer *) &device,
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
(gpointer *) &info))
update_device_display (input_settings, info->settings, device);
}
static void
device_mapping_info_free (DeviceMappingInfo *info)
{
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
#ifdef HAVE_LIBWACOM
if (info->wacom_device)
libwacom_destroy (info->wacom_device);
#endif
backends: Fix dangling callback not being disconnected This fixes possible crashes if configuration is changed on a device that was added and then removed. https://bugzilla.gnome.org/show_bug.cgi?id=784881
2017-07-12 10:24:16 +00:00
g_signal_handler_disconnect (info->settings, info->changed_id);
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
g_object_unref (info->settings);
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
g_free (info->group_modes);
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
g_slice_free (DeviceMappingInfo, info);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
static gboolean
check_add_mappable_device (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
backends: Add envvar to disable wacom configuration People that relied on xsetwacom to configure their tablets used to get away with this by disabling the wacom g-s-d plugin prior to running their scripts. This is not possible anymore with mutter managing device configuration. Given that X11 shall not go away soon and there's a core of stubbornly accustomed users, provide a MUTTER_DISABLE_WACOM_CONFIGURATION envvar to provide *some* way to do this.
2017-10-03 22:42:39 +00:00
ClutterInputDeviceType device_type;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
GSettings *settings;
backends: Add envvar to disable wacom configuration People that relied on xsetwacom to configure their tablets used to get away with this by disabling the wacom g-s-d plugin prior to running their scripts. This is not possible anymore with mutter managing device configuration. Given that X11 shall not go away soon and there's a core of stubbornly accustomed users, provide a MUTTER_DISABLE_WACOM_CONFIGURATION envvar to provide *some* way to do this.
2017-10-03 22:42:39 +00:00
device_type = clutter_input_device_get_device_type (device);
if ((device_type == CLUTTER_TABLET_DEVICE ||
device_type == CLUTTER_PEN_DEVICE ||
device_type == CLUTTER_ERASER_DEVICE ||
device_type == CLUTTER_PAD_DEVICE) &&
g_getenv ("MUTTER_DISABLE_WACOM_CONFIGURATION") != NULL)
return FALSE;
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
settings = lookup_device_settings (device);
if (!settings)
return FALSE;
priv = meta_input_settings_get_instance_private (input_settings);
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
info = g_slice_new0 (DeviceMappingInfo);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
info->input_settings = input_settings;
info->device = device;
info->settings = settings;
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
#ifdef HAVE_LIBWACOM
backends: Add envvar to disable wacom configuration People that relied on xsetwacom to configure their tablets used to get away with this by disabling the wacom g-s-d plugin prior to running their scripts. This is not possible anymore with mutter managing device configuration. Given that X11 shall not go away soon and there's a core of stubbornly accustomed users, provide a MUTTER_DISABLE_WACOM_CONFIGURATION envvar to provide *some* way to do this.
2017-10-03 22:42:39 +00:00
if (device_type == CLUTTER_TABLET_DEVICE ||
device_type == CLUTTER_PAD_DEVICE)
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
{
WacomError *error = libwacom_error_new ();
info->wacom_device = libwacom_new_from_path (priv->wacom_db,
clutter_input_device_get_device_node (device),
WFALLBACK_NONE, error);
if (!info->wacom_device)
{
g_warning ("Could not get tablet information for '%s': %s",
clutter_input_device_get_device_name (device),
libwacom_error_get_message (error));
}
libwacom_error_free (&error);
}
#endif
backends: Add envvar to disable wacom configuration People that relied on xsetwacom to configure their tablets used to get away with this by disabling the wacom g-s-d plugin prior to running their scripts. This is not possible anymore with mutter managing device configuration. Given that X11 shall not go away soon and there's a core of stubbornly accustomed users, provide a MUTTER_DISABLE_WACOM_CONFIGURATION envvar to provide *some* way to do this.
2017-10-03 22:42:39 +00:00
if (device_type == CLUTTER_PAD_DEVICE)
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
{
info->group_modes =
g_new0 (guint, clutter_input_device_get_n_mode_groups (device));
}
backends: Fix dangling callback not being disconnected This fixes possible crashes if configuration is changed on a device that was added and then removed. https://bugzilla.gnome.org/show_bug.cgi?id=784881
2017-07-12 10:24:16 +00:00
info->changed_id = g_signal_connect (settings, "changed",
G_CALLBACK (mapped_device_changed_cb),
info);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
g_hash_table_insert (priv->mappable_devices, device, info);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
backends: Map tablets/pads, and wire to configuration vfuncs With this, the left-handed setting works. The other configuration vfuncs remain empty stubs, but will be correctly applied when those are handled.
2016-05-13 10:17:00 +00:00
apply_mappable_device_settings (input_settings, info);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
return TRUE;
}
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
static void
apply_device_settings (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettings: Initialize the accel-profile setting Shouldn't just update them when they change; they also need to be set when initializing. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-07-29 01:28:18 +00:00
MetaInputSettingsPrivate *priv =
meta_input_settings_get_instance_private (input_settings);
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_device_speed (input_settings, device);
update_device_natural_scroll (input_settings, device);
MetaInputSettings: Don't initialize the same setting twice Two settings were set twice on the same device. Now instead group the generic update functions together, removing the redundant calls. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-07-29 01:26:55 +00:00
update_mouse_left_handed (input_settings, device);
MetaInputSettings: Initialize the accel-profile setting Shouldn't just update them when they change; they also need to be set when initializing. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-07-29 01:28:18 +00:00
update_pointer_accel_profile (input_settings,
priv->mouse_settings,
device);
MetaInputSettings: Don't initialize the same setting twice Two settings were set twice on the same device. Now instead group the generic update functions together, removing the redundant calls. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-07-29 01:26:55 +00:00
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_touchpad_left_handed (input_settings, device);
update_touchpad_tap_enabled (input_settings, device);
Add tag-and-drag setting from libinput into mutter The problem is that libinput offers the possibility to not enabled dragging when tap-to-click is enabled but mutter doesn't. For people who have a sensitive touchpad and who like tap-to-click option, dragging is launched even when you don't want it : for example, when you select a folder, most of the time the folder is dragging whereas just selected or when you want to select some lines of a text file, several lines are moved as a cut-paste which is not expected and erase datas. To fix it, you need to have the possibility to desactivate the drag option when you use tap-to-click in mutter. Because it's already a specification of libinput, it remains to add it to mutter. Implementation with X11 is added too. https://bugzilla.gnome.org/show_bug.cgi?id=775755
2017-08-17 23:00:10 +00:00
update_touchpad_tap_and_drag_enabled (input_settings, device);
Implements disable-while-typing in mutter. Disable-while-typing disables the touchpad while the user is typing. This patch introduces the necessary backend code to implement the org.gnome.desktop.peripherals.touchpad.disable-while-typing setting of gsettings-desktop-schemas which was implemented in commit 4c5b1c1df399d6afaaccb237e299ccd1d5d29ddd and released as part of 3.24. This is known as dwt in libinput. This patch has been tested on X11 and Wayland. https://bugzilla.gnome.org/show_bug.cgi?id=764852
2017-05-23 13:38:00 +00:00
update_touchpad_disable_while_typing (input_settings, device);
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_touchpad_send_events (input_settings, device);
backends: Re-add support for edge scrolling with some touchpads Add support for setting edge-scrolling separately from two-finger scrolling. We now have 2 separate boolean settings for those, with the Mouse panel in gnome-control-center allowing to set only one of those at a time, but nothing precludes both being set in the configuration. We need to handle: - two-finger-scrolling-enabled and edge-scrolling-enabled settings both being set. - those 2 settings being change out-of-order - two-finger-scrolling being set on a device that doesn't support it - edge-scrolling-enabled on a device that doesn't support it And the combinations of one touchpad supporting just one of edge scrolling and two-finger scrolling and another vice-versa. https://bugzilla.gnome.org/show_bug.cgi?id=768245
2016-06-30 12:27:23 +00:00
update_touchpad_two_finger_scroll (input_settings, device);
backends: Update two-finger scrolling before edge scrolling As whether edge scrolling is enabled depends on whether two-finger scrolling is disabled, make sure to update two-finger scrolling first. Note that this only fixes the problem on startup. Changing the settings in GSettings directly might cause an inconsistent state, but the main UI for this setting, gnome-control-center, makes sure to update two-finger scrolling before edge scrolling. https://bugzilla.gnome.org/show_bug.cgi?id=769276
2016-08-05 09:58:24 +00:00
update_touchpad_edge_scroll (input_settings, device);
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
update_touchpad_click_method (input_settings, device);
update_trackball_scroll_button (input_settings, device);
MetaInputSettings: Initialize the accel-profile setting Shouldn't just update them when they change; they also need to be set when initializing. https://bugzilla.gnome.org/show_bug.cgi?id=769179
2016-07-29 01:28:18 +00:00
update_pointer_accel_profile (input_settings,
priv->trackball_settings,
device);
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
}
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
static void
update_stylus_pressure (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ClutterInputDeviceTool *tool)
{
MetaInputSettingsClass *input_settings_class;
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
GSettings *tool_settings;
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
const gint32 *curve;
GVariant *variant;
gsize n_elems;
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
return;
if (!tool)
return;
tool_settings = lookup_tool_settings (tool, device);
if (clutter_input_device_tool_get_tool_type (tool) ==
CLUTTER_INPUT_DEVICE_TOOL_ERASER)
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
variant = g_settings_get_value (tool_settings, "eraser-pressure-curve");
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
else
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
variant = g_settings_get_value (tool_settings, "pressure-curve");
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
curve = g_variant_get_fixed_array (variant, &n_elems, sizeof (gint32));
if (n_elems != 4)
return;
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
input_settings_class->set_stylus_pressure (input_settings, device, tool, curve);
}
static void
update_stylus_buttonmap (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ClutterInputDeviceTool *tool)
{
MetaInputSettingsClass *input_settings_class;
GDesktopStylusButtonAction primary, secondary;
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
GSettings *tool_settings;
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_PEN_DEVICE &&
clutter_input_device_get_device_type (device) != CLUTTER_ERASER_DEVICE)
return;
if (!tool)
return;
tool_settings = lookup_tool_settings (tool, device);
backends: Remove ToolSettings struct Its only purpose was caching settings applying to an stylus/tool, this is now handled through ClutterInputDeviceTool evdev specific API, or X device properties, so is not needed anymore. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-11-01 16:19:13 +00:00
primary = g_settings_get_enum (tool_settings, "button-action");
secondary = g_settings_get_enum (tool_settings, "secondary-button-action");
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
input_settings_class->set_stylus_button_map (input_settings, device, tool,
primary, secondary);
}
static void
apply_stylus_settings (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ClutterInputDeviceTool *tool)
{
update_stylus_pressure (input_settings, device, tool);
update_stylus_buttonmap (input_settings, device, tool);
}
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
static void
evaluate_two_finger_scrolling (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsClass *klass;
MetaInputSettingsPrivate *priv;
if (clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
return;
klass = META_INPUT_SETTINGS_GET_CLASS (input_settings);
priv = meta_input_settings_get_instance_private (input_settings);
if (klass->has_two_finger_scroll (input_settings, device))
g_hash_table_add (priv->two_finger_devices, device);
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
static void
meta_input_settings_device_added (ClutterDeviceManager *device_manager,
ClutterInputDevice *device,
MetaInputSettings *input_settings)
{
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
return;
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
evaluate_two_finger_scrolling (input_settings, device);
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
apply_device_settings (input_settings, device);
check_add_mappable_device (input_settings, device);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
static void
meta_input_settings_device_removed (ClutterDeviceManager *device_manager,
ClutterInputDevice *device,
MetaInputSettings *input_settings)
{
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
MetaInputSettingsPrivate *priv;
priv = meta_input_settings_get_instance_private (input_settings);
g_hash_table_remove (priv->mappable_devices, device);
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
if (g_hash_table_remove (priv->two_finger_devices, device) &&
g_hash_table_size (priv->two_finger_devices) == 0)
apply_device_settings (input_settings, NULL);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
}
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
static void
meta_input_settings_tool_changed (ClutterDeviceManager *device_manager,
ClutterInputDevice *device,
ClutterInputDeviceTool *tool,
MetaInputSettings *input_settings)
{
if (!tool)
return;
apply_stylus_settings (input_settings, device, tool);
}
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
static void
check_mappable_devices (MetaInputSettings *input_settings)
{
MetaInputSettingsPrivate *priv;
const GSList *devices, *l;
priv = meta_input_settings_get_instance_private (input_settings);
devices = clutter_device_manager_peek_devices (priv->device_manager);
for (l = devices; l; l = l->next)
{
ClutterInputDevice *device = l->data;
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER)
continue;
check_add_mappable_device (input_settings, device);
}
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
static void
meta_input_settings_constructed (GObject *object)
{
MetaInputSettings *input_settings = META_INPUT_SETTINGS (object);
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
GSList *devices, *d;
devices = meta_input_settings_get_devices (input_settings, CLUTTER_TOUCHPAD_DEVICE);
for (d = devices; d; d = d->next)
evaluate_two_finger_scrolling (input_settings, d->data);
g_slist_free (devices);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
input-settings: Ensure that we always apply the same set of settings This makes the hotplug and coldplug paths the same so that we don't miss out on any setting. https://bugzilla.gnome.org/show_bug.cgi?id=747434
2015-04-14 13:27:47 +00:00
apply_device_settings (input_settings, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
update_keyboard_repeat (input_settings);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
check_mappable_devices (input_settings);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
static void
meta_input_settings_class_init (MetaInputSettingsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = meta_input_settings_dispose;
object_class->constructed = meta_input_settings_constructed;
backends: Add function to retrieve the action mapped to an stylus button This function will be useful for the wayland implementation, because buttons are mapped at the time of sending those through the wire. As x11/wayland implementations differ here, this function will be useful for the wayland implementation, as the action is handled lat
2016-06-22 13:48:07 +00:00
quark_tool_settings =
g_quark_from_static_string ("meta-input-settings-tool-settings");
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
static void
meta_input_settings_init (MetaInputSettings *settings)
{
MetaInputSettingsPrivate *priv;
priv = meta_input_settings_get_instance_private (settings);
priv->device_manager = clutter_device_manager_get_default ();
g_signal_connect (priv->device_manager, "device-added",
G_CALLBACK (meta_input_settings_device_added), settings);
g_signal_connect (priv->device_manager, "device-removed",
G_CALLBACK (meta_input_settings_device_removed), settings);
clutter/evdev: Take over stylus configuration Stylus configuration (stylus buttons, pressure) was handled at the very high level, doing the button and pressure translations right before sending these to wayland clients. However, it makes more sense to store these settings into the ClutterInputDeviceTool itself, and have clutter apply the config at the lower level so 1) the settings actually apply desktop-wide, not just in clients and 2) X11 and wayland may share similar configuration paths. The settings are now just applied whenever the tool enters proximity, in reaction to ClutterDeviceManager::tool-changed. This commit moves all handling of these two settings to the clutter level, and removes the wayland-specific paths https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-31 16:43:38 +00:00
g_signal_connect (priv->device_manager, "tool-changed",
G_CALLBACK (meta_input_settings_tool_changed), settings);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
g_signal_connect (priv->mouse_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings);
priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
g_signal_connect (priv->touchpad_settings, "changed",
G_CALLBACK (meta_input_settings_changed_cb), settings);
priv->trackball_settings = g_settings_new ("org.gnome.desktop.peripherals.trackball");
g_signal_connect (priv->trackball_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);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
input-settings: Set double click timeout from gsettings Clutter's evdev input backend has no support for setting double click timeout set by gnome-settings-daemon. This results in touchpad click events timing out on wayland, because the default timeout value wasn't enough. This patch moves timeout setting to mutter and removes X11 backend specific setting from clutter. https://bugzilla.gnome.org/show_bug.cgi?id=771576
2017-03-21 14:32:35 +00:00
priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
g_settings_bind (priv->gsd_settings, "double-click",
clutter_settings_get_default(), "double-click-time",
G_SETTINGS_BIND_GET);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
priv->mappable_devices =
backends: Store mappable devices' info in the hashtable Instead of as closure data. We will need to store (and query) more per-device info, so access to this struct is necessary.
2016-05-13 12:28:52 +00:00
g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free);
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
backends: add 'monitors-updated-internal' signal to only update internal state Adding an internal signal and use it to update the internal state before emitting "monitors-changed" which will be repeated by the screen to the world. https://bugzilla.gnome.org/show_bug.cgi?id=788860
2017-10-13 00:14:40 +00:00
g_signal_connect (priv->monitor_manager, "monitors-changed-internal",
input-settings: Handle device-to-output mapping For each device that can be mapped (touchscreens, tablets), the output will be fetched from settings and matched with the currently connected ones. If a match is found, the device matrix will be found out from the output configuration and set on the device. This is also updated both individually for newly connected devices, and collectively on output configuration changes. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-12-11 17:14:08 +00:00
G_CALLBACK (monitors_changed_cb), settings);
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
backends: Add missing guards to libwacom calls
2016-07-22 21:05:18 +00:00
#ifdef HAVE_LIBWACOM
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
priv->wacom_db = libwacom_database_new ();
if (!priv->wacom_db)
{
g_warning ("Could not create database of Wacom devices, "
"expect tablets to misbehave");
}
backends: Add missing guards to libwacom calls
2016-07-22 21:05:18 +00:00
#endif
MetaInputSettings: allow edge scrolling without 2fg capable devices We should only force edge scrolling off if two finger is enabled *and* we actually have two finger capable devices. https://bugzilla.gnome.org/show_bug.cgi?id=778554
2017-02-13 13:06:35 +00:00
priv->two_finger_devices = g_hash_table_new (NULL, NULL);
backends: Add MetaInputSettings This object internally keeps track of the relevant input configuration, and goes through its vmethods in order to apply the configuration on the backend-specific devices. So far, only mouse/touchpad settings are actually attached to GSettings changes. ::set_matrix(), meant for tablets/touchscreens, is not hooked yet. One caveat is that meta_input_settings_create() may return NULL if the backend does not own the windowing system (wayland nested on X11 being the one case), and thus device settings can't be changed freely. https://bugzilla.gnome.org/show_bug.cgi?id=739397
2014-10-29 14:30:52 +00:00
}
backends: Export call to retrieve the base GSettings for a tablet
2016-06-29 11:49:20 +00:00
GSettings *
meta_input_settings_get_tablet_settings (MetaInputSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
g_return_val_if_fail (META_IS_INPUT_SETTINGS (settings), NULL);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL);
priv = meta_input_settings_get_instance_private (settings);
info = g_hash_table_lookup (priv->mappable_devices, device);
return info ? g_object_ref (info->settings) : NULL;
}
Rename MetaMonitorInfo MetaLogicalMonitor In preparation for further refactorizations, rename the MetaMonitorInfo struct to MetaLogicalMonitor. Eventually, part of MetaLogicalMonitor will be split into a MetaMonitor type. https://bugzilla.gnome.org/show_bug.cgi?id=777732
2016-11-25 06:31:38 +00:00
MetaLogicalMonitor *
meta_input_settings_get_tablet_logical_monitor (MetaInputSettings *settings,
ClutterInputDevice *device)
backends: Export function to query the mapped MetaMonitorInfo of a tablet Or NULL if the tablet is mapped to the full desktop size.
2016-06-29 11:50:20 +00:00
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
g_return_val_if_fail (META_IS_INPUT_SETTINGS (settings), NULL);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL);
priv = meta_input_settings_get_instance_private (settings);
info = g_hash_table_lookup (priv->mappable_devices, device);
if (!info)
return NULL;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
return meta_input_settings_find_logical_monitor (settings,
info->settings,
device);
backends: Export function to query the mapped MetaMonitorInfo of a tablet Or NULL if the tablet is mapped to the full desktop size.
2016-06-29 11:50:20 +00:00
}
backends: Add function to lookup the mapping for a given tablet At least for wayland, this needs implementing within mutter. So add a function to look this setting up.
2016-05-13 10:18:48 +00:00
GDesktopTabletMapping
meta_input_settings_get_tablet_mapping (MetaInputSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
g_return_val_if_fail (META_IS_INPUT_SETTINGS (settings),
G_DESKTOP_TABLET_MAPPING_ABSOLUTE);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device),
G_DESKTOP_TABLET_MAPPING_ABSOLUTE);
priv = meta_input_settings_get_instance_private (settings);
info = g_hash_table_lookup (priv->mappable_devices, device);
g_return_val_if_fail (info != NULL, G_DESKTOP_TABLET_MAPPING_ABSOLUTE);
return g_settings_get_enum (info->settings, "mapping");
}
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
static GDesktopPadButtonAction
meta_input_settings_get_pad_button_action (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
guint button)
{
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
GDesktopPadButtonAction action;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
GSettings *settings;
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings),
G_DESKTOP_PAD_BUTTON_ACTION_NONE);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad),
G_DESKTOP_PAD_BUTTON_ACTION_NONE);
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
button, META_PAD_DIRECTION_NONE, -1);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
action = g_settings_get_enum (settings, "action");
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
g_object_unref (settings);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
return action;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
}
backends: Fetch libwacom information for tablets in MetaInputSettings Given that information defines largely how such devices are to be configured, it makes sense to have that information at hand. A getter has been also added for the places where it could be useful, although it will require HAVE_LIBWACOM checks in callers too.
2016-05-13 11:20:07 +00:00
#ifdef HAVE_LIBWACOM
WacomDevice *
meta_input_settings_get_tablet_wacom_device (MetaInputSettings *settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
g_return_val_if_fail (META_IS_INPUT_SETTINGS (settings), NULL);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL);
priv = meta_input_settings_get_instance_private (settings);
info = g_hash_table_lookup (priv->mappable_devices, device);
g_return_val_if_fail (info != NULL, NULL);
return info->wacom_device;
}
#endif /* HAVE_LIBWACOM */
backends: Add function to apply pressure sensitivity to tablet tools A bezier curve is created out of the 2 control points in settings, so the pressure is made to follow the stablished curve between 0 and 1.
2016-06-22 13:58:33 +00:00
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
static gboolean
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
cycle_logical_monitors (MetaInputSettings *settings,
MetaLogicalMonitor *current_logical_monitor,
MetaLogicalMonitor **next_logical_monitor)
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
{
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaInputSettingsPrivate *priv =
meta_input_settings_get_instance_private (settings);
MetaMonitorManager *monitor_manager = priv->monitor_manager;
GList *logical_monitors;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
/* We cycle between:
* - the span of all monitors (current_output = NULL)
* - each monitor individually.
*/
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitors =
meta_monitor_manager_get_logical_monitors (monitor_manager);
if (!current_logical_monitor)
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
{
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
*next_logical_monitor = logical_monitors->data;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
}
else
{
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
GList *l;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
l = g_list_find (logical_monitors, current_logical_monitor);
if (l->next)
*next_logical_monitor = l->next->data;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
else
backends: Fix output cycling in non display-attached tablets It would only allow to alternate between the logical monitors, we actually want to return NULL here so it can cycle to the whole span of monitors. https://bugzilla.gnome.org/show_bug.cgi?id=782032
2017-06-16 17:21:18 +00:00
*next_logical_monitor = NULL;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
}
return TRUE;
}
static void
meta_input_settings_cycle_tablet_output (MetaInputSettings *input_settings,
ClutterInputDevice *device)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
MetaLogicalMonitor *logical_monitor;
backends: Notify tablet mapping changes in the UI This takes over the older code in g-s-d. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:08:34 +00:00
const gchar *edid[4] = { 0 }, *pretty_name = NULL;
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
g_return_if_fail (META_IS_INPUT_SETTINGS (input_settings));
g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
g_return_if_fail (clutter_input_device_get_device_type (device) == CLUTTER_TABLET_DEVICE ||
clutter_input_device_get_device_type (device) == CLUTTER_PAD_DEVICE);
priv = meta_input_settings_get_instance_private (input_settings);
info = g_hash_table_lookup (priv->mappable_devices, device);
g_return_if_fail (info != NULL);
#ifdef HAVE_LIBWACOM
backends: Notify tablet mapping changes in the UI This takes over the older code in g-s-d. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:08:34 +00:00
if (info->wacom_device)
{
/* Output rotation only makes sense on external tablets */
if (libwacom_get_integration_flags (info->wacom_device) != WACOM_DEVICE_INTEGRATED_NONE)
return;
pretty_name = libwacom_get_name (info->wacom_device);
}
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
#endif
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
logical_monitor = meta_input_settings_find_logical_monitor (input_settings,
info->settings,
device);
if (!cycle_logical_monitors (input_settings,
logical_monitor,
&logical_monitor))
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
return;
input-settings: Use logical monitors instead of outputs A MetaOutput is a connector, not exactly a monitor or a region on the stage; for example tiled monitors are split up into multiple outputs, and for what is used in input settings, that makes no sense. Change this to use logical monitors instead of outputs. https://bugzilla.gnome.org/show_bug.cgi?id=779745
2017-03-07 04:20:14 +00:00
if (logical_monitor)
{
MetaMonitor *monitor;
/* Pick an arbitrary monitor in the logical monitor to represent it. */
monitor = meta_logical_monitor_get_monitors (logical_monitor)->data;
edid[0] = meta_monitor_get_vendor (monitor);
edid[1] = meta_monitor_get_product (monitor);
edid[2] = meta_monitor_get_serial (monitor);
}
else
{
edid[0] = "";
edid[1] = "";
edid[2] = "";
}
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
g_settings_set_strv (info->settings, "display", edid);
backends: Notify tablet mapping changes in the UI This takes over the older code in g-s-d. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:08:34 +00:00
meta_display_show_tablet_mapping_notification (meta_get_display (),
device, pretty_name);
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
}
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
static void
emulate_modifiers (ClutterVirtualInputDevice *device,
ClutterModifierType mods,
ClutterKeyState state)
{
guint i;
struct {
ClutterModifierType mod;
guint keyval;
} mod_map[] = {
{ CLUTTER_SHIFT_MASK, CLUTTER_KEY_Shift_L },
{ CLUTTER_CONTROL_MASK, CLUTTER_KEY_Control_L },
{ CLUTTER_MOD1_MASK, CLUTTER_KEY_Meta_L }
};
for (i = 0; i < G_N_ELEMENTS (mod_map); i++)
{
if ((mods & mod_map[i].mod) == 0)
continue;
clutter_virtual_input_device_notify_keyval (device,
clutter_get_current_event_time (),
mod_map[i].keyval, state);
}
}
static void
meta_input_settings_emulate_keybinding (MetaInputSettings *input_settings,
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
const gchar *accel,
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
gboolean is_press)
{
MetaInputSettingsPrivate *priv;
ClutterKeyState state;
guint key, mods;
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
if (!accel || !*accel)
return;
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
priv = meta_input_settings_get_instance_private (input_settings);
/* FIXME: This is appalling */
gtk_accelerator_parse (accel, &key, &mods);
if (!priv->virtual_pad_keyboard)
{
ClutterDeviceManager *manager = clutter_device_manager_get_default ();
priv->virtual_pad_keyboard =
clutter_device_manager_create_virtual_device (manager,
CLUTTER_KEYBOARD_DEVICE);
}
state = is_press ? CLUTTER_KEY_STATE_PRESSED : CLUTTER_KEY_STATE_RELEASED;
if (is_press)
emulate_modifiers (priv->virtual_pad_keyboard, mods, state);
clutter_virtual_input_device_notify_keyval (priv->virtual_pad_keyboard,
clutter_get_current_event_time (),
key, state);
if (!is_press)
emulate_modifiers (priv->virtual_pad_keyboard, mods, state);
}
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
gboolean
meta_input_settings_is_pad_button_grabbed (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
guint button)
{
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), FALSE);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad), FALSE);
g_return_val_if_fail (clutter_input_device_get_device_type (pad) ==
CLUTTER_PAD_DEVICE, FALSE);
return (meta_input_settings_get_pad_button_action (input_settings, pad, button) !=
G_DESKTOP_PAD_BUTTON_ACTION_NONE);
}
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
static gboolean
backends: Have meta_input_settings_handle_pad_button() take an event As all the relevant backends are expected to provide ClutterPadButtonEvents, it makes no sense to split the information, plus all other event fields are now available and might be needed in the future. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 10:49:05 +00:00
meta_input_settings_handle_pad_button (MetaInputSettings *input_settings,
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
ClutterInputDevice *pad,
backends: Have meta_input_settings_handle_pad_button() take an event As all the relevant backends are expected to provide ClutterPadButtonEvents, it makes no sense to split the information, plus all other event fields are now available and might be needed in the future. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 10:49:05 +00:00
const ClutterPadButtonEvent *event)
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
{
GDesktopPadButtonAction action;
backends: Have meta_input_settings_handle_pad_button() take an event As all the relevant backends are expected to provide ClutterPadButtonEvents, it makes no sense to split the information, plus all other event fields are now available and might be needed in the future. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 10:49:05 +00:00
gint button, group, mode;
gboolean is_press;
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
GSettings *settings;
gchar *accel;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), FALSE);
backends: Have meta_input_settings_handle_pad_button() take an event As all the relevant backends are expected to provide ClutterPadButtonEvents, it makes no sense to split the information, plus all other event fields are now available and might be needed in the future. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 10:49:05 +00:00
g_return_val_if_fail (event->type == CLUTTER_PAD_BUTTON_PRESS ||
event->type == CLUTTER_PAD_BUTTON_RELEASE, FALSE);
button = event->button;
wayland: Notify tablet mode switches This will show a fancy OSD so the change is immediately visible. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:10:23 +00:00
mode = event->mode;
group = clutter_input_device_get_mode_switch_button_group (pad, button);
backends: Have meta_input_settings_handle_pad_button() take an event As all the relevant backends are expected to provide ClutterPadButtonEvents, it makes no sense to split the information, plus all other event fields are now available and might be needed in the future. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 10:49:05 +00:00
is_press = event->type == CLUTTER_PAD_BUTTON_PRESS;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
wayland: Notify tablet mode switches This will show a fancy OSD so the change is immediately visible. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:10:23 +00:00
if (is_press && group >= 0)
{
guint n_modes = clutter_input_device_get_group_n_modes (pad, group);
const gchar *pretty_name = NULL;
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
priv = meta_input_settings_get_instance_private (input_settings);
info = g_hash_table_lookup (priv->mappable_devices, pad);
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
#ifdef HAVE_LIBWACOM
wayland: Notify tablet mode switches This will show a fancy OSD so the change is immediately visible. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:10:23 +00:00
if (info && info->wacom_device)
pretty_name = libwacom_get_name (info->wacom_device);
#endif
meta_display_notify_pad_group_switch (meta_get_display (), pad,
pretty_name, group, mode, n_modes);
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
info->group_modes[group] = mode;
wayland: Notify tablet mode switches This will show a fancy OSD so the change is immediately visible. https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:10:23 +00:00
}
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
action = meta_input_settings_get_pad_button_action (input_settings, pad, button);
switch (action)
{
case G_DESKTOP_PAD_BUTTON_ACTION_SWITCH_MONITOR:
backends: Implement "switch monitor" pad button action This action remaps the tablet to each of the connected monitors, or to the span of all monitors.
2016-06-22 17:12:52 +00:00
if (is_press)
meta_input_settings_cycle_tablet_output (input_settings, pad);
return TRUE;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
case G_DESKTOP_PAD_BUTTON_ACTION_HELP:
backends: Implement the "show osd" pad action Just call back into meta_display_request_show_osd().
2016-06-29 11:52:52 +00:00
if (is_press)
meta_display_request_pad_osd (meta_get_display (), pad, FALSE);
return TRUE;
case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING:
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
button, META_PAD_DIRECTION_NONE, -1);
accel = g_settings_get_string (settings, "keybinding");
meta_input_settings_emulate_keybinding (input_settings, accel, is_press);
g_object_unref (settings);
g_free (accel);
backends: Add missing pad button-to-keycombo translation https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-17 16:20:18 +00:00
return TRUE;
backends: Add API to trigger actions related to pad buttons It does nothing at the moment, but can be hooked into MetaWaylandTabletPad now. For X11, we need to trigger these for the pad events we receive from the passive pad button grabs.
2016-06-22 16:51:27 +00:00
case G_DESKTOP_PAD_BUTTON_ACTION_NONE:
default:
return FALSE;
}
}
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
static gboolean
meta_input_settings_handle_pad_action (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
MetaPadActionType action,
guint number,
MetaPadDirection direction,
guint mode)
{
GSettings *settings;
gboolean handled = FALSE;
gchar *accel;
settings = lookup_pad_action_settings (pad, action, number, direction, mode);
accel = g_settings_get_string (settings, "keybinding");
if (accel && *accel)
{
meta_input_settings_emulate_keybinding (input_settings, accel, TRUE);
meta_input_settings_emulate_keybinding (input_settings, accel, FALSE);
handled = TRUE;
}
g_object_unref (settings);
g_free (accel);
return handled;
}
static gboolean
meta_input_settings_get_pad_action_direction (MetaInputSettings *input_settings,
const ClutterEvent *event,
MetaPadDirection *direction)
{
MetaInputSettingsPrivate *priv;
ClutterInputDevice *pad = clutter_event_get_device (event);
MetaPadActionType pad_action;
gboolean has_direction = FALSE;
MetaPadDirection inc_dir, dec_dir;
guint number;
gdouble value;
priv = meta_input_settings_get_instance_private (input_settings);
*direction = META_PAD_DIRECTION_NONE;
switch (event->type)
{
case CLUTTER_PAD_RING:
pad_action = META_PAD_ACTION_RING;
number = event->pad_ring.ring_number;
value = event->pad_ring.angle;
inc_dir = META_PAD_DIRECTION_CW;
dec_dir = META_PAD_DIRECTION_CCW;
break;
case CLUTTER_PAD_STRIP:
pad_action = META_PAD_ACTION_STRIP;
number = event->pad_strip.strip_number;
value = event->pad_strip.value;
inc_dir = META_PAD_DIRECTION_DOWN;
dec_dir = META_PAD_DIRECTION_UP;
break;
default:
return FALSE;
}
if (priv->last_pad_action_info.pad == pad &&
priv->last_pad_action_info.action == pad_action &&
priv->last_pad_action_info.number == number &&
value >= 0 && priv->last_pad_action_info.value >= 0)
{
*direction = (value - priv->last_pad_action_info.value) > 0 ?
inc_dir : dec_dir;
has_direction = TRUE;
}
priv->last_pad_action_info.pad = pad;
priv->last_pad_action_info.action = pad_action;
priv->last_pad_action_info.number = number;
priv->last_pad_action_info.value = value;
return has_direction;
}
gboolean
meta_input_settings_handle_pad_event (MetaInputSettings *input_settings,
const ClutterEvent *event)
{
ClutterInputDevice *pad;
MetaPadDirection direction = META_PAD_DIRECTION_NONE;
pad = clutter_event_get_source_device ((ClutterEvent *) event);
switch (event->type)
{
case CLUTTER_PAD_BUTTON_PRESS:
case CLUTTER_PAD_BUTTON_RELEASE:
return meta_input_settings_handle_pad_button (input_settings, pad,
&event->pad_button);
case CLUTTER_PAD_RING:
if (!meta_input_settings_get_pad_action_direction (input_settings,
event, &direction))
return FALSE;
return meta_input_settings_handle_pad_action (input_settings, pad,
META_PAD_ACTION_RING,
event->pad_ring.ring_number,
direction,
event->pad_ring.mode);
case CLUTTER_PAD_STRIP:
if (!meta_input_settings_get_pad_action_direction (input_settings,
event, &direction))
return FALSE;
return meta_input_settings_handle_pad_action (input_settings, pad,
META_PAD_ACTION_STRIP,
event->pad_strip.strip_number,
direction,
event->pad_strip.mode);
default:
return FALSE;
}
}
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
static gchar *
compose_directional_action_label (GSettings *direction1,
GSettings *direction2)
{
gchar *accel1, *accel2, *str = NULL;
accel1 = g_settings_get_string (direction1, "keybinding");
accel2 = g_settings_get_string (direction2, "keybinding");
if (accel1 && *accel1 && accel2 && *accel2)
str = g_strdup_printf ("%s / %s", accel1, accel2);
g_free (accel1);
g_free (accel2);
return str;
}
static gchar *
meta_input_settings_get_ring_label (MetaInputSettings *settings,
ClutterInputDevice *pad,
guint number,
guint mode)
{
GSettings *settings1, *settings2;
gchar *label;
/* We only allow keybinding actions with those */
settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number,
META_PAD_DIRECTION_CW, mode);
settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number,
META_PAD_DIRECTION_CCW, mode);
label = compose_directional_action_label (settings1, settings2);
g_object_unref (settings1);
g_object_unref (settings2);
return label;
}
static gchar *
meta_input_settings_get_strip_label (MetaInputSettings *settings,
ClutterInputDevice *pad,
guint number,
guint mode)
{
GSettings *settings1, *settings2;
gchar *label;
/* We only allow keybinding actions with those */
settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number,
META_PAD_DIRECTION_UP, mode);
settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number,
META_PAD_DIRECTION_DOWN, mode);
label = compose_directional_action_label (settings1, settings2);
g_object_unref (settings1);
g_object_unref (settings2);
return label;
}
static gchar *
meta_input_settings_get_button_label (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
guint button)
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
{
GDesktopPadButtonAction action;
backends: Add action label to mode switch buttons https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:06:41 +00:00
gint group;
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), NULL);
g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad), NULL);
g_return_val_if_fail (clutter_input_device_get_device_type (pad) ==
CLUTTER_PAD_DEVICE, NULL);
backends: Add action label to mode switch buttons https://bugzilla.gnome.org/show_bug.cgi?id=771098
2016-12-28 11:06:41 +00:00
group = clutter_input_device_get_mode_switch_button_group (pad, button);
if (group >= 0)
{
/* TRANSLATORS: This string refers to a button that switches between
* different modes.
*/
return g_strdup_printf (_("Mode Switch (Group %d)"), group);
}
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
action = meta_input_settings_get_pad_button_action (input_settings, pad, button);
switch (action)
{
case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING:
{
GSettings *settings;
gchar *accel;
backends: Map tablet pad rings/strips to action settings Just like we do for buttons, with a few twists. These have 2 directions mappable to different keycombos, and are affected by the current mode in their group. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-04 11:24:41 +00:00
settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
button, META_PAD_DIRECTION_NONE, -1);
Revert "backends: Use g-s-d settings for tablet configuration" This reverts commit b52f304f9db590220555cb3a04a3c31f32ee7f19. https://bugzilla.gnome.org/show_bug.cgi?id=773779
2016-10-11 16:58:48 +00:00
accel = g_settings_get_string (settings, "keybinding");
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
g_object_unref (settings);
return accel;
}
case G_DESKTOP_PAD_BUTTON_ACTION_SWITCH_MONITOR:
backends: Add comment to translators in "Switch monitor" string Without context it's not clear to what it actually refers to. Add some context. https://bugzilla.gnome.org/show_bug.cgi?id=770929
2016-09-12 17:43:47 +00:00
/* TRANSLATORS: This string refers to an action, cycles drawing tablets'
* mapping through the available outputs.
*/
backends: Add function to retrieve the label for a pad button action As those are specified by settings.
2016-06-22 17:06:54 +00:00
return g_strdup (_("Switch monitor"));
case G_DESKTOP_PAD_BUTTON_ACTION_HELP:
return g_strdup (_("Show on-screen help"));
case G_DESKTOP_PAD_BUTTON_ACTION_NONE:
default:
return NULL;
}
}
backends: Extend pad action label checks to rings/strips This way the pad OSD can obtain the keycombos that are mapped to these for labeling purposes. https://bugzilla.gnome.org/show_bug.cgi?id=782033
2017-07-05 11:35:31 +00:00
static guint
get_current_pad_mode (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
MetaPadActionType action_type,
guint number)
{
MetaInputSettingsPrivate *priv;
DeviceMappingInfo *info;
guint group = 0, n_groups;
priv = meta_input_settings_get_instance_private (input_settings);
info = g_hash_table_lookup (priv->mappable_devices, pad);
n_groups = clutter_input_device_get_n_mode_groups (pad);
if (!info->group_modes || n_groups == 0)
return 0;
if (action_type == META_PAD_ACTION_RING ||
action_type == META_PAD_ACTION_STRIP)
{
/* Assume features are evenly distributed in groups */
group = number % n_groups;
}
return info->group_modes[group];
}
gchar *
meta_input_settings_get_pad_action_label (MetaInputSettings *input_settings,
ClutterInputDevice *pad,
MetaPadActionType action_type,
guint number)
{
guint mode;
switch (action_type)
{
case META_PAD_ACTION_BUTTON:
return meta_input_settings_get_button_label (input_settings, pad, number);
case META_PAD_ACTION_RING:
mode = get_current_pad_mode (input_settings, pad, action_type, number);
return meta_input_settings_get_ring_label (input_settings, pad,
number, mode);
case META_PAD_ACTION_STRIP:
mode = get_current_pad_mode (input_settings, pad, action_type, number);
return meta_input_settings_get_strip_label (input_settings, pad,
number, mode);
}
return NULL;
}
Copy permalink