[xorg-commit-diffs] xc/programs/xkbcomp/rules xorg, NONE,
1.1.4.1 xorg-it.lst, NONE, 1.1.4.1 xorg.lst, NONE,
1.1.4.1 xorg.xml, NONE, 1.1.4.1 Imakefile, 1.1.4.1,
1.1.4.1.2.1 xfree86, 1.1.4.2.2.1, NONE xfree86-it.lst,
1.1.4.1.2.1, NONE xfree86.lst, 1.1.4.2.2.1, NONE xfree86.xml,
1.1.4.1.2.1, NONE
Alexander Gottwald
xorg-commit at pdx.freedesktop.org
Mon Mar 29 07:46:40 PST 2004
Committed by: ago
--- NEW FILE: xorg ---
// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
//
// Rules for resolving XKB components for use with X
// Copyright 1996 by Joseph Moss
//
// 2002 Modifier: Ivan Pascal The XFree86 Project
//
// Layouts that still need be composed by old rules
! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn hr_US
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
//! $nonlatin = am ar ben bg by dev el ge_la ge_ru guj gur il il_phonetic\
// ir iu kan lo mk mm ml ori ru sr syr syr_phonetic tel th\
// tj tml ua
! $pcmodels = pc101 pc102 pc104 pc105
! $maclaptop = ibook powerbook
! $mac = macintosh macintosh_old ibook powerbook
! model = keycodes
macintosh_old = macintosh
powerpcps2 = powerpcps2
pc98 = xfree98(pc98)
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
* = xfree86
! $azerty = be fr fr-latin9
! $qwertz = al cz de hr pl2 ro si sk
! layout[1] = keycodes
$azerty = +aliases(azerty)
$qwertz = +aliases(qwertz)
* = +aliases(qwerty)
! layout = keycodes
$azerty = +aliases(azerty)
$qwertz = +aliases(qwertz)
* = +aliases(qwerty)
! model = geometry
microsoft = microsoft(natural)
microsoftpro = microsoft(natural)
microsoftprose = microsoft(natural)
dell101 = dell(dell101)
flexpro = keytronic(FlexPro)
hp6000 = hp(omnibook)
omnikey101 = northgate(omnikey101)
thinkpad = ibm/thinkpad(common)
$pcmodels = pc(%m)
jp106 = pc(jp106)
everex = everex(STEPnote)
winbook = winbook(XP5)
pc98 = nec(pc98)
abnt2 = pc(abnt2)
$mac = macintosh(macintosh)
* = pc(pc104)
! model variant layout = symbols
$maclaptop nodeadkeys * = macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch)
$mac nodeadkeys * = macintosh/us(extended)+macintosh/%l%(v)
$pcmodels nodeadkeys $oldlayouts = en_US(%m%_v)+%l%(v)
* nodeadkeys $oldlayouts = en_US(pc105%_v)+%l%(v)
! model layout = symbols
pc98 nec/jp = nec/jp(pc98)
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)
$mac us = macintosh/us(extended)
$mac en_US = macintosh/us(extended)
$mac * = macintosh/us(extended)+macintosh/%l%(v)
$pcmodels intl = us(%mcompose)
* intl = us(pc104compose)
* jp = jp
$pcmodels $oldlayouts = en_US(%m)+%l%(v)
$pcmodels $nonlatin = pc/pc(%m)+pc/us+pc/%l%(v):2
$pcmodels * = pc/pc(%m)+pc/%l%(v)
* $oldlayouts = en_US(pc105)+%l%(v)
* $nonlatin = pc/pc(pc105)+pc/us+pc/%l%(v):2
* * = pc/pc(pc105)+pc/%l%(v)
! model layout[1] = symbols
$pcmodels * = pc/pc(%m)+pc/%l[1]%(v[1])
* * = pc/pc(pc105)+pc/%l[1]%(v[1])
! layout[2] = symbols
* = +pc/%l[2]%(v[2]):2
! layout[3] = symbols
* = +pc/%l[3]%(v[3]):3
! layout[4] = symbols
* = +pc/%l[4]%(v[4]):4
! $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 dtk2000 \
dexxa diamond genius geniuscomfy2 \
ennyah_dkb1008 \
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 \
mx1998 mx2500 mx2750 \
microsoftinet microsoftpro microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
oretec \
propeller \
qtronix \
samsung4500 samsung4510 \
sk1300 sk2500 sk6200 sk7100 \
sven symplon toshiba_s3000 trust trustda yahoo
! model = symbols
$inetkbds = +inet(%m)
! model layout = compat
pc98 nec/jp = pc98(basic)
* * = complete
! model layout[1] = compat
* * = complete
! model = types
* = complete
! option = symbols
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)
grp:lwin_switch = +group(lwin_switch)
grp:rwin_switch = +group(rwin_switch)
grp:toggle = +group(toggle)
grp:shift_toggle = +group(shift_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
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)
grp:lwin_toggle = +group(lwin_toggle)
grp:rwin_toggle = +group(rwin_toggle)
grp:lshift_toggle = +group(lshift_toggle)
grp:rshift_toggle = +group(rshift_toggle)
grp:lctrl_toggle = +group(lctrl_toggle)
grp:rctrl_toggle = +group(rctrl_toggle)
grp:lalt_toggle = +group(lalt_toggle)
lv3:switch = +level3(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)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
ctrl:ctrl_aa = +ctrl(ctrl_aa)
ctrl:ctrl_ra = +ctrl(ctrl_ra)
altwin:menu = +altwin(menu)
altwin:meta_alt = +altwin(meta_alt)
altwin:meta_win = +altwin(meta_win)
altwin:left_meta_win = +altwin(left_meta_win)
altwin:super_win = +altwin(super_win)
altwin:hyper_win = +altwin(hyper_win)
compose:ralt = +compose(ralt)
compose:rwin = +compose(rwin)
compose:menu = +compose(menu)
srvrkeys:none = +srvr_ctrl(no_srvr_keys)
! option = compat
grp_led:num = +leds(num)
grp_led:caps = +leds(caps)
grp_led:scroll = +leds(scroll)
! option = types
caps:internal = +caps(internal)
caps:internal_nocancel = +caps(internal_nocancel)
caps:shift = +caps(shift)
caps:shift_nocancel = +caps(shift_nocancel)
numpad:microsoft = +numpad(microsoft)
--- NEW FILE: xorg-it.lst ---
// $Xorg: xfree86-it.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
//
// Elenco dei modelli e dei lingauggi
// Copyright 1996 by Joseph Moss
//
! model
microsoft Microsoft Natural
dell101 Dell 101-key PC
flexpro Keytronic FlexPro
omnikey101 Northgate OmniKey 101
pc101 101-key PC Generico
pc102 102-key (Intl) PC Generico
pc104 104-key PC Generico
pc105 105-key (Intl) PC Generico
jp106 106-key Giapponese
everex Everex STEPnote
winbook Winbook Modello XP5
pc98 PC-98xx Series
! layout
us Inglese Statunitense
en_US U.S. Inglese + ISO9995-3
be Belga
bg Bulgaro
ca Canadese
cz Ceco
cz_qwerty Ceco (qwerty)
de Tedesco
de_CH Tedesco Svizzero
dk Danese
es Spagnolo
fi Finlandese
fr Francese
fr_CH Francese Svizzero
gb Regno Unito
hu Ungherese
hu_qwerty Ungherese (qwerty)
it Italiano
jp Giapponese
no Norvegese
pl Polacco
pt Portoghese
ru Russo
se Svedese
sk Slovacco
sk_qwerty Slovacco (qwerty)
th Tailandese
nec/jp nec/jp(pc98)
--- NEW FILE: xorg.lst ---
// $XdotOrg: xc/programs/xkbcomp/rules/xfree86.lst,v 1.1.4.3 2003/12/20 00:28:32 kaleb Exp $
// $Xorg: xfree86.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
//
// Rules descriptions for X
// Copyright 1996 by Joseph Moss
//
! model
pc101 Generic 101-key PC
pc102 Generic 102-key (Intl) PC
pc104 Generic 104-key PC
pc105 Generic 105-key (Intl) PC
dell101 Dell 101-key PC
everex Everex STEPnote
flexpro Keytronic FlexPro
microsoft Microsoft Natural
omnikey101 Northgate OmniKey 101
winbook Winbook Model XP5
jp106 Japanese 106-key
pc98 PC-98xx Series
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
btc5126t BTC 5126T
btc9000 BTC 9000
btc9000a BTC 9000A
cherryblue Cherry Blue Line CyBo at rd
cherrybluea Cherry Blue Line CyBo at rd (alternate option)
chicony Chicony Internet Keyboard
chicony9885 Chicony KB-9885
compaqeak8 Compaq Easy Access Keyboard
compaqik7 Compaq Internet Keyboard (7 keys)
compaqik13 Compaq Internet Keyboard (13 keys)
compaqik18 Compaq Internet Keyboard (18 keys)
armada Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard
ipaq Compaq iPaq Keyboard
dell Dell
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
hp5181 Hewlett-Packard 5181 Internet Keyboard
hpxe3gc Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
hpxe3gf Hewlett-Packard Omnibook XE3 GF
hpxe4xxx Hewlett-Packard Omnibook XE4xxx and ZE4xxx
hpxt1000 Hewlett-Packard Omnibook XT1000
hpzt11xx Hewlett-Packard Pavilion ZT11xx
hp500fa Hewlett-Packard Omnibook 500 FA
hp5xx Hewlett-Packard Omnibook 5xx
hp6000 Hewlett-Packard Omnibook 6000/6100
hp5185 Hewlett-Packard 5185 Internet Keyboard
honeywell_euroboard Honeywell Euroboard
rapidaccess IBM Rapid Access
rapidaccess2 IBM Rapid Access II
rapidaccess2a IBM Rapid Access II (alternate option)
thinkpad IBM ThinkPad 560Z/600/600E/A22E
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
logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB)
logiik Logitech Internet Keyboard
itouch Logitech iTouch
mx1998 Memorex MX1998
mx2500 Memorex MX2500 EZ-Access Keyboard
mx2750 Memorex MX2750
microsoftinet Microsoft Internet Keyboard
microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
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+
samsung4500 Samsung SDM 4500P
samsung4510 Samsung SDM 4510P
sk1300 SK-1300
sk2500 SK-2500
sk6200 SK-6200
sk7100 SK-7100
sven SVEN Ergonomic 2500
symplon Symplon PaceBook (tablet PC)
toshiba_s3000 Toshiba Satellite S3000
trust Trust Wireless Keyboard Classic
trustda Trust Direct Access Keyboard
yahoo Yahoo! Internet Keyboard
// The entries here should be ordered as follows:
//
// US entries first
// others in alphabetical order by the language/country name in English
! layout
us U.S. English
en_US U.S. English w/ ISO9995-3
us_intl U.S. English w/ deadkeys
al Albanian
ar Arabic
am Armenian
az Azerbaijani
by Belarusian
be Belgian
ben Bengali
bs Bosnian
br Brazilian
bg Bulgarian
mm Burmese
ca Canadian
ca_enhanced French Canadian
hr Croatian
hr_US Croatian (US)
cz Czech
cz_qwerty Czech (qwerty)
dk Danish
nl Dutch
dvorak Dvorak
dz Dzongkha / Tibetan
ee Estonian
fo Faroese
fi Finnish
fr French
fr-latin9 French (alternative)
ge_la Georgian (latin)
ge_ru Georgian (russian)
de German
el Greek
guj Gujarati
gur Gurmukhi
dev Hindi
hu Hungarian
hu_qwerty Hungarian (qwerty)
is Icelandic
iu Inuktitut
ir Iranian
il Israeli
it Italian
jp Japanese
kan Kannada
ko Korean
lo Lao
la Latin America
lt Lithuanian qwerty "numeric"
lt_std Lithuanian azerty standard
lv Latvian
mk Macedonian
ml Malayalam
mt Maltese
mt_us Maltese (US layout)
mn Mongolian
no Norwegian
ogham Ogham
ori Oriya
pl Polish
pl2 Polish (qwertz)
pt Portuguese
ro Romanian
ru Russian
se_FI Northern Saami (Finland)
se_NO Northern Saami (Norway)
se_SE Northern Saami (Sweden)
sr Serbian (Cyrillic)
yu Serbian (Latin)
si Slovenian
sk Slovak
sk_qwerty Slovak (qwerty)
es Spanish
se Swedish
fr_CH Swiss French
de_CH Swiss German
syr Syriac
tj Tajik
tml Tamil
tel Telugu
th Thai (Kedmanee)
th_tis Thai (TIS-820.2538)
th_pat Thai (Pattachote)
tr Turkish
tr_f Turkish (F)
ua Ukrainian
gb United Kingdom
uz Uzbek
vn Vietnamese
nec/jp PC-98xx Series
! variant
nodeadkeys Eliminate dead keys
! option
grp Group Shift/Lock behavior
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
grp:ctrl_shift_toggle Control+Shift changes group
grp:ctrl_alt_toggle Alt+Control changes group
grp:alt_shift_toggle Alt+Shift changes group
grp:menu_toggle Menu key changes group
grp:lwin_toggle Left Win-key changes group
grp:rwin_toggle Right Win-key changes group
grp:lshift_toggle Left Shift key changes group
grp:rshift_toggle Right Shift key changes group
grp:lctrl_toggle Left Ctrl key changes group
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
lv3:rwin_switch Press Right Win-key to choose 3rd level
ctrl Control Key Position
ctrl:nocaps Make CapsLock an additional Control
ctrl:swapcaps Swap Control and Caps Lock
ctrl:ctrl_ac Control key at left of 'A'
ctrl:ctrl_aa Control key at bottom left
ctrl:ctrl_ra Right Control key works as Right Alt
grp_led Use keyboard LED to show alternative group
grp_led:num Num_Lock LED shows alternative group
grp_led:caps Caps_Lock LED shows alternative group
grp_led:scroll Scroll_Lock LED shows alternative group
caps CapsLock key behavior
caps:internal uses internal capitalization. Shift cancels Caps.
caps:internal_nocancel uses internal capitalization. Shift doesn't cancel Caps.
caps:shift acts as Shift with locking. Shift cancels Caps.
caps:shift_nocancel acts as Shift with locking. Shift doesn't cancel Caps.
altwin Alt/Win key behavior
altwin:menu Add the standard behavior to Menu key.
altwin:meta_alt Alt and Meta on the Alt keys (default).
altwin:meta_win Meta is mapped to the Win-keys.
altwin:left_meta_win Meta is mapped to the left Win-key.
altwin:meta_super Super is mapped to the Win-keys (default).
altwin:meta_hyper Hyper is mapped to the Win-keys.
compose:ralt Right Alt is Compose
compose:rwin Right Win-key is Compose
compose:menu Menu is Compose
numpad:microsoft Shift with numpad keys works as in MS Windows.
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server.
--- NEW FILE: xorg.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
<xkbConfigRegistry>
<modelList>
<model>
<configItem>
<name>pc101</name>
<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>
<description xml:lang="uk">Звичайна 101-клавішна Ð´Ð»Ñ ÐŸÐš</description>
[...5802 lines suppressed...]
<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>
<description xml:lang="zh_CN">Shift+æ•°å—键盘的功能ç‰åŒäºŽ MS Windows</description>
</configItem>
</option>
<option>
<configItem>
<name>srvrkeys:none</name>
<description>Special keys (Ctrl+Alt+<key>) handled in a server.</description>
</configItem>
</option>
</group>
</optionList>
</xkbConfigRegistry>
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -u -d -r1.1.4.1 -r1.1.4.1.2.1
--- a/Imakefile 17 Nov 2003 19:04:09 -0000 1.1.4.1
+++ b/Imakefile 29 Mar 2004 15:46:06 -0000 1.1.4.1.2.1
@@ -1,10 +1,12 @@
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+XCOMM $XdotOrg$
- DATAFILES = README sgi xfree86 sun
- LISTFILES = sgi.lst xfree86.lst xfree86-it.lst sun.lst xfree86.xml
+ DATAFILES = README sgi xorg sun
+ LISTFILES = sgi.lst xorg.lst xorg-it.lst sun.lst xorg.xml
all::
InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/rules)
InstallMultiple($(LISTFILES),$(LIBDIR)/xkb/rules)
+InstallCreateLink($(LIBDIR)/xkb/rules,xorg,xfree86)
DependTarget()
--- xfree86 DELETED ---
--- xfree86-it.lst DELETED ---
--- xfree86.lst DELETED ---
--- xfree86.xml DELETED ---
More information about the xorg-commit-diffs
mailing list