From a8db6e705e78721a1f2d82c54fcebfe304b4d66a Mon Sep 17 00:00:00 2001 From: DreymaR <7303297+DreymaR@users.noreply.github.com> Date: Sun, 31 Jul 2022 17:00:34 +0200 Subject: [PATCH] Fixes * The Extend mapping for Enter/Return was reported to break the key: Disabled it. * The aliases for Colemak DH had a bug (not actually used so far though) --- README.md | 12 ++++++++++-- xkb-data_xmod/xkb/keycodes/aliases | 4 ++-- xkb-data_xmod/xkb/keycodes/evdev | 1 + xkb-data_xmod/xkb/keycodes/xfree86 | 1 + xkb-data_xmod/xkb/symbols/extend | 14 +++++++------- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index bf80b56..6428776 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ DreymaR, 2021-10 TODO: ----- -* Rename setxkb --> setkb ? +* Rename setxkb --> setkb? It's easier to type! Would have to update all docs including the Forum topic. * Make a restore to default layout shortcut? It's only an alias for `setxkb 4n/5n`. Maybe `resetxkb 4/5`? * To get Extend with the currently active layout, use `setxkbmap -v 9 -option "" -option "misc:extend,lv5:caps_switch_lock,compose:menu"`. * Add lv5:lalt_switch_lock for LALT-Extend. @@ -59,7 +59,15 @@ TODO: * A purge option in addition to restore for the install script? So backup dirs etc are removed and the xkb dir restored to original state. -* Update xkb-data and start testing on a Wayland system! +* Update xkb-data and start testing on a Wayland system! Use the GitLab repo as that's the freshest there is. + +* A clarification by Peter Hutterer on the mystic .part files in the rules component: + - https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/327#note_1436334 + - The parts are numbered to get their sequence in the resulting files right. Only when there are differences, they start with base/evdev. + - There are RMLVO (user interface) and KcCSGST (actual XKB) letter codes. The naming of those .part files is 1234-rmlvo-kccgst.part... + - but with only the relevant bits. So, e.g., `0009-m_g.part` is the model to group mapping of the final rules file. `ml_s.part` is model + layout to symbols. + - It seems that you can make layout commits by editing only the rules/base.xml (and symbols) file(s) though? + * Echo the setxkbmap command when using setxkb.sh, for ease of troubleshooting! Also make the script able to output the command for piping? * Add a model-less Colemak-CAWS for people who want to switch to QWERTY? Or instructions on how to setxkb it? That's better, I think. * Problem: Using Google Spreadsheets, hitting Caps Lock (which is mapped to ISO_Level5_Shift) clears the current spreadsheet cell. diff --git a/xkb-data_xmod/xkb/keycodes/aliases b/xkb-data_xmod/xkb/keycodes/aliases index 61475cf..ffe6430 100644 --- a/xkb-data_xmod/xkb/keycodes/aliases +++ b/xkb-data_xmod/xkb/keycodes/aliases @@ -148,7 +148,7 @@ xkb_keycodes "colemak_dh" { alias = ; alias = ; alias = ; - alias = ; + alias = ; alias = ; alias = ; alias = ; @@ -159,7 +159,7 @@ xkb_keycodes "colemak_dh" { alias = ; alias = ; alias = ; - alias = ; + alias = ; alias = ; }; // <-- DreymaR: Additions to xkb/keycodes/aliases diff --git a/xkb-data_xmod/xkb/keycodes/evdev b/xkb-data_xmod/xkb/keycodes/evdev index 489934c..e36bbb2 100644 --- a/xkb-data_xmod/xkb/keycodes/evdev +++ b/xkb-data_xmod/xkb/keycodes/evdev @@ -40,6 +40,7 @@ default xkb_keycodes "evdev" { = 36; = 66; + alias = ; // DreymaR: The Extend modifier is usually on the Caps key = 38; = 39; = 40; diff --git a/xkb-data_xmod/xkb/keycodes/xfree86 b/xkb-data_xmod/xkb/keycodes/xfree86 index dfefe78..eb7b5bc 100644 --- a/xkb-data_xmod/xkb/keycodes/xfree86 +++ b/xkb-data_xmod/xkb/keycodes/xfree86 @@ -45,6 +45,7 @@ xkb_keycodes "basic" { = 36; = 66; + alias = ; // DreymaR: The Extend modifier is usually on the Caps key = 38; = 39; = 40; diff --git a/xkb-data_xmod/xkb/symbols/extend b/xkb-data_xmod/xkb/symbols/extend index 9568cb5..1ae82b0 100644 --- a/xkb-data_xmod/xkb/symbols/extend +++ b/xkb-data_xmod/xkb/symbols/extend @@ -424,13 +424,13 @@ xkb_symbols "lv5" { Redirect(key=,clearmods=LevelFive), Redirect(key=,clearmods=LevelFive) , // / NoAction() , NoAction() ] }; // ' " - key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , - Print , Print , // PrtScr - Print , Print ], // PrtScr - actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), - Redirect(key=,clearmods=LevelFive), Redirect(key=,clearmods=LevelFive) , // - NoAction() , NoAction() ] - }; // Return/Enter +// key { symbols[Group1]=[ NoSymbol , NoSymbol , NoSymbol , NoSymbol , +// Print , Print , // PrtScr +// Print , Print ], // PrtScr +// actions[Group1]=[NoAction(),NoAction(),NoAction(),NoAction(), +// Redirect(key=,clearmods=LevelFive), Redirect(key=,clearmods=LevelFive) , // +// NoAction() , NoAction() ] +// }; // Return/Enter // This mapping breaks the Enter key for some? Not sure why. // +=======+==============================+=======+ // |=======| Lower Row |=======|