hyprland/language: Fix commas in keyboard names and layouts #3406
+26
−5
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commit 29917fb ("Fix hyprland/language events not working with keyboard names with commas in them (#3224)") attempted to fix the problem, but introduced the opposite problem.
The event data from Hyprland is "activelayout>>KEYBOARDNAME,LAYOUTNAME", but both KEYBOARDNAME and LAYOUTNAME may contain embedded commas, so the simple
find_first_of(',')
orfind_last_of(',')
solutions will break things for different users.This patch attempts to solve the problem by trying all combinations of keyboardname and layoutname until one makes sense, either by matching the keyboard name to the user-configured device name, or by matching the layoutname to the list of valid layouts.