Add support for the xkb-switch keyboard layout reader. #1386
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It'd simplify this code if Also, this adds a way to read the variant. |
Closes #1384 at #1384 If you set the xkbmap layout to a multilingual string with variants, such as: ``` setxkbmap -layout us,es,ru setxkbmap -variant dvorak,,phonetic ``` the `keyboard_layout` block will not show the current layout nor the current variant. It will only show the entire multilingual layout string. This is because `i3status-rust` uses the command [`setxkbmap -query`](https://github.com/greshake/i3status-rust/blob/b6e1b0b755de9f4520f1ecf17086d62fc5f190fe/src/blocks/keyboard_layout.rs#L63) to get the current layout. ``` $ setxkbmap -query ☸ 0007-04 rules: evdev model: pc105 layout: us,es,ru variant: dvorak,,phonetic options: grp:ctrls_toggle ``` This commit uses [`xkb-switch`](https://github.com/grwlf/xkb-switch) to read the current layout and keyboard variant. Example usage: ``` [[block]] block = "keyboard_layout" driver = "xkbswitch" format = "{layout} {variant}" interval = 1 ```
- Less newlines. - Use unwrap_or_else instead of running unwrap_or with a function call. This improves efficiency by making the function call lazy. - Use a character instead of a single-character string for split().
|
I guess this has come up often enough that we may as well add it. IIRC the alternative was pulling in all the X bindings just to get the layout info... |
|
Thanks! |
|
Glad to help! |
MaxVerevkin
pushed a commit
to MaxVerevkin/i3status-rust
that referenced
this pull request
Jan 16, 2022
* Add support for the xkb-switch keyboard layout reader. Closes greshake#1384 at greshake#1384 If you set the xkbmap layout to a multilingual string with variants, such as: ``` setxkbmap -layout us,es,ru setxkbmap -variant dvorak,,phonetic ``` the `keyboard_layout` block will not show the current layout nor the current variant. It will only show the entire multilingual layout string. This is because `i3status-rust` uses the command [`setxkbmap -query`](https://github.com/greshake/i3status-rust/blob/b6e1b0b755de9f4520f1ecf17086d62fc5f190fe/src/blocks/keyboard_layout.rs#L63) to get the current layout. ``` $ setxkbmap -query ☸ 0007-04 rules: evdev model: pc105 layout: us,es,ru variant: dvorak,,phonetic options: grp:ctrls_toggle ``` This commit uses [`xkb-switch`](https://github.com/grwlf/xkb-switch) to read the current layout and keyboard variant. Example usage: ``` [[block]] block = "keyboard_layout" driver = "xkbswitch" format = "{layout} {variant}" interval = 1 ``` * Fix formatting and linter errors. - Less newlines. - Use unwrap_or_else instead of running unwrap_or with a function call. This improves efficiency by making the function call lazy. - Use a character instead of a single-character string for split(). * Add documentation
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #1384
If you set the xkbmap layout to a multilingual string with variants, such as:
the
keyboard_layoutblock will not show the current layout nor the current variant. It will only show the entire multilingual layout string. This is becausei3status-rustuses the commandsetxkbmap -queryto get the current layout.This pull request uses
xkb-switchto read the current layout and keyboard variant.Example usage