blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1318 from dcz-purism/text_input_error 

text-input: Don't reject enable requests when unfocused
This commit is contained in:
Drew DeVault 2018-10-17 18:07:46 +02:00 committed by GitHub
parent 5893b197ba 14c6ee894e
commit 67a2040cad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
types/wlr_text_input_v3.c
View File

@ -175,11 +175,10 @@ static void text_input_commit(struct wl_client *client,
text_input->current_enabled = text_input->pending_enabled; text_input->current_enabled = text_input->pending_enabled;
text_input->current_serial++; text_input->current_serial++;
if (text_input->current_enabled && text_input->focused_surface == NULL) { if (text_input->focused_surface == NULL) {
wl_resource_post_error(text_input->resource, 0, "Text input was not" wlr_log(WLR_DEBUG, "Text input commit received without focus\n");
"entered, and cannot be enabled\n");
return;
} }
if (!old_enabled && text_input->current_enabled) { if (!old_enabled && text_input->current_enabled) {
wlr_signal_emit_safe(&text_input->events.enable, text_input); wlr_signal_emit_safe(&text_input->events.enable, text_input);
} else if (old_enabled && !text_input->current_enabled) { } else if (old_enabled && !text_input->current_enabled) {