Removed the Curl keyboard models
* Instead of Curl models, reverted to swapping D-V in symbols/colemak, in the cmk_ed_dbg partial. * This means that Extend D will be Paste as it only sees the Angle mod. To make it V, you have to edit symbols/extend. * It's hard for many (new) users to understand and change the model, it seems.
This commit is contained in:
parent
bbade12adc
commit
57e5e883c4
|
@ -1,3 +1,4 @@
|
|||
*_ignore*
|
||||
*_test*
|
||||
*_Shortcut.*
|
||||
* Copy*
|
||||
|
|
57
README.md
57
README.md
|
@ -1,7 +1,7 @@
|
|||
DreymaR's Big Bag of Keyboard Tricks
|
||||
====================================
|
||||
|
||||
### For Linux (updated to [XKB-data v2.23.1-1ubuntu1][XKBdat], 2018-08)
|
||||
### For Linux using XKB
|
||||
|
||||
* New "Colemak[eD]" AltGr mappings (lv3-4) putting dead keys on AltGr+symbol keys and reworking most other mappings
|
||||
* Angle/Wide ergo modifications to improve wrist angles, hand spacing and right pinky stretch/load effort
|
||||
|
@ -11,30 +11,59 @@ DreymaR's Big Bag of Keyboard Tricks
|
|||
Also, a layout to 'Keep Local Symbols' like their default (QWERTY-type) counterparts for that locale
|
||||
* Intuitive phonetic layouts for Cyrillic, Greek and Hebrew scripts
|
||||
* Mirrored Colemak that allows one-handed typing (if I ever break an arm...)
|
||||
* The 4 Tarmak transitional Colemak layouts for learning Colemak (or Colemak-Curl) in smaller steps if desired
|
||||
|
||||
* The 4 Tarmak transitional Colemak layouts for learning Colemak(-DH) in smaller steps if desired
|
||||
|
||||
|
||||
More info
|
||||
---------
|
||||
|
||||
Run the install and setxkb scripts with -h (or look inside them) for more help and info about their workings!
|
||||
|
||||
|
||||
Learn about `setxkb.sh "model locale variant"` shortstring syntax in the [BigBag][BigBagTx].
|
||||
The default is `"5cw us us"`: PC105(ISO) board with Curl(DH)AngleWide mods, US locale, Cmk-eD UniversalSymbols variant.
|
||||
To switch to, say, an ANSI board without ergo mods, that's `4n` instead of `5cw`. Look in the scripts.
|
||||
|
||||
NOTE: It may be necessary to select "Use system defaults" if you have changed anything in the OS GUI layout settings.
|
||||
|
||||
These files are updated to [XKB-data v2.23.1-1ubuntu1][XKB-Ub18], 2018.
|
||||
The xkb-data package is consistent enough between distros. I use the [Debian xkb-data][XKB-DebS], sometimes with some Ubuntu updates.
|
||||
The .deb packages may be opened using `dpkg -x` or `ar -xv` (from `binutils`) on Linux, and for instance PeaZip on Windows.
|
||||
|
||||
|
||||
Links
|
||||
-----
|
||||
|
||||
See [DREYMAR'S XKB topic on the Colemak Forums](http://forum.colemak.com/viewtopic.php?id=1438) (http://forum.colemak.com).
|
||||
There are plenty of explanations and further links in there, as well as links to files.
|
||||
|
||||
See [DREYMAR'S BigBag XKB topic on the Colemak Forums][BigBagTx].
|
||||
There are plenty of explanations and further links in there.
|
||||
|
||||
|
||||
Happy XKB hacking!
|
||||
DreymaR, 2018-08
|
||||
|
||||
DreymaR, 2020-11
|
||||
|
||||
|
||||
TODO:
|
||||
-----
|
||||
* The Curl(DH) model implementation have to go as it may mess w/ QWERTY. Instead, I should use two Extend variants.
|
||||
- It also seems very hard for some newcomers to understand. So yes, I should have the Angle mod only and not CurlAngle models.
|
||||
- Also, matrix users want the V-D swap without an Angle mod! Another nail in the coffin for the Curl models.
|
||||
- Actually, should I make a NoModel CurlAngle layout for the model impaired? Vanilla, Curl(DH) and Curl(DH)Angle then.
|
||||
- Could just make a CurlAngle option!
|
||||
- But first, just the Curl with D-V swap built in. Just let the Extend Paste function be where it falls for now.
|
||||
* Update to the latest xkb-data: https://ubuntu.pkgs.org/20.04/ubuntu-main-amd64/xkb-data_2.29-2_all.deb.html
|
||||
* Find out how to change the rules component properly to allow compiling and eventually merging to the main repo?
|
||||
* Migrate from `~/.bashrc` to `~/.xprofile`? The latter is more appropriate, but which setups source it and which ones don't?
|
||||
* Note: It may be necessary to select "Use system defaults" if you have changed anything in the OS GUI layout settings.
|
||||
* The Curl(DH) model implementation may have to go as it may mess w/ QWERTY, and instead I should use two Extend variants?
|
||||
* Could use an <EXT> key code alias defined in keycodes/evdev (alias <EXT> = <CAPS>), instead of the <CAPS> code?
|
||||
* Choose another default layout for the setxkb.sh script than Norwegian! But which one? I want to diffferentiate between the US locale and the US variant (Universal Symbols).
|
||||
* Could use an <XTND> key code alias defined in keycodes/evdev (alias <XTND> = <CAPS>), instead of the <CAPS> code?
|
||||
|
||||
|
||||
DONE:
|
||||
-----
|
||||
* 2020-11-05: Switched to the new DH = DHm standard (was DH = DHk)
|
||||
* Changed the default layout for the setxkb.sh script to US (UniSym): In my experience, most uneducated users want US English.
|
||||
|
||||
|
||||
[XKBdat]: https://ubuntu.pkgs.org/18.04/ubuntu-main-amd64/xkb-data_2.23.1-1ubuntu1_all.deb.html (xkb-data download page)
|
||||
[XKB-conf]: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ (XKeyboard Config page)
|
||||
[XKBgitlb]: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config (XKB-config on GitLab)
|
||||
[XKB-pkgs]: https://pkgs.org/download/xkb-data (pkgs.org xkb-data page)
|
||||
[XKB-DebS]: https://packages.debian.org/sid/xkb-data (Debian Sid xkb-data download)
|
||||
[XKB-Ub18]: https://ubuntu.pkgs.org/18.04/ubuntu-main-amd64/xkb-data_2.23.1-1ubuntu1_all.deb.html (Ubuntu 18.04 LTS xkb-data page)
|
||||
[BigBagTx]: http://forum.colemak.com/viewtopic.php?id=1438 (DreymaR's BigBag on the Colemak Forum)
|
|
@ -66,7 +66,7 @@ DoBackup='ifnone' # (-n/b) Default backup behavior is "if no backups are found"
|
|||
SubDirs='all' # (-m) Directory/-ies inside X11 to modify (e.g., 'xkb locale', 'all')
|
||||
InstGTK='no' # (-g) Whether to install the GTK 2.0/3.0 config (if not present)
|
||||
SetXMap='no' # (-x) Whether to run the setxkb script after installing
|
||||
SetXStr='5cw us us' # (--) Shortcut string for setxkb - 'kbd loc sym' (model layout eD-variant)
|
||||
SetXStr='5caw us us' # (--) Shortcut string for setxkb - 'kbd loc sym' (model layout eD-variant)
|
||||
## NOTE: '# (-a)' means that the value can be set by option argument '-a <value>'
|
||||
|
||||
HelpStr="\e[1mUsage: bash ${MyNAME} [optional args] [<kbd> [<loc> <sym>]]\e[0m\n"\
|
||||
|
|
60
setxkb.sh
60
setxkb.sh
|
@ -5,7 +5,7 @@
|
|||
## === by Øystein Bech "DreymaR" Gadmar, 2014 ===
|
||||
## ======================================================
|
||||
|
||||
HeadStr="DreymaR's setxkbmap script (by GadOE, 2015-01)"
|
||||
HeadStr="DreymaR's setxkbmap script (by GadOE, 2020-12)"
|
||||
DescStr=\
|
||||
"\e[1mShell script to change X.org keyboard setup\e[0m\n"\
|
||||
" using the 'setxkbmap' command.\n"\
|
||||
|
@ -23,8 +23,8 @@ FootStr="Happy xkb-hacking! ~ Øystein Bech 'DreymaR' Gadmar"
|
|||
# Example: '5w no us' activates model pc105aw-sl, layout no(cmk_ed_us)
|
||||
# Models: 4n 4a(pc104angle-z) 4w(pc104wide-qu) 4aw(pc104aw-zqu) 4f(pc104awing)
|
||||
# 5n 5a(pc105angle) 5w/5aw(pc105aw-sl)
|
||||
# - Curl(DH) models add a 'c', like this: 4c, 5cw etc
|
||||
# - Thus, the allowed model short strings are (4|5)(n|a|c)[(w|f)]
|
||||
# - Curl(DH) "models" add a 'c', like this: 4c, 5caw etc
|
||||
# - Thus, the allowed model short strings are (4|5)(n|a|c|ca)[(w|f)]
|
||||
# XKB options are left out of this: Too complex (e.g., replace or append?)
|
||||
|
||||
##-------------- init ------------------------------------------
|
||||
|
@ -36,18 +36,18 @@ MyNAME=`basename $0`
|
|||
## @@@ The default X11 dir under some (older) distros is /usr/lib/X11 @@@
|
||||
X11DIR='/usr/share/X11'; [ -d "${X11DIR}" ] || X11DIR='/usr/lib/X11'
|
||||
|
||||
#~ XKBmodel=pc104aw-zqu # ANSI-104 keyboard w/ Angle(Z)Wide(Quote) mod
|
||||
XKBmodel=pc105caw-sl # ISO-105 keyboard w/ CurlAngleWide(Slash) mod
|
||||
#~ XKBlayout='us(cmk_ed_us),gr(colemak),ru(colemak)'
|
||||
XKBlayout='no(cmk_ed_us)' # Norwegian Colemak[eD]'Universal Symbols' layout
|
||||
#~ XKBmodel=pc104aw-zqu # ANSI-104 keyboard w/ Angle(Z)Wide(Quote) mod
|
||||
XKBmodel=pc105aw-sl # ISO-105 keyboard w/ CurlAngleWide(Slash) mod
|
||||
#~ XKBlayout='us(cmk_ed_us),gr(colemak),ru(colemak)' # Multiple layouts
|
||||
XKBlayout='us(cmk_ed_us)' # US English Colemak[eD]'Universal Symbols' layout
|
||||
XKBoption='misc:extend,lv5:caps_switch_lock,grp:shifts_toggle,compose:menu'
|
||||
VerboseLvl=9 # (-v) How much info should setxkbmap print out?
|
||||
KeepXKM='no' # (-k) Retain old /var/lib/xkb/server-*.xkm files?
|
||||
XKBdir="${X11DIR}/xkb" # (-d) The xkb-type dir to run setxkbmap from
|
||||
AddCmd='no' # (-a) Add setxkbmap cmd to file?
|
||||
VerboseLvl=9 # (-v) How much info should setxkbmap print out?
|
||||
KeepXKM='no' # (-k) Retain old /var/lib/xkb/server-*.xkm files?
|
||||
XKBdir="${X11DIR}/xkb" # (-d) The xkb-type dir to run setxkbmap from
|
||||
AddCmd='no' # (-a) Add setxkbmap cmd to file?
|
||||
AddDefault="${HOME}/.bashrc"
|
||||
AddCmdTo=${AddDefault} # (-f) File (such as '~/.bashrc') to add setxkbmap cmd to
|
||||
SetXStr='' #'5cw no us' # (--) Shortcut string for setxkb (model locale eD-variant)
|
||||
AddCmdTo=${AddDefault} # (-f) File (such as '~/.bashrc') to add setxkbmap cmd to
|
||||
SetXStr='' #'5caw us us' # (--) Shortcut string for setxkb (model locale eD-variant)
|
||||
## NOTE: '# (-a)' means that the value can be set by option argument '-a <value>'
|
||||
|
||||
HelpStr="\e[1mUsage: bash ${MyNAME} [optional args] [<kbd> [<loc> <sym>]]\e[0m\n"\
|
||||
|
@ -72,8 +72,8 @@ HelpStr="\e[1mUsage: bash ${MyNAME} [optional args] [<kbd> [<loc> <sym>]]\e[0m\n
|
|||
" <loc> Two-letter locale layout code like 'us' for USA, 'gb' for UK etc\n"\
|
||||
" <sym> 'us'/'ks' for 'Universal' or 'Keep Locale' symbol variants\n\n"\
|
||||
" Examples: '5a se us': PC105-Angle, Swedish Cmk[eD] 'UnifiedSym'\n"\
|
||||
" '4cf gb ks': PC104-Curl(DH)AWing, Eng.(UK) Cmk[eD] 'KeepSym'\n"\
|
||||
" '5cw': PC105-Curl(DH)AngleWide, keep current layout/variant\n"
|
||||
" '4ca gb ks': PC104-Curl(DH)Angle, Eng.(UK) Cmk[eD] 'KeepSym'\n"\
|
||||
" '5caw': PC105-Curl(DH)AngleWide, keep current layout/variant\n"
|
||||
#~ " (See the script's comments for more info.)"
|
||||
|
||||
|
||||
|
@ -148,20 +148,15 @@ shift $(( $OPTIND - 1 )) # Remove already processed args
|
|||
|
||||
if [ -n "${SetXStr}" ]; then # Use ShortString notation
|
||||
case ${SetXStr[0]} in
|
||||
4n) XKBmodel='pc104' ;; # Generic ANSI-101/104-key
|
||||
4a) XKBmodel='pc104angle-z' ;; # w/ Angle(Z) ergo mod
|
||||
4w) XKBmodel='pc104wide-qu' ;; # w/ Wide(Quote) ergo mod
|
||||
4aw) XKBmodel='pc104aw-zqu' ;; # w/ Angle(Z)Wide(Quote) ergo mod
|
||||
4f|4af) XKBmodel='pc104awing' ;; # w/ AngleWing(Quote) ergo mod
|
||||
4c) XKBmodel='pc104curl-z' ;; # w/ Curl(DH)Angle(Z) ergo mod
|
||||
4cw) XKBmodel='pc104caw-zqu' ;; # w/ Curl(DH)Angle(Z)Wide(Quote) mod
|
||||
4cf) XKBmodel='pc104cawing' ;; # w/ Curl(DH)AngleWing(Quote) mod
|
||||
4n|4c) XKBmodel='pc104' ;; # Generic ANSI-101/104-key
|
||||
4a|4ca) XKBmodel='pc104angle-z' ;; # w/ Angle(Z) ergo mod
|
||||
4w|4cw) XKBmodel='pc104wide-qu' ;; # w/ Wide(Quote) ergo mod
|
||||
4aw|4caw) XKBmodel='pc104aw-zqu' ;; # w/ Angle(Z)Wide(Quote) ergo mod
|
||||
4f|4af|4cf) XKBmodel='pc104awing' ;; # w/ AngleWing(Quote) ergo mod
|
||||
|
||||
5n) XKBmodel='pc105' ;; # Generic ISO-102/105-key
|
||||
5a) XKBmodel='pc105angle' ;; # w/ Angle(LSGT) ergo mod
|
||||
5w|5aw) XKBmodel='pc105aw-sl' ;; # w/ AngleWide(Slash) ergo mod
|
||||
5c) XKBmodel='pc105curl' ;; # w/ Curl(DH)Angle ergo mod
|
||||
5cw) XKBmodel='pc105caw-sl' ;; # w/ Curl(DH)AngleWide(Slash) mod
|
||||
5n|5c) XKBmodel='pc105' ;; # Generic ISO-102/105-key
|
||||
5a|5ca) XKBmodel='pc105angle' ;; # w/ Angle(LSGT) ergo mod
|
||||
5w|5aw|5caw) XKBmodel='pc105aw-sl' ;; # w/ AngleWide(Slash) ergo mod
|
||||
|
||||
*) MyError "ShortStr model '${SetXStr[0]}' unknown!" ;;
|
||||
esac
|
||||
|
@ -171,14 +166,7 @@ if [ -n "${SetXStr}" ]; then # Use ShortString notation
|
|||
fi
|
||||
|
||||
## NOTE: The code below post processes Curl models into model+option, as per my XKB implementation.
|
||||
case ${XKBmodel} in
|
||||
pc104curl-z) Curling='yes' ;; # PC104-Curl(DH)Angle(Z)
|
||||
pc104caw-zqu) Curling='yes' ;; # PC104-Curl(DH)Angle(Z)Wide(Quote)
|
||||
pc104cawing) Curling='yes' ;; # PC104-Curl(DH)AngleWing(Quote)
|
||||
pc105curl) Curling='yes' ;; # PC105-Curl(DH)Angle(LSGT)
|
||||
pc105caw-sl) Curling='yes' ;; # PC105-Curl(DH)AngleWide(Slash)
|
||||
esac
|
||||
[[ $Curling == 'yes' ]] && XKBoption+=',misc:cmk_curl_dh'
|
||||
[[ ${SetXStr[0]} =~ "c" ]] && XKBoption+=',misc:cmk_curl_dh'
|
||||
|
||||
|
||||
##-------------- main ------------------------------------------
|
||||
|
|
Binary file not shown.
|
@ -2,4 +2,4 @@ XKB data for DreymaR's Big Bag of Keyboard Tricks
|
|||
=================================================
|
||||
|
||||
xkb-data version: 2-23-1-1ub1
|
||||
My starting date: 2018-02-02
|
||||
Deb archive date: 2018-02-02
|
||||
|
|
|
@ -2,4 +2,5 @@ XKB data for DreymaR's Big Bag of Keyboard Tricks
|
|||
=================================================
|
||||
|
||||
xkb-data version: 2-23-1-1ub1, edition DreymaR
|
||||
Deb archive date: 2018-02-02
|
||||
My starting date: 2018-08-21
|
||||
|
|
|
@ -1590,28 +1590,6 @@ xkb_geometry "pc104angle-z" {
|
|||
}; // End of "Alpha" section
|
||||
}; // End of "pc104angle-z" geometry
|
||||
|
||||
// pc104_CurlAngle(Z) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_geometry "pc104curl-z" {
|
||||
include "pc(pc104)"
|
||||
description= "Generic 104 - CurlAngle(Z)Ergo mod";
|
||||
|
||||
section.left= 19;
|
||||
row.left= 1;
|
||||
key.shape= "NORM";
|
||||
key.gap= 1;
|
||||
section "Alpha" {
|
||||
top= 61;
|
||||
row {
|
||||
top= 58;
|
||||
keys { { <LFSH>, "LFSH", color="grey20" },
|
||||
<AB02>, <AB03>, <AB05>, <AB04>, <AB01>,
|
||||
<AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
|
||||
{ <RTSH>, "RTSH", color="grey20" }
|
||||
};
|
||||
}; // End of bottom row
|
||||
}; // End of "Alpha" section
|
||||
}; // End of "pc104curl-z" geometry
|
||||
|
||||
// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013)
|
||||
xkb_geometry "pc104wide-qu" {
|
||||
include "pc(pc104)"
|
||||
|
@ -1680,28 +1658,6 @@ xkb_geometry "pc104aw-zqu" {
|
|||
}; // End of "Alpha" section
|
||||
}; // End of "pc104aw-zqu" geometry
|
||||
|
||||
// pc104_CurlAngle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_geometry "pc104caw-zqu" {
|
||||
include "pc(pc104wide-qu)"
|
||||
description= "Generic 104 - CurlAngle(Z)Wide(Quote)Ergo mod";
|
||||
|
||||
section.left= 19;
|
||||
row.left= 1;
|
||||
key.shape= "NORM";
|
||||
key.gap= 1;
|
||||
section "Alpha" {
|
||||
top= 61;
|
||||
row {
|
||||
top= 58;
|
||||
keys { { <LFSH>, "LFSH", color="grey20" },
|
||||
<AB02>, <AB03>, <AB05>, <AB04>, <AB01>,
|
||||
<AB10>, <AB06>, <AB07>, <AB08>, <AB09>,
|
||||
{ <RTSH>, "RTSH", color="grey20" }
|
||||
};
|
||||
}; // End of bottom row
|
||||
}; // End of "Alpha" section
|
||||
}; // End of "pc104caw-zqu" geometry
|
||||
|
||||
// pc104_AngleWing(Quote) ergonomic mod (by DreymaR, 2015)
|
||||
xkb_geometry "pc104awing" {
|
||||
include "pc(pc104)"
|
||||
|
@ -1748,28 +1704,6 @@ xkb_geometry "pc104awing" {
|
|||
}; // End of "Alpha" section
|
||||
}; // End of "pc104awing" geometry
|
||||
|
||||
// pc104_CurlAngleWing(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_geometry "pc104cawing" {
|
||||
include "pc(pc104awing)"
|
||||
description= "Generic 104 - CurlAngleWing(Quote)Ergo mod";
|
||||
|
||||
section.left= 19;
|
||||
row.left= 1;
|
||||
key.shape= "NORM";
|
||||
key.gap= 1;
|
||||
section "Alpha" {
|
||||
top= 61;
|
||||
row {
|
||||
top= 58;
|
||||
keys { { <LFSH>, "LFSH", color="grey20" },
|
||||
<AB01>, <AB02>, <AB03>, <AB05>, <AB04>,
|
||||
<AB10>, <AB06>, <AB07>, <AB08>, <AB09>,
|
||||
{ <RTSH>, "RTSH", color="grey20" }
|
||||
};
|
||||
}; // End of bottom row
|
||||
}; // End of "Alpha" section
|
||||
}; // End of "pc104caw-zqu" geometry
|
||||
|
||||
// pc105_Angle(LSGT) ergonomic mod (by DreymaR, 2011)
|
||||
xkb_geometry "pc105angle" {
|
||||
include "pc(pc105)"
|
||||
|
@ -1859,26 +1793,4 @@ xkb_geometry "pc105aw-sl" {
|
|||
}; // End of bottom row
|
||||
}; // End of "Alpha" section
|
||||
}; // End of "pc105aw-sl" geometry
|
||||
|
||||
// pc105_CurlAngleWide(Slash) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_geometry "pc105caw-sl" {
|
||||
include "pc(pc105aw-sl)"
|
||||
description= "Generic 105 - CurlAngleWide(/)Ergo mod";
|
||||
|
||||
section.left= 19;
|
||||
row.left= 1;
|
||||
key.shape= "NORM";
|
||||
key.gap= 1;
|
||||
section "Alpha" {
|
||||
top= 61;
|
||||
row {
|
||||
top= 58;
|
||||
keys { { <LFSH>, "LFSH", color="grey20" },
|
||||
<AB01>, <AB02>, <AB03>, <AB05>, <AB04>, <LSGT>,
|
||||
<BKSL>, <AB06>, <AB07>, <AB08>, <AB09>,
|
||||
{ <RTSH>, "RTSH", color="grey20" }
|
||||
};
|
||||
}; // End of bottom row
|
||||
}; // End of "Alpha" section
|
||||
}; // End of "pc105caw-sl" geometry
|
||||
// <-- DreymaR: Additions to xkb/geometry/pc
|
||||
|
|
|
@ -327,18 +327,6 @@ xkb_keycodes "pc104angle-z" {
|
|||
augment "evdev(evdev)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngle(Z) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104curl-z" {
|
||||
|
||||
<AB02> = 52; // X < Z
|
||||
<AB03> = 53; // C < X
|
||||
<AB05> = 54; // B < C
|
||||
<AB04> = 55; // V < V
|
||||
<AB01> = 56; // Z < B
|
||||
|
||||
augment "evdev(evdev)"
|
||||
};
|
||||
|
||||
// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013)
|
||||
xkb_keycodes "pc104wide-qu" {
|
||||
|
||||
|
@ -363,23 +351,6 @@ xkb_keycodes "pc104awing" {
|
|||
augment "evdev(evdev)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104caw-zqu" {
|
||||
|
||||
include "evdev(pc104wide-rightpart)"
|
||||
include "evdev(pc104wide-midpart)"
|
||||
augment "evdev(pc104curl-z)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngleWing(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104cawing" {
|
||||
|
||||
<AB05> = 55; // B < V
|
||||
<AB04> = 56; // V < B
|
||||
|
||||
augment "evdev(pc104awing)"
|
||||
};
|
||||
|
||||
// pc104_Wide partial ergonomic mod (by DreymaR, 2013)
|
||||
xkb_keycodes "pc104wide-midpart" {
|
||||
|
||||
|
@ -460,19 +431,6 @@ xkb_keycodes "pc105angle" {
|
|||
augment "evdev(evdev)"
|
||||
};
|
||||
|
||||
// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc105curl" {
|
||||
|
||||
<AB01> = 94; // Z < LG
|
||||
<AB02> = 52; // X < Z
|
||||
<AB03> = 53; // C < X
|
||||
<AB05> = 54; // B < C
|
||||
<AB04> = 55; // V < V
|
||||
<LSGT> = 56; // LG < B
|
||||
|
||||
augment "evdev(evdev)"
|
||||
};
|
||||
|
||||
// pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011)
|
||||
xkb_keycodes "pc105aw-sl" {
|
||||
|
||||
|
@ -480,13 +438,6 @@ xkb_keycodes "pc105aw-sl" {
|
|||
augment "evdev(pc105angle)"
|
||||
};
|
||||
|
||||
// pc105_CurlAngleWide(Slash) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc105caw-sl" {
|
||||
|
||||
include "evdev(pc105wide-rightpart)"
|
||||
augment "evdev(pc105curl)"
|
||||
};
|
||||
|
||||
// pc105_Wide(Slash) partial ergonomic mod (by DreymaR, 2011)
|
||||
xkb_keycodes "pc105wide-rightpart" {
|
||||
|
||||
|
|
|
@ -423,18 +423,6 @@ xkb_keycodes "pc104angle-z" {
|
|||
augment "xfree86(xfree86)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngle(Z) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104curl-z" {
|
||||
|
||||
<AB02> = 52; // X < Z
|
||||
<AB03> = 53; // C < X
|
||||
<AB05> = 54; // B < C
|
||||
<AB04> = 55; // V < V
|
||||
<AB01> = 56; // Z < B
|
||||
|
||||
augment "xfree86(xfree86)"
|
||||
};
|
||||
|
||||
// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013)
|
||||
xkb_keycodes "pc104wide-qu" {
|
||||
|
||||
|
@ -459,23 +447,6 @@ xkb_keycodes "pc104awing" {
|
|||
augment "xfree86(xfree86)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104caw-zqu" {
|
||||
|
||||
include "xfree86(pc104wide-rightpart)"
|
||||
include "xfree86(pc104wide-midpart)"
|
||||
augment "xfree86(pc104curl-z)"
|
||||
};
|
||||
|
||||
// pc104_CurlAngleWing(Quote) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc104cawing" {
|
||||
|
||||
<AB05> = 55; // B < V
|
||||
<AB04> = 56; // V < B
|
||||
|
||||
augment "xfree86(pc104awing)"
|
||||
};
|
||||
|
||||
// pc104_Wide partial ergonomic mod (by DreymaR, 2013)
|
||||
xkb_keycodes "pc104wide-midpart" {
|
||||
|
||||
|
@ -556,19 +527,6 @@ xkb_keycodes "pc105angle" {
|
|||
augment "xfree86(xfree86)"
|
||||
};
|
||||
|
||||
// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc105curl" {
|
||||
|
||||
<AB01> = 94; // Z < LG
|
||||
<AB02> = 52; // X < Z
|
||||
<AB03> = 53; // C < X
|
||||
<AB05> = 54; // B < C
|
||||
<AB04> = 55; // V < V
|
||||
<LSGT> = 56; // LG < B
|
||||
|
||||
augment "xfree86(xfree86)"
|
||||
};
|
||||
|
||||
// pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011)
|
||||
xkb_keycodes "pc105aw-sl" {
|
||||
|
||||
|
@ -576,13 +534,6 @@ xkb_keycodes "pc105aw-sl" {
|
|||
augment "xfree86(pc105angle)"
|
||||
};
|
||||
|
||||
// pc105_CurlAngleWide(Slash) ergonomic mod (by DreymaR, 2017)
|
||||
xkb_keycodes "pc105caw-sl" {
|
||||
|
||||
include "xfree86(pc105wide-rightpart)"
|
||||
augment "xfree86(pc105curl)"
|
||||
};
|
||||
|
||||
// pc105_Wide(Slash) partial ergonomic mod (by DreymaR, 2011)
|
||||
xkb_keycodes "pc105wide-rightpart" {
|
||||
|
||||
|
|
|
@ -978,19 +978,16 @@
|
|||
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
|
||||
* misc:typo = +typo(base):2
|
||||
* misc:extend = +extend(basic):2
|
||||
// * misc:cmk_curl_dh = +colemak(cmk_ed_dh):2
|
||||
|
||||
! layout[3] option = symbols
|
||||
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
|
||||
* misc:typo = +typo(base):3
|
||||
* misc:extend = +extend(basic):3
|
||||
// * misc:cmk_curl_dh = +colemak(cmk_ed_dh):3
|
||||
|
||||
! layout[4] option = symbols
|
||||
$threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
|
||||
* misc:typo = +typo(base):4
|
||||
* misc:extend = +extend(basic):4
|
||||
// * misc:cmk_curl_dh = +colemak(cmk_ed_dh):4
|
||||
|
||||
! option = symbols
|
||||
grp:shift_toggle = +group(shifts_toggle)
|
||||
|
|
|
@ -7,13 +7,8 @@
|
|||
pc104wide-qu Generic 104-key PC Wide(Quote)Ergo
|
||||
pc104aw-zqu Generic 104-key PC Angle(Z)Wide(Quote)Ergo
|
||||
pc104awing Generic 104-key PC AngleWing(Quote)Ergo
|
||||
pc104curl-z Generic 104-key PC CurlAngle(Z)Ergo
|
||||
pc104caw-zqu Generic 104-key PC CurlAngle(Z)Wide(Quote)Ergo
|
||||
pc104cawing Generic 104-key PC CurlAngleWing(Quote)Ergo
|
||||
pc105angle Generic 105-key PC (intl.) Angle_Ergo
|
||||
pc105aw-sl Generic 105-key PC (intl.) AngleWide(/)Ergo
|
||||
pc105curl Generic 105-key PC (intl.) CurlAngle_Ergo
|
||||
pc105caw-sl Generic 105-key PC (intl.) CurlAngleWide(/)Ergo
|
||||
dell101 Dell 101-key PC
|
||||
latitude Dell Latitude laptop
|
||||
dellm65 Dell Precision M65 laptop
|
||||
|
|
|
@ -58,27 +58,6 @@
|
|||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc104curl-z</name>
|
||||
<description>Generic 104-key PC (CurlAngle(Z)Ergo mod)</description>
|
||||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc104caw-zqu</name>
|
||||
<description>Generic 104-key PC (CurlAngle(Z)Wide(Quote)Ergo mod)</description>
|
||||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc104cawing</name>
|
||||
<description>Generic 104-key PC (CurlAngleWing(Quote)Ergo mod)</description>
|
||||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc105angle</name>
|
||||
|
@ -93,20 +72,6 @@
|
|||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc105curl</name>
|
||||
<description>Generic 105-key PC (intl.) (CurlAngle_Ergo mod)</description>
|
||||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>pc105caw-sl</name>
|
||||
<description>Generic 105-key PC (intl.) (CurlAngleWide(/)Ergo mod)</description>
|
||||
<vendor>Generic</vendor>
|
||||
</configItem>
|
||||
</model>
|
||||
<model>
|
||||
<configItem>
|
||||
<name>dell101</name>
|
||||
|
|
|
@ -267,18 +267,16 @@ xkb_symbols "cmk_ed_dvh" {
|
|||
|
||||
hidden partial alphanumeric_keys
|
||||
xkb_symbols "cmk_ed_dbg" {
|
||||
// This is the 'Dbg' loop for the Colemak Curl-DH ergo mod.
|
||||
// In the new implementation, D is moved inside V by one of the CurlAngle mods (to affect Extend)
|
||||
// This is the 'Dbg' loop for the Colemak Curl-DH ergo mod. D is moved inside V (Extend is unaffected).
|
||||
key <AD05> { [ b, B, enfilledcircbullet, Greek_beta ] }; // QWE T Cmk G
|
||||
key <AC05> { [ g, G, eng, ENG ] }; // QWE G Cmk D
|
||||
key <AB05> { [ d, D, eth, ETH ] }; // QWE/Cmk B
|
||||
// key <AB04> { [ d, D, eth, ETH ] }; // QWE/Cmk V
|
||||
// key <AB05> { [ v, V, division, Greek_gamma ] }; // QWE/Cmk B
|
||||
key <AB04> { [ d, D, eth, ETH ] }; // QWE/Cmk V
|
||||
key <AB05> { [ v, V, division, Greek_gamma ] }; // QWE/Cmk B
|
||||
};
|
||||
|
||||
hidden partial alphanumeric_keys
|
||||
xkb_symbols "cmk_ed_hmk" {
|
||||
// This is the 'Hmk' switch for the Colemak Curl-DH ergo mod
|
||||
// This is the 'Hmk' switch for the Colemak Curl-DHk ergo mod with K on the home row.
|
||||
key <AC06> { [ k, K, ccedilla, Ccedilla ] }; // QWE/Cmk H
|
||||
key <AB06> { [ m, M, multiply, downarrow ] }; // QWE N Cmk K
|
||||
key <AB07> { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M
|
||||
|
@ -286,7 +284,7 @@ xkb_symbols "cmk_ed_hmk" {
|
|||
|
||||
hidden partial alphanumeric_keys
|
||||
xkb_symbols "cmk_ed_hm" {
|
||||
// This is the 'Hm' switch for the old Colemak Curl-DHm ergo mod, with M on the home row.
|
||||
// This is the 'Hm' switch for the original/standard Colemak Curl-DHm ergo mod.
|
||||
key <AC06> { [ m, M, multiply, downarrow ] }; // QWE/Cmk H
|
||||
key <AB07> { [ h, H, hstroke, Hstroke ] }; // QWE/Cmk M
|
||||
};
|
||||
|
@ -361,15 +359,14 @@ xkb_symbols "tarmak2c_et" {
|
|||
include "colemak(tarmak_mask_prs_to_rsd)"
|
||||
include "colemak(tarmak_mask_jyoc_to_yocp)"
|
||||
include "colemak(tarmak_mask_lui_to_uil)"
|
||||
// TODO: Make this go away, implementing proper CurlAngle models in its stead.
|
||||
//// For the old Curl(DvbgHm) mod, activating the right-hand HM switch is still optional.
|
||||
//// For Curl(DHm), activating the right-hand HM switch is still optional.
|
||||
// include "colemak(cmk_ed_dbg)"
|
||||
// include "colemak(cmk_ed_dbghm)"
|
||||
//// NOTE: The below is for DBG/DVBG mods (VJ/JV on <AB04>/<AB05> respectively)
|
||||
//// For the Curl-DH mod, both sides are activated at this point forward. (Activate it normally for step 3–4.)
|
||||
include "colemak(cmk_ed_dbghk)"
|
||||
key <AB04> { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V
|
||||
key <AB05> { [ j, J, U0283, U01A9 ] }; // QWE/Cmk B - stray J
|
||||
key <AB04> { [ j, J, U0283, U01A9 ] }; // QWE/Cmk B - stray J
|
||||
key <AB05> { [ v, V, division, Greek_gamma ] }; // QWE/Cmk V
|
||||
name[Group1]= "English/Intl (Tarmak2c_ET - Colemak Curl-DH transitional)";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue