aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDorota Czaplejewicz <dorota.czaplejewicz@puri.sm>2018-10-17 15:34:41 +0000
committerDorota Czaplejewicz <dorota.czaplejewicz@puri.sm>2018-10-17 15:34:41 +0000
commit14c6ee894edfbef9a4f9c9de546c77ee6f261940 (patch)
tree6731ad6caa2345cd346c86c7cb1cfe7f1d18bdb8
parentaffc83ff82d03ef0804936f637291a2575efcce1 (diff)
text-input: Don't reject enable requests when unfocused
The prevoius implementation would always raise an error in the following sequence: -> enter -> leave <- enable The text-input type is not equipped to manage the validity of clents' requests, which should be handled in the compositor, as rootston does.
-rw-r--r--types/wlr_text_input_v3.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/types/wlr_text_input_v3.c b/types/wlr_text_input_v3.c
index 52c0fcc9..6ec0762a 100644
--- a/types/wlr_text_input_v3.c
+++ b/types/wlr_text_input_v3.c
@@ -175,11 +175,10 @@ static void text_input_commit(struct wl_client *client,
text_input->current_enabled = text_input->pending_enabled;
text_input->current_serial++;
- if (text_input->current_enabled && text_input->focused_surface == NULL) {
- wl_resource_post_error(text_input->resource, 0, "Text input was not"
- "entered, and cannot be enabled\n");
- return;
+ if (text_input->focused_surface == NULL) {
+ wlr_log(WLR_DEBUG, "Text input commit received without focus\n");
}
+
if (!old_enabled && text_input->current_enabled) {
wlr_signal_emit_safe(&text_input->events.enable, text_input);
} else if (old_enabled && !text_input->current_enabled) {