Sanitize pro1 xkb layouts and add a us-intl variant #2
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.
This is an attempt to sanitize the file by removing unnecessary or erroneous definitions, and it adds another us variant as well as some comments on how to use it.
In the original
pro1
file, lines 1 to 11 corresponded to a partial us layout to changep
andl
third level into/
and?
. However, this has become obsolete because those changes are also included in the us-international layout starting at line 77 (of the originalpro1
file), which has become the default when selecting "English (US)" in SFOS Settings > Text input > Active layout.What this commit does:
/usr/share/X11/xkb/symbols/
;Alt
+Space
. This is not the ideal place to add detailed comments, but the SFOS UI does not allow selecting concurrent variants and toggling between them, so this should definitely be documented somewhere and here doesn't seem too bad.I have tested it a bit in all the layouts we came up with so far, I believe the functionality is conserved: default de, ru or us layouts are correctly selected when picking them in SFOS Settings > Text input > Active layout. Layout toggle between ru and us still works as expected when running the appropriate dconf commands to enable this option, and now the extra us variant with dead keys can be selected in the same way, as described in comments. Note that using dconf to enable two concurrent layouts and the toggle option will clear the selection in SFOS Settings > Text input > Active layout, and selecting one again from the UI will disable the dconf options. No need to restart Lipstick, it seems.
Let me know what you think, and please test if you can. I'm happy to try improving this.
--
Also, one question remains: now that
/
and?
are on theSym
key by default, should we keep them onp
andl
third levels too, or should we restoreö
andø
that are normally sitting there on a us-intl layout? Both choices have their pros and cons. Keeping/
and?
fits what is actually written on the keyboard, which makes it easier to understand for new users, and more straightforward, but this meansö
andø
are harder to use (they can still be used, but they're one level higher, and their capital letter version requires usingCaps Lock
), meaning it is less easy and less straightforward for those writing in a Scandic language.