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

imwayland: Don't reset serial while text-input is alive

Browse Source 
The serial number is a persistent property of the text-input object.
This commit is contained in:
Dorota Czaplejewicz
2018-09-14 20:31:55 +00:00
parent 8fd2d461fc
commit af46ba27cc
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/input/imwayland.c
View File

@ -41,6 +41,8 @@ struct _GtkIMContextWaylandGlobal
struct zwp_text_input_v3 *text_input;
GtkIMContext *current;
guint serial;
};
struct _GtkIMContextWaylandClass
@ -77,8 +79,6 @@ struct _GtkIMContextWayland
enum zwp_text_input_v3_change_cause surrounding_change;
guint serial;
struct surrounding_delete pending_surrounding_delete;
struct preedit current_preedit;
@ -260,7 +260,6 @@ text_input_done (void *data,
struct zwp_text_input_v3 *text_input,
uint32_t serial)
{
GtkIMContextWayland *context;
GtkIMContextWaylandGlobal *global = data;
gboolean result;
gboolean valid;
@ -268,9 +267,7 @@ text_input_done (void *data,
if (!global->current)
return;
context = GTK_IM_CONTEXT_WAYLAND (global->current);
valid = serial == context->serial;
valid = serial == global->serial;
text_input_delete_surrounding_text_apply(global, valid);
text_input_commit_apply(global, valid);
g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
@ -305,6 +302,7 @@ registry_handle_global (void *data,
global->text_input =
zwp_text_input_manager_v3_get_text_input (global->text_input_manager,
gdk_wayland_seat_get_wl_seat (seat));
global->serial = 0;
zwp_text_input_v3_add_listener (global->text_input,
&text_input_listener, global);
}
@ -463,7 +461,7 @@ commit_state (GtkIMContextWayland *context)
{
if (global->current != GTK_IM_CONTEXT (context))
return;
context->serial++;
global->serial++;
zwp_text_input_v3_commit (global->text_input);
context->surrounding_change = ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_INPUT_METHOD;
}