mirror of
https://github.com/swaywm/sway.git
synced 2026-06-13 14:33:19 -04:00
4e0dfbf2f9
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.
86 lines
3.1 KiB
C
86 lines
3.1 KiB
C
#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
|
|
* input_method interfaces on a given seat. Multiple text-input interfaces may
|
|
* be bound to a relay, but at most one will be focused (receiving events) at
|
|
* a time. At most one input-method interface may be bound to the seat. The
|
|
* relay manages life cycle of both sides. When both sides are present and
|
|
* focused, the relay passes messages between them.
|
|
*
|
|
* Text input focus is a subset of keyboard focus - if the text-input is
|
|
* in the focused state, wl_keyboard sent an enter as well. However, having
|
|
* wl_keyboard focused doesn't mean that text-input will be focused.
|
|
*/
|
|
struct sway_input_method_relay {
|
|
struct sway_seat *seat;
|
|
|
|
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;
|
|
|
|
struct wl_listener input_method_new;
|
|
struct wl_listener input_method_manager_destroy;
|
|
struct wl_listener input_method_commit;
|
|
struct wl_listener input_method_new_popup_surface;
|
|
struct wl_listener input_method_grab_keyboard;
|
|
struct wl_listener input_method_destroy;
|
|
|
|
struct wl_listener input_method_keyboard_grab_destroy;
|
|
};
|
|
|
|
|
|
struct sway_text_input {
|
|
struct sway_input_method_relay *relay;
|
|
|
|
struct wlr_text_input_v3 *input;
|
|
// The surface getting seat's focus. Stored for when text-input cannot
|
|
// be sent an enter event immediately after getting focus, e.g. when
|
|
// there's no input method available. Cleared once text-input is entered.
|
|
struct wlr_surface *pending_focused_surface;
|
|
|
|
struct wl_list link;
|
|
|
|
struct wl_listener pending_focused_surface_destroy;
|
|
|
|
struct wl_listener text_input_enable;
|
|
struct wl_listener text_input_commit;
|
|
struct wl_listener text_input_disable;
|
|
struct wl_listener text_input_destroy;
|
|
};
|
|
|
|
void sway_input_method_relay_init(struct sway_seat *seat,
|
|
struct sway_input_method_relay *relay);
|
|
|
|
void sway_input_method_relay_finish(struct sway_input_method_relay *relay);
|
|
|
|
// Updates currently focused surface. Surface must belong to the same seat.
|
|
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);
|
|
|
|
#endif
|