diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
42 files changed, 365 insertions, 365 deletions
diff --git a/xorg-server/xkeyboard-config/rules/HDR b/xorg-server/xkeyboard-config/rules/HDR index 664d48ef2..769b8fc7f 100644 --- a/xorg-server/xkeyboard-config/rules/HDR +++ b/xorg-server/xkeyboard-config/rules/HDR @@ -1,33 +1,33 @@ -! model = keycodes
-! layout[1] = keycodes
-! layout = keycodes
-! option = keycodes
-! model layout = geometry
-! model = geometry
-! model layout variant = symbols
-! model layout = symbols
-! model layout[1] = symbols
-! model layout[1] variant[1] = symbols
-! model layout[2] = symbols
-! model layout[3] = symbols
-! model layout[4] = symbols
-! model layout[2] variant[2] = symbols
-! model layout[3] variant[3] = symbols
-! model layout[4] variant[4] = symbols
-! model = symbols
-! layout variant = compat
-! layout[1] variant[1] = compat
-! layout[2] variant[2] = compat
-! layout[3] variant[3] = compat
-! layout[4] variant[4] = compat
-! model layout = compat
-! model layout[1] = compat
-! model = types
-! layout option = symbols
-! layout[1] option = symbols
-! layout[2] option = symbols
-! layout[3] option = symbols
-! layout[4] option = symbols
-! option = symbols
-! option = compat
-! option = types
+! model = keycodes +! layout[1] = keycodes +! layout = keycodes +! option = keycodes +! model layout = geometry +! model = geometry +! model layout variant = symbols +! model layout = symbols +! model layout[1] = symbols +! model layout[1] variant[1] = symbols +! model layout[2] = symbols +! model layout[3] = symbols +! model layout[4] = symbols +! model layout[2] variant[2] = symbols +! model layout[3] variant[3] = symbols +! model layout[4] variant[4] = symbols +! model = symbols +! layout variant = compat +! layout[1] variant[1] = compat +! layout[2] variant[2] = compat +! layout[3] variant[3] = compat +! layout[4] variant[4] = compat +! model layout = compat +! model layout[1] = compat +! model = types +! layout option = symbols +! layout[1] option = symbols +! layout[2] option = symbols +! layout[3] option = symbols +! layout[4] option = symbols +! option = symbols +! option = compat +! option = types diff --git a/xorg-server/xkeyboard-config/rules/README b/xorg-server/xkeyboard-config/rules/README index cd73bca8f..bcf19ce0c 100644 --- a/xorg-server/xkeyboard-config/rules/README +++ b/xorg-server/xkeyboard-config/rules/README @@ -1,2 +1,2 @@ -This directory lists sets of rules which can be used to obtain an exact XKB
-configuration.
+This directory lists sets of rules which can be used to obtain an exact XKB +configuration. diff --git a/xorg-server/xkeyboard-config/rules/base.l1_k.part b/xorg-server/xkeyboard-config/rules/base.l1_k.part index 032ca5331..91b775396 100644 --- a/xorg-server/xkeyboard-config/rules/base.l1_k.part +++ b/xorg-server/xkeyboard-config/rules/base.l1_k.part @@ -1,3 +1,3 @@ - $azerty = +aliases(azerty)
- $qwertz = +aliases(qwertz)
- * = +aliases(qwerty)
+ $azerty = +aliases(azerty) + $qwertz = +aliases(qwertz) + * = +aliases(qwerty) diff --git a/xorg-server/xkeyboard-config/rules/base.l1o_s.part b/xorg-server/xkeyboard-config/rules/base.l1o_s.part index 098539443..592fab272 100644 --- a/xorg-server/xkeyboard-config/rules/base.l1o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.l1o_s.part @@ -1,2 +1,2 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
- * misc:typo = +typo(base):1
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 + * misc:typo = +typo(base):1 diff --git a/xorg-server/xkeyboard-config/rules/base.l2o_s.part b/xorg-server/xkeyboard-config/rules/base.l2o_s.part index 5f4a5e60f..aac680e9d 100644 --- a/xorg-server/xkeyboard-config/rules/base.l2o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.l2o_s.part @@ -1,2 +1,2 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
- * misc:typo = +typo(base):2
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 + * misc:typo = +typo(base):2 diff --git a/xorg-server/xkeyboard-config/rules/base.l3o_s.part b/xorg-server/xkeyboard-config/rules/base.l3o_s.part index 270af2bdc..1010e2e03 100644 --- a/xorg-server/xkeyboard-config/rules/base.l3o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.l3o_s.part @@ -1,2 +1,2 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
- * misc:typo = +typo(base):3
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 + * misc:typo = +typo(base):3 diff --git a/xorg-server/xkeyboard-config/rules/base.l4o_s.part b/xorg-server/xkeyboard-config/rules/base.l4o_s.part index 7e6175637..49650ad9c 100644 --- a/xorg-server/xkeyboard-config/rules/base.l4o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.l4o_s.part @@ -1,2 +1,2 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
- * misc:typo = +typo(base):4
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 + * misc:typo = +typo(base):4 diff --git a/xorg-server/xkeyboard-config/rules/base.l_k.part b/xorg-server/xkeyboard-config/rules/base.l_k.part index 032ca5331..91b775396 100644 --- a/xorg-server/xkeyboard-config/rules/base.l_k.part +++ b/xorg-server/xkeyboard-config/rules/base.l_k.part @@ -1,3 +1,3 @@ - $azerty = +aliases(azerty)
- $qwertz = +aliases(qwertz)
- * = +aliases(qwerty)
+ $azerty = +aliases(azerty) + $qwertz = +aliases(qwertz) + * = +aliases(qwerty) diff --git a/xorg-server/xkeyboard-config/rules/base.lo_s.part b/xorg-server/xkeyboard-config/rules/base.lo_s.part index 1a37c3d48..dee7b6daa 100644 --- a/xorg-server/xkeyboard-config/rules/base.lo_s.part +++ b/xorg-server/xkeyboard-config/rules/base.lo_s.part @@ -1,2 +1,2 @@ - $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
- * misc:typo = +typo(base)
+ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) + * misc:typo = +typo(base) diff --git a/xorg-server/xkeyboard-config/rules/base.m_g.part b/xorg-server/xkeyboard-config/rules/base.m_g.part index 978aac0c7..753f2ed75 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_g.part +++ b/xorg-server/xkeyboard-config/rules/base.m_g.part @@ -1,27 +1,27 @@ - microsoftelite = microsoft(elite)
- $msmodels = microsoft(natural)
- dell101 = dell(dell101)
- dellm65 = dell(dellm65)
- latitude = dell(latitude)
- flexpro = keytronic(FlexPro)
- hp6000 = hp(omnibook)
- hpmini110 = hp(mini110)
- hpdv5 = hp(dv5)
- omnikey101 = northgate(omnikey101)
- sanwaskbkg3 = sanwa(sanwaskbkg3)
- $pcmodels = pc(%m)
- $pcgeometries = pc(%m)
- everex = everex(STEPnote)
- thinkpad = thinkpad(intl)
- thinkpad60 = thinkpad(60)
- thinkpadz60 = thinkpad(60)
- $tmgeometries = typematrix(%m)
- winbook = winbook(XP5)
- pc98 = nec(pc98)
- $applealu = macintosh(%m)
- $macbooks = macintosh(%m)
- $macs = macintosh(macintosh)
- hhk = hhk(basic)
- kinesis = kinesis(model100)
- $nokiamodels = nokia(%m)
- * = pc(pc104)
+ microsoftelite = microsoft(elite) + $msmodels = microsoft(natural) + dell101 = dell(dell101) + dellm65 = dell(dellm65) + latitude = dell(latitude) + flexpro = keytronic(FlexPro) + hp6000 = hp(omnibook) + hpmini110 = hp(mini110) + hpdv5 = hp(dv5) + omnikey101 = northgate(omnikey101) + sanwaskbkg3 = sanwa(sanwaskbkg3) + $pcmodels = pc(%m) + $pcgeometries = pc(%m) + everex = everex(STEPnote) + thinkpad = thinkpad(intl) + thinkpad60 = thinkpad(60) + thinkpadz60 = thinkpad(60) + $tmgeometries = typematrix(%m) + winbook = winbook(XP5) + pc98 = nec(pc98) + $applealu = macintosh(%m) + $macbooks = macintosh(%m) + $macs = macintosh(macintosh) + hhk = hhk(basic) + kinesis = kinesis(model100) + $nokiamodels = nokia(%m) + * = pc(pc104) diff --git a/xorg-server/xkeyboard-config/rules/base.m_k.part b/xorg-server/xkeyboard-config/rules/base.m_k.part index bae06c55d..2c621208f 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_k.part +++ b/xorg-server/xkeyboard-config/rules/base.m_k.part @@ -1,14 +1,14 @@ - amiga = amiga(de)
- ataritt = ataritt(de)
- empty = empty
- sun4 = sun(type4_euro)
- sun5 = sun(type5_euro)
- sun6 = sun(type6_usb)
- sun6euro = sun(type6tuv_usb)
- pc98 = xfree98(pc98)
- $applealu = macintosh(alukbd)
- macintosh_hhk = macintosh(hhk)
- macintosh_old = macintosh(old)
- $macs = macintosh
- thinkpadz60 = xfree86(thinkpadz60)
- * = xfree86
+ amiga = amiga(de) + ataritt = ataritt(de) + empty = empty + sun4 = sun(type4_euro) + sun5 = sun(type5_euro) + sun6 = sun(type6_usb) + sun6euro = sun(type6tuv_usb) + pc98 = xfree98(pc98) + $applealu = macintosh(alukbd) + macintosh_hhk = macintosh(hhk) + macintosh_old = macintosh(old) + $macs = macintosh + thinkpadz60 = xfree86(thinkpadz60) + * = xfree86 diff --git a/xorg-server/xkeyboard-config/rules/base.m_s.part b/xorg-server/xkeyboard-config/rules/base.m_s.part index 0eee0456d..4bbbcce31 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_s.part +++ b/xorg-server/xkeyboard-config/rules/base.m_s.part @@ -1,51 +1,51 @@ - a4techKB21 = +inet(media_nav_common)
- a4techKBS8 = +inet(media_nav_acpi_common)
- a4_rfkb23 = +inet(media_nav_acpi_common)
- asus_laptop = +inet(media_common)
- acer_tm_800 = +inet(acer_laptop)
- benqx730 = +inet(benqx)
- benqx800 = +inet(benqx)
- btc5126t = +inet(nav_acpi_common)
- btc9116u = +inet(btc9019u)
- btc6301urf = +inet(media_nav_acpi_common)
- dellsk8125 = +inet(dell)
- dellsk8135 = +inet(dell)
- cherrybunlim = +inet(nav_common)
- dexxa = +inet(media_nav_common)
- dtk2000 = +inet(media_nav_acpi_common)
- fscaa1667g = +inet(media_nav_common)
- geniuskb19e = +inet(media_nav_acpi_common)
- geniuscomfy = +inet(media_nav_acpi_common)
- geniuskkb2050hs = +inet(dellusbmm)
- hpnx9020 = +inet(hpi6)
- latitude = +inet(media_common)
- logicd = +inet(logitech_base)
- logicd_it = +inet(logitech_base)
- logicd_nav = +inet(logitech_base)
- logicd_opt = +inet(logitech_base)
- logiultrax = +inet(logitech_base)
- logiclx300 = +inet(logiex110)
- logii350 = +inet(logiex110)
- logimel = +inet(logiex110)
- logicdit = +inet(logicd)
- logicdo = +inet(logicd)
- logicdp = +inet(logicd)
- logicdpa = +inet(logicda)
- logiciink = +inet(logicink)
- ltcd = +inet(logicda)
- microsoftccurve2k = +inet(microsoftprooem)
- microsoftpro = +inet(media_nav_acpi_common)
- precision_m = +inet(media_nav_common)
- scorpius = +inet(media_nav_acpi_common)
- sp_inet = +inet(media_nav_acpi_common)
- targa_v811 = +inet(media_nav_acpi_common)
- thinkpad = +inet(media_nav_common)
- thinkpadz60 = +inet(thinkpad60)
- tm2030USB-102 = +inet(media_nav_acpi_common)
- tm2030USB-106 = +inet(media_nav_acpi_common)
- trust_slimline = +inet(media_nav_acpi_common)
- vsonku306 = +inet(microsoftprooem)
- $inetkbds = +inet(%m)
- $maclaptop = +inet(apple)+level3(enter_switch)
- $applealu = +inet(apple)
- $macs = +inet(apple)
+ a4techKB21 = +inet(media_nav_common) + a4techKBS8 = +inet(media_nav_acpi_common) + a4_rfkb23 = +inet(media_nav_acpi_common) + asus_laptop = +inet(media_common) + acer_tm_800 = +inet(acer_laptop) + benqx730 = +inet(benqx) + benqx800 = +inet(benqx) + btc5126t = +inet(nav_acpi_common) + btc9116u = +inet(btc9019u) + btc6301urf = +inet(media_nav_acpi_common) + dellsk8125 = +inet(dell) + dellsk8135 = +inet(dell) + cherrybunlim = +inet(nav_common) + dexxa = +inet(media_nav_common) + dtk2000 = +inet(media_nav_acpi_common) + fscaa1667g = +inet(media_nav_common) + geniuskb19e = +inet(media_nav_acpi_common) + geniuscomfy = +inet(media_nav_acpi_common) + geniuskkb2050hs = +inet(dellusbmm) + hpnx9020 = +inet(hpi6) + latitude = +inet(media_common) + logicd = +inet(logitech_base) + logicd_it = +inet(logitech_base) + logicd_nav = +inet(logitech_base) + logicd_opt = +inet(logitech_base) + logiultrax = +inet(logitech_base) + logiclx300 = +inet(logiex110) + logii350 = +inet(logiex110) + logimel = +inet(logiex110) + logicdit = +inet(logicd) + logicdo = +inet(logicd) + logicdp = +inet(logicd) + logicdpa = +inet(logicda) + logiciink = +inet(logicink) + ltcd = +inet(logicda) + microsoftccurve2k = +inet(microsoftprooem) + microsoftpro = +inet(media_nav_acpi_common) + precision_m = +inet(media_nav_common) + scorpius = +inet(media_nav_acpi_common) + sp_inet = +inet(media_nav_acpi_common) + targa_v811 = +inet(media_nav_acpi_common) + thinkpad = +inet(media_nav_common) + thinkpadz60 = +inet(thinkpad60) + tm2030USB-102 = +inet(media_nav_acpi_common) + tm2030USB-106 = +inet(media_nav_acpi_common) + trust_slimline = +inet(media_nav_acpi_common) + vsonku306 = +inet(microsoftprooem) + $inetkbds = +inet(%m) + $maclaptop = +inet(apple)+level3(enter_switch) + $applealu = +inet(apple) + $macs = +inet(apple) diff --git a/xorg-server/xkeyboard-config/rules/base.m_t.part b/xorg-server/xkeyboard-config/rules/base.m_t.part index 7ccbf47b9..9669d6b38 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_t.part +++ b/xorg-server/xkeyboard-config/rules/base.m_t.part @@ -1,4 +1,4 @@ - $macs = complete+numpad(mac)
- $applealu = complete+numpad(mac)
- $nokiamodels = complete+nokia
- * = complete
+ $macs = complete+numpad(mac) + $applealu = complete+numpad(mac) + $nokiamodels = complete+nokia + * = complete diff --git a/xorg-server/xkeyboard-config/rules/base.ml1_c.part b/xorg-server/xkeyboard-config/rules/base.ml1_c.part index 0e6147b23..f59e596d5 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml1_c.part +++ b/xorg-server/xkeyboard-config/rules/base.ml1_c.part @@ -1 +1 @@ - * * = complete
+ * * = complete diff --git a/xorg-server/xkeyboard-config/rules/base.ml1_s.part b/xorg-server/xkeyboard-config/rules/base.ml1_s.part index efe8ae124..20b4276ed 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml1_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml1_s.part @@ -1,15 +1,15 @@ - 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])
- sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1])
- macintosh_old us = macintosh_vndr/us(oldmac)
- macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
- macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
- applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac)
- $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1])
- $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1])
- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
- nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
- nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1])
- $thinkpads br = pc+%l[1](thinkpad)
- * * = pc+%l[1]%(v[1])
+ 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]) + sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) + macintosh_old us = macintosh_vndr/us(oldmac) + macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) + macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) + applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) + $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) + $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) + $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) + $thinkpads br = pc+%l[1](thinkpad) + * * = pc+%l[1]%(v[1]) diff --git a/xorg-server/xkeyboard-config/rules/base.ml2_s.part b/xorg-server/xkeyboard-config/rules/base.ml2_s.part index 3c80545d5..27f997529 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml2_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml2_s.part @@ -1,3 +1,3 @@ - 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
+ 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 diff --git a/xorg-server/xkeyboard-config/rules/base.ml3_s.part b/xorg-server/xkeyboard-config/rules/base.ml3_s.part index b7e669f87..607752509 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml3_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml3_s.part @@ -1,3 +1,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
+ 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 diff --git a/xorg-server/xkeyboard-config/rules/base.ml4_s.part b/xorg-server/xkeyboard-config/rules/base.ml4_s.part index d8830ae34..8d92f393c 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml4_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml4_s.part @@ -1,3 +1,3 @@ - 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
+ 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 diff --git a/xorg-server/xkeyboard-config/rules/base.ml_c.part b/xorg-server/xkeyboard-config/rules/base.ml_c.part index f71278ff1..ec8f02291 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml_c.part +++ b/xorg-server/xkeyboard-config/rules/base.ml_c.part @@ -1,4 +1,4 @@ - pc98 nec_vndr/jp = pc98(basic)
- * jp = complete+japan
- olpc * = olpc
- * * = complete
+ pc98 nec_vndr/jp = pc98(basic) + * jp = complete+japan + olpc * = olpc + * * = complete diff --git a/xorg-server/xkeyboard-config/rules/base.ml_g.part b/xorg-server/xkeyboard-config/rules/base.ml_g.part index 353bdae23..e66bb0b50 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml_g.part +++ b/xorg-server/xkeyboard-config/rules/base.ml_g.part @@ -1 +1 @@ - thinkpad us = thinkpad(us)
+ thinkpad us = thinkpad(us) diff --git a/xorg-server/xkeyboard-config/rules/base.mlv_s.part b/xorg-server/xkeyboard-config/rules/base.mlv_s.part index 2bdd8612b..1eecc55c0 100644 --- a/xorg-server/xkeyboard-config/rules/base.mlv_s.part +++ b/xorg-server/xkeyboard-config/rules/base.mlv_s.part @@ -1,4 +1,4 @@ - 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)
- nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
+ 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) + nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) diff --git a/xorg-server/xkeyboard-config/rules/base.o_t.part b/xorg-server/xkeyboard-config/rules/base.o_t.part index 9b3155e74..e0d4b15ed 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_t.part +++ b/xorg-server/xkeyboard-config/rules/base.o_t.part @@ -1,8 +1,8 @@ - caps:internal = +caps(internal)
- caps:internal_nocancel = +caps(internal_nocancel)
- caps:shift = +caps(shift)
- caps:shift_nocancel = +caps(shift_nocancel)
- numpad:pc = +numpad(pc)
- numpad:mac = +numpad(mac)
- numpad:microsoft = +numpad(microsoft)
- numpad:shift3 = +numpad(shift3)
+ caps:internal = +caps(internal) + caps:internal_nocancel = +caps(internal_nocancel) + caps:shift = +caps(shift) + caps:shift_nocancel = +caps(shift_nocancel) + numpad:pc = +numpad(pc) + numpad:mac = +numpad(mac) + numpad:microsoft = +numpad(microsoft) + numpad:shift3 = +numpad(shift3) diff --git a/xorg-server/xkeyboard-config/rules/bin/Makefile.am b/xorg-server/xkeyboard-config/rules/bin/Makefile.am index 787e34f8a..99077804a 100644 --- a/xorg-server/xkeyboard-config/rules/bin/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/bin/Makefile.am @@ -1,10 +1,10 @@ -transform_scripts= \
-mln_s.sh \
-mlnvn_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
-
-EXTRA_DIST=$(transform_scripts)
+transform_scripts= \ +mln_s.sh \ +mlnvn_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +EXTRA_DIST=$(transform_scripts) diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh index 39e931103..b2d222432 100644 --- a/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/ml1_s.sh @@ -1,18 +1,18 @@ -#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1_s.part
-
-> $OUTFILE
-
-awk '{
- if (index($2, "(") == 0) {
- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
- } else {
- printf " * %s = pc+%s\n", $1, $2;
- }
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1_s.part + +> $OUTFILE + +awk '{ + if (index($2, "(") == 0) { + printf " * %s = pc+%s%%(v[1])\n", $1, $2; + } else { + printf " * %s = pc+%s\n", $1, $2; + } +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh index 6e0d7ed79..7c2b1a84c 100644 --- a/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh @@ -1,10 +1,10 @@ -#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1v1_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1v1_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh index fc904f392..084d4c0be 100644 --- a/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh @@ -1,10 +1,10 @@ -#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml1v_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1v_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh index 80515aa84..666ba870f 100644 --- a/xorg-server/xkeyboard-config/rules/bin/ml_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/ml_s.sh @@ -1,14 +1,14 @@ -#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.ml_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s = pc+%s\n", $1, $2;
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml_s.part + +> $OUTFILE + +awk '{ + printf " * %s = pc+%s\n", $1, $2; +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh index 4a615fe7d..67fd8a06e 100644 --- a/xorg-server/xkeyboard-config/rules/bin/mln_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/mln_s.sh @@ -1,20 +1,20 @@ -#!/bin/sh
-
-variant=$1
-
-INDIR=$2
-OUTFILE=base.ml${variant}_s.part
-
-> $OUTFILE
-
-awk '{
- if (index($2, "(") == 0) {
- printf " * %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2;
- } else {
- printf " * %s = +%s:'${variant}'\n", $1, $2;
- }
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +variant=$1 + +INDIR=$2 +OUTFILE=base.ml${variant}_s.part + +> $OUTFILE + +awk '{ + if (index($2, "(") == 0) { + printf " * %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2; + } else { + printf " * %s = +%s:'${variant}'\n", $1, $2; + } +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " * %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh index 30123874b..1a5f40f25 100644 --- a/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh @@ -1,12 +1,12 @@ -#!/bin/sh
-
-variant=$1
-
-INDIR=$2
-OUTFILE=base.ml${variant}v${variant}_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +variant=$1 + +INDIR=$2 +OUTFILE=base.ml${variant}v${variant}_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh index 3c10343cc..5b466d59c 100644 --- a/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh +++ b/xorg-server/xkeyboard-config/rules/bin/mlv_s.sh @@ -1,10 +1,10 @@ -#!/bin/sh
-
-INDIR=$1
-OUTFILE=base.mlv_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
+#!/bin/sh + +INDIR=$1 +OUTFILE=base.mlv_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkeyboard-config/rules/compat/.gitignore b/xorg-server/xkeyboard-config/rules/compat/.gitignore index d207853f2..bd274090a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/.gitignore +++ b/xorg-server/xkeyboard-config/rules/compat/.gitignore @@ -1,6 +1,6 @@ -base.ml2_s.part
-base.ml2v2_s.part
-base.ml3_s.part
-base.ml3v3_s.part
-base.ml4_s.part
-base.ml4v4_s.part
+base.ml2_s.part +base.ml2v2_s.part +base.ml3_s.part +base.ml3v3_s.part +base.ml4_s.part +base.ml4v4_s.part diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part index d85efe4e7..64ff0f2f5 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part @@ -1 +1 @@ - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part index fd80f998d..fea61be76 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part @@ -1 +1 @@ - de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part index 0fc152316..5a1fb2f8a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part @@ -1 +1 @@ - de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part index 8954744ea..ac8a91102 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part @@ -1 +1 @@ - de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lists.part b/xorg-server/xkeyboard-config/rules/compat/base.lists.part index 98c54127a..f1cf7ee22 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.lists.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.lists.part @@ -1,2 +1,2 @@ -
-! $dvoraklayouts = br ca de ee es fr gb no pl se us
+ +! $dvoraklayouts = br ca de ee es fr gb no pl se us diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part index d85efe4e7..64ff0f2f5 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part @@ -1 +1 @@ - de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) diff --git a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part index 8a3cecf3a..8f1e9e452 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.o_s.part @@ -1 +1 @@ - grp:shift_toggle = +group(shifts_toggle)
+ grp:shift_toggle = +group(shifts_toggle) diff --git a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst index 2318de247..cecda6d8a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst +++ b/xorg-server/xkeyboard-config/rules/compat/layoutsMapping.lst @@ -1,27 +1,27 @@ -ar ara
-ben in(ben)
-bs ba
-cs rs
-cz_qwerty cz(qwerty)
-dev in(deva)
-dvorak us(dvorak)
-dzdwi bt
-el gr
-en_US latin
-guj in(guj)
-gur in(guru)
-iu ca(ike)
-lo la
-kan in(kan)
-mi mao
-ml in(mal)
-ogham ie(ogam)
-ori ie(ori)
-sapmi no(smi)
-sr srp
-syr sy(syc)
-tel in(tel)
-tml in(tam)
-yu srp
-fr-latin9 fr(latin9)
-us_intl us(alt-intl)
+ar ara +ben in(ben) +bs ba +cs rs +cz_qwerty cz(qwerty) +dev in(deva) +dvorak us(dvorak) +dzdwi bt +el gr +en_US latin +guj in(guj) +gur in(guru) +iu ca(ike) +lo la +kan in(kan) +mi mao +ml in(mal) +ogham ie(ogam) +ori ie(ori) +sapmi no(smi) +sr srp +syr sy(syc) +tel in(tel) +tml in(tam) +yu srp +fr-latin9 fr(latin9) +us_intl us(alt-intl) diff --git a/xorg-server/xkeyboard-config/rules/evdev.m_k.part b/xorg-server/xkeyboard-config/rules/evdev.m_k.part index 4f1c5c30a..810675463 100644 --- a/xorg-server/xkeyboard-config/rules/evdev.m_k.part +++ b/xorg-server/xkeyboard-config/rules/evdev.m_k.part @@ -1,3 +1,3 @@ - pc98 = evdev(pc98)
- applealu_jis = evdev+macintosh(jisevdev)
- * = evdev
+ pc98 = evdev(pc98) + applealu_jis = evdev+macintosh(jisevdev) + * = evdev diff --git a/xorg-server/xkeyboard-config/rules/evdev.m_s.part b/xorg-server/xkeyboard-config/rules/evdev.m_s.part index 1b423053c..5a6416bf7 100644 --- a/xorg-server/xkeyboard-config/rules/evdev.m_s.part +++ b/xorg-server/xkeyboard-config/rules/evdev.m_s.part @@ -1,3 +1,3 @@ - $evdevkbds = +inet(evdev)+inet(%m)
- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
- * = +inet(evdev)
+ $evdevkbds = +inet(evdev)+inet(%m) + applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) + * = +inet(evdev) diff --git a/xorg-server/xkeyboard-config/rules/merge.sh b/xorg-server/xkeyboard-config/rules/merge.sh index be06dfc71..b18af7c3d 100644 --- a/xorg-server/xkeyboard-config/rules/merge.sh +++ b/xorg-server/xkeyboard-config/rules/merge.sh @@ -1,25 +1,25 @@ -#!/bin/sh
-
-INDIR=`dirname $0`
-DEST=$1
-shift
-
-if [ -z "$HDR" ]; then
- HDR="HDR"
-fi
-
-basename=`basename $0`
-echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
-
-for i in $*; do
- if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
- echo >> $DEST;
- read hdr
- echo "$hdr" >> $DEST
- elif test -f $i; then
- cat $i >> $DEST || exit 1
- else
- cat $INDIR/$i >> $DEST || exit 1
- fi
-done < $HDR
-
+#!/bin/sh + +INDIR=`dirname $0` +DEST=$1 +shift + +if [ -z "$HDR" ]; then + HDR="HDR" +fi + +basename=`basename $0` +echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST + +for i in $*; do + if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then + echo >> $DEST; + read hdr + echo "$hdr" >> $DEST + elif test -f $i; then + cat $i >> $DEST || exit 1 + else + cat $INDIR/$i >> $DEST || exit 1 + fi +done < $HDR + |