aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-06 07:56:34 +0000
committermarha <marha@users.sourceforge.net>2010-09-06 07:56:34 +0000
commitbd2374fbd8ef9330bf05268e5267921db38f355d (patch)
tree268a7b70037297560127465979c1e7f3aea473ff
parent2b1008913cdd6a3b9b6c52d2e1616649bd20ee97 (diff)
parente816f09fa17f2c583267410665c9e90cf784d715 (diff)
downloadvcxsrv-bd2374fbd8ef9330bf05268e5267921db38f355d.tar.gz
vcxsrv-bd2374fbd8ef9330bf05268e5267921db38f355d.tar.bz2
vcxsrv-bd2374fbd8ef9330bf05268e5267921db38f355d.zip
svn merge ^/branches/released .
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in28
-rw-r--r--xorg-server/xkeyboard-config/symbols/Makefile.am80
-rw-r--r--xorg-server/xkeyboard-config/symbols/at38
-rw-r--r--xorg-server/xkeyboard-config/symbols/makefile2
-rw-r--r--xorg-server/xkeyboard-config/symbols/pk2
5 files changed, 108 insertions, 42 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 224321903..4ac238c7d 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1502,6 +1502,34 @@
</layout>
<layout>
<configItem>
+ <name>at</name>
+ <_shortDescription>Aut</_shortDescription>
+ <_description>Austria</_description>
+ <languageList><iso639Id>ger</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>nodeadkeys</name>
+ <_description>Eliminate dead keys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>sundeadkeys</name>
+ <_description>Sun dead keys</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>mac</name>
+ <_description>Macintosh</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
<name>az</name>
<_shortDescription>Aze</_shortDescription>
<_description>Azerbaijan</_description>
diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index fc618a4b9..0541dc3f6 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -1,40 +1,40 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
-
-symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
-ad af al \
-am ara az \
-ba bd be \
-bg br brai \
-bt bw by \
-ca cd \
-ch cn cz \
-de dk \
-ee es et epo \
-fi fo fr \
-gb ge gh gn \
-gr hr hu \
-ie il in iq \
-ir is it jp \
-ke kg kh \
-kr kz \
-la latam latin \
-lk lt lv \
-ma mao me \
-mk ml mm \
-mn mt mv \
-ng nl no np \
-pc pk pl pt \
-ro rs ru \
-se si sk sn \
-sy th \
-terminate \
-tj tm tr tz \
-ua us uz vn \
-za \
-altwin capslock compose ctrl empty eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
-
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+
+symbolsdir = $(xkb_base)/symbols
+dist_symbols_DATA = \
+ad af al \
+am ara at az \
+ba bd be \
+bg br brai \
+bt bw by \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+ke kg kh \
+kr kz \
+la latam latin \
+lk lt lv \
+ma mao me \
+mk ml mm \
+mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk sn \
+sy th \
+terminate \
+tj tm tr tz \
+ua us uz vn \
+za \
+altwin capslock compose ctrl empty eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
+
+dir_data = $(dist_symbols_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkeyboard-config/symbols/at b/xorg-server/xkeyboard-config/symbols/at
new file mode 100644
index 000000000..b892af7a8
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/at
@@ -0,0 +1,38 @@
+
+// based on a keyboard map from an 'xkb/symbols/de' file
+//
+// $XKeyboardConfig$
+// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+
+default
+xkb_symbols "basic" {
+
+ include "de(basic)"
+
+ name[Group1]="Austria";
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+ include "de(nodeadkeys)"
+
+ name[Group1]="Austria - Eliminate dead keys";
+};
+
+partial alphanumeric_keys
+xkb_symbols "mac" {
+
+ include "de(mac)"
+
+ name[Group1]= "Austria - Macintosh";
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+ include "de(Sundeadkeys)"
+
+ name[Group1]="Austria - Sun dead keys";
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/makefile b/xorg-server/xkeyboard-config/symbols/makefile
index 6eea13f1c..db9ca7968 100644
--- a/xorg-server/xkeyboard-config/symbols/makefile
+++ b/xorg-server/xkeyboard-config/symbols/makefile
@@ -10,7 +10,7 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
dist_xkbdata_symbols_DATA = \
ad af al \
-am ara az \
+am ara at az \
ba bd be \
bg br brai \
bt bw by \
diff --git a/xorg-server/xkeyboard-config/symbols/pk b/xorg-server/xkeyboard-config/symbols/pk
index da1198772..c240bb119 100644
--- a/xorg-server/xkeyboard-config/symbols/pk
+++ b/xorg-server/xkeyboard-config/symbols/pk
@@ -202,7 +202,7 @@ xkb_symbols "urd-nla" {
partial alphanumeric_keys
xkb_symbols "snd" {
- name[Group1]= "Pakistan - MBSindhi";
+ name[Group1]= "Pakistan - Sindhi";
// www.bhurgri.com
key <TLDE> { [ 0x1002019, 0x1002018 ] };