summaryrefslogtreecommitdiff
path: root/linux/X/rules/base
diff options
context:
space:
mode:
authorstephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2012-02-06 14:48:39 +0000
committerstephan <stephan@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2012-02-06 14:48:39 +0000
commit504bffd627220ad2d0827bdc27c0f418597cde14 (patch)
treed5f6453dc455957dd67eb6b0c442859b2506f8fa /linux/X/rules/base
parent837b495dc643c98f5acab31c85c9677ece48d55e (diff)
downloadneo-layout-504bffd627220ad2d0827bdc27c0f418597cde14.tar.gz
neo-layout-504bffd627220ad2d0827bdc27c0f418597cde14.tar.bz2
neo-layout-504bffd627220ad2d0827bdc27c0f418597cde14.zip
Synchronisieren mit xkeyboard-config upstream
git-svn-id: https://svn.neo-layout.org@2418 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to 'linux/X/rules/base')
-rw-r--r--linux/X/rules/base104
1 files changed, 32 insertions, 72 deletions
diff --git a/linux/X/rules/base b/linux/X/rules/base
index 68c29df..44fa866 100644
--- a/linux/X/rules/base
+++ b/linux/X/rules/base
@@ -1,12 +1,9 @@
// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
-// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
//
// Rules for resolving XKB components for use with XFree86
// Copyright 1996 by Joseph Moss
//
// 2002 Modifier: Ivan Pascal The XFree86 Project
-// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $
//
// If you want non-latin layouts implicitly include the en_US layout
@@ -19,7 +16,7 @@
! $pcmodels = pc101 pc102 pc104 pc105
// Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
@@ -60,15 +57,15 @@
genius geniuscomfy2 \
gyration honeywell_euroboard \
hp250x hp5xx hp500fa hpdv5 \
- hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
ibm_spacesaver ipaq inspiron intel \
logiaccess logicda logicink \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik \
logitech_base itouch logiultrax \
logitech_g15 \
- logidinovo logidinovoedge \
- microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+ logidinovo logidinovoedge \
+ microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
@@ -80,7 +77,7 @@
silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
- tm2030USB toshiba_s3000 trust trustda \
+ toshiba_s3000 trust trustda \
unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
@@ -114,6 +111,7 @@
lt lv nl no pl pt ro ru \
se sk tr tw ua
+! $htcdreamlayouts = us it de
! $dvoraklayouts = br ca de ee es fr gb no pl se us
@@ -159,6 +157,7 @@
hpmini110 = hp(mini110)
hpdv5 = hp(dv5)
omnikey101 = northgate(omnikey101)
+ sanwaskbkg3 = sanwa(sanwaskbkg3)
$pcmodels = pc(%m)
$pcgeometries = pc(%m)
everex = everex(STEPnote)
@@ -192,7 +191,6 @@
* gur basic = pc+in(guru)
* ie laptop = pc+ie(basic)
* ie CloGaelachLaptop = pc+ie(CloGaelach)
- * il si1452 = pc+ie(basic)
* in urd = pc+in(urd-phonetic)
* iu basic = pc+ca(ike)
* lo basic = pc+la(basic)
@@ -227,10 +225,6 @@
* yu unicode = pc+srp(latinunicode)
* yu yz = pc+srp(latinyz)
* yu unicodeyz = pc+srp(latinunicodeyz)
- * rs combiningkeys = pc+extras/rs(combiningkeys)
- * us alt-intl-unicode = pc+extras/us(alt-intl-unicode)
- * us crd = pc+extras/us(crd)
- * us intl-unicode = pc+extras/us(intl-unicode)
classmate us intl = pc+us(classmate-intl)
classmate us alt-intl = pc+us(classmate-alt-intl)
classmate us altgr-intl = pc+us(classmate-altgr-intl)
@@ -279,7 +273,6 @@
* gur(basic) = pc+in(guru)
* ie(laptop) = pc+ie(basic)
* ie(CloGaelachLaptop) = pc+ie(CloGaelach)
- * il(si1452) = pc+ie(basic)
* in(urd) = pc+in(urd-phonetic)
* iu(basic) = pc+ca(ike)
* lo(basic) = pc+la(basic)
@@ -314,11 +307,6 @@
* yu(unicode) = pc+srp(latinunicode)
* yu(yz) = pc+srp(latinyz)
* yu(unicodeyz) = pc+srp(latinunicodeyz)
- * apl = pc+extras/apl
- * rs(combiningkeys) = pc+extras/rs(combiningkeys)
- * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode)
- * us(crd) = pc+extras/us(crd)
- * us(intl-unicode) = pc+extras/us(intl-unicode)
ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2
ataritt * = xfree68_vndr/ataritt(us)+%l%(v)
amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2
@@ -357,6 +345,7 @@
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
$thinkpads br = pc+br(thinkpad)
+ htcdream $htcdreamlayouts = %l(htcdream)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
@@ -403,7 +392,6 @@
* gur(basic) = pc+in(guru)
* ie(laptop) = pc+ie(basic)
* ie(CloGaelachLaptop) = pc+ie(CloGaelach)
- * il(si1452) = pc+ie(basic)
* in(urd) = pc+in(urd-phonetic)
* iu(basic) = pc+ca(ike)
* lo(basic) = pc+la(basic)
@@ -438,11 +426,6 @@
* yu(unicode) = pc+srp(latinunicode)
* yu(yz) = pc+srp(latinyz)
* yu(unicodeyz) = pc+srp(latinunicodeyz)
- * apl = pc+extras/apl%(v[1])
- * rs(combiningkeys) = pc+extras/rs(combiningkeys)
- * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode)
- * us(crd) = pc+extras/us(crd)
- * us(intl-unicode) = pc+extras/us(intl-unicode)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1])
@@ -475,7 +458,6 @@
* gur basic = pc+in(guru)
* ie laptop = pc+ie(basic)
* ie CloGaelachLaptop = pc+ie(CloGaelach)
- * il si1452 = pc+ie(basic)
* in urd = pc+in(urd-phonetic)
* iu basic = pc+ca(ike)
* lo basic = pc+la(basic)
@@ -510,10 +492,6 @@
* yu unicode = pc+srp(latinunicode)
* yu yz = pc+srp(latinyz)
* yu unicodeyz = pc+srp(latinunicodeyz)
- * rs combiningkeys = pc+extras/rs(combiningkeys)
- * us alt-intl-unicode = pc+extras/us(alt-intl-unicode)
- * us crd = pc+extras/us(crd)
- * us intl-unicode = pc+extras/us(intl-unicode)
! model layout[2] = symbols
* ar = +ara%(v[2]):2
@@ -558,7 +536,6 @@
* gur(basic) = +in(guru):2
* ie(laptop) = +ie(basic):2
* ie(CloGaelachLaptop) = +ie(CloGaelach):2
- * il(si1452) = +ie(basic):2
* in(urd) = +in(urd-phonetic):2
* iu(basic) = +ca(ike):2
* lo(basic) = +la(basic):2
@@ -593,11 +570,6 @@
* yu(unicode) = +srp(latinunicode):2
* yu(yz) = +srp(latinyz):2
* yu(unicodeyz) = +srp(latinunicodeyz):2
- * apl = +extras/apl%(v[2]):2
- * rs(combiningkeys) = +extras/rs(combiningkeys):2
- * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2
- * us(crd) = +extras/us(crd):2
- * us(intl-unicode) = +extras/us(intl-unicode):2
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2
nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2
* * = +%l[2]%(v[2]):2
@@ -645,7 +617,6 @@
* gur(basic) = +in(guru):3
* ie(laptop) = +ie(basic):3
* ie(CloGaelachLaptop) = +ie(CloGaelach):3
- * il(si1452) = +ie(basic):3
* in(urd) = +in(urd-phonetic):3
* iu(basic) = +ca(ike):3
* lo(basic) = +la(basic):3
@@ -680,11 +651,6 @@
* yu(unicode) = +srp(latinunicode):3
* yu(yz) = +srp(latinyz):3
* yu(unicodeyz) = +srp(latinunicodeyz):3
- * apl = +extras/apl%(v[3]):3
- * rs(combiningkeys) = +extras/rs(combiningkeys):3
- * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3
- * us(crd) = +extras/us(crd):3
- * us(intl-unicode) = +extras/us(intl-unicode):3
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3
nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3
* * = +%l[3]%(v[3]):3
@@ -732,7 +698,6 @@
* gur(basic) = +in(guru):4
* ie(laptop) = +ie(basic):4
* ie(CloGaelachLaptop) = +ie(CloGaelach):4
- * il(si1452) = +ie(basic):4
* in(urd) = +in(urd-phonetic):4
* iu(basic) = +ca(ike):4
* lo(basic) = +la(basic):4
@@ -767,11 +732,6 @@
* yu(unicode) = +srp(latinunicode):4
* yu(yz) = +srp(latinyz):4
* yu(unicodeyz) = +srp(latinunicodeyz):4
- * apl = +extras/apl%(v[4]):4
- * rs(combiningkeys) = +extras/rs(combiningkeys):4
- * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4
- * us(crd) = +extras/us(crd):4
- * us(intl-unicode) = +extras/us(intl-unicode):4
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4
nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4
* * = +%l[4]%(v[4]):4
@@ -792,7 +752,6 @@
* gur basic = +in(guru):2
* ie laptop = +ie(basic):2
* ie CloGaelachLaptop = +ie(CloGaelach):2
- * il si1452 = +ie(basic):2
* in urd = +in(urd-phonetic):2
* iu basic = +ca(ike):2
* lo basic = +la(basic):2
@@ -827,10 +786,6 @@
* yu unicode = +srp(latinunicode):2
* yu yz = +srp(latinyz):2
* yu unicodeyz = +srp(latinunicodeyz):2
- * rs combiningkeys = +extras/rs(combiningkeys):2
- * us alt-intl-unicode = +extras/us(alt-intl-unicode):2
- * us crd = +extras/us(crd):2
- * us intl-unicode = +extras/us(intl-unicode):2
! model layout[3] variant[3] = symbols
* ben basic = +in(ben):3
@@ -848,7 +803,6 @@
* gur basic = +in(guru):3
* ie laptop = +ie(basic):3
* ie CloGaelachLaptop = +ie(CloGaelach):3
- * il si1452 = +ie(basic):3
* in urd = +in(urd-phonetic):3
* iu basic = +ca(ike):3
* lo basic = +la(basic):3
@@ -883,10 +837,6 @@
* yu unicode = +srp(latinunicode):3
* yu yz = +srp(latinyz):3
* yu unicodeyz = +srp(latinunicodeyz):3
- * rs combiningkeys = +extras/rs(combiningkeys):3
- * us alt-intl-unicode = +extras/us(alt-intl-unicode):3
- * us crd = +extras/us(crd):3
- * us intl-unicode = +extras/us(intl-unicode):3
! model layout[4] variant[4] = symbols
* ben basic = +in(ben):4
@@ -904,7 +854,6 @@
* gur basic = +in(guru):4
* ie laptop = +ie(basic):4
* ie CloGaelachLaptop = +ie(CloGaelach):4
- * il si1452 = +ie(basic):4
* in urd = +in(urd-phonetic):4
* iu basic = +ca(ike):4
* lo basic = +la(basic):4
@@ -939,10 +888,6 @@
* yu unicode = +srp(latinunicode):4
* yu yz = +srp(latinyz):4
* yu unicodeyz = +srp(latinunicodeyz):4
- * rs combiningkeys = +extras/rs(combiningkeys):4
- * us alt-intl-unicode = +extras/us(alt-intl-unicode):4
- * us crd = +extras/us(crd):4
- * us intl-unicode = +extras/us(intl-unicode):4
! model = symbols
a4techKB21 = +inet(media_nav_common)
@@ -1067,17 +1012,12 @@
grp:shifts_toggle = +group(shifts_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
grp:alts_toggle = +group(alts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
- grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
grp:caps_toggle = +capslock(grouplock)
grp:caps_switch = +capslock(groupshift)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:shift_caps_switch = +group(shift_caps_switch)
grp:win_menu_switch = +group(win_menu_switch)
grp:alt_caps_toggle = +group(alt_caps_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:alt_space_toggle = +group(alt_space_toggle)
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
@@ -1090,6 +1030,19 @@
grp:lalt_toggle = +group(lalt_toggle)
grp:sclk_toggle = +group(sclk_toggle)
grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch)
+ grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu)
+ grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle)
+ grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
+ grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
+ grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
+ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
+ grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -1110,11 +1063,15 @@
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
caps:none = +capslock(none)
+ caps:ctrl_modifier = +capslock(ctrl_modifier)
ctrl:nocaps = +ctrl(nocaps)
+ ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
- ctrl:ctrl_ra = +ctrl(ctrl_ra)
+ ctrl:ac_ctrl = +ctrl(ac_ctrl)
+ ctrl:aa_ctrl = +ctrl(aa_ctrl)
+ ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
+ ctrl:menu_rctrl = +ctrl(menu_rctrl)
+ ctrl:ralt_rctrl = +ctrl(ralt_rctrl)
compose:ralt = +compose(ralt)
compose:lwin = +compose(lwin)
compose:rwin = +compose(rwin)
@@ -1131,6 +1088,7 @@
eurosign:2 = +eurosign(2)
eurosign:4 = +eurosign(4)
eurosign:5 = +eurosign(5)
+ rupeesign:4 = +rupeesign(4)
keypad:oss = +keypad(oss)
keypad:legacy = +keypad(legacy)
keypad:legacy_wang = +keypad(legacy_wang)
@@ -1148,6 +1106,7 @@
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
+ japan:hztg_escape = +jp(hztg_escape)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
@@ -1160,6 +1119,7 @@
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
+ keypad:pointerkeys = +keypad(pointerkeys)
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
shift:both_capslock = +shift(both_capslock)
shift:lshift_both_capslock = +shift(lshift_both_capslock)
@@ -1191,9 +1151,9 @@
grp_led:num = +lednum(group_lock)
grp_led:caps = +ledcaps(group_lock)
grp_led:scroll = +ledscroll(group_lock)
- grp:caps_toggle = +ledcaps(group_lock)
japan:kana_lock = +japan(kana_lock)
caps:shiftlock = +ledcaps(shift_lock)
+ grab:break_actions = +xfree86(grab_break)
! option = types