[gnome-shell/wip/carlosg/clutter-seat: 8/9] st: Get keymap from ClutterSeat
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/carlosg/clutter-seat: 8/9] st: Get keymap from ClutterSeat
- Date: Mon, 14 Oct 2019 08:11:07 +0000 (UTC)
commit 0860a870470e32e72e0c376b808b0d856b9b11fc
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Oct 5 16:18:49 2019 +0200
st: Get keymap from ClutterSeat
https://gitlab.gnome.org/GNOME/mutter/merge_requests/852
src/st/st-entry.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index eb8609887b..600be2333f 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -265,10 +265,12 @@ st_entry_dispose (GObject *object)
StEntry *entry = ST_ENTRY (object);
StEntryPrivate *priv = ST_ENTRY_PRIV (entry);
ClutterKeymap *keymap;
+ ClutterSeat *seat;
cogl_clear_object (&priv->text_shadow_material);
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
+ seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
+ keymap = clutter_seat_get_keymap (seat);
g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
G_OBJECT_CLASS (st_entry_parent_class)->dispose (object);
@@ -569,10 +571,12 @@ clutter_text_focus_in_cb (ClutterText *text,
{
StEntry *entry = ST_ENTRY (actor);
ClutterKeymap *keymap;
+ ClutterSeat *seat;
st_entry_update_hint_visibility (entry);
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
+ seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
+ keymap = clutter_seat_get_keymap (seat);
keymap_state_changed (keymap, entry);
g_signal_connect (keymap, "state-changed",
G_CALLBACK (keymap_state_changed), entry);
@@ -587,6 +591,7 @@ clutter_text_focus_out_cb (ClutterText *text,
{
StEntry *entry = ST_ENTRY (actor);
ClutterKeymap *keymap;
+ ClutterSeat *seat;
st_widget_remove_style_pseudo_class (ST_WIDGET (actor), "focus");
@@ -595,7 +600,8 @@ clutter_text_focus_out_cb (ClutterText *text,
clutter_text_set_cursor_visible (text, FALSE);
remove_capslock_feedback (entry);
- keymap = clutter_backend_get_keymap (clutter_get_default_backend ());
+ seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
+ keymap = clutter_seat_get_keymap (seat);
g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]