2 files changed, 66 insertions, 0 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index 49b9d09b..6d7495dd 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -7,6 +7,7 @@
 #include <wlr/util/edges.h>
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
+#include "sway/input/text_input.h"
 
 struct sway_seat;
 
@@ -86,6 +87,8 @@ struct sway_seat {
 
         list_t *deferred_bindings; // struct sway_binding
 
+        struct sway_input_method_relay im_relay;
+
         struct wl_listener focus_destroy;
         struct wl_listener new_node;
         struct wl_listener request_start_drag;
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
new file mode 100644
index 00000000..4c3b2e07
--- /dev/null
+++ b/include/sway/input/text_input.h
@@ -0,0 +1,63 @@
+#ifndef _SWAY_INPUT_TEXT_INPUT_H
+#define _SWAY_INPUT_TEXT_INPUT_H
+
+#include <wlr/types/wlr_text_input_v3.h>
+#include <wlr/types/wlr_input_method_v2.h>
+#include <wlr/types/wlr_surface.h>
+#include "sway/input/seat.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 (reveiving 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 wlr_input_method_v2 *input_method; // doesn't have to be present
+
+        struct wl_listener text_input_new;
+        struct wl_listener text_input_enable;
+        struct wl_listener text_input_commit;
+        struct wl_listener text_input_disable;
+        struct wl_listener text_input_destroy;
+
+        struct wl_listener input_method_new;
+        struct wl_listener input_method_commit;
+        struct wl_listener input_method_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;
+};
+
+void sway_input_method_relay_init(struct sway_seat *seat,
+        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);
+
+struct sway_text_input *sway_text_input_create(
+        struct sway_input_method_relay *relay,
+        struct wlr_text_input_v3 *text_input);
+
+#endif