From 68a482969d206f72234e1a12838a2cd8b0af2cd0 Mon Sep 17 00:00:00 2001 From: DreymaR Date: Fri, 9 Jun 2017 12:44:45 +0200 Subject: [PATCH] New unified Curl-DH mod; CurlAngle models --- .gitattributes | 53 ++++-- LICENSE.md | 2 +- README.md | 4 +- dreymar-xtools/sample_etc-default-keyboard | 4 +- dreymar-xtools/xkbmodel-awide-sl.sh | 8 +- dreymar-xtools/xkbmodel-pc105.sh | 8 +- install-dreymar-xmod.sh | 4 +- setxkb.sh | 97 +++++----- x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc | 142 +++++++++++++-- .../xkb/keycodes/aliases | 32 ++++ .../xkb/keycodes/evdev | 160 +++++++++++------ .../xkb/keycodes/xfree86 | 165 ++++++++++++------ x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev | 32 ++-- .../xkb/rules/evdev.lst | 32 ++-- .../xkb/rules/evdev.xml | 87 +++++---- .../xkb/symbols/colemak | 148 ++++++++-------- .../xkb/symbols/colemak_eD_template | 2 +- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hu | 2 +- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il | 42 ++++- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ro | 2 +- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs | 2 +- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/tr | 2 +- x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us | 72 +++----- 23 files changed, 705 insertions(+), 397 deletions(-) diff --git a/.gitattributes b/.gitattributes index bdb0cab..57cf60c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,42 @@ -# Auto detect text files and perform LF normalization +# Set the default behavior, in case people don't have core.autocrlf set: * text=auto -# Custom for Visual Studio -*.cs diff=csharp +# Declare text files that will always be normalized and converted +# to native line endings on checkout: +*.txt text +*.md text +*.c text +*.h text +*.cpp text +*.hpp text +*.c++ text +*.h++ text +*.bat text +*.css text +*.htm text +*.html text +*.xml text +*.yaml text +*.ini text +*.hex text +LICENSE text -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain +# Declare files that will always have LF/CRLF line endings on checkout: +*.svg text eol=lf +*.sh text eol=lf +*.mk text eol=lf + +# Declare files that are truly binary and should not be modified: +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +*.png binary +*.pdf binary +*.zip binary +*.tar binary +*.gz binary +*.tgz binary diff --git a/LICENSE.md b/LICENSE.md index 786f243..4ddfb4d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright 2016, Øystein Bech Gadmar (a.k.a. "DreymaR") +Copyright 2016, Øystein Bech Gadmar (a.k.a. "DreymaR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 6757dad..f782a82 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ DreymaR's Big Bag of Keyboard Tricks * New "Colemak[eD]" AltGr mappings (lv3-4) putting dead keys on AltGr+symbol keys and reworking most other mappings * An "Extend" layer using Caps Lock as a modifier (lv5-8) for navigation/editing from the home position and more * Angle/Wide ergo modifications to improve wrist angles, hand spacing and right pinky stretch/load effort -* Curl-DH ergo modifications to encourage natural finger curvature +* Curl(DH) ergo modifications to encourage natural finger curvature * For several locales, a 'Unified Symbols' layout with only a few necessary changes from the standard Colemak[eD]; 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 @@ -26,4 +26,4 @@ See the [DREYMAR'S (XKB) topic on the Colemak Forums](http://forum.colemak.com/v There are plenty of explanations and further links in there, as well as links to files. Happy XKB hacking! -DreymaR, 2016-10 +DreymaR, 2017-06 diff --git a/dreymar-xtools/sample_etc-default-keyboard b/dreymar-xtools/sample_etc-default-keyboard index 91ca613..b36a648 100644 --- a/dreymar-xtools/sample_etc-default-keyboard +++ b/dreymar-xtools/sample_etc-default-keyboard @@ -7,10 +7,10 @@ # in /etc/X11/xorg.conf. #XKBMODEL="pc105" -XKBMODEL="pc105awide-sl" +XKBMODEL="pc105caw-sl" XKBLAYOUT="no,no" XKBVARIANT="cmk_ed_us," -XKBOPTIONS="compose:menu,terminate:ctrl_alt_bksp,grp_led:scroll,lv5:caps_switch_lock,misc:extend" +XKBOPTIONS="compose:menu,terminate:ctrl_alt_bksp,grp_led:scroll,lv5:caps_switch_lock,misc:extend,misc:cmk_curl_dh" # If you don't want to use the XKB layout on the console, you can # specify an alternative keymap. Make sure it will be accessible diff --git a/dreymar-xtools/xkbmodel-awide-sl.sh b/dreymar-xtools/xkbmodel-awide-sl.sh index 187a4c9..70914cf 100644 --- a/dreymar-xtools/xkbmodel-awide-sl.sh +++ b/dreymar-xtools/xkbmodel-awide-sl.sh @@ -10,9 +10,13 @@ #XKBmodel='pc104' #XKBmodel='pc104angle-z' #XKBmodel='pc104wide-qu' +#XKBmodel='pc104aw-zqu' +#XKBmodel='pc104curl-z' +#XKBmodel='pc104caw-zqu' #XKBmodel='pc105' -XKBmodel='pc105awide-sl' -#XKBmodel='pc105angle-lg' +#XKBmodel='pc105angle' +XKBmodel='pc105aw-sl' +#XKBmodel='pc105caw-sl' VerboseLvl=9 UsageStr="sh $0 [-m model]" HelpStr="Usage: $UsageStr\n"\ diff --git a/dreymar-xtools/xkbmodel-pc105.sh b/dreymar-xtools/xkbmodel-pc105.sh index 5ab0a37..f13d686 100644 --- a/dreymar-xtools/xkbmodel-pc105.sh +++ b/dreymar-xtools/xkbmodel-pc105.sh @@ -10,9 +10,13 @@ #XKBmodel='pc104' #XKBmodel='pc104angle-z' #XKBmodel='pc104wide-qu' +#XKBmodel='pc104aw-zqu' +#XKBmodel='pc104curl-z' +#XKBmodel='pc104caw-zqu' XKBmodel='pc105' -#XKBmodel='pc105awide-sl' -#XKBmodel='pc105angle-lg' +#XKBmodel='pc105angle' +#XKBmodel='pc105aw-sl' +#XKBmodel='pc105caw-sl' VerboseLvl=9 UsageStr="sh $0 [-m model]" HelpStr="Usage: $UsageStr\n"\ diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh index 7c018b8..547a692 100644 --- a/install-dreymar-xmod.sh +++ b/install-dreymar-xmod.sh @@ -8,7 +8,7 @@ HeadStr="DreymaR's Big Bag Of Tricks install script (by GadOE, 2016-06)" DescStr=\ "\e[1mShell script to apply DreymaR's changes to the X keyboard files:\e[0m\n"\ -" - AngleWide Ergonomic keyboard models for pc104/pc105 keyboards,\n"\ +" - CurlAngleWide Ergonomic keyboard models for pc104/pc105 keyboards,\n"\ " - Extend mappings as a Misc option and CapsLock as a chooser (using lv5-8),\n"\ " - the Colemak [edition DreymaR] layout, using my own lv3-4 mappings,\n"\ " - locale variants of Colemak[eD] with 'keep local' or 'unified' symbol keys,\n"\ @@ -67,7 +67,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='5aw us us' # (-s) Shortcut string for setxkb - 'mmm ll vv' (model layout eD-variant) +SetXStr='5cw us us' # (-s) Shortcut string for setxkb - 'mmm ll vv' (model layout eD-variant) ## NOTE: '# (-a)' means that the value can be set by option argument '-a ' HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ diff --git a/setxkb.sh b/setxkb.sh index f3fbcd2..7d2a6f4 100644 --- a/setxkb.sh +++ b/setxkb.sh @@ -19,10 +19,13 @@ FootStr="Happy xkb-hacking! ~ Øystein Bech 'DreymaR' Gadmar" # Need a full xkb dir then (not just the xkb-mod files) ## NOTE: I made a handy shorthand for activating simple cmk_ed model/layout combos. -# Example: -s '5w no us' activates model pc105awide-sl, layout no(cmk_ed_us) -# Models: 4n 4a(pc104angle-z) 4w(pc104wide-qu) 4aw(pc104awide-zqu) 4f(pc104aframe) -# 5n 5a(pc105angle-lg) 5w/5aw(pc105awide-sl) -# Options left out of this: Too complex (replace all or add another, and if so, how?) +# See the help text of this script for more info on the model-layout-variant syntax. +# Example: -s '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 with(-out) Wide use a c: 4c, 5cw etc +# - Thus, the allowed model short strings are (4|5)(n|a|c)[(w|f)] +# XKB options are left out of this: Too complex (e.g., replace or append?) ##-------------- init ------------------------------------------ @@ -33,9 +36,8 @@ 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=pc104awide-zqu # ANSI-104 keyboard w/ Angle(Z)Wide(Quote) mod -XKBmodel=pc105awide-sl # ISO-105 keyboard w/ AngleWide(Slash) mod -#~ XKBmodel=pc105caw-bksl # ISO-105 w/ Curl(DbgHk)AngleWide(Slash) mod +#~ 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 XKBoption='misc:extend,lv5:caps_switch_lock,grp:shifts_toggle,compose:menu' @@ -45,7 +47,7 @@ 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='' #'5aw no us' # (-s) Shortcut string for setxkb - 'model locale eD-variant(sym)' +SetXStr='' #'5cw no us' # (-s) Shortcut string for setxkb - 'model locale eD-variant(sym)' ## NOTE: '# (-a)' means that the value can be set by option argument '-a ' HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ @@ -64,13 +66,13 @@ HelpStr="\e[1mUsage: bash ${MyNAME} [optional args]\e[0m\n"\ "[-f] to add cmd to - '${AddCmdTo}'\n"\ "\n\e[1mShortStr notation (a space separated string defining model+layout):\e[0m\n"\ " 1) 4/5 - ANSI-104/ISO-105 keyboard,\n"\ -" n/a/b/v - Normal/Angle/Curl-DbgHk/Curl-DvbgHm\n"\ -" w/f - Wide/AngleFrame (a.k.a. 'A-Wing')\n"\ +" n/a/c - Normal/Angle/Curl-DH\n"\ +" w/f - Wide/A-Wing (a.k.a. 'A-Frame')\n"\ " 2) Two-letter layout code like 'us' for USA, 'gb' for UK etc\n"\ " 3) 'us'/'ks' for 'Universal'/'Keep Local' symbol locale variants\n"\ -" Example: '5a se us': PC105-Angle, Swedish Cmk[eD] 'UniSym'\n"\ -" '4bf gb ks': PC104-Curl(DbgHk)AWing, Eng.(UK) Cmk[eD] 'KeepSym'\n"\ -" '5bw': PC105-Curl(DbgHk)AngleWide (keep existing layout)\n" +" Examples: '5a se us': PC105-Angle, Swedish Cmk[eD] 'UniSym'\n"\ +" '4cf gb ks': PC104-Curl(DH)AWing, Eng.(UK) Cmk[eD] 'KeepSym'\n"\ +" '5cw': PC105-Curl(DH)AngleWide - keep current layout/variant\n" #~ " (See the script's comments for more info.)" @@ -130,14 +132,14 @@ while getopts "m:l:o:v:s:d:f:akh?" cmdarg; do l) XKBlayout="$OPTARG" ;; o) XKBoption="$OPTARG" ;; v) VerboseLvl="$OPTARG" ;; - s) SetXStr=($OPTARG) ;; # Split the string + s) SetXStr=($OPTARG) ;; # Split the string d) XKBdir="$OPTARG" ;; f) AddCmdTo="$OPTARG" ;; a) AddCmd='yes' ;; k) KeepXKM='yes' ;; - h) PrintHelpAndExit 0 ;; - \?) PrintHelpAndExit 0 ;; - :) PrintHelpAndExit 1 ;; + h) PrintHelpAndExit 0 ;; + \?) PrintHelpAndExit 0 ;; + :) PrintHelpAndExit 1 ;; esac done #~ pos_arg=${@:$OPTIND:1} # Get the remaining (positional) arg @@ -147,22 +149,17 @@ if [ -n "${SetXStr}" ]; then # Use the ShortStr notation 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='pc104awide-zqu' ;; # w/ Angle(Z)Wide(Quote) ergo mod - 4f|4af) XKBmodel='pc104aframe' ;; # w/ AngleWing(Quote) ergo mod - 4b) XKBmodel='pc104curla-bkz' ;; # w/ Curl(DbgHk)Angle(Z) ergo mod - 4v) XKBmodel='pc104curla-vmz' ;; # w/ Curl(DvbgHm)Angle(Z) ergo mod - 4bw) XKBmodel='pc104caw-bkzqu' ;; # w/ Curl(DbgHk)Angle(Z)Wide(Quote) mod - 4vw) XKBmodel='pc104caw-vmzqu' ;; # w/ Curl(DvbgHm)Angle(Z)Wide(Quote) mod - 4bf) XKBmodel='pc104cawing-bk' ;; # w/ Curl(DbgHk)AngleWing(Quote) mod - 4vf) XKBmodel='pc104cawing-vm' ;; # w/ Curl(DvbgHm)AngleWing(Quote) 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 5n) XKBmodel='pc105' ;; # Generic ISO-102/105-key - 5a) XKBmodel='pc105angle-lg' ;; # w/ Angle(LSGT) ergo mod - 5w|5aw) XKBmodel='pc105awide-sl' ;; # w/ AngleWide(Slash) ergo mod - 5b) XKBmodel='pc105curla-bk' ;; # w/ Curl(DbgHk)Angle ergo mod - 5v) XKBmodel='pc105curla-vm' ;; # w/ Curl(DvbgHm)Angle ergo mod - 5bw) XKBmodel='pc105caw-bksl' ;; # w/ Curl(DbgHk)AngleWide(Slash) mod - 5vw) XKBmodel='pc105caw-vmsl' ;; # w/ Curl(DvbgHm)AngleWide(Slash) mod + 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 *) MyError "ShortStr model '${SetXStr[0]}' unknown!" ;; esac @@ -170,31 +167,21 @@ if [ -n "${SetXStr}" ]; then # Use the ShortStr notation [ -n "${SetXStr[2]}" ] && XKBlayout="${SetXStr[1]}(cmk_ed_${SetXStr[2]})" \ || XKBlayout=`setxkbmap -query | grep layout | awk '{print $2}'` fi -## NOTE: Curl mods as models would mess up Extend, but I've kept the shortstr codes above. -# So, model strings are [4|5][n|a|v|b][-|w|f] +## TODO: Add Curl-ZXCDV angle models (pc105cawide-sl etc) -## NOTE: The code below post processes Curl models into model+option, as per my implementation. +## NOTE: The code below post processes Curl models into model+option, as per my XKB implementation. +## TODO: The Curl keyboard models sort of negate this? Only need to set the option for all of them. case ${XKBmodel} in - pc104curla-bkz) XKBmodel='pc104angle-z' # PC104-Curl(DbgHk)Angle(Z) - XKBoption+=',misc:cmk_curl_dbghk' ;; - pc104curla-vmz) XKBmodel='pc104angle-z' # PC104-Curl(DvbgHm)Angle(Z) - XKBoption+=',misc:cmk_curl_dvbghm' ;; - pc104caw-bkzqu) XKBmodel='pc104awide-zqu' # PC104-Curl(DbgHk)Angle(Z)Wide(Quote) - XKBoption+=',misc:cmk_curl_dbghk' ;; - pc104caw-vmzqu) XKBmodel='pc104awide-zqu' # PC104-Curl(DvbgHm)Angle(Z)Wide(Quote) - XKBoption+=',misc:cmk_curl_dvbghm' ;; - pc104cawing-bk) XKBmodel='pc104aframe' # PC104-Curl(DbgHk)AngleWing(Quote) - XKBoption+=',misc:cmk_curl_dbghk' ;; - pc104cawing-vm) XKBmodel='pc104aframe' # PC104-Curl(DvbgHm)AngleWing(Quote) - XKBoption+=',misc:cmk_curl_dvbghm' ;; - pc105curla-bk) XKBmodel='pc105angle-lg' # PC105-Curl(DbgHk)Angle - XKBoption+=',misc:cmk_curl_dbghk' ;; - pc105curla-vm) XKBmodel='pc105angle-lg' # PC105-Curl(DvbgHm)Angle - XKBoption+=',misc:cmk_curl_dvbghm' ;; - pc105caw-bksl) XKBmodel='pc105awide-sl' # PC105-Curl(DbgHk)AngleWide(Slash) - XKBoption+=',misc:cmk_curl_dbghk' ;; - pc105caw-vmsl) XKBmodel='pc105awide-sl' # PC105-Curl(DvbgHm)AngleWide(Slash) - XKBoption+=',misc:cmk_curl_dvbghm' ;; + pc104curl-z) XKBmodel='pc104angle-z' # PC104-Curl(DH)Angle(Z) + XKBoption+=',misc:cmk_curl_dh' ;; + pc104caw-zqu) XKBmodel='pc104aw-zqu' # PC104-Curl(DH)Angle(Z)Wide(Quote) + XKBoption+=',misc:cmk_curl_dh' ;; + pc104cawing) XKBmodel='pc104awing' # PC104-Curl(DH)AngleWing(Quote) + XKBoption+=',misc:cmk_curl_dh' ;; + pc105curl) XKBmodel='pc105angle' # PC105-Curl(DH)Angle(LSGT) + XKBoption+=',misc:cmk_curl_dh' ;; + pc105caw-sl) XKBmodel='pc105aw-sl' # PC105-Curl(DH)AngleWide(Slash) + XKBoption+=',misc:cmk_curl_dh' ;; esac @@ -272,7 +259,7 @@ exit 0 ## Extend mappings w/ Caps switch (for both), ## Switch grp w/ 2xCtrl; Compose on Menu key: #~ setxkbmap \ -#~ -model pc105awide-sl, \ +#~ -model pc105aw-sl, \ #~ -layout "no(cmk_ed_us),gr(colemak)", \ #~ -option "misc:extend,lv5:caps_switch_lock,"\ #~ "grp:rctrl_switch_ctrls_toggle,compose:menu" diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc b/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc index 24f87ef..c312013 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc @@ -1567,11 +1567,10 @@ xkb_geometry "pc104alt" { }; // End of "pc104alt" geometry -// --> OEystein Bech "DreymaR" Gadmar, 2013: Additions to xkb/geometry/pc +// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/geometry/pc // pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_geometry "pc104angle-z" { include "pc(pc104)" - description= "Generic 104 - Angle(Z)Ergo mod"; section.left= 19; @@ -1591,10 +1590,31 @@ 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", color="grey20" }, + , , , , , + , , , , , + { , "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)" - description= "Generic 104 - Wide(Quote)Ergo mod"; section.left= 19; @@ -1639,9 +1659,8 @@ xkb_geometry "pc104wide-qu" { }; // End of "pc104wide-qu" geometry // pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2015) -xkb_geometry "pc104awide-zqu" { +xkb_geometry "pc104aw-zqu" { include "pc(pc104wide-qu)" - description= "Generic 104 - Angle(Z)Wide(Quote)Ergo mod"; section.left= 19; @@ -1656,16 +1675,37 @@ xkb_geometry "pc104awide-zqu" { , , , , , , , , , , { , "RTSH", color="grey20" } - }; // pc104-AngleWide-ZQu + }; }; // End of bottom row }; // End of "Alpha" section -}; // End of "pc104awide-zqu" geometry +}; // End of "pc104aw-zqu" geometry -// pc104_AngleFrame(Quote) ergonomic mod (by DreymaR, 2015) -xkb_geometry "pc104aframe" { +// 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", color="grey20" }, + , , , , , + , , , , , + { , "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)" - - description= "Generic 104 - AngleFrame ergo mod"; + description= "Generic 104 - AngleWing(Quote)Ergo mod"; section.left= 19; row.left= 1; @@ -1706,13 +1746,34 @@ xkb_geometry "pc104aframe" { }; }; // End of bottom row }; // End of "Alpha" section -}; // End of "pc104aframe" geometry +}; // 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", color="grey20" }, + , , , , , + , , , , , + { , "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-lg" { +xkb_geometry "pc105angle" { include "pc(pc105)" - - description= "Generic 105 - Angle(LSGT)Ergo mod"; + description= "Generic 105 - Angle_Ergo mod"; section.left= 19; row.left= 1; @@ -1729,12 +1790,33 @@ xkb_geometry "pc105angle-lg" { }; }; // End of bottom row }; // End of "Alpha" section -}; // End of "pc105angle-lg" geometry +}; // End of "pc105angle" geometry + +// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017) +xkb_geometry "pc105curl" { + include "pc(pc105)" + description= "Generic 105 - CurlAngle_Ergo mod"; + + section.left= 19; + row.left= 1; + key.shape= "NORM"; + key.gap= 1; + section "Alpha" { + top= 61; + row { + top= 58; + keys { { , "LFSH", color="grey20" }, + , , , , , , + , , , , , + { , "RTSH", color="grey20" } + }; + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc105curl" geometry // pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011) -xkb_geometry "pc105awide-sl" { +xkb_geometry "pc105aw-sl" { include "pc(pc105)" - description= "Generic 105 - AngleWide(/)Ergo mod"; section.left= 19; @@ -1776,5 +1858,27 @@ xkb_geometry "pc105awide-sl" { }; }; // End of bottom row }; // End of "Alpha" section -}; // End of "pc105awide-sl" geometry +}; // 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", color="grey20" }, + , , , , , , + , , , , , + { , "RTSH", color="grey20" } + }; + }; // End of bottom row + }; // End of "Alpha" section +}; // End of "pc105caw-sl" geometry // <-- DreymaR: Additions to xkb/geometry/pc diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases index cadb55e..61475cf 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases @@ -130,4 +130,36 @@ xkb_keycodes "colemak" { alias = ; alias = ; }; + +xkb_keycodes "colemak_dh" { + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; + alias = ; +}; // <-- DreymaR: Additions to xkb/keycodes/aliases diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev index 0664e5e..9377ddd 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev @@ -314,7 +314,7 @@ xkb_keycodes "pc98" { }; -// --> OEystein Bech "DreymaR" Gadmar, 2015: Additions to xkb/keycodes/evdev +// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/keycodes/evdev // pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_keycodes "pc104angle-z" { @@ -327,38 +327,99 @@ xkb_keycodes "pc104angle-z" { augment "evdev(evdev)" }; -// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) -xkb_keycodes "pc104wide-qu" { +// pc104_CurlAngle(Z) ergonomic mod (by DreymaR, 2017) +xkb_keycodes "pc104curl-z" { - include "evdev(pc104wide-rightpart)" - - = 16; // = < 7 - = 29; // [ < Y - = 35; // ' < ] - = 43; // ] < H - = 57; // / < N + = 52; // X < Z + = 53; // C < X + = 54; // B < C + = 55; // V < V + = 56; // Z < B augment "evdev(evdev)" }; -// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2015) -xkb_keycodes "pc104awide-zqu" { +// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-qu" { include "evdev(pc104wide-rightpart)" + include "evdev(pc104wide-midpart)" + augment "evdev(evdev)" +}; + +// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104aw-zqu" { + + include "evdev(pc104wide-rightpart)" + include "evdev(pc104wide-midpart)" + augment "evdev(pc104angle-z)" +}; + +// pc104_AngleWing(Quote) ergonomic mod (by DreymaR, 2015) +xkb_keycodes "pc104awing" { + + include "evdev(pc104wide-rightpart)" + include "evdev(pc104awing-leftpart)" + 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" { + + = 55; // B < V + = 56; // V < B + + augment "evdev(pc104awing)" +}; + +// pc104_Wide partial ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-midpart" { = 16; // = < 7 = 29; // [ < Y = 35; // ' < ] = 43; // ] < H = 57; // / < N - - augment "evdev(pc104angle-z)" }; -// pc104_AngleFrame(Quote) ergonomic mod (by DreymaR, 2015) -xkb_keycodes "pc104aframe" { +// pc104_Wide partial ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-rightpart" { - include "evdev(pc104wide-rightpart)" + = 17; // 7 < 8 + = 18; // 8 < 9 + = 19; // 9 < 0 + = 20; // 0 < - + = 21; // - < = + + = 30; // Y < U + = 31; // U < I + = 32; // I < O + = 33; // O < P + = 34; // P < [ + + = 44; // H < J + = 45; // J < K + = 46; // K < L + = 47; // L < ; + = 48; // ; < ' + = 51; // \ < \ + + = 58; // N < M + = 59; // M < , + = 60; // , < . + = 61; // . < / +}; + +// pc104_AngleWing partial ergonomic mod (by DreymaR, 2015) +xkb_keycodes "pc104awing-leftpart" { = 10; // = < 1 = 24; // [ < Q @@ -384,41 +445,10 @@ xkb_keycodes "pc104aframe" { = 41; // D < F = 42; // F < G = 43; // G < H - - augment "evdev(evdev)" -}; - -// pc104_Wide partial ergonomic mod (by DreymaR, 2013) -xkb_keycodes "pc104wide-rightpart" { - - = 17; // 7 < 8 - = 18; // 8 < 9 - = 19; // 9 < 0 - = 20; // 0 < - - = 21; // - < = - - = 30; // Y < U - = 31; // U < I - = 32; // I < O - = 33; // O < P - = 34; // P < [ - - = 44; // H < J - = 45; // J < K - = 46; // K < L - = 47; // L < ; - = 48; // ; < ' -// = 51; // \ < \ - - = 58; // N < M - = 59; // M < , - = 60; // , < . - = 61; // . < / - }; // pc105_Angle(LSGT) ergonomic mod (by DreymaR, 2011) -xkb_keycodes "pc105angle-lg" { +xkb_keycodes "pc105angle" { = 94; // Z < LG = 52; // X < Z @@ -430,8 +460,35 @@ xkb_keycodes "pc105angle-lg" { augment "evdev(evdev)" }; +// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017) +xkb_keycodes "pc105curl" { + + = 94; // Z < LG + = 52; // X < Z + = 53; // C < X + = 54; // B < C + = 55; // V < V + = 56; // LG < B + + augment "evdev(evdev)" +}; + // pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011) -xkb_keycodes "pc105awide-sl" { +xkb_keycodes "pc105aw-sl" { + + include "evdev(pc105wide-rightpart)" + 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" { = 16; // = < 7 = 17; // 7 < 8 @@ -463,7 +520,6 @@ xkb_keycodes "pc105awide-sl" { = 59; // M < , = 60; // , < . = 61; // . < / - - augment "evdev(pc105angle-lg)" }; + // <-- DreymaR: Additions to xkb/keycodes/evdev diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 index 4a778b8..e3ea0b4 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 @@ -410,7 +410,7 @@ xkb_keycodes "thinkpadz60" { }; -// --> OEystein Bech "DreymaR" Gadmar, 2013: Additions to xkb/keycodes/xfree86 +// --> OEystein Bech "DreymaR" Gadmar, 2017: Additions to xkb/keycodes/xfree86 // pc104_Angle(Z) ergonomic mod (by DreymaR, 2011) xkb_keycodes "pc104angle-z" { @@ -423,38 +423,99 @@ xkb_keycodes "pc104angle-z" { augment "xfree86(xfree86)" }; -// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) -xkb_keycodes "pc104wide-qu" { +// pc104_CurlAngle(Z) ergonomic mod (by DreymaR, 2017) +xkb_keycodes "pc104curl-z" { - include "xfree86(pc104wide-rightpart)" - - = 16; // = < 7 - = 29; // [ < Y - = 35; // ' < ] - = 43; // ] < H - = 57; // / < N + = 52; // X < Z + = 53; // C < X + = 54; // B < C + = 55; // V < V + = 56; // Z < B augment "xfree86(xfree86)" }; -// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2015) -xkb_keycodes "pc104awide-zqu" { +// pc104_Wide(Quote) ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-qu" { include "xfree86(pc104wide-rightpart)" + include "xfree86(pc104wide-midpart)" + augment "xfree86(xfree86)" +}; + +// pc104_Angle(Z)Wide(Quote) ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104aw-zqu" { + + include "xfree86(pc104wide-rightpart)" + include "xfree86(pc104wide-midpart)" + augment "xfree86(pc104angle-z)" +}; + +// pc104_AngleWing(Quote) ergonomic mod (by DreymaR, 2015) +xkb_keycodes "pc104awing" { + + include "xfree86(pc104wide-rightpart)" + include "xfree86(pc104awing-leftpart)" + 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" { + + = 55; // B < V + = 56; // V < B + + augment "xfree86(pc104awing)" +}; + +// pc104_Wide partial ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-midpart" { = 16; // = < 7 = 29; // [ < Y = 35; // ' < ] = 43; // ] < H = 57; // / < N - - augment "xfree86(pc104angle-z)" }; -// pc104_AngleFrame(Quote) ergonomic mod (by DreymaR, 2015) -xkb_keycodes "pc104aframe" { +// pc104_Wide partial ergonomic mod (by DreymaR, 2013) +xkb_keycodes "pc104wide-rightpart" { - include "xfree86(pc104wide-rightpart)" + = 17; // 7 < 8 + = 18; // 8 < 9 + = 19; // 9 < 0 + = 20; // 0 < - + = 21; // - < = + + = 30; // Y < U + = 31; // U < I + = 32; // I < O + = 33; // O < P + = 34; // P < [ + + = 44; // H < J + = 45; // J < K + = 46; // K < L + = 47; // L < ; + = 48; // ; < ' + = 51; // \ < \ + + = 58; // N < M + = 59; // M < , + = 60; // , < . + = 61; // . < / +}; + +// pc104_AngleWing partial ergonomic mod (by DreymaR, 2015) +xkb_keycodes "pc104awing-leftpart" { = 10; // = < 1 = 24; // [ < Q @@ -480,46 +541,10 @@ xkb_keycodes "pc104aframe" { = 41; // D < F = 42; // F < G = 43; // G < H - - augment "xfree86(xfree86)" -}; - -// pc104_Wide partial ergonomic mod (by DreymaR, 2013) -xkb_keycodes "pc104wide-rightpart" { - - = 16; // = < 7 - = 17; // 7 < 8 - = 18; // 8 < 9 - = 19; // 9 < 0 - = 20; // 0 < - - = 21; // - < = - - = 29; // [ < Y - = 30; // Y < U - = 31; // U < I - = 32; // I < O - = 33; // O < P - = 34; // P < [ - = 35; // ' < ] - - = 43; // ] < H - = 44; // H < J - = 45; // J < K - = 46; // K < L - = 47; // L < ; - = 48; // ; < ' -// = 51; // \ < \ - - = 57; // / < N - = 58; // N < M - = 59; // M < , - = 60; // , < . - = 61; // . < / - }; // pc105_Angle(LSGT) ergonomic mod (by DreymaR, 2011) -xkb_keycodes "pc105angle-lg" { +xkb_keycodes "pc105angle" { = 94; // Z < LG = 52; // X < Z @@ -531,8 +556,35 @@ xkb_keycodes "pc105angle-lg" { augment "xfree86(xfree86)" }; +// pc105_CurlAngle(LSGT) ergonomic mod (by DreymaR, 2017) +xkb_keycodes "pc105curl" { + + = 94; // Z < LG + = 52; // X < Z + = 53; // C < X + = 54; // B < C + = 55; // V < V + = 56; // LG < B + + augment "xfree86(xfree86)" +}; + // pc105_AngleWide(Slash) ergonomic mod (by DreymaR, 2011) -xkb_keycodes "pc105awide-sl" { +xkb_keycodes "pc105aw-sl" { + + include "xfree86(pc105wide-rightpart)" + 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" { = 16; // = < 7 = 17; // 7 < 8 @@ -564,7 +616,6 @@ xkb_keycodes "pc105awide-sl" { = 59; // M < , = 60; // , < . = 61; // . < / - - augment "xfree86(pc105angle-lg)" }; + // <-- DreymaR: Additions to xkb/keycodes/xfree86 diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev index 7f2299f..214216b 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev @@ -13,7 +13,9 @@ // ori pk ru scc sy syr tel th tj tam ua uz // PC models -! $pcmodels = pc101 pc102 pc104 pc105 pc104angle-z pc104wide-qu pc104awide-zqu pc104aframe pc105angle-lg pc105awide-sl +! $pcmodels = pc101 pc102 pc104 pc105 \ + pc104angle-z pc104wide-qu pc104aw-zqu pc104awing pc105angle pc105aw-sl \ + pc104curl-z pc104caw-zqu pc104cawing pc105curl pc105caw-sl // Jolla devices and keyboards ! $jollamodels = jollasbj @@ -100,10 +102,15 @@ olpcm = evdev+olpc(olpcm) pc104angle-z = evdev(pc104angle-z) pc104wide-qu = evdev(pc104wide-qu) - pc104awide-zqu = evdev(pc104awide-zqu) - pc104aframe = evdev(pc104aframe) - pc105angle-lg = evdev(pc105angle-lg) - pc105awide-sl = evdev(pc105awide-sl) + pc104aw-zqu = evdev(pc104aw-zqu) + pc104awing = evdev(pc104awing) + pc104curl-z = evdev(pc104curl-z) + pc104caw-zqu = evdev(pc104caw-zqu) + pc104cawing = evdev(pc104cawing) + pc105angle = evdev(pc105angle) + pc105aw-sl = evdev(pc105aw-sl) + pc105curl = evdev(pc105curl) + pc105caw-sl = evdev(pc105caw-sl) * = evdev ! layout[1] = keycodes @@ -938,36 +945,31 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) * misc:typo = +typo(base) * misc:extend = +extend(basic) - * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed) - * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed) + * misc:cmk_curl_dh = +colemak(cmk_ed_dh) ! layout[1] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 * misc:typo = +typo(base):1 * misc:extend = +extend(basic):1 - * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):1 - * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):1 + * misc:cmk_curl_dh = +colemak(cmk_ed_dh):1 ! layout[2] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 * misc:typo = +typo(base):2 * misc:extend = +extend(basic):2 -// * misc:cmk_curl_dbghk = +colemak(cmk_dbg-hk_ed):2 -// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):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_dbghk = +colemak(cmk_dbg-hk_ed):3 -// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):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_dbghk = +colemak(cmk_dbg-hk_ed):4 -// * misc:cmk_curl_dvbghm = +colemak(cmk_dvbg-hm_ed):4 +// * misc:cmk_curl_dh = +colemak(cmk_ed_dh):4 ! option = symbols grp:shift_toggle = +group(shifts_toggle) diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst index e78ee92..7e437f7 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst @@ -5,10 +5,15 @@ pc105 Generic 105-key (Intl) PC pc104angle-z Generic 104-key PC Angle(Z)Ergo pc104wide-qu Generic 104-key PC Wide(Quote)Ergo - pc104awide-zqu Generic 104-key PC Angle(Z)Wide(Quote)Ergo - pc104aframe Generic 104-key PC AngleWing(Quote)Ergo - pc105angle-lg Generic 105-key (Intl) PC Angle(LSGT)Ergo - pc105awide-sl Generic 105-key (Intl) PC AngleWide(/)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 (Intl) PC Angle_Ergo + pc105aw-sl Generic 105-key (Intl) PC AngleWide(/)Ergo + pc105curl Generic 105-key (Intl) PC CurlAngle_Ergo + pc105caw-sl Generic 105-key (Intl) PC CurlAngleWide(/)Ergo dell101 Dell 101-key PC latitude Dell Latitude series laptop dellm65 Dell Precision M65 @@ -296,15 +301,13 @@ alt-intl us: English (US, alternative international) colemak us: English (Colemak) cmk_ed_us us: English (Colemak[eD] - edition DreymaR) - tarmak1_e us: English (Tarmak1 - Colemak[eD] transitional) - tarmak1k_e us: English (Tarmak1k - Colemak[eD] transit. w/ Curl-Hk mod) - tarmak2_et us: English (Tarmak2 - Colemak[eD] transitional) - tarmak2bk_et us: English (Tarmak2bk - Colemak[eD] transit. w/ Curl-DbgHk mod) - tarmak2vm_et us: English (Tarmak2vm - Colemak[eD] transit. w/ Curl-DvbgHm mod) - tarmak3_etr us: English (Tarmak3 - Colemak[eD] transitional) - tarmak4_etro us: English (Tarmak4 - Colemak[eD] transitional) - cmk_ed_dvbghm us: English (Colemak[eD], Curl-DvbgHm ergo) - cmk_ed_dbghk us: English (Colemak[eD], Curl-DbgHk ergo) + tarmak1__e us: English (Tarmak1 - Colemak[eD] transitional) + tarmak1c_e us: English (Tarmak1C - Colemak[eD] Curl-DH transitional) + tarmak2__et us: English (Tarmak2 - Colemak[eD] transitional) + tarmak2c_et us: English (Tarmak2C - Colemak[eD] Curl-DH transitional) + tarmak3__etr us: English (Tarmak3 - Colemak[eD] transitional) + tarmak4__etro us: English (Tarmak4 - Colemak[eD] transitional) + cmk_ed_dh us: English (Colemak[eD], Curl-DH ergo mod) cmk_ed_mirror us: English (Colemak[eD], mirrored) dvorak us: English (Dvorak) dvorak-intl us: English (Dvorak, international with dead keys) @@ -935,8 +938,7 @@ shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:extend Enable level5 Extend mappings (home position arrows etc) - misc:cmk_curl_dbghk Colemak Curl ergo mod (DbgHk variant) - misc:cmk_curl_dvbghm Colemak Curl ergo mod (DvbgHm variant) + misc:cmk_curl_dh Colemak Curl(DH) ergo mod shift:both_capslock Both Shift keys together toggle Caps Lock shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shift key deactivates shift:both_shiftlock Both Shift keys together toggle ShiftLock diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml index c814818..3e0341b 100644 --- a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml +++ b/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml @@ -46,32 +46,67 @@ - pc104awide-zqu + pc104aw-zqu Generic 104-key PC (Angle(Z)Wide(Quote)Ergo mod) Generic - pc104aframe + pc104awing Generic 104-key PC (AngleWing(Quote)Ergo mod) Generic - pc105angle-lg - Generic 105-key (Intl) PC (Angle(LSGT)Ergo mod) + pc104curl-z + Generic 104-key PC (CurlAngle(Z)Ergo mod) Generic - pc105awide-sl + pc104caw-zqu + Generic 104-key PC (CurlAngle(Z)Wide(Quote)Ergo mod) + Generic + + + + + pc104cawing + Generic 104-key PC (CurlAngleWing(Quote)Ergo mod) + Generic + + + + + pc105angle + Generic 105-key (Intl) PC (Angle_Ergo mod) + Generic + + + + + pc105aw-sl Generic 105-key (Intl) PC (AngleWide(/)Ergo mod) Generic + + + pc105curl + Generic 105-key (Intl) PC (CurlAngle_Ergo mod) + Generic + + + + + pc105caw-sl + Generic 105-key (Intl) PC (CurlAngleWide(/)Ergo mod) + Generic + + dell101 @@ -1407,56 +1442,44 @@ - tarmak1_e + tarmak1__e English (Tarmak1 - Colemak[eD] transitional) - tarmak1k_e - English (Tarmak1k - Colemak[eD] transit. w/ Curl-Hk mod) + tarmak1c_e + English (Tarmak1C - Colemak[eD] Curl-DH transitional) - tarmak2_et + tarmak2__et English (Tarmak2 - Colemak[eD] transitional) - tarmak2bk_et - English (Tarmak2bk - Colemak[eD] transit. w/ Curl-DbgHk mod) + tarmak2c_et + English (Tarmak2C - Colemak[eD] Curl-DH transitional) - tarmak2vm_et - English (Tarmak2vm - Colemak[eD] transit. w/ Curl-DvbgHm mod) - - - - - tarmak3_etr + tarmak3__etr English (Tarmak3 - Colemak[eD] transitional) - tarmak4_etro + tarmak4__etro English (Tarmak4 - Colemak[eD] transitional) - cmk_ed_dvbghm - English (Colemak[eD], Curl-DvbgHm ergo) - - - - - cmk_ed_dbghk - English (Colemak[eD], Curl-DbgHk ergo) + cmk_ed_dh + English (Colemak[eD], Curl-DH ergo mod) @@ -7253,14 +7276,8 @@ -