diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-12 13:44:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 13:44:46 +0200 |
| commit | 66e8908e9ad5027934537a6e7f641ba3a74637e2 (patch) | |
| tree | 83df866657c9de240f0b8feb7b5bfcaf7dc30654 /rootston/seat.c | |
| parent | c5452feb773496a6631f35a4b49355ddd052d555 (diff) | |
| parent | 585757d6e6acd7c8dd15073d849278498066dac1 (diff) | |
Merge pull request #1203 from dcz-purism/input
Support input method and text input
Diffstat (limited to 'rootston/seat.c')
| -rw-r--r-- | rootston/seat.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index c41c32ed..82444dcb 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -16,6 +16,7 @@ #include "rootston/input.h" #include "rootston/keyboard.h" #include "rootston/seat.h" +#include "rootston/text_input.h" #include "rootston/xcursor.h" @@ -605,6 +606,8 @@ struct roots_seat *roots_seat_create(struct roots_input *input, char *name) { return NULL; } + roots_input_method_relay_init(seat, &seat->im_relay); + wl_list_insert(&input->seats, &seat->link); seat->new_drag_icon.notify = roots_seat_handle_new_drag_icon; @@ -1182,6 +1185,7 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { if (view == NULL) { seat->cursor->mode = ROOTS_CURSOR_PASSTHROUGH; wlr_seat_keyboard_clear_focus(seat->seat); + roots_input_method_relay_set_focus(&seat->im_relay, NULL); return; } @@ -1220,6 +1224,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { if (seat->cursor) { roots_cursor_update_focus(seat->cursor); } + + roots_input_method_relay_set_focus(&seat->im_relay, view->wlr_surface); } /** |