mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-06-13 14:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Preserve IME ordering: forwarded key presses create an outstanding response count; text-input state/done snapshots wait behind those keys; later keys wait behind queued state.

Browse source 
Previously, Sway was letting zwp_input_method_v2.done advance the IM serial while a key already forwarded through zwp_input_method_keyboard_grab_v2.key could still answer with a commit using the older serial.  wlroots then rejected that commit per protocol.
This commit is contained in:
Danny Milosavljevic 2026-05-18 18:07:55 +02:00
parent 9c663b1fa1
commit 4e0dfbf2f9
3 changed files with 314 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/sway/input/text_input.h
View file

@ -1,9 +1,11 @@
#ifndef _SWAY_INPUT_TEXT_INPUT_H
#define _SWAY_INPUT_TEXT_INPUT_H
#include <stdint.h>
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/types/wlr_input_method_v2.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_virtual_keyboard_v1.h>
/**
* The relay structure manages the relationship between text-input and
@ -22,7 +24,9 @@ struct sway_input_method_relay {
struct wl_list text_inputs; // sway_text_input::link
struct wl_list input_popups; // sway_input_popup::link
struct wl_list pending_im_events; // sway_pending_im_event::link
struct wlr_input_method_v2 *input_method; // doesn't have to be present
uint32_t pending_key_responses;
struct wl_listener text_input_new;
struct wl_listener text_input_manager_destroy;
@ -66,6 +70,15 @@ void sway_input_method_relay_finish(struct sway_input_method_relay *relay);
void sway_input_method_relay_set_focus(struct sway_input_method_relay *relay,
struct wlr_surface *surface);
void sway_input_method_relay_keyboard_grab_key(
struct sway_input_method_relay *relay,
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab,
struct wlr_keyboard *keyboard, uint32_t time, uint32_t key, uint32_t state);
void sway_input_method_relay_virtual_keyboard_key(
struct sway_input_method_relay *relay,
struct wlr_virtual_keyboard_v1 *virtual_keyboard, uint32_t state);
struct sway_text_input *sway_text_input_create(
struct sway_input_method_relay *relay,
struct wlr_text_input_v3 *text_input);