[Xorg-commit] xc/programs/xkbcomp/rules xfree86,1.1.4.2,1.1.4.3 xfree86.lst,1.1.4.3,1.1.4.4 xfree86.xml,1.1.4.3,1.1.4.4
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/programs/xkbcomp/rules
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xkbcomp/rules
Modified Files:
Tag: XORG-CURRENT
xfree86 xfree86.lst xfree86.xml
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: xfree86
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xfree86,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xfree86 26 Nov 2003 22:49:11 -0000 1.1.4.2
+++ b/xfree86 23 Feb 2004 21:37:58 -0000 1.1.4.3
@@ -5,7 +5,7 @@
// Copyright 1996 by Joseph Moss
//
// 2002 Modifier: Ivan Pascal The XFree86 Project
-// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.75 2003/10/14 13:36:29 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.80 2004/01/17 14:59:36 pascal Exp $
//
// Layouts that still need be composed by old rules
@@ -56,7 +56,7 @@
everex = everex(STEPnote)
winbook = winbook(XP5)
pc98 = nec(pc98)
- abnt2 = pc
+ abnt2 = pc(abnt2)
$mac = macintosh(macintosh)
* = pc(pc104)
@@ -68,7 +68,7 @@
! model layout = symbols
pc98 nec/jp = nec/jp(pc98)
- abnt2 br = us(pc101)+br
+ abnt2 br = pc/pc(pc104)+pc/br
$maclaptop us = macintosh/us(extended)+apple(laptop_bad_switch)
$maclaptop en_US = macintosh/us(extended)+apple(laptop_bad_switch)
$maclaptop * = macintosh/us(extended)+apple(laptop_bad_switch)+macintosh/%l%(v)
@@ -98,24 +98,24 @@
! layout[4] = symbols
* = +pc/%l[4]%(v[4]):4
-! $inetkbds = airkey acpi scorpius \
+! $inetkbds = airkey acpi scorpius azonaRF2300 \
brother \
btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
cherryblue cherrybluea \
chicony chicony9885 \
compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
- dell inspiron \
- dexxa diamond genius \
+ dell inspiron dtk2000 \
+ dexxa diamond genius geniuscomfy2 \
ennyah_dkb1008 \
hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
hp500fa hp5xx hp5185 \
honeywell_euroboard \
rapidaccess rapidaccess2 rapidaccess2a \
- ltcd logicdp logicdpa logicink logiciink \
+ ltcd logiaccess logicdp logicdpa logicink logiciink \
logiinkse logiinkseusb logiik itouch \
mx1998 mx2500 mx2750 \
microsoftinet microsoftpro microsoftprooem microsoftprose \
- microsoftoffice \
+ microsoftoffice microsoftmult \
oretec \
propeller \
qtronix \
@@ -148,6 +148,7 @@
grp:alts_toggle = +group(alts_toggle)
grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
grp:caps_toggle = +group(caps_toggle)
+ grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:menu_toggle = +group(menu_toggle)
@@ -159,8 +160,10 @@
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
lv3:switch = +level3(switch)
- lv3:menu_switch = +level3(menu_switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:lalt_switch = +level3(lalt_switch)
lv3:alt_switch = +level3(alt_switch)
+ lv3:menu_switch = +level3(menu_switch)
lv3:win_switch = +level3(win_switch)
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
Index: xfree86.lst
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xfree86.lst,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xfree86.lst 20 Dec 2003 00:28:32 -0000 1.1.4.3
+++ b/xfree86.lst 23 Feb 2004 21:37:58 -0000 1.1.4.4
@@ -5,7 +5,7 @@
// Rules descriptions for XFree86
// Copyright 1996 by Joseph Moss
//
-// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.76 2003/12/18 14:14:38 pascal Exp $
+// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.81 2004/01/17 14:59:36 pascal Exp $
! model
pc101 Generic 101-key PC
@@ -23,6 +23,7 @@
abnt2 Brazilian ABNT2
airkey Acer AirKey V
acpi ACPI Standard
+ azonaRF2300 Azona RF2300 wireless Internet Keyboard
scorpius Advance Scorpius KI
brother Brother Internet Keyboard
btc5113rf BTC 5113RF Multimedia
@@ -44,8 +45,10 @@
inspiron Laptop/notebook Dell Inspiron 8xxx
dexxa Dexxa Wireless Desktop Keyboard
diamond Diamond 9801 / 9802 series
+ dtk2000 DTK2000
ennyah_dkb1008 Ennyah DKB-1008
genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+ geniuscomfy2 Genius Comfy KB-21e-Scroll
hpi6 Hewlett-Packard Internet Keyboard
hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard
hp2505 Hewlett-Packard SK-2505 Internet Keyboard
@@ -67,6 +70,7 @@
ltcd Logitech Cordless Desktop
logicdp Logitech Cordless Desktop Pro
logicdpa Logitech Cordless Desktop Pro (alternate option)
+ logiaccess Logitech Access Keyboard
logicink Logitech Internet Navigator Keyboard
logiciink Logitech iTouch Internet Navigator Keyboard
logiinkse Logitech iTouch Internet Navigator Keyboard SE
@@ -81,6 +85,7 @@
microsoftprooem Microsoft Natural Keyboard Pro OEM
microsoftprose Microsoft Internet Keyboard Pro, Swedish
microsoftoffice Microsoft Office Keyboard
+ microsoftmult Microsoft Wireless Multimedia Keyboard
oretec Oretec MCK-800 MM/Internet keyboard
propeller Propeller Voyager (KTEZ-1000)
qtronix QTronix Scorpius 98N+
@@ -127,6 +132,7 @@
dk Danish
nl Dutch
dvorak Dvorak
+ dz Dzongkha / Tibetan
ee Estonian
fo Faroese
fi Finnish
@@ -199,13 +205,15 @@
! option
grp Group Shift/Lock behavior
- grp:switch R-Alt switches group while pressed
+ grp:switch Right Alt key switches group while pressed
+ grp:lswitch Left Alt key switches group while pressed
grp:lwin_switch Left Win-key switches group while pressed
grp:rwin_switch Right Win-key switches group while pressed
grp:win_switch Both Win-keys switch group while pressed
grp:toggle Right Alt key changes group
grp:lalt_toggle Left Alt key changes group
grp:caps_toggle Caps Lock key changes group
+ grp:shift_caps_toggle Shift+CapsLock changes group
grp:shift_toggle Both Shift keys together change group
grp:alts_toggle Both Alt keys together change group
grp:ctrls_toggle Both Ctrl keys together change group
@@ -221,6 +229,9 @@
grp:rctrl_toggle Right Ctrl key changes group
lv3 Third level choosers
lv3:switch Press Right Control to choose 3rd level
+ lv3:lalt_switch Press Left Alt key to choose 3rd level
+ lv3:ralt_switch Press Right Alt key to choose 3rd level
+ lv3:alt_switch Press any of Alt keys to choose 3rd level
lv3:menu_switch Press Menu key to choose 3rd level
lv3:win_switch Press any of Win-keys to choose 3rd level
lv3:lwin_switch Press Left Win-key to choose 3rd level
Index: xfree86.xml
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xfree86.xml,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xfree86.xml 20 Dec 2003 00:28:32 -0000 1.1.4.3
+++ b/xfree86.xml 23 Feb 2004 21:37:58 -0000 1.1.4.4
@@ -8,8 +8,12 @@
<description>Generic 101-key PC</description>
<description xml:lang="bg">Стандартна 101 клавишна PC клавиатура</description>
<description xml:lang="cs">Obecné PC 101 kláves</description>
+ <description xml:lang="da">Generisk 101-taster PC</description>
+ <description xml:lang="fr">clavier Generic 101-key PC</description>
+ <description xml:lang="hu">általános 101 gombos PC</description>
<description xml:lang="nl">Algemeen 101-toetsen PC</description>
<description xml:lang="ru">Обычный 101-клавишный PC</description>
+ <description xml:lang="sk">Všeobecná PC 101 kláves</description>
<description xml:lang="sr">Обична Ñа 101 таÑтером</description>
<description xml:lang="tr">Soysal 101 tuÅŸlu PC</description>
[...4105 lines suppressed...]
+ <description xml:lang="hu">Egyéb kompatibilitási beállÃtások</description>
<description xml:lang="nl">Overige compatibiliteitsopties</description>
<description xml:lang="ru">Разные параметры ÑовмеÑтимоÑти</description>
+ <description xml:lang="sk">DodatoÄné voľby pre kompatibilitu</description>
<description xml:lang="sr">Разне могућноÑти за ÑаглаÑноÑÑ‚</description>
<description xml:lang="tr">Çeşitli uyumluluk seçenekleri</description>
<description xml:lang="zh_CN">其它兼容选项</description>
@@ -4596,8 +5818,12 @@
<name>numpad:microsoft</name>
<description>Shift with numpad keys works as in MS Windows</description>
<description xml:lang="cs">Shift s numerickými klávesami pracuje jako v MS Windows</description>
+ <description xml:lang="da">Skift med numeriske taster virker som i MS Windows</description>
+ <description xml:lang="fr">la clé Shift avec le pavé nuérique se comporte comme dans MS Windows</description>
+ <description xml:lang="hu">A Shift+numerikus billentyűk úgy működjenek, mint Microsoft Windowsban.</description>
<description xml:lang="nl">Shift met cijferblok-toetsen werkt zoals in MS Windows</description>
<description xml:lang="ru">Клавиша Shift Ñ ÐºÐ»Ð°Ð²Ð¸ÑˆÐ°Ð¼Ð¸ цифровой клавиатуры работают как в MS Windows</description>
+ <description xml:lang="sk">Shift s numerickými klávesmi pracuje ako v MS Windows</description>
<description xml:lang="sr">Shift уз нумеричку таÑатуру ради као у MS Windows-у</description>
<description xml:lang="tr">Sağdaki Nümerik tuşlar MS Windows'daki gibi çalışır</description>
<description xml:lang="uk">Клавіша Shift з клавішами на додатковій цировій клавіатурі функціонує Ñк в Ms Windows</description>
More information about the xorg-commit
mailing list