callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkimcontextwayland: Shuffle full resets after IM changes

Browse Source 
Doing reset() on the text widgets after commit and delete_surrounding
is still too eager for some IMs (e.g. those that expect being able
to commit text while keeping a preedit buffer shown).

However, reset() is more of a "synchronize state" action on Wayland,
and it is still desirable to do that after changes that do come from
the IM (e.g. requesting the new surrounding text and cursor/anchor
positions). Notably here, the text_input protocol may still come up
with a preedit string after this state synchronization happens.

Shuffle the code so that the text widgets do not reset() the IM
context after text is deleted or committed, but the Wayland IM does
apply its practical effects after these actions happen. This keeps
the Wayland IM fully up-to-date wrt text widget state, while not
altering the ::commit and ::delete-surrounding-text behavior for
other IM context implementations.
This commit is contained in:
Carlos Garnacho
2022-09-24 11:45:18 +02:00
committed by msizanoen1
parent a88e848306
commit 92813e52cd
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/input/imwayland.c
View File

@ -260,9 +260,14 @@ text_input_delete_surrounding_text_apply (GtkIMContextWaylandGlobal *global)
len = context->pending_surrounding_delete.after_length
+ context->pending_surrounding_delete.before_length;
if (len > 0)
g_signal_emit_by_name (global->current, "delete-surrounding",
-context->pending_surrounding_delete.before_length,
len, &retval);
{
g_signal_emit_by_name (global->current, "delete-surrounding",
-context->pending_surrounding_delete.before_length,
len, &retval);
notify_im_change (GTK_IM_CONTEXT_WAYLAND (context),
ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD);
}
context->pending_surrounding_delete = defaults;
}
@ -926,6 +931,17 @@ gtk_im_context_wayland_get_surrounding (GtkIMContext *context,
return TRUE;
}
static void
gtk_im_context_wayland_commit (GtkIMContext *context,
const gchar *str)
{
if (GTK_IM_CONTEXT_CLASS (parent_class)->commit)
GTK_IM_CONTEXT_CLASS (parent_class)->commit (context, str);
notify_im_change (GTK_IM_CONTEXT_WAYLAND (context),
ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD);
}
static void
gtk_im_context_wayland_class_init (GtkIMContextWaylandClass *klass)
{
@ -944,6 +960,7 @@ gtk_im_context_wayland_class_init (GtkIMContextWaylandClass *klass)
im_context_class->set_use_preedit = gtk_im_context_wayland_set_use_preedit;
im_context_class->set_surrounding = gtk_im_context_wayland_set_surrounding;
im_context_class->get_surrounding = gtk_im_context_wayland_get_surrounding;
im_context_class->commit = gtk_im_context_wayland_commit;
parent_class = g_type_class_peek_parent (klass);
}