Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more complete input method support #2053

Merged
merged 20 commits into from
Dec 30, 2023
Merged

more complete input method support #2053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8f53847
implement input method keyboard grab
lilydjwg Oct 31, 2023
e5699cb
support input method popups
lilydjwg Nov 18, 2023
eb4760a
input method: avoid disabling a just-enabled text input on focus change
lilydjwg Nov 24, 2023
316955b
workaround focus change while preediting
lilydjwg Nov 24, 2023
74443a5
input method: don't grab keyboard if no text input is focused
lilydjwg Dec 5, 2023
371600a
input method: fix conflicts with compositor shortcut keys
lilydjwg Dec 5, 2023
e0fce8a
input method: address reviews
lilydjwg Dec 8, 2023
880bb88
use at place_popup_at function to convert from relative coordinates t…
lilydjwg Dec 8, 2023
d60b7bb
input method: simplify key handling code
lilydjwg Dec 8, 2023
a09a560
fix style
lilydjwg Dec 8, 2023
6ce370d
convert coordinates type
lilydjwg Dec 8, 2023
1682ced
input method: use input_method->active instead of already_disabled_input
lilydjwg Dec 26, 2023
302838f
move place_popup_at to view-impl
lilydjwg Dec 27, 2023
cda1913
input method: explain the focus change workaround in detail
lilydjwg Dec 27, 2023
7940111
input method: use pid to identify the input method sent key events
lilydjwg Dec 26, 2023
c302c35
fix headers
lilydjwg Dec 27, 2023
5f0ce1f
input method: better ways to identify IM sent keys
lilydjwg Dec 30, 2023
8a9cf96
Revert "input method: use input_method->active instead of already_dis…
lilydjwg Dec 30, 2023
91e8f06
input method: don't send deactivate command if the input is not the c…
lilydjwg Dec 30, 2023
bfaef7a
fix code style
lilydjwg Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/core/seat/input-method-relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,17 @@ void wf::input_method_relay::disable_text_input(wlr_text_input_v3 *input)
return;
}

// on focus change, we disable on one text input and enable on another
// however, the former may also send us a disable request AFTER we've done the above
// let's just ignore repeated disable reuqests.
if (input == already_disabled_input)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

input has an input->active field which keeps track of whether the input was activated or not. Maybe we can use that instead of keeping track of this ourselves? Wlroots automatically updates input->active so we wouldn't need already_disabled_input at all if I understand correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

input->current_enabled is still true on destruction.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not not sure what input->current_enabled is, but I am pretty sure that input->active in wlroots is doing exactly what you need here: it is set only when deactive() is called (which is also when you will set already_disabled_input). Not to mention that the current approach seems a bit hacky, what if there are multiple text inputs or something of the sort?

Copy link
Contributor Author

@lilydjwg lilydjwg Dec 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh you mean the input method struct, not the text input one... Yes, it works! I'll update the code.

There are full of hacks in the implementation of Linux input method unfortunately. It never gets better. We thank god when it works (compared to those doesn't work, e.g. Steam).

{
return;
}

wlr_input_method_v2_send_deactivate(input_method);
send_im_state(input);
already_disabled_input = input;
}

void wf::input_method_relay::remove_text_input(wlr_text_input_v3 *input)
Expand Down
1 change: 1 addition & 0 deletions src/core/seat/input-method-relay.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class input_method_relay
on_input_method_new, on_input_method_commit, on_input_method_destroy,
on_grab_keyboard, on_grab_keyboard_destroy, on_new_popup_surface;
wlr_input_method_keyboard_grab_v2 *keyboard_grab = nullptr;
wlr_text_input_v3 *already_disabled_input = nullptr;
text_input *find_focusable_text_input();
void set_focus(wlr_surface*);

Expand Down