svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 407 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/rules/xorg.lst b/xorg-server/xkbdata.src/rules/xorg.lst
new file mode 100644
index 000000000..7ff4160e4
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/xorg.lst
@@ -0,0 +1,407 @@
+! 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
+  a4techKB21      A4Tech KB-21
+  a4techKBS8      A4Tech KBS-8
+  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
+  btc9001ah       BTC 9001AH
+  btc5090         BTC 5090
+  cherryblue      Cherry Blue Line CyBo@rd
+  cherryblueb     Cherry CyMotion Master XPress
+  cherrybluea     Cherry Blue Line CyBo@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)
+  cymotionlinux   Cherry CyMotion Master Linux
+  armada          Laptop/notebook Compaq (eg. Armada) 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
+  gyration        Gyration
+  hpi6            Hewlett-Packard Internet Keyboard
+  hp2501          Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505          Hewlett-Packard SK-2505 Internet Keyboard
+  hpxe3gc         Hewlett-Packard Omnibook XE3 GC
+  hpxe3gf         Hewlett-Packard Omnibook XE3 GF
+  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
+  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
+  logiaccess      Logitech Access Keyboard
+  ltcd            Logitech Cordless Desktop
+  logicdit        Logitech Cordless Desktop iTouch
+  logicdp         Logitech Cordless Desktop Pro
+  logicdpa        Logitech Cordless Desktop Pro (alternate option)
+  logicdpa2       Logitech Cordless Desktop Pro (alternate option2)
+  logicdo         Logitech Cordless Desktop Optical
+  logicfn         Logitech Cordless Freedom/Desktop Navigator
+  logicdn         Logitech Cordless Desktop Navigator
+  logidak         Logitech Deluxe Access Keyboard
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  itouch          Logitech iTouch
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  logiink         Logitech Internet Navigator Keyboard
+  itouchin        Logitech iTouch keyboard Internet Navigator
+  logiultrax      Logitech Ultra-X Keyboard
+  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
+  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
+  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
+  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
+  sp_inet         Super Power Multimedia Keyboard
+  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
+  macintosh       Macintosh
+  macintosh_old   Macintosh Old
+  powerpcps2      PowerPC PS/2
+  acer_tm_800     Acer TravelMate 800
+
+! layout
+  us              U.S. English
+  ara             Arabic
+  al              Albania
+  am              Armenia
+  az              Azerbaijan
+  by              Belarus
+  be              Belgium
+  bd              Bangladesh
+  in              India
+  ba              Bosnia and Herzegovina
+  br              Brazil
+  bg              Bulgaria
+  mm              Myanmar
+  ca              Canada
+  hr              Croatia
+  cz              Czechia
+  dk              Denmark
+  nl              Netherlands
+  bt              Bhutan
+  ee              Estonia
+  ir              Iran
+  fo              Faroe Islands
+  fi              Finland
+  fr              France
+  ge              Georgia
+  de              Germany
+  gr              Greece
+  hu              Hungary
+  is              Iceland
+  il              Israel
+  it              Italy
+  jp              Japan
+  kg              Kyrgyzstan
+  la              Laos
+  latam           Latin American
+  lt              Lithuania
+  lv              Latvia
+  mao             Maori
+  mkd             Macedonian
+  mt              Malta
+  mn              Mongolia
+  no              Norway
+  pl              Poland
+  pt              Portugal
+  ro              Romania
+  ru              Russia
+  srp             Serbian
+  si              Slovenia
+  sk              Slovakia
+  es              Spain
+  se              Sweden
+  ch              Switzerland
+  sy              Syria
+  tj              Tajikistan
+  lk              Sri Lanka
+  th              Thailand
+  tr              Turkish 
+  ua              Ukraine
+  gb              United Kingdom
+  uz              Uzbekistan
+  vn              Vietnam
+  nec_vndr/jp     PC-98xx Series
+  ie              Ireland
+  pk              Pakistan
+
+! variant
+  intl            us: International (with dead keys)
+  alt-intl        us: Alternative international (former us_intl)
+  dvorak          us: Dvorak
+  rus             us: Russian phonetic
+  azerty          ara: azerty
+  azerty_digits   ara: azerty/digits
+  digits          ara: digits
+  qwerty          ara: qwerty
+  qwerty_digits   ara: qwerty/digits
+  phonetic        am: Phonetic
+  cyrillic        az: Cyrillic
+  winkeys         by: Winkeys
+  iso-alternate   be: ISO Alternate
+  nodeadkeys      be: Eliminate dead keys
+  sundeadkeys     be: Sun dead keys
+  probhat         bd: Probhat
+  ben             in: Bengali
+  ben_probhat     in: Bengali Probhat
+  guj             in: Gujarati
+  guru            in: Gurmukhi
+  kan             in: Kannada
+  mal             in: Malayalam
+  ori             in: Oriya
+  tam_unicode     in: Tamil Unicode
+  tam_TAB         in: Tamil TAB Typewriter
+  tam_TSCII       in: Tamil TSCII Typewriter
+  tam             in: Tamil
+  tel             in: Telugu
+  urd             in: Urdu
+  nodeadkeys      br: Eliminate dead keys
+  phonetic        bg: Phonetic
+  fr-dvorak       ca: French Dvorak
+  fr-legacy       ca: French (legacy)
+  multi           ca: Multilingual
+  multi-2gr       ca: Multilingual, second part
+  ike             ca: Inuktitut
+  us              hr: US keyboard with Croatian letters
+  bksl            cz: With <\|> key
+  qwerty          cz: qwerty
+  qwerty_bksl     cz: qwerty, extended Backslash
+  nodeadkeys      dk: Eliminate dead keys
+  nodeadkeys      ee: Eliminate dead keys
+  nodeadkeys      fo: Eliminate dead keys
+  nodeadkeys      fi: Eliminate dead keys
+  smi             fi: Northern Saami
+  nodeadkeys      fr: Eliminate dead keys
+  sundeadkeys     fr: Sun dead keys
+  latin9          fr: Alternative
+  latin9_nodeadkeys fr: Alternative, eliminate dead keys
+  latin9_sundeadkeys fr: Alternative, Sun dead keys
+  dvorak          fr: Dvorak
+  ru              ge: Russian
+  deadacute       de: Dead acute
+  deadgraveacute  de: Dead grave acute
+  nodeadkeys      de: Eliminate dead keys
+  ro              de: Romanian keyboard with German letters
+  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
+  dvorak          de: Dvorak
+  extended        gr: Extended
+  nodeadkeys      gr: Eliminate dead keys
+  polytonic       gr: Polytonic
+  standard        hu: Standard
+  nodeadkeys      hu: Eliminate dead keys
+  qwerty          hu: qwerty
+  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
+  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
+  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
+  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
+  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
+  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
+  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
+  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
+  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
+  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
+  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
+  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
+  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
+  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
+  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
+  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
+  Sundeadkeys     is: Sun dead keys
+  nodeadkeys      is: Eliminate dead keys
+  lyx             il: lyx
+  si1452          il: si1452
+  phonetic        il: Phonetic
+  nodeadkeys      it: Eliminate dead keys
+  nodeadkeys      latam: Eliminate dead keys
+  sundeadkeys     latam: Sun dead keys
+  std             lt: "Standard"
+  us              lt: US keyboard with Lithuanian letters
+  apostrophe      lv: Apostrophe (') variant
+  tilde           lv: Tilde (~) variant
+  fkey            lv: F-letter (F) variant
+  nodeadkeys      mkd: Eliminate dead keys
+  us              mt: US keyboard with Maltian letters
+  nodeadkeys      no: Eliminate dead keys
+  dvorak          no: Dvorak
+  smi             no: Northern Saami
+  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
+  qwertz          pl: qwertz
+  dvorak          pl: Dvorak
+  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
+  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
+  nodeadkeys      pt: Eliminate dead keys
+  sundeadkeys     pt: Sun dead keys
+  us              ro: US keyboard with Romanian letters
+  de              ro: Romanian keyboard with German letters
+  phonetic        ru: Phonetic
+  typewriter      ru: Typewriter
+  winkeys         ru: Winkeys
+  yz              srp: Z and ZHE swapped
+  latin           srp: Latin
+  latinunicode    srp: Latin Unicode
+  latinyz         srp: Latin qwerty
+  latinunicodeyz  srp: Latin Unicode qwerty
+  alternatequotes srp: With guillemots
+  latinalternatequotes srp: Latin with guillemots
+  bksl            sk: Extended Backslash
+  qwerty          sk: qwerty
+  qwerty_bksl     sk: qwerty, extended Backslash
+  nodeadkeys      es: Eliminate dead keys
+  sundeadkeys     es: Sun dead keys
+  dvorak          es: Dvorak
+  nodeadkeys      se: Eliminate dead keys
+  dvorak          se: Dvorak
+  rus             se: Russian phonetic
+  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
+  smi             se: Northern Saami
+  de_nodeadkeys   ch: German, eliminate dead keys
+  de_sundeadkeys  ch: German, Sun dead keys
+  fr              ch: French
+  fr_nodeadkeys   ch: French, eliminate dead keys
+  fr_sundeadkeys  ch: French, Sun dead keys
+  syc             sy: Syriac
+  syc_phonetic    sy: Syriac phonetic
+  tam_unicode     lk: Tamil Unicode
+  tam_TAB         lk: Tamil TAB Typewriter
+  tam_TSCII       lk: Tamil TSCII Typewriter
+  sin_phonetic    lk: Sinhala phonetic
+  tis             th: TIS-820.2538
+  pat             th: Pattachote
+  f               tr: (F)
+  alt             tr: Alt-Q
+  phonetic        ua: Phonetic
+  typewriter      ua: Typewriter
+  winkeys         ua: Winkeys
+  rstu            ua: Standard RSTU
+  rstu_ru         ua: Standard RSTU on Russian layout
+  intl            gb: International (with dead keys)
+  dvorak          gb: Dvorak
+  CloGaelach      ie: CloGaelach
+  UnicodeExpert   ie: UnicodeExpert
+  ogam            ie: Ogham
+  ogam_is434      ie: Ogham IS434
+
+! option
+  grp                  Group Shift/Lock behavior
+  grp:switch           R-Alt 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:rctrl_switch     Right Ctrl key switches group while pressed.
+  grp:toggle           Right Alt key changes group.
+  grp:lalt_toggle      Left Alt key changes group.
+  grp:caps_toggle      CapsLock key changes group.
+  grp:shift_caps_toggle Shift+CapsLock changes group.
+  grp:shifts_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: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.
+  lv3:alt_switch       Press any of Alt keys 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.
+  ctrl                 Control key position
+  ctrl:nocaps          Make CapsLock an additional Control.
+  ctrl:swapcaps        Swap Control and CapsLock.
+  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          NumLock LED shows alternative group.
+  grp_led:caps         CapsLock LED shows alternative group.
+  grp_led:scroll       ScrollLock LED shows alternative group.
+  caps                 CapsLock key behavior
+  caps:internal        CapsLock uses internal capitalization. Shift cancels CapsLock.
+  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't cancel CapsLock.
+  caps:shift           CapsLock acts as Shift with locking. Shift cancels CapsLock.
+  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock.
+  caps:shift_lock      CapsLock just locks the Shift modifier.
+  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
+  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  altwin               Alt/Win key behavior
+  altwin:menu          Add the standard behavior to Menu key.
+  altwin:meta_alt      Alt and Meta are 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:super_win     Super is mapped to the Win-keys (default).
+  altwin:hyper_win     Hyper is mapped to the Win-keys.
+  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
+  Compose key          Compose key position
+  compose:ralt         Right Alt is Compose.
+  compose:rwin         Right Win-key is Compose.
+  compose:menu         Menu is Compose.
+  compose:rctrl        Right Ctrl is Compose.
+  compat               Miscellaneous compatibility options
+  numpad:microsoft     Shift with numpad keys works as in MS Windows.
+  srvrkeys:none        Special keys (Ctrl+Alt+<key>) handled in a server.
+  eurosign             Adding the EuroSign to certain keys
+  eurosign:e           Add the EuroSign to the E key.
+  eurosign:5           Add the EuroSign to the 5 key.
+  eurosign:2           Add the EuroSign to the 2 key.