[mutter/wip/carlosg/input-thread: 142/159] backends/native: Proxy bell notifications from within the MetaSeatImpl
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/input-thread: 142/159] backends/native: Proxy bell notifications from within the MetaSeatImpl
- Date: Wed, 12 Aug 2020 17:24:05 +0000 (UTC)
commit 81c983fdf4d01bffa62f2957803b43117418b4aa
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Aug 11 17:32:48 2020 +0200
backends/native: Proxy bell notifications from within the MetaSeatImpl
As with other changes from within the MetaSeatImpl realm, proxy that
through a MetaSeatImpl signal, instead of poking directly on the ClutterSeat.
src/backends/native/meta-input-device-native.c | 2 +-
src/backends/native/meta-seat-impl.c | 13 +++++++++++++
src/backends/native/meta-seat-impl.h | 1 +
src/backends/native/meta-seat-native.c | 9 +++++++++
4 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/src/backends/native/meta-input-device-native.c b/src/backends/native/meta-input-device-native.c
index 8e71522bba..aef6a2e682 100644
--- a/src/backends/native/meta-input-device-native.c
+++ b/src/backends/native/meta-input-device-native.c
@@ -222,7 +222,7 @@ meta_input_device_native_is_grouped (ClutterInputDevice *device,
static void
meta_input_device_native_bell_notify (MetaInputDeviceNative *device)
{
- clutter_seat_bell_notify (CLUTTER_SEAT (device->seat_impl->seat));
+ meta_seat_impl_notify_bell (device->seat_impl);
}
static void
diff --git a/src/backends/native/meta-seat-impl.c b/src/backends/native/meta-seat-impl.c
index 3f58fcdf38..801e590a3f 100644
--- a/src/backends/native/meta-seat-impl.c
+++ b/src/backends/native/meta-seat-impl.c
@@ -110,6 +110,7 @@ enum
KBD_A11Y_FLAGS_CHANGED,
KBD_A11Y_MODS_STATE_CHANGED,
TOUCH_MODE,
+ BELL,
N_SIGNALS
};
@@ -2740,6 +2741,12 @@ meta_seat_impl_class_init (MetaSeatImplClass *klass)
0, NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ signals[BELL] =
+ g_signal_new ("bell",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
g_object_class_install_properties (object_class, N_PROPS, props);
}
@@ -3116,3 +3123,9 @@ meta_seat_impl_notify_kbd_a11y_mods_state_changed (MetaSeatImpl *impl,
g_signal_emit (impl, signals[KBD_A11Y_MODS_STATE_CHANGED], 0,
new_latched_mods, new_locked_mods);
}
+
+void
+meta_seat_impl_notify_bell (MetaSeatImpl *impl)
+{
+ g_signal_emit (impl, signals[BELL], 0);
+}
diff --git a/src/backends/native/meta-seat-impl.h b/src/backends/native/meta-seat-impl.h
index 52897629f4..3adfd9635f 100644
--- a/src/backends/native/meta-seat-impl.h
+++ b/src/backends/native/meta-seat-impl.h
@@ -261,5 +261,6 @@ void meta_seat_impl_notify_kbd_a11y_flags_changed (MetaSeatImpl *impl,
void meta_seat_impl_notify_kbd_a11y_mods_state_changed (MetaSeatImpl *impl,
xkb_mod_mask_t new_latched_mods,
xkb_mod_mask_t new_locked_mods);
+void meta_seat_impl_notify_bell (MetaSeatImpl *impl);
#endif /* META_SEAT_IMPL_H */
diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c
index 33278ceffe..564ca95307 100644
--- a/src/backends/native/meta-seat-native.c
+++ b/src/backends/native/meta-seat-native.c
@@ -137,6 +137,13 @@ proxy_touch_mode_changed (MetaSeatImpl *impl,
g_object_notify (G_OBJECT (seat_native), "touch-mode");
}
+static void
+proxy_bell (MetaSeatImpl *impl,
+ MetaSeatNative *seat_native)
+{
+ clutter_seat_bell_notify (CLUTTER_SEAT (seat_native));
+}
+
static void
meta_seat_native_constructed (GObject *object)
{
@@ -149,6 +156,8 @@ meta_seat_native_constructed (GObject *object)
G_CALLBACK (proxy_kbd_a11y_mods_state_changed), seat);
g_signal_connect (seat->impl, "touch-mode",
G_CALLBACK (proxy_touch_mode_changed), seat);
+ g_signal_connect (seat->impl, "bell",
+ G_CALLBACK (proxy_bell), seat);
seat->core_pointer = meta_seat_impl_get_pointer (seat->impl);
seat->core_keyboard = meta_seat_impl_get_keyboard (seat->impl);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]