diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | rules/base.lists.part | 2 | ||||
| -rw-r--r-- | rules/base.ml_s.part | 2 | ||||
| -rw-r--r-- | rules/base.mlv_s.part | 3 | ||||
| -rw-r--r-- | rules/base.xml.in | 7 | ||||
| -rw-r--r-- | symbols/inet | 9 | ||||
| -rw-r--r-- | symbols/us | 149 |
7 files changed, 177 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2007-08-18 Sergey Udaltsov + + * rules/base.lists.part, rules/base.ml_s.part, rules/base.mlv_s.part, + rules/base.xml.in, symbols/inet, symbols/us: added classmate model + with specific variants, + https://bugs.freedesktop.org/show_bug.cgi?id=11955 + 2007-08-14 Sergey Udaltsov * symbols/inet, rules/base.xml.in: added asus_laptop, diff --git a/rules/base.lists.part b/rules/base.lists.part index a6b1b281..b75331f8 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part @@ -39,7 +39,7 @@ gyration honeywell_euroboard \ hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ - ipaq inspiron latitude \ + ipaq inspiron intel latitude \ logiaccess logicd logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik itouch logiultrax \ diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part index e318c1e8..1fab2dc2 100644 --- a/rules/base.ml_s.part +++ b/rules/base.ml_s.part @@ -2,6 +2,8 @@ ataritt * = xfree68_vndr/ataritt(us)+%l%(v) amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) + + classmate us = pc+%l(classmate) sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2 sun4 * = latin+sun_vndr/us(sun4)+%l%(v) sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 diff --git a/rules/base.mlv_s.part b/rules/base.mlv_s.part index e69de29b..df4eef24 100644 --- a/rules/base.mlv_s.part +++ b/rules/base.mlv_s.part @@ -0,0 +1,3 @@ + 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) diff --git a/rules/base.xml.in b/rules/base.xml.in index 10e046b8..ada60560 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -915,6 +915,13 @@ <vendor>Fujitsu</vendor> </configItem> </model> + <model> + <configItem> + <name>classmate</name> + <_description>Classmate PC</_description> + <vendor>Intel</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> diff --git a/symbols/inet b/symbols/inet index 584f52c2..7493aa82 100644 --- a/symbols/inet +++ b/symbols/inet @@ -2169,3 +2169,12 @@ xkb_symbols "logitech_g15" { key <XFER> { [ XF86Launch8 ] }; }; + +// Intel + +// Intel Classmate +partial alphanumeric_keys +xkb_symbols "classmate" { + key <I2E> { [ XF86AudioLowerVolume ] }; + key <I30> { [ XF86AudioRaiseVolume ] }; +}; @@ -603,7 +603,6 @@ xkb_symbols "altgr-intl" { // five dead keys moved into level3: key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; - key <AE06> { [ 6, asciicircum, onequarter, dead_circumflex ] }; key <AC11> { [apostrophe,quotedbl, dead_acute, dead_diaeresis ] }; // diversions from the MS Intl keyboard: @@ -622,3 +621,151 @@ xkb_symbols "altgr-intl" { include "level3(ralt_switch)" }; + +// Intel ClassmatePC Keyboard Layout +// by Piter PUNK <piterpk@terra.com.br> +// +// The keyboard layouts below maps the us(basic), us(intl) and us(alt-intl) +// to ClassmatePC keyboard. All layouts uses RCTL as level3(switch) since +// the keyboard doesn't have AltGr key. The EuroSign is engraved at 5 key. + +// classmate - us(basic) +partial alphanumeric_keys +xkb_symbols "classmate" { + include "us(basic)" + name[Group1]= "U.S. English - ClassmatePC"; + + key <LSGT> { [ backslash, bar, backslash, bar ] }; + + include "eurosign(5)" + include "level3(switch)" +}; + +// classmate-intl - us(intl) +// RCTL is generated by Fn+Alt, because that, when trying to access +// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got +// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key> +// generate the same symbol as the original key. +partial alphanumeric_keys +xkb_symbols "classmate-intl" { + include "us(intl)" + name[Group1]= "U.S. English - ClassmatePC (International)"; + key.type[Group1]="FOUR_LEVEL"; + + key <LSGT> { [ backslash, bar, backslash, bar ] }; + + key <KP7> { [ KP_Home, KP_7, + onehalf, dead_horn ] }; + key <KP8> { [ KP_Up, KP_8, + threequarters, dead_ogonek ] }; + key <KP9> { [ KP_Prior, KP_9, + leftsinglequotemark, dead_breve ] }; + key <KPMU> { [ KP_Multiply, KP_Multiply, + rightsinglequotemark, dead_abovering ] }; + + key <KP4> { [ KP_Left, KP_4, + uacute, Uacute ] }; + key <KP5> { [ KP_Begin, KP_5, + iacute, Iacute ] }; + key <KP6> { [ KP_Right, KP_6, + oacute, Oacute ] }; + key <KPSU> { [ KP_Subtract, KP_Subtract, + odiaresis, Odiaresis ] }; + + key <KP2> { [ KP_Down, KP_2, + oe, OE ] }; + key <KP3> { [ KP_Next, KP_3, + oslash, Ooblique ] }; + key <KPAD> { [ KP_Add, KP_Add, + paragraph, degree ] }; + + key <KP0> { [ KP_Insert, KP_0, + mu, mu ] }; + key <KPDL> { [ KP_Delete, KP_Decimal, + dead_abovedot, dead_caron ] }; + key <KPDV> { [ KP_Divide, KP_Divide, + questiondown, dead_hook ] }; + + include "level3(switch)" +}; + +// classmate-alt-intl - us(alt-intl) +// RCTL is generated by Fn+Alt, because that, when trying to access +// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got +// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key> +// generate the same symbol as the original key. +partial alphanumeric_keys +xkb_symbols "classmate-alt-intl" { + include "us(alt-intl)" + name[Group1]= "U.S. English - ClassmatePC (Alternative International)"; + key.type[Group1]="FOUR_LEVEL"; + + key <LSGT> { [ backslash, bar, backslash, bar ] }; + + key <KPSU> { [ KP_Subtract, KP_Subtract ] }; + + key <KP9> { [ KP_Prior, KP_9, + leftsinglequotemark, dead_breve ] }; + key <KPMU> { [ KP_Multiply, KP_Multiply, + rightsinglequotemark, dead_abovering ] }; + + key <KPAD> { [ KP_Add, KP_Add, + dead_ogonek, dead_diaresis ] }; + + key <KPDL> { [ KP_Delete, KP_Decimal, + dead_abovedot, dead_circumflex ] }; + key <KPDV> { [ KP_Divide, KP_Divide, + dead_hook, dead_hook ] }; + + include "level3(switch)" +}; + +// classmate-altgr-intl - us(altgr-intl) +// RCTL is generated by Fn+Alt, because that, when trying to access +// the level3 symbols at 7,8,9,0,u,i,o,p,j,k,l,;,m,. and / we got +// the keypad keycodes. The keypad is changed to make Fn+Alt+<KP_key> +// generate the same symbol as the original key. +partial alphanumeric_keys +xkb_symbols "classmate-altgr-intl" { + include "us(altgr-intl)" + name[Group1]= "U.S. English - ClassmatePC (International Fn+Alt dead-keys)"; + key.type[Group1]="FOUR_LEVEL"; + + key <LSGT> { [ backslash, bar, backslash, bar ] }; + + key <KP7> { [ KP_Home, KP_7, + dead_horn, dead_horn ] }; + key <KP8> { [ KP_Up, KP_8, + dead_ogonek, dead_ogonek ] }; + key <KP9> { [ KP_Prior, KP_9, + leftsinglequotemark, dead_breve ] }; + key <KPMU> { [ KP_Multiply, KP_Multiply, + rightsinglequotemark, dead_abovering ] }; + + key <KP4> { [ KP_Left, KP_4, + uacute, Uacute ] }; + key <KP5> { [ KP_Begin, KP_5, + iacute, Iacute ] }; + key <KP6> { [ KP_Right, KP_6, + oacute, Oacute ] }; + key <KPSU> { [ KP_Subtract, KP_Subtract, + odiaresis, Odiaresis ] }; + + key <KP1> { [ KP_End, KP_1, + idiaresis, Idiaresis ] }; + key <KP2> { [ KP_Down, KP_2, + oe, OE ] }; + key <KP3> { [ KP_Next, KP_3, + oslash, Ooblique ] }; + key <KPAD> { [ KP_Add, KP_Add, + paragraph, degree ] }; + + key <KP0> { [ KP_Insert, KP_0, + mu, mu ] }; + key <KPDL> { [ KP_Delete, KP_Decimal, + dead_abovedot, dead_caron ] }; + key <KPDV> { [ KP_Divide, KP_Divide, + questiondown, dead_hook ] }; + + include "level3(switch)" +}; |