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

clutter: Push commit/delete_sourrounding as IM events

Browse Source 
These are not given directly to the input focus anymore, instead
queued up as events.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1286
This commit is contained in:
Carlos Garnacho 2020-02-17 11:03:51 +01:00
parent debd89197b
commit e7f6af51ac
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
clutter/clutter/clutter-input-method.c
View File

@ -277,17 +277,45 @@ clutter_input_method_get_focus (ClutterInputMethod *im)
return priv->focus; return priv->focus;
} }
static void
clutter_input_method_put_im_event (ClutterInputMethod *im,
ClutterEventType event_type,
const gchar *text,
int32_t offset,
uint32_t len)
{
ClutterInputDevice *keyboard;
ClutterSeat *seat;
ClutterStage *stage;
ClutterEvent *event;
seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
keyboard = clutter_seat_get_keyboard (seat);
stage = _clutter_input_device_get_stage (keyboard);
if (stage == NULL)
return;
event = clutter_event_new (event_type);
event->im.text = g_strdup (text);
event->im.offset = offset;
event->im.len = len;
clutter_event_set_device (event, keyboard);
clutter_event_set_source_device (event, keyboard);
clutter_event_set_flags (event, CLUTTER_EVENT_FLAG_INPUT_METHOD);
clutter_event_set_stage (event, stage);
clutter_event_put (event);
clutter_event_free (event);
}
void void
clutter_input_method_commit (ClutterInputMethod *im, clutter_input_method_commit (ClutterInputMethod *im,
const gchar *text) const gchar *text)
{ {
ClutterInputMethodPrivate *priv;
g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im)); g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
priv = clutter_input_method_get_instance_private (im); clutter_input_method_put_im_event (im, CLUTTER_IM_COMMIT, text, 0, 0);
if (priv->focus)
clutter_input_focus_commit (priv->focus, text);
} }
void void
@ -295,13 +323,9 @@ clutter_input_method_delete_surrounding (ClutterInputMethod *im,
int offset, int offset,
guint len) guint len)
{ {
ClutterInputMethodPrivate *priv;
g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im)); g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
priv = clutter_input_method_get_instance_private (im); clutter_input_method_put_im_event (im, CLUTTER_IM_DELETE, NULL, offset, len);
if (priv->focus)
clutter_input_focus_delete_surrounding (priv->focus, offset, len);
} }
void void
@ -329,13 +353,9 @@ clutter_input_method_set_preedit_text (ClutterInputMethod *im,
const gchar *preedit, const gchar *preedit,
guint cursor) guint cursor)
{ {
ClutterInputMethodPrivate *priv;
g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im)); g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
priv = clutter_input_method_get_instance_private (im); clutter_input_method_put_im_event (im, CLUTTER_IM_PREEDIT, preedit, cursor, 0);
if (priv->focus)
clutter_input_focus_set_preedit_text (priv->focus, preedit, cursor);
} }
void void