[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/5] Recreate xkb/keymap/hurd from xkeyboard-config-1.8's xfree86
|
From: |
Diego Nieto Cid |
|
Subject: |
[PATCH 5/5] Recreate xkb/keymap/hurd from xkeyboard-config-1.8's xfree86 keymap. |
|
Date: |
Wed, 11 Aug 2010 20:51:51 -0300 |
modified: xkb/keymap/hurd
* Don't include inexistant symbol file: pc104.
* en_US was replaced by pc(pc105).
* Append us layout by default as pc(pc105) no longer describes
a full keyboard.
---
xkb/keymap/hurd | 294 +++++++++++++++++++++++++++++++------------------------
1 files changed, 166 insertions(+), 128 deletions(-)
diff --git a/xkb/keymap/hurd b/xkb/keymap/hurd
index 66de67e..8ee4de8 100644
--- a/xkb/keymap/hurd
+++ b/xkb/keymap/hurd
@@ -1,347 +1,385 @@
-// $Xorg: xfree86,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.30 2003/04/03 16:34:49
dawes Exp $
-
-
-// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.26 2002/01/16 18:20:11
dawes Exp $
-
xkb_keymap "Hurd" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default+hurd" };
xkb_compatibility { include "default" };
- xkb_symbols { include
"en_US(pc105)+hurd+pc104+group(win_switch)+compose(menu)" };
+ xkb_symbols { include
"pc(pc105)+us+hurd+group(win_switch)+compose(menu)" };
xkb_geometry { include "pc" };
};
-xkb_keymap "us" {
+
+default xkb_keymap "us" {
xkb_keycodes { include "xfree86" };
- xkb_types { include "default+hurd" };
+ xkb_types { include "default+hurd" };
xkb_compatibility { include "default" };
- xkb_symbols { include "us(pc105)+hurd" };
+ xkb_symbols { include "pc(pc105)+us+hurd" };
xkb_geometry { include "pc" };
};
-xkb_keymap "us_microsoft" {
+
+// "ar" addition by Arabeyes Team, <support@arabeyes.org>
+xkb_keymap "ar" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "us(pc105)" };
- xkb_geometry { include "microsoft" };
+ xkb_symbols { include "pc(pc105)+ara" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "us_flexpro" {
+xkb_keymap "be" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "us(pc105)" };
- xkb_geometry { include "keytronic(FlexPro)" };
+ xkb_symbols { include "pc(pc105)+be" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "en_US" {
+xkb_keymap "bg" {
xkb_keycodes { include "xfree86" };
- xkb_types { include "default+hurd" };
+ xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+hurd" };
- xkb_geometry { include "pc" };
+ xkb_symbols { include "pc(pc105)+bg" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "be" {
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+xkb_keymap "br" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+br" };
+ xkb_geometry { include "pc(abnt2)" };
+};
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz)
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used
anymore.
+xkb_keymap "cz" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+cz" };
+ xkb_geometry { include "pc" };
+};
+xkb_keymap "de" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+be" };
+ xkb_symbols { include "pc(pc105)+de" };
xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "bg" {
+xkb_keymap "ch_de" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+bg" };
+ xkb_symbols { include "pc(pc105)+ch(de)" };
xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "de" {
+xkb_keymap "ch_fr" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+de" };
+ xkb_symbols { include "pc(pc105)+ch(fr)" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "dk" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+dk" };
+ xkb_symbols { include "pc(pc105)+dk" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "dvorak" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+dvorak" };
+ xkb_symbols { include "pc(pc105)+us(dvorak)"};
xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "es" {
+xkb_keymap "en_US" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+es" };
+ xkb_symbols { include "pc(pc105)+us" };
+ xkb_geometry { include "pc" };
+};
+xkb_keymap "es" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default+hurd" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+es+hurd" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "fr" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default+hurd" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+fr+hurd" };
+ xkb_symbols { include "pc(pc105)+fr+hurd" };
xkb_geometry { include "pc(pc102)" };
};
+xkb_keymap "fr-latin9" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+fr-latin9" };
+ xkb_geometry { include "pc" };
+};
xkb_keymap "fr_CA" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+ca" };
+ xkb_symbols { include "pc(pc105)+ca" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "gb" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+gb" };
+ xkb_symbols { include "pc(pc105)+gb" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "hr" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+hr" };
+ xkb_symbols { include "pc(pc105)+hr" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "it" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+it" };
+ xkb_symbols { include "pc(pc105)+it" };
xkb_geometry { include "pc(pc102)" };
};
+xkb_keymap "jp106" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "jp(jp106)" };
+ xkb_geometry { include "pc(jp106)" };
+};
xkb_keymap "lt" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+lt" };
+ xkb_symbols { include "pc(pc105)+lt" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "lt_std" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+lt_std" };
+ xkb_symbols { include "pc(pc105)+lt(std)" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "lv" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+lv" };
+ xkb_symbols { include "pc(pc105)+lv" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "mk" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+mk" };
+ xkb_symbols { include "pc(pc105)+mk" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "mt" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+mt" };
- xkb_geometry { include "pc(pc102)" };
-};
-xkb_keymap "mt_us" {
- xkb_keycodes { include "xfree86" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+mt_us" };
+ xkb_symbols { include "pc(pc105)+mt" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "no" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+no" };
+ xkb_symbols { include "pc(pc105)+no" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "pl" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+pl" };
+ xkb_symbols { include "pc(pc105)+pl" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "pt" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+pt" };
+ xkb_symbols { include "pc(pc105)+pt" };
xkb_geometry { include "pc(pc102)" };
};
+// ro: additions by Cristian Gafton, <gafton@redhat.com>
+xkb_keymap "ro" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+ro(pc101)" };
+ xkb_geometry { include "pc(pc101)" };
+};
+xkb_keymap "ro_microsoft" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+ro(pc105)" };
+ xkb_geometry { include "pc(pc105)" };
+};
xkb_keymap "ru" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+ru" };
+ xkb_symbols { include "pc(pc105)+ru" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "se_FI" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+fi" };
+ xkb_symbols { include "pc(pc105)+fi" };
xkb_geometry { include "pc(pc102)" };
};
xkb_keymap "se_SE" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+se" };
+ xkb_symbols { include "pc(pc105)+se" };
xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "th" {
+xkb_keymap "sl" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+th" };
- xkb_geometry { include "pc(pc102)" };
+ xkb_symbols { include "pc(pc105)+si" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "de_CH" {
+xkb_keymap "sl_SI" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+de_CH" };
- xkb_geometry { include "pc(pc102)" };
+ xkb_symbols { include "pc(pc105)+si" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "fr_CH" {
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz)
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used
anymore.
+xkb_keymap "sk" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+fr_CH" };
- xkb_geometry { include "pc(pc102)" };
+ xkb_symbols { include "pc(pc105)+sk" };
+ xkb_geometry { include "pc" };
};
-xkb_keymap "jp106" {
- xkb_keycodes { include "xfree86(jp106)" };
+// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
+xkb_keymap "syr" {
+ xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "jp(jp106)" };
- xkb_geometry { include "pc(jp106)" };
-};
-
-// Additions by Eric Moreau, 1998-09-27
-// I am reachable at eric_moreau@compuserve.com
-
-xkb_keymap "fr_CA_sundeadkeys" {
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+syr" };
+ xkb_geometry { include "pc(pc102)" };
+};
+xkb_keymap "th" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include
"en_US(pc102)+ca_enhanced(sundeadkeys)+us_group3(basic)+group(ctrl_shift_toggle)+ralt(mode_switch)"
};
+ xkb_symbols { include "pc(pc105)+th" };
xkb_geometry { include "pc(pc102)" };
};
-
-xkb_keymap "fr_CA" {
+xkb_keymap "th_tis" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include
"en_US(pc102)+ca_enhanced(basic)+us_group3(basic)+group(ctrl_shift_toggle)+ralt(mode_switch)"
};
+ xkb_symbols { include "pc(pc105)+th(tis)" };
xkb_geometry { include "pc(pc102)" };
};
-
-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
-// us_intl means standard us keyboard plus dead_keys symbols
-// these keyboards are very popular in Brazil
-
-xkb_keymap "us_intl" {
+xkb_keymap "th_pat" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "us(pc101)+us_intl" };
- xkb_geometry { include "pc" };
+ xkb_symbols { include "pc(pc105)+th(pat)" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "br" {
- xkb_keycodes { include "xfree86(abnt2)" };
+xkb_keymap "tr" {
+ xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "us(pc101)+br" };
- xkb_geometry { include "pc(abnt2)" };
+ xkb_symbols { include "pc(pc105)+tr" };
+ xkb_geometry { include "pc(pc102)" };
};
-
-// cz and sk keymaps by Kamil Toman (ktoman@email.cz)
-// are designed to replace old czechoslovakian and czsk keyboards
-// and their prog variants. Those are now obsolete and should not be used
anymore.
-xkb_keymap "cz" {
+xkb_keymap "uk" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+cz" };
- xkb_geometry { include "pc" };
+ xkb_symbols { include "pc(pc105)+uk)" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "cz_qwerty" {
+xkb_keymap "us_flexpro" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+cz_qwerty" };
- xkb_geometry { include "pc" };
+ xkb_symbols { include "us(pc105)" };
+ xkb_geometry { include "keytronic(FlexPro)" };
};
-xkb_keymap "sk" {
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+// us_intl means standard us keyboard plus dead_keys symbols
+// these keyboards are very popular in Brazil
+xkb_keymap "us_intl" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+sk" };
+ xkb_symbols { include "us(pc101)+us(intl)" };
xkb_geometry { include "pc" };
};
-xkb_keymap "sk_qwerty" {
+xkb_keymap "us_microsoft" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+sk_qwerty" };
- xkb_geometry { include "pc" };
+ xkb_symbols { include "us(pc105)" };
+ xkb_geometry { include "microsoft" };
};
-xkb_keymap "sl" {
+xkb_keymap "uz" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+si" };
+ xkb_symbols { include "pc(pc105)+uz" };
xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "sl_SI" {
+
+# svu: compatibility keymaps, based on variants
+xkb_keymap "cz_qwerty" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+si" };
- xkb_geometry { include "pc(pc102)" };
+ xkb_symbols { include "pc(pc105)+cz(qwerty)" };
+ xkb_geometry { include "pc" };
};
-
-// Additions by Cristian Gafton, <gafton@redhat.com>
-xkb_keymap "ro" {
- xkb_keycodes { include "xfree86" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc101)+ro(pc101)" };
- xkb_geometry { include "pc(pc101)" };
+xkb_keymap "de_CH" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+ch(de)" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "ro_microsoft" {
- xkb_keycodes { include "xfree86" };
- xkb_types { include "default" };
- xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+ro(pc105)" };
- xkb_geometry { include "pc(pc105)" };
+xkb_keymap "fr_CH" {
+ xkb_keycodes { include "xfree86" };
+ xkb_types { include "default" };
+ xkb_compatibility { include "default" };
+ xkb_symbols { include "pc(pc105)+ch(fr)" };
+ xkb_geometry { include "pc(pc102)" };
};
-xkb_keymap "tr" {
+xkb_keymap "mt_us" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+tr" };
+ xkb_symbols { include "pc(pc105)+mt(us)" };
xkb_geometry { include "pc(pc102)" };
};
-// Additions by Arabeyes Team, <support@arabeyes.org>
-xkb_keymap "ar" {
+xkb_keymap "sk_qwerty" {
xkb_keycodes { include "xfree86" };
xkb_types { include "default" };
xkb_compatibility { include "default" };
- xkb_symbols { include "en_US(pc105)+ar" };
- xkb_geometry { include "pc(pc102)" };
+ xkb_symbols { include "pc(pc105)+sk(qwerty)" };
+ xkb_geometry { include "pc" };
};
--
1.7.2
- [PATCH 0/8] Bring console-driver-xkb up to date, Diego Nieto Cid, 2010/08/04
- [PATCH 1/8] Update the parser to work with current XKB files., Diego Nieto Cid, 2010/08/04
- Re: [PATCH 1/8] Update the parser to work with current XKB files., olafBuddenhagen, 2010/08/11
- Re: [PATCH 1/8] Update the parser to work, Diego Nieto Cid, 2010/08/11
- [PATCH 1/5] Add type to $$ in mid-rules., Diego Nieto Cid, 2010/08/11
- [PATCH 2/5] Lexer support for keycodes with +/- symbols and arbitrary level numbers., Diego Nieto Cid, 2010/08/11
- [PATCH 3/5] Skip to main file's default section when needed., Diego Nieto Cid, 2010/08/11
- [PATCH 4/5] Update key type assigment routine., Diego Nieto Cid, 2010/08/11
- [PATCH 5/5] Recreate xkb/keymap/hurd from xkeyboard-config-1.8's xfree86 keymap.,
Diego Nieto Cid <=
- [PATCH 4/8] Remove glue code and use mig to regenerate it., Diego Nieto Cid, 2010/08/04
- [PATCH 3/8] Rule vmod returns an int with the vmod's bit on., Diego Nieto Cid, 2010/08/04
- [PATCH 2/8] Avoid hashing garbage for short keynames., Diego Nieto Cid, 2010/08/04
[PATCH 5/8] Update code borrowed from console-client., Diego Nieto Cid, 2010/08/04
[PATCH 6/8] Add missing functions to input_driver_test., Diego Nieto Cid, 2010/08/04