diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-13 19:59:46 +0200 |
| commit | 0d495843cebea4ae94a3138db2bf51da80a16391 (patch) | |
| tree | 6e7b747c07035ae3a29ee3fb73e1eb43df7d2f8d /xorg-server/xkeyboard-config | |
| parent | 01b6bb489cc42ea112ed91dd1f2aeb90bc8e212b (diff) | |
| parent | f4babb3a422e27cd33fba36f7a21eb67b7dee25d (diff) | |
| download | vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.gz vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.tar.bz2 vcxsrv-0d495843cebea4ae94a3138db2bf51da80a16391.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
X11/extensions/configure.ac
X11/xtrans/configure.ac
X11/xtrans/doc/Makefile.am
libX11/configure.ac
libX11/docbook.am
libXdmcp/configure.ac
libXdmcp/doc/Makefile.am
libXext/configure.ac
libXext/docbook.am
libXmu/configure.ac
libXmu/doc/Makefile.am
mesalib/src/mapi/glapi/gen/Makefile
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/state_tracker/st_draw.c
xorg-server/xkeyboard-config/rules/base.extras.xml.in
xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.extras.xml.in | 10 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst | 2 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/de | 27 |
3 files changed, 38 insertions, 1 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 64a8cc321..ed2869b54 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -55,6 +55,16 @@ </languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>hu</name>
+ <_description>German (with Hungarian letters and no dead keys)</_description>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>hun</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst index 0a976c233..1b9d1d182 100644 --- a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst +++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst @@ -1,5 +1,5 @@ ben basic in ben
-ben probhat in ben_probhat
+ben probhat in ben_probhat
dev basic in deva
dvorak $dvoraklayouts %v dvorak
dvorak basic us dvorak
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index b3da23a2a..4b33becf1 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -580,6 +580,8 @@ xkb_symbols "htcdream" { include "level3(alt_switch)"
};
+// EXTRAS:
+
partial alphanumeric_keys
xkb_symbols "us" {
include "us"
@@ -599,3 +601,28 @@ xkb_symbols "us" { include "level3(ralt_switch)"
};
+
+partial alphanumeric_keys
+xkb_symbols "hu" {
+
+ // modify the basic German layout to not have any dead keys and add Hungarian letters
+
+ include "de(basic)"
+ name[Group1]="German (with Hungarian letters and no dead keys)";
+
+ key <AB01> { [ y, Y, guillemotleft, less ] };
+ key <AC10> { [odiaeresis, Odiaeresis, eacute, Eacute ] };
+ key <AC11> { [adiaeresis, Adiaeresis, aacute, Aacute] };
+ key <AD03> { [ e, E, EuroSign, EuroSign ] };
+ key <AD06> { [ z, Z, leftarrow, yen ] };
+ key <AD07> { [ u, U, uacute, Uacute ] };
+ key <AD08> { [ i, I, iacute, Iacute ] };
+ key <AD09> { [ o, O, odoubleacute,Odoubleacute ] };
+ key <AD11> { [udiaeresis, Udiaeresis, udoubleacute,Udoubleacute ] };
+ key <AD12> { [ plus, asterisk, asciitilde, macron ] };
+ key <AE12> { [ acute, grave, oacute, Oacute ] };
+ key <BKSL> { [numbersign, apostrophe, grave, grave ] };
+ key <TLDE> { [asciicircum, degree, notsign, notsign ] };
+
+
+};
|