Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/xkeyboard-config/rules regenerate for ...



details:   https://anonhg.NetBSD.org/src/rev/b4c435a7d281
branches:  trunk
changeset: 794532:b4c435a7d281
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 17 09:02:02 2014 +0000

description:
regenerate for xkeyboard-config 2.11.

diffstat:

 external/mit/xorg/lib/xkeyboard-config/rules/base      |  107 ++++++++++------
 external/mit/xorg/lib/xkeyboard-config/rules/base.lst  |   95 ++++++++------
 external/mit/xorg/lib/xkeyboard-config/rules/evdev     |   47 +------
 external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst |   95 ++++++++------
 4 files changed, 175 insertions(+), 169 deletions(-)

diffs (truncated from 741 to 300 lines):

diff -r 10d4b84890fe -r b4c435a7d281 external/mit/xorg/lib/xkeyboard-config/rules/base
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Mar 17 08:11:32 2014 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Mar 17 09:02:02 2014 +0000
@@ -40,6 +40,50 @@
 ! $azerty = be fr
 ! $qwertz = al cz de hr hu ro si sk 
 
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+! $thinkpads = thinkpad thinkpad60 thinkpadz60
+
+! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
+         sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \
+         sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+
+! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type_6_7 keyboards with custom layouts
+! $sun_custom = ara be br ca ch cz de dk \
+                ee es fi fr gb gr it jp \
+                kr lt lv nl no pl pt ro \
+                ru se sk tr tw ua us
+
+! $sun_var =  sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \
+              sun_type7 sun_type7_suncompat suncompat
+
+! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
+
+! $htcdreamlayouts = us it de
+
 ! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
               airkey \
               apple armada azonaRF2300 \
@@ -80,50 +124,20 @@
               toshiba_s3000 trust trustda \
               unitekkb1925 yahoo
 
-// all layouts with 3rd and 4th groups
-! $threelevellayouts = al az \
-              be br bt \
-              ca ch cs cz \
-              de dk \
-              ee es \
-              fi fo fr \
-              gb gr \
-              hu \
-              ie ir is it \
-              latam \
-              lk lt \
-              mn mt \
-              nl no \
-              pl pt \
-              ro \
-              se sk \
-              tr \
-              us \
-              vn \
-              za
-
-! $evdevkbds = ibm_spacesaver
-
-! $thinkpads = thinkpad thinkpad60 thinkpadz60
-
-! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
-         sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \
-         sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
-
-! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
-
-// Sun Type_6_7 keyboards with custom layouts
-! $sun_custom = ara be br ca ch cz de dk \
-                ee es fi fr gb gr it jp \
-                kr lt lv nl no pl pt ro \
-                ru se sk tr tw ua us
-
-! $sun_var =  sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \
-              sun_type7 sun_type7_suncompat suncompat
-
-! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
-
-! $htcdreamlayouts = us it de
+! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
+               cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
+               armada presario dellm65 inspiron dellusbmm diamond \
+               ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
+               hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
+               logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \
+               microsoft4000 microsoft7000 microsoftprooem microsoftmult \
+               propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \
+               toshiba_s3000 trust trustda cymotionlinux silvercrest \
+               emachines benqx unitekkb1925 creativedw7000 compalfl90 \
+               pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \
+               dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \
+               microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \
+               tm2030USB-102 tm2030USB-106 trust_slimline
 
 ! $dvoraklayouts = br ca de ee es fr gb no pl se us
 
@@ -957,6 +971,9 @@
   sun_type7_jp_usb     =       +sun_vndr/solaris(defaults_type7jp)
   $sun                 =               +sun_vndr/solaris(defaults)
 
+! model                layout          =       symbols
+ $inetmediakbds        jp      =       +jp(henkan)
+
 ! layout       variant         =       compat
   de           neo                     =       +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
   jp        $sun_compat =   complete+japan(kana_lock)
@@ -1025,6 +1042,7 @@
   altwin:hyper_win     =       +altwin(hyper_win)
   altwin:alt_super_win =       +altwin(alt_super_win)
   altwin:swap_alt_win  =       +altwin(swap_alt_win)
+  grab:debug           =       +srvr_ctrl(grab_debug)
   grp:switch           =       +group(switch)
   grp:lswitch          =       +group(lswitch)
   grp:win_switch       =       +group(win_switch)
@@ -1147,6 +1165,7 @@
   shift:breaks_caps     =      +shift(breaks_caps)
   esperanto:qwerty      =      +epo(qwerty)
   esperanto:dvorak      =      +epo(dvorak)
+  esperanto:colemak     =      +epo(colemak)
   terminate:ctrl_alt_bksp =    +terminate(ctrl_alt_bksp)
   keypad:pointerkeys   =       +keypad(pointerkeys)
   apple:alupckeys      =       +macintosh_vndr/apple(alupckeys)
diff -r 10d4b84890fe -r b4c435a7d281 external/mit/xorg/lib/xkeyboard-config/rules/base.lst
--- a/external/mit/xorg/lib/xkeyboard-config/rules/base.lst     Mon Mar 17 08:11:32 2014 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/base.lst     Mon Mar 17 09:02:02 2014 +0000
@@ -195,7 +195,7 @@
   az              Azerbaijani
   by              Belarusian
   be              Belgian
-  bd              Bengali
+  bd              Bangla
   in              Indian
   ba              Bosnian
   br              Portuguese (Brazil)
@@ -296,7 +296,7 @@
   rus             us: Russian (US, phonetic)
   mac             us: English (Macintosh)
   altgr-intl      us: English (international AltGr dead keys)
-  olpc2           us: English (layout toggle on multiply/divide key)
+  olpc2           us: English (the divide/multiply keys toggle the layout)
   hbs             us: Serbo-Croatian (US)
   workman         us: English (Workman)
   workman-intl    us: English (Workman, international with dead keys)
@@ -323,23 +323,25 @@
   legacy          by: Belarusian (legacy)
   latin           by: Belarusian (Latin)
   oss             be: Belgian (alternative)
-  oss_latin9      be: Belgian (alternative, latin-9 only)
+  oss_latin9      be: Belgian (alternative, Latin-9 only)
   oss_sundeadkeys be: Belgian (alternative, Sun dead keys)
   iso-alternate   be: Belgian (ISO alternate)
   nodeadkeys      be: Belgian (eliminate dead keys)
   sundeadkeys     be: Belgian (Sun dead keys)
   wang            be: Belgian (Wang model 724 azerty)
-  probhat         bd: Bengali (Probhat)
-  ben             in: Bengali (India)
-  ben_probhat     in: Bengali (India, Probhat)
-  ben_baishakhi   in: Bengali (India, Baishakhi)
-  ben_bornona     in: Bengali (India, Bornona)
-  ben_gitanjali   in: Bengali (India, Uni Gitanjali)
-  ben_inscript    in: Bengali (India, Baishakhi Inscript)
+  probhat         bd: Bangla (Probhat)
+  ben             in: Bangla (India)
+  ben_probhat     in: Bangla (India, Probhat)
+  ben_baishakhi   in: Bangla (India, Baishakhi)
+  ben_bornona     in: Bangla (India, Bornona)
+  ben_gitanjali   in: Bangla (India, Uni Gitanjali)
+  ben_inscript    in: Bangla (India, Baishakhi Inscript)
+  eeyek           in: Manipuri (Eeyek)
   guj             in: Gujarati
   guru            in: Punjabi (Gurmukhi)
   jhelum          in: Punjabi (Gurmukhi Jhelum)
   kan             in: Kannada
+  kan-kagapa      in: Kannada (KaGaPa phonetic)
   mal             in: Malayalam
   mal_lalitha     in: Malayalam (Lalitha)
   mal_enhanced    in: Malayalam (enhanced Inscript with Rupee Sign)
@@ -350,11 +352,15 @@
   tam_TSCII       in: Tamil (TSCII typewriter)
   tam             in: Tamil
   tel             in: Telugu
+  tel-kagapa      in: Telugu (KaGaPa phonetic)
   urd-phonetic    in: Urdu (phonetic)
   urd-phonetic3   in: Urdu (alternative phonetic)
   urd-winkeys     in: Urdu (WinKeys)
   bolnagri        in: Hindi (Bolnagri)
   hin-wx          in: Hindi (Wx)
+  hin-kagapa      in: Hindi (KaGaPa phonetic)
+  san-kagapa      in: Sanskrit (KaGaPa phonetic)
+  mar-kagapa      in: Marathi (KaGaPa phonetic)
   eng             in: English (India, with RupeeSign)
   alternatequotes ba: Bosnian (use guillemets for quotes)
   unicode         ba: Bosnian (use Bosnian digraphs)
@@ -362,9 +368,9 @@
   us              ba: Bosnian (US keyboard with Bosnian letters)
   nodeadkeys      br: Portuguese (Brazil, eliminate dead keys)
   dvorak          br: Portuguese (Brazil, Dvorak)
-  nativo          br: Portuguese (Brazil, nativo)
-  nativo-us       br: Portuguese (Brazil, nativo for USA keyboards)
-  nativo-epo      br: Portuguese (Brazil, nativo for Esperanto)
+  nativo          br: Portuguese (Brazil, Nativo)
+  nativo-us       br: Portuguese (Brazil, Nativo for US keyboards)
+  nativo-epo      br: Esperanto (Brazil, Nativo)
   phonetic        bg: Bulgarian (traditional phonetic)
   bas_phonetic    bg: Bulgarian (new phonetic)
   french          ma: French (Morocco)
@@ -387,7 +393,7 @@
   eng             ca: English (Canada)
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
-  uig             cn: Uyghur
+  ug              cn: Uyghur
   alternatequotes hr: Croatian (use guillemets for quotes)
   unicode         hr: Croatian (use Croatian digraphs)
   unicodeus       hr: Croatian (US keyboard with Croatian digraphs)
@@ -424,14 +430,14 @@
   nodeadkeys      fr: French (eliminate dead keys)
   sundeadkeys     fr: French (Sun dead keys)
   oss             fr: French (alternative)
-  oss_latin9      fr: French (alternative, latin-9 only)
+  oss_latin9      fr: French (alternative, Latin-9 only)
   oss_nodeadkeys  fr: French (alternative, eliminate dead keys)
   oss_sundeadkeys fr: French (alternative, Sun dead keys)
   latin9          fr: French (legacy, alternative)
   latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys)
   latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys)
   bepo            fr: French (Bepo, ergonomic, Dvorak way)
-  bepo_latin9     fr: French (Bepo, ergonomic, Dvorak way, latin-9 only)
+  bepo_latin9     fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
   dvorak          fr: French (Dvorak)
   mac             fr: French (Macintosh)
   bre             fr: French (Breton)
@@ -554,7 +560,7 @@
   mac_nodeadkeys  pt: Portuguese (Macintosh, eliminate dead keys)
   mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
   nativo          pt: Portuguese (Nativo)
-  nativo-us       pt: Portuguese (Nativo for USA keyboards)
+  nativo-us       pt: Portuguese (Nativo for US keyboards)
   nativo-epo      pt: Esperanto (Portugal, Nativo)
   cedilla         ro: Romanian (cedilla)
   std             ro: Romanian (standard)
@@ -586,7 +592,7 @@
   latinunicodeyz  rs: Serbian (Latin Unicode qwerty)
   alternatequotes rs: Serbian (Cyrillic with guillemets)
   latinalternatequotes rs: Serbian (Latin with guillemets)
-  rue             rs: Pannonian Rusyn (homophonic)
+  rue             rs: Pannonian Rusyn
   alternatequotes si: Slovenian (use guillemets for quotes)
   us              si: Slovenian (US keyboard with Slovenian letters)
   bksl            sk: Slovak (extended Backslash)
@@ -684,7 +690,7 @@
   gag             md: Moldavian (Gagauz)
 
 ! option
-  grp                  Key(s) to change layout
+  grp                  Switching to another layout
   grp:switch           Right Alt (while pressed)
   grp:lswitch          Left Alt (while pressed)
   grp:lwin_switch      Left Win (while pressed)
@@ -728,7 +734,7 @@
   lv3:alt_switch       Any Alt key
   lv3:lalt_switch      Left Alt
   lv3:ralt_switch      Right Alt
-  lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Multi_Key
+  lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose
   lv3:ralt_alt         Right Alt key never chooses 3rd level
   lv3:enter_switch     Enter on keypad
   lv3:caps_switch      Caps Lock
@@ -746,33 +752,36 @@
   ctrl:rctrl_ralt      Right Ctrl as Right Alt
   ctrl:menu_rctrl      Menu as Right Ctrl
   ctrl:ctrl_ralt       Right Alt as Right Ctrl
+  ctrl:swap_lalt_lctl  Swap Left Alt key with Left Ctrl key
+  ctrl:swap_lwin_lctl  Swap Left Win key with Left Ctrl key
+  ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
   grp_led              Use keyboard LED to show alternative layout
   grp_led:num          Num Lock



Home | Main Index | Thread Index | Old Index