isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Make device tracking at MetaInputSettings ad-hoc API

Browse Source 
Depending on the backend, we want to integrate this object at different
levels. It will sit close to the MetaBackendX11/MetaSeatX11 in X11, but
it will be put deep down with MetaSeatImpl in the native backend, in a
separate thread.

Since we can't depend on a single object type, nor are able to track
ClutterSeat signals neatly, make this API something to be called
explicitly by backends.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho 2020-08-11 16:27:35 +02:00 committed by Marge Bot
parent fe9092da19
commit 2c1558ddbd
6 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clutter/clutter/clutter-seat.c
View File

@ -36,7 +36,6 @@ enum
{ {
DEVICE_ADDED, DEVICE_ADDED,
DEVICE_REMOVED, DEVICE_REMOVED,
TOOL_CHANGED,
KBD_A11Y_MASK_CHANGED, KBD_A11Y_MASK_CHANGED,
KBD_A11Y_FLAGS_CHANGED, KBD_A11Y_FLAGS_CHANGED,
PTR_A11Y_DWELL_CLICK_TYPE_CHANGED, PTR_A11Y_DWELL_CLICK_TYPE_CHANGED,
@ -149,18 +148,6 @@ clutter_seat_class_init (ClutterSeatClass *klass)
0, NULL, NULL, NULL, 0, NULL, NULL, NULL,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
CLUTTER_TYPE_INPUT_DEVICE); CLUTTER_TYPE_INPUT_DEVICE);
signals[TOOL_CHANGED] =
g_signal_new (I_("tool-changed"),
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
_clutter_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2,
CLUTTER_TYPE_INPUT_DEVICE,
CLUTTER_TYPE_INPUT_DEVICE_TOOL);
g_signal_set_va_marshaller (signals[TOOL_CHANGED],
G_TYPE_FROM_CLASS (object_class),
_clutter_marshal_VOID__OBJECT_OBJECTv);
/** /**
* ClutterSeat::kbd-a11y-mods-state-changed: * ClutterSeat::kbd-a11y-mods-state-changed:

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

@ -189,4 +189,15 @@ void meta_input_settings_set_device_aspect_ratio (MetaInputSettings *input_sett
void meta_input_settings_get_kbd_a11y_settings (MetaInputSettings *input_settings, void meta_input_settings_get_kbd_a11y_settings (MetaInputSettings *input_settings,
MetaKbdA11ySettings *a11y_settings); MetaKbdA11ySettings *a11y_settings);
void meta_input_settings_add_device (MetaInputSettings *input_settings,
ClutterInputDevice *device);
void meta_input_settings_remove_device (MetaInputSettings *input_settings,
ClutterInputDevice *device);
void meta_input_settings_notify_tool_change (MetaInputSettings *input_settings,
ClutterInputDevice *device,
ClutterInputDeviceTool *tool);
void meta_input_settings_notify_kbd_a11y_change (MetaInputSettings *input_settings,
MetaKeyboardA11yFlags new_flags,
MetaKeyboardA11yFlags what_changed);
#endif /* META_INPUT_SETTINGS_PRIVATE_H */ #endif /* META_INPUT_SETTINGS_PRIVATE_H */

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

@ -1209,11 +1209,10 @@ load_keyboard_a11y_settings (MetaInputSettings *input_settings)
g_signal_emit (input_settings, signals[KBD_A11Y_CHANGED], 0, &priv->kbd_a11y_settings); g_signal_emit (input_settings, signals[KBD_A11Y_CHANGED], 0, &priv->kbd_a11y_settings);
} }
static void void
on_keyboard_a11y_settings_changed (ClutterSeat *seat, meta_input_settings_notify_kbd_a11y_change (MetaInputSettings *input_settings,
MetaKeyboardA11yFlags new_flags, MetaKeyboardA11yFlags new_flags,
MetaKeyboardA11yFlags what_changed, MetaKeyboardA11yFlags what_changed)
MetaInputSettings *input_settings)
{ {
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings); MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
guint i; guint i;
@ -1585,10 +1584,9 @@ evaluate_two_finger_scrolling (MetaInputSettings *input_settings,
g_hash_table_add (priv->two_finger_devices, device); g_hash_table_add (priv->two_finger_devices, device);
} }
static void void
meta_input_settings_device_added (ClutterSeat *seat, meta_input_settings_add_device (MetaInputSettings *input_settings,
ClutterInputDevice *device, ClutterInputDevice *device)
MetaInputSettings *input_settings)
{ {
if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL) if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_LOGICAL)
return; return;
@ -1599,10 +1597,9 @@ meta_input_settings_device_added (ClutterSeat *seat,
check_add_mappable_device (input_settings, device); check_add_mappable_device (input_settings, device);
} }
static void void
meta_input_settings_device_removed (ClutterSeat *seat, meta_input_settings_remove_device (MetaInputSettings *input_settings,
ClutterInputDevice *device, ClutterInputDevice *device)
MetaInputSettings *input_settings)
{ {
MetaInputSettingsPrivate *priv; MetaInputSettingsPrivate *priv;
@ -1651,11 +1648,10 @@ current_tool_info_free (CurrentToolInfo *info)
g_free (info); g_free (info);
} }
static void void
meta_input_settings_tool_changed (ClutterSeat *seat, meta_input_settings_notify_tool_change (MetaInputSettings *input_settings,
ClutterInputDevice *device, ClutterInputDevice *device,
ClutterInputDeviceTool *tool, ClutterInputDeviceTool *tool)
MetaInputSettings *input_settings)
{ {
MetaInputSettingsPrivate *priv; MetaInputSettingsPrivate *priv;
@ -1744,12 +1740,6 @@ meta_input_settings_init (MetaInputSettings *settings)
priv = meta_input_settings_get_instance_private (settings); priv = meta_input_settings_get_instance_private (settings);
priv->seat = clutter_backend_get_default_seat (clutter_get_default_backend ()); priv->seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
g_signal_connect (priv->seat, "device-added",
G_CALLBACK (meta_input_settings_device_added), settings);
g_signal_connect (priv->seat, "device-removed",
G_CALLBACK (meta_input_settings_device_removed), settings);
g_signal_connect (priv->seat, "tool-changed",
G_CALLBACK (meta_input_settings_tool_changed), settings);
priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse"); priv->mouse_settings = g_settings_new ("org.gnome.desktop.peripherals.mouse");
g_signal_connect (priv->mouse_settings, "changed", g_signal_connect (priv->mouse_settings, "changed",
@ -1776,8 +1766,6 @@ meta_input_settings_init (MetaInputSettings *settings)
priv->keyboard_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard"); priv->keyboard_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
g_signal_connect (priv->keyboard_a11y_settings, "changed", g_signal_connect (priv->keyboard_a11y_settings, "changed",
G_CALLBACK (meta_input_keyboard_a11y_settings_changed), settings); G_CALLBACK (meta_input_keyboard_a11y_settings_changed), settings);
g_signal_connect (priv->seat, "kbd-a11y-flags-changed",
G_CALLBACK (on_keyboard_a11y_settings_changed), settings);
priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse"); priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
g_signal_connect (priv->mouse_a11y_settings, "changed", g_signal_connect (priv->mouse_a11y_settings, "changed",

16
src/backends/native/meta-seat-impl.c
View File

@ -1551,6 +1551,9 @@ process_base_event (MetaSeatImpl *seat_impl,
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterEvent *device_event = NULL; ClutterEvent *device_event = NULL;
struct libinput_device *libinput_device; struct libinput_device *libinput_device;
MetaInputSettings *input_settings;
input_settings = meta_backend_get_input_settings (meta_get_backend ());
switch (libinput_event_get_type (event)) switch (libinput_event_get_type (event))
{ {
@ -1560,6 +1563,7 @@ process_base_event (MetaSeatImpl *seat_impl,
device = evdev_add_device (seat_impl, libinput_device); device = evdev_add_device (seat_impl, libinput_device);
device_event = clutter_event_new (CLUTTER_DEVICE_ADDED); device_event = clutter_event_new (CLUTTER_DEVICE_ADDED);
clutter_event_set_device (device_event, device); clutter_event_set_device (device_event, device);
meta_input_settings_add_device (input_settings, device);
break; break;
case LIBINPUT_EVENT_DEVICE_REMOVED: case LIBINPUT_EVENT_DEVICE_REMOVED:
@ -1570,6 +1574,7 @@ process_base_event (MetaSeatImpl *seat_impl,
clutter_event_set_device (device_event, device); clutter_event_set_device (device_event, device);
evdev_remove_device (seat_impl, evdev_remove_device (seat_impl,
META_INPUT_DEVICE_NATIVE (device)); META_INPUT_DEVICE_NATIVE (device));
meta_input_settings_remove_device (input_settings, device);
break; break;
default: default:
@ -1634,9 +1639,9 @@ input_device_update_tool (ClutterInputDevice *input_device,
struct libinput_tablet_tool *libinput_tool) struct libinput_tablet_tool *libinput_tool)
{ {
MetaInputDeviceNative *evdev_device = META_INPUT_DEVICE_NATIVE (input_device); MetaInputDeviceNative *evdev_device = META_INPUT_DEVICE_NATIVE (input_device);
MetaSeatImpl *seat_impl = seat_impl_from_device (input_device);
ClutterInputDeviceTool *tool = NULL; ClutterInputDeviceTool *tool = NULL;
ClutterInputDeviceToolType tool_type; ClutterInputDeviceToolType tool_type;
MetaInputSettings *input_settings;
uint64_t tool_serial; uint64_t tool_serial;
if (libinput_tool) if (libinput_tool)
@ -1660,8 +1665,8 @@ input_device_update_tool (ClutterInputDevice *input_device,
clutter_input_device_update_from_tool (input_device, tool); clutter_input_device_update_from_tool (input_device, tool);
evdev_device->last_tool = tool; evdev_device->last_tool = tool;
g_signal_emit_by_name (seat_impl->seat_native, "tool-changed", input_settings = meta_backend_get_input_settings (meta_get_backend ());
input_device, tool); meta_input_settings_notify_tool_change (input_settings, input_device, tool);
} }
} }
@ -3075,6 +3080,11 @@ meta_seat_impl_notify_kbd_a11y_flags_changed (MetaSeatImpl *seat_impl,
MetaKeyboardA11yFlags new_flags, MetaKeyboardA11yFlags new_flags,
MetaKeyboardA11yFlags what_changed) MetaKeyboardA11yFlags what_changed)
{ {
MetaInputSettings *input_settings;
input_settings = meta_backend_get_input_settings (meta_get_backend ());
meta_input_settings_notify_kbd_a11y_change (input_settings,
new_flags, what_changed);
g_signal_emit (seat_impl, signals[KBD_A11Y_FLAGS_CHANGED], 0, g_signal_emit (seat_impl, signals[KBD_A11Y_FLAGS_CHANGED], 0,
new_flags, what_changed); new_flags, what_changed);
} }

9
src/backends/x11/meta-seat-x11.c
View File

@ -21,6 +21,7 @@
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#include <X11/extensions/XKB.h> #include <X11/extensions/XKB.h>
#include "backends/meta-input-settings-private.h"
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-backend-x11.h"
#include "backends/x11/meta-event-x11.h" #include "backends/x11/meta-event-x11.h"
#include "backends/x11/meta-input-device-tool-x11.h" #include "backends/x11/meta-input-device-tool-x11.h"
@ -725,6 +726,7 @@ meta_seat_x11_handle_event_post (ClutterSeat *seat,
{ {
MetaSeatX11 *seat_x11 = META_SEAT_X11 (seat); MetaSeatX11 *seat_x11 = META_SEAT_X11 (seat);
ClutterInputDevice *device; ClutterInputDevice *device;
MetaInputSettings *input_settings;
gboolean is_touch; gboolean is_touch;
if (event->type != CLUTTER_DEVICE_ADDED && if (event->type != CLUTTER_DEVICE_ADDED &&
@ -734,15 +736,18 @@ meta_seat_x11_handle_event_post (ClutterSeat *seat,
device = clutter_event_get_device (event); device = clutter_event_get_device (event);
is_touch = is_touch =
clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE; clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE;
input_settings = meta_backend_get_input_settings (meta_get_backend ());
switch (event->type) switch (event->type)
{ {
case CLUTTER_DEVICE_ADDED: case CLUTTER_DEVICE_ADDED:
meta_input_settings_add_device (input_settings, device);
seat_x11->has_touchscreens |= is_touch; seat_x11->has_touchscreens |= is_touch;
break; break;
case CLUTTER_DEVICE_REMOVED: case CLUTTER_DEVICE_REMOVED:
if (is_touch) if (is_touch)
seat_x11->has_touchscreens = has_touchscreens (seat_x11); seat_x11->has_touchscreens = has_touchscreens (seat_x11);
meta_input_settings_remove_device (input_settings, device);
break; break;
default: default:
break; break;
@ -939,6 +944,7 @@ translate_property_event (MetaSeatX11 *seat_x11,
{ {
ClutterInputDeviceTool *tool = NULL; ClutterInputDeviceTool *tool = NULL;
ClutterInputDeviceToolType type; ClutterInputDeviceToolType type;
MetaInputSettings *input_settings;
int serial_id; int serial_id;
serial_id = device_get_tool_serial (device); serial_id = device_get_tool_serial (device);
@ -959,7 +965,8 @@ translate_property_event (MetaSeatX11 *seat_x11,
} }
meta_input_device_x11_update_tool (device, tool); meta_input_device_x11_update_tool (device, tool);
g_signal_emit_by_name (seat_x11, "tool-changed", device, tool); input_settings = meta_backend_get_input_settings (meta_get_backend ());
meta_input_settings_notify_tool_change (input_settings, device, tool);
if (tool) if (tool)
clutter_input_device_update_from_tool (device, tool); clutter_input_device_update_from_tool (device, tool);

13
src/backends/x11/meta-xkb-a11y-x11.c
View File

@ -118,10 +118,15 @@ check_settings_changed (ClutterSeat *seat)
} }
if (what_changed) if (what_changed)
g_signal_emit_by_name (seat, {
"kbd-a11y-flags-changed", meta_input_settings_notify_kbd_a11y_change (input_settings,
kbd_a11y_settings.controls, kbd_a11y_settings.controls,
what_changed); what_changed);
g_signal_emit_by_name (seat,
"kbd-a11y-flags-changed",
kbd_a11y_settings.controls,
what_changed);
}
XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE); XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE);
} }