From: svu Date: Sat, 1 Mar 2008 21:01:55 +0000 (+0000) Subject: introducing virtual modules, reducing symbols/inet, b.fd.o#14665 X-Git-Tag: v_1_3~34 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85e363d81951964fd8b05aedb8df9f10fa3c0a0f;p=platform%2Fupstream%2Fxkeyboard-config.git introducing virtual modules, reducing symbols/inet, b.fd.o#14665 --- diff --git a/ChangeLog b/ChangeLog index 1529656..d106e58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-01 Sergey Udaltsov + + * rules/base.lists.part, rules/base.m_s.part, rules/base.xml.in, + symbols/inet: reorganizing keyboard in symbols/inet. Some models are + now implemented as "virtual" (by rules only). + http://bugs.freedesktop.org/show_bug.cgi?id=14665 + 2008-02-28 Sergey Udaltsov * rules/base.xml.in, symbols/in: added in(jhelum), other indian fixes, diff --git a/rules/base.lists.part b/rules/base.lists.part index 6afb405..a46a2a0 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -43,9 +43,10 @@ hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ ipaq inspiron intel latitude \ - logiaccess logicd logicda logicink \ + logiaccess logicda logicink \ logiex110 logiclx300 \ - logiinkse logiinkseusb logiitc logiik itouch logiultrax \ + logiinkse logiinkseusb logiitc logiik \ + logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ diff --git a/rules/base.m_s.part b/rules/base.m_s.part index 9c520d2..def3aed 100644 --- a/rules/base.m_s.part +++ b/rules/base.m_s.part @@ -1,3 +1,17 @@ + benqx730 = +inet(benqx) + benqx800 = +inet(benqx) + dellsk8125 = +inet(dell) + dellsk8135 = +inet(dell) + hpnx9020 = +inet(hp5185) + 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) + vsonku306 = +inet(microsoftprooem) $inetkbds = +inet(%m) acer_tm_800 = +inet(acer_laptop) benqx730 = +inet(benqx) diff --git a/rules/base.xml.in b/rules/base.xml.in index e2938a3..d70b13c 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -332,6 +332,20 @@ + dellsk8125 + <_description>Dell SK-8125 + Dell + + + + + dellsk8135 + <_description>Dell SK-8135 + Dell + + + + dellusbmm <_description>Dell USB Multimedia Keybard Dell @@ -422,6 +436,13 @@ + logitech_base + <_description>Logitech Generic Keyboard + Logitech + + + + logitech_g15 <_description>Logitech G15 extra keys via G15daemon Logitech @@ -492,6 +513,27 @@ + hp5181 + <_description>Hewlett-Packard Internet Keyboard 5181 + Hewlett-Packard + + + + + hp5185 + <_description>Hewlett-Packard Internet Keyboard 5185 + Hewlett-Packard + + + + + hpnx9020 + <_description>Hewlett-Packard nx9020 + Hewlett-Packard + + + + hp6000 <_description>Hewlett-Packard Omnibook 6000/6100 Hewlett-Packard @@ -562,6 +604,20 @@ + logii350 + <_description>Logitech Internet 350 Keyboard + Logitech + + + + + logimel + <_description>Logitech Media Elite Keyboard + Logitech + + + + logicd <_description>Logitech Cordless Desktop Logitech @@ -569,6 +625,27 @@ + logicd_it + <_description>Logitech Cordless Desktop iTouch + Logitech + + + + + logicd_nav + <_description>Logitech Cordless Desktop Navigator + Logitech + + + + + logicd_opt + <_description>Logitech Cordless Desktop Optical + Logitech + + + + logicda <_description>Logitech Cordless Desktop (alternate option) Logitech @@ -723,6 +800,13 @@ + vsonku306 + <_description>ViewSonic KU-306 Internet Keyboard + ViewSonic + + + + microsoftprose <_description>Microsoft Internet Keyboard Pro, Swedish Microsoft Inc. @@ -975,6 +1059,20 @@ + benqx730 + <_description>BenQ X-Touch 730 + BenQ + + + + + benqx800 + <_description>BenQ X-Touch 800 + BenQ + + + + hhk <_description>Happy Hacking Keyboard Fujitsu diff --git a/symbols/inet b/symbols/inet index 7c36916..c07f548 100644 --- a/symbols/inet +++ b/symbols/inet @@ -1268,7 +1268,7 @@ xkb_symbols "thinkpad60" { // Logitech // Logitech common definitions -partial hidden alphanumeric_keys +partial alphanumeric_keys xkb_symbols "logitech_base" { include "inet(media_nav_common)" @@ -1323,12 +1323,6 @@ xkb_symbols "logiaccess" { key { [ XF86Search ] }; }; -// Logitech Cordless Desktop -partial alphanumeric_keys -xkb_symbols "logicd" { - include "inet(logitech_base)" -}; - // Logitech Cordless Desktop (alternate option) partial alphanumeric_keys xkb_symbols "logicda" { @@ -1346,14 +1340,6 @@ xkb_symbols "logicink" { key { [ XF86Start ] }; }; -// Logitech Cordless Desktop LX-300 -partial alphanumeric_keys -xkb_symbols "logiclx300" { - include "inet(logitech_base)" - - key { [ XF86Calculator ] }; -}; - // Logitech Cordless Desktop EX110 partial alphanumeric_keys xkb_symbols "logiex110" { @@ -1449,11 +1435,6 @@ xkb_symbols "itouch" { key { [ XF86AudioRaiseVolume ] }; }; -partial alphanumeric_keys -xkb_symbols "logiultrax" { - include "inet(logitech_base)" -}; - // Logitech UltraX Cordless Media Desktop partial alphanumeric_keys xkb_symbols "logiultraxc" {