mirror of
https://github.com/swaywm/sway.git
synced 2025-10-08 21:25:58 +00:00
Merge 7640105256
into 90d3270970
This commit is contained in:
commit
cecc50f904
1 changed files with 7 additions and 2 deletions
|
@ -64,9 +64,13 @@ static void handle_im_commit(struct wl_listener *listener, void *data) {
|
|||
static void handle_im_keyboard_grab_destroy(struct wl_listener *listener, void *data) {
|
||||
struct sway_input_method_relay *relay = wl_container_of(listener, relay,
|
||||
input_method_keyboard_grab_destroy);
|
||||
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab = relay->input_method->keyboard_grab;
|
||||
struct wlr_seat *wlr_seat = keyboard_grab->input_method->seat;
|
||||
wl_list_remove(&relay->input_method_keyboard_grab_destroy.link);
|
||||
// input_method may already be torn down; seat is compositor-owned
|
||||
struct wlr_input_method_keyboard_grab_v2 *keyboard_grab =
|
||||
relay->input_method ? relay->input_method->keyboard_grab : NULL;
|
||||
struct wlr_seat *wlr_seat = relay->seat ? relay->seat->wlr_seat : NULL;
|
||||
if (!keyboard_grab || !wlr_seat)
|
||||
return;
|
||||
|
||||
if (keyboard_grab->keyboard) {
|
||||
// send modifier state to original client
|
||||
|
@ -254,6 +258,7 @@ static void handle_text_input_enable(struct wl_listener *listener, void *data) {
|
|||
}
|
||||
wlr_input_method_v2_send_activate(text_input->relay->input_method);
|
||||
relay_send_im_state(text_input->relay, text_input->input);
|
||||
wlr_text_input_v3_send_done(text_input->input);
|
||||
}
|
||||
|
||||
static void handle_text_input_commit(struct wl_listener *listener,
|
||||
|
|
Loading…
Add table
Reference in a new issue