From 06c87ff20f310b96ad7bff647dd8a806d95873c6 Mon Sep 17 00:00:00 2001 From: svu Date: Sun, 13 Jun 2004 20:21:00 +0000 Subject: [PATCH] fixing loads of bugs from fd.o bugzilla --- BUGS | 58 +++++++++++++++++++++++ rules/base | 13 ++--- rules/base.lst | 5 ++ rules/base.xml.in | 38 +++++++++++++-- symbols/am | 2 +- symbols/inet | 118 ++++++++++++++++++++++++++++++++++++++++++++++ symbols/lt | 36 +++++++------- symbols/us | 2 +- 8 files changed, 243 insertions(+), 29 deletions(-) create mode 100644 BUGS diff --git a/BUGS b/BUGS new file mode 100644 index 0000000..4045137 --- /dev/null +++ b/BUGS @@ -0,0 +1,58 @@ +http://freedesktop.org/bugzilla/show_bug.cgi?id=320 +http://bugs.xfree86.org/show_bug.cgi?id=1155 + + DONE: Added microsoftprousb + +http://freedesktop.org/bugzilla/show_bug.cgi?id=326 +http://bugs.xfree86.org/show_bug.cgi?id=1227 + + ?: Which of 'inet' files is right? + +http://freedesktop.org/bugzilla/show_bug.cgi?id=365 + + DONE: Two keysyms swapped in us(intl) + +http://freedesktop.org/bugzilla/show_bug.cgi?id=371 + + ?: What exactly is broken? Some patch would be nice + +http://freedesktop.org/bugzilla/show_bug.cgi?id=458 + + DONE: Changed Farsi to Iranian + +http://freedesktop.org/bugzilla/show_bug.cgi?id=463 + + ?: Don't know how to fix, really. Let's see. + +http://freedesktop.org/bugzilla/show_bug.cgi?id=496 + + DONE: Added Gyration Compact Keyboard + +http://freedesktop.org/bugzilla/show_bug.cgi?id=574 + + DONE: The patch applied + +http://freedesktop.org/bugzilla/show_bug.cgi?id=587 + + ?: Which of altwin options should be included? + Some part of meta_win is already there + +http://freedesktop.org/bugzilla/show_bug.cgi?id=630 + + DONE: Logitech iTouch Cordless Keyboard (model Y-RB6) added + +http://freedesktop.org/bugzilla/show_bug.cgi?id=666 + + DONE: Long ago added alt_super_win + +http://freedesktop.org/bugzilla/show_bug.cgi?id=711 + + DONE: Added Super Power Multimedia Keyboard + +http://freedesktop.org/bugzilla/show_bug.cgi?id=743 + + DONE: Armenian fixed + +http://freedesktop.org/bugzilla/show_bug.cgi?id=744 + + DONE: Model a4techKB21 added diff --git a/rules/base b/rules/base index 30629d3..87d9a06 100644 --- a/rules/base +++ b/rules/base @@ -42,6 +42,7 @@ ! model = geometry microsoft = microsoft(natural) microsoftpro = microsoft(natural) + microsoftprousb = microsoft(natural) microsoftprose = microsoft(natural) dell101 = dell(dell101) flexpro = keytronic(FlexPro) @@ -93,7 +94,7 @@ ! layout[4] = symbols * = +%l[4]%(v[4]):4 -! $inetkbds = airkey acpi scorpius azonaRF2300 \ +! $inetkbds = a4techKB21 airkey acpi scorpius azonaRF2300 \ brother \ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\ cherryblue cherrybluea \ @@ -101,21 +102,21 @@ compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \ dell inspiron dtk2000 \ dexxa diamond genius geniuscomfy2 \ - ennyah_dkb1008 \ + ennyah_dkb1008 gyration \ hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \ hp500fa hp5xx hp5185 \ honeywell_euroboard \ rapidaccess rapidaccess2 rapidaccess2a \ - ltcd logiaccess logicdp logicdpa logicink logiciink \ - logiinkse logiinkseusb logiik itouch \ + ltcd logiaccess logicdp logicdpa logicdit logicink logiciink \ + logiinkse logiinkseusb logiitc logiik itouch \ mx1998 mx2500 mx2750 \ - microsoftinet microsoftpro microsoftprooem microsoftprose \ + microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ oretec \ propeller \ qtronix \ samsung4500 samsung4510 \ - sk1300 sk2500 sk6200 sk7100 \ + sk1300 sk2500 sk6200 sk7100 sp_inet \ sven symplon toshiba_s3000 trust trustda yahoo ! model = symbols diff --git a/rules/base.lst b/rules/base.lst index a373af8..2594de6 100644 --- a/rules/base.lst +++ b/rules/base.lst @@ -20,6 +20,7 @@ winbook Winbook Model XP5 jp106 Japanese 106-key pc98 PC-98xx Series + a4techKB21 A4Tech KB-21 abnt2 Brazilian ABNT2 airkey Acer AirKey V acpi ACPI Standard @@ -49,6 +50,7 @@ ennyah_dkb1008 Ennyah DKB-1008 genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910 geniuscomfy2 Genius Comfy KB-21e-Scroll + gyration Gyration hpi6 Hewlett-Packard Internet Keyboard hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard hp2505 Hewlett-Packard SK-2505 Internet Keyboard @@ -68,6 +70,7 @@ rapidaccess2a IBM Rapid Access II (alternate option) thinkpad IBM ThinkPad 560Z/600/600E/A22E ltcd Logitech Cordless Desktop + logicdit Logitech Cordless Desktop iTouch logicdp Logitech Cordless Desktop Pro logicdpa Logitech Cordless Desktop Pro (alternate option) logiaccess Logitech Access Keyboard @@ -82,6 +85,7 @@ mx2750 Memorex MX2750 microsoftinet Microsoft Internet Keyboard microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro microsoftprooem Microsoft Natural Keyboard Pro OEM microsoftprose Microsoft Internet Keyboard Pro, Swedish microsoftoffice Microsoft Office Keyboard @@ -95,6 +99,7 @@ sk2500 SK-2500 sk6200 SK-6200 sk7100 SK-7100 + sp_inet Super Power Multimedia Keyboard sven SVEN Ergonomic 2500 symplon Symplon PaceBook (tablet PC) toshiba_s3000 Toshiba Satellite S3000 diff --git a/rules/base.xml.in b/rules/base.xml.in index 4011949..04c87de 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -74,6 +74,12 @@ <_description>PC-98xx Series + + + a4techKB21 + <_description>A4Tech KB-21 + + abnt2 @@ -260,6 +266,12 @@ <_description>Genius Comfy KB-21e-Scroll + + + gyration + <_description>Gyration + + hpi6 @@ -410,6 +422,12 @@ <_description>Logitech Deluxe Access Keyboard + + + logiitc + <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) + + logiik @@ -476,6 +494,12 @@ <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + + + microsoftprousb + <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro + + microsoftprooem @@ -554,6 +578,12 @@ <_description>SK-7100 + + + sp_inet + <_description>Super Power Multimedia Keyboard + + sven @@ -982,7 +1012,7 @@ ir <_shortDescription>Irn - <_description>Farsi + <_description>Iranian @@ -1401,14 +1431,14 @@ - lt_std + std <_description>Standard - lt_us - <_description>US + us + <_description>US keyboard with Lithuanian letters diff --git a/symbols/am b/symbols/am index 48f8b42..2c62c70 100644 --- a/symbols/am +++ b/symbols/am @@ -116,7 +116,7 @@ xkb_symbols "old" { key { [ 0x100056d, 0x100053d ] }; key { [ 0x1000577, 0x1000547 ] }; key { [ comma, guillemotleft ] }; - key { [ period, guillemotright ] }; + key { [ 0x1002024, guillemotright ] }; key { [ 0x100055e, 0x100055e ] }; }; diff --git a/symbols/inet b/symbols/inet index ae4adc7..d9067ea 100644 --- a/symbols/inet +++ b/symbols/inet @@ -20,6 +20,33 @@ // Acer +partial alphanumeric_keys +xkb_symbols "a4techKB21" { + name[Group1]= "A4Tech KB-21"; + + // Left side + key { [ XF86Back ] }; + key { [ XF86Forward ] }; + key { [ XF86Stop ] }; + key { [ XF86Refresh ] }; + key { [ XF86HomePage ] }; + key { [ XF86Search ] }; + + // Middle + key { [ XF86AudioPrev ] }; + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioStop, XF86Eject ] }; + key { [ XF86AudioNext ] }; + + // Right side + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioMute ] }; + key { [ XF86Favorites ] }; + key { [ XF86Mail ] }; + key { [ XF86MyComputer ] }; +}; + partial alphanumeric_keys xkb_symbols "airkey" { name[Group1]= "Acer AirKey V"; @@ -1063,6 +1090,26 @@ xkb_symbols "logiaccess" { key { [ XF86Music ] }; }; +partial alphanumeric_keys +xkb_symbols "logicdit" { + name[Group1]= "Logitech Cordless Desktop iTouch"; + + key { [ XF86Standby ] }; + + key { [ XF86AudioMute ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioStop ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioNext ] }; + + key { [ XF86HomePage ] }; + key { [ XF86Mail ] }; + key { [ XF86Search ] }; + key { [ XF86Go ] }; +}; + partial alphanumeric_keys xkb_symbols "logicdp" { name[Group1]= "Logitech Cordless Desktop Pro"; @@ -1261,6 +1308,24 @@ xkb_symbols "logiinkseusb" { }; +partial alphanumeric_keys +xkb_symbols "logiitc" { + name[Group1]= "Logitech iTouch Cordless Keyboard (model Y-RB6)"; + + key { [ XF86PowerOff ] }; + key { [ XF86AudioMute ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioStop ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioNext ] }; + key { [ XF86HomePage ] }; + key { [ XF86Mail ] }; + key { [ XF86Search ] }; + key { [ XF86Favorites ] }; +}; + partial alphanumeric_keys xkb_symbols "logiik" { name[Group1]= "Logitech Internet Keyboard"; @@ -1436,6 +1501,35 @@ xkb_symbols "microsoftpro" { key { [ XF86Standby ] }; }; +partial alphanumeric_keys + xkb_symbols "microsoftprousb" { + name[Group1]= "Microsoft Natural Keyboard Pro USB"; + + // Multimedia Section -- Right Side + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioStop ] }; + key { [ XF86AudioNext ] }; + key { [ XF86AudioMedia ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioMute ] }; + // Internet Section -- Left Side + key { [ XF86HomePage ] }; + key { [ XF86Mail ] }; + key { [ XF86Favorites ] }; + key { [ XF86Search ] }; + key { [ XF86Stop ] }; + key { [ XF86Back ] }; + key { [ XF86Forward ] }; + key { [ XF86Reload ] }; + // My Computer Section -- Far Right + // My computer maps to printscreen, so leaving commented out for now + // key { [ XF86MyComputer ] }; + key { [ XF86Calculator ] }; + key { [ XF86Standby ] }; +}; + partial alphanumeric_keys xkb_symbols "microsoftprooem" { name[Group1]= "Microsoft Natural Keyboard Pro OEM"; @@ -1947,3 +2041,27 @@ xkb_symbols "yahoo" { key { [ XF86Standby ] }; key { [ XF86WakeUp ] }; }; + +// Super Power Internet Keyboard + +xkb_symbols "sp_inet" { + name[Group1]= "Super Power Multimedia Keyboard"; + + key { [ XF86Refresh ] }; + key { [ XF86Favorites ] }; + key { [ XF86Back ] }; + key { [ XF86Forward ] }; + key { [ XF86Stop ] }; + key { [ XF86HomePage ] }; + key { [ XF86Mail ] }; + key { [ XF86AudioPlay, XF86AudioPause ] }; + key { [ XF86AudioStop ] }; + key { [ XF86AudioPrev ] }; + key { [ XF86AudioNext ] }; + key { [ XF86AudioRaiseVolume ] }; + key { [ XF86AudioMute ] }; + key { [ XF86AudioLowerVolume ] }; + key { [ XF86PowerOff ] }; + key { [ XF86Standby ] }; + key { [ XF86WakeUp ] }; +}; diff --git a/symbols/lt b/symbols/lt index 6d4e534..bf18e48 100644 --- a/symbols/lt +++ b/symbols/lt @@ -1,12 +1,14 @@ // based on -// Lithuanian keyboard map by Rièardas Èepas -// merged into one file by Nerijus Baliûnas +// Lithuanian keyboard map by Ričardas Čepas +// merged into one file by Nerijus BaliÅ«nas +// Added number and special characters writing in basic lt layout with RAlt by +// Mantas KriaučiÅ«nas , 2004 // // $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $ // If you want to have 2 layouts, use -// Option "XkbLayout" "lt,lt(lt_us)" +// Option "XkbLayout" "lt,lt(us)" // Lithuanian Baltic layout - Lithuanian letters on the numeric row partial default alphanumeric_keys modifier_keys @@ -16,17 +18,17 @@ xkb_symbols "basic" { name[Group1]="Lithuanian"; - key { [ aogonek, Aogonek ] }; - key { [ ccaron, Ccaron ] }; - key { [ eogonek, Eogonek ] }; - key { [ eabovedot, Eabovedot ] }; - key { [ iogonek, Iogonek ] }; - key { [ scaron, Scaron ] }; - key { [ uogonek, Uogonek ] }; - key { [ umacron, Umacron ] }; - key { [doublelowquotemark, parenleft ] }; - key { [leftdoublequotemark,parenright ] }; - key { [ zcaron, Zcaron ] }; + key { [ aogonek, Aogonek, 1, exclam ] }; + key { [ ccaron, Ccaron, 2, at ] }; + key { [ eogonek, Eogonek, 3, numbersign ] }; + key { [ eabovedot, Eabovedot, 4, dollar ] }; + key { [ iogonek, Iogonek, 5, percent ] }; + key { [ scaron, Scaron, 6, asciicircum ] }; + key { [ uogonek, Uogonek, 7, ampersand ] }; + key { [ umacron, Umacron, 8, asterisk ] }; + key { [doublelowquotemark, parenleft, 9, parenleft ] }; + key { [leftdoublequotemark,parenright, 0, parenright ] }; + key { [ zcaron, Zcaron, equal, plus ] }; key { [ endash, EuroSign ] }; @@ -36,7 +38,7 @@ xkb_symbols "basic" { // Similar to the above, but you should use Right Alt + numeric row // for Lithuanian letters partial alphanumeric_keys modifier_keys -xkb_symbols "lt_us" { +xkb_symbols "us" { include "latin" @@ -61,14 +63,14 @@ xkb_symbols "lt_us" { }; // Lithuanian keyboard map by Gediminas Paulauskas -// Minor modification by Rièardas Èepas according to http://sun3.mif.vu.lt/cs/TK4/lithkeyb.html +// Minor modification by Ričardas Čepas according to http://sun3.mif.vu.lt/cs/TK4/lithkeyb.html // Describes Lithuanian keymap LST 1582:2000 // Extensions: B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this // layout usable with pc101 and pc104 keyboards. partial alphanumeric_keys modifier_keys -xkb_symbols "lt_std" { +xkb_symbols "std" { include "latin" diff --git a/symbols/us b/symbols/us index 3e3654e..84b10f3 100644 --- a/symbols/us +++ b/symbols/us @@ -107,7 +107,7 @@ xkb_symbols "intl" { key { [ l, L, oslash, Ooblique ] }; key { [ semicolon, colon, paragraph, degree ] }; - key { [dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; + key { [dead_acute, dead_diaeresis, quotedbl, apostrophe ] }; key { [ z, Z, ae, AE ] }; key { [ c, C, copyright, cent ] }; -- 2.32.0.93.g670b81a890