diff options
Diffstat (limited to 'xorg-server/xkbdata.src/rules')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.m_k.part | 31 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.m_s.part | 103 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/rules/base.xml.in | 14 |
3 files changed, 65 insertions, 83 deletions
diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index 25a598b30..2c621208f 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -1,17 +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)
- evdev = evdev
- $nokiamodels = evdev
- olpc = evdev
- $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/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part index d969b3f0e..4bbbcce31 100644 --- a/xorg-server/xkbdata.src/rules/base.m_s.part +++ b/xorg-server/xkbdata.src/rules/base.m_s.part @@ -1,52 +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)
- acpi = +inet(acpi_common)
- 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/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index d588790d6..e5f02f871 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -123,13 +123,6 @@ </model> <model> <configItem> - <name>acpi</name> - <_description>ACPI Standard</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>azonaRF2300</name> <_description>Azona RF2300 wireless Internet Keyboard</_description> <vendor>Azona</vendor> @@ -1135,13 +1128,6 @@ </model> <model> <configItem> - <name>evdev</name> - <_description>Evdev-managed keyboard</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>benqx</name> <_description>BenQ X-Touch</_description> <vendor>BenQ</vendor> |