Merge remote-tracking branch 'origin/released'

10 files changed, 384 insertions, 2 deletions

diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index e53dd344c..731a2e474 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,6 @@
+2.7	8 bugs fixed, most important:
+	- Fxx fixed (CTRL+ALT type)
+	- *.dir files not produced any more
 2.6	16 bugs fixed
 	Updated translations
 	Using proper gettext, instead of glib-gettext
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index a43c379c8..9ba1819be 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.6)
+AC_INIT(xkeyboard-config, 2.6.99)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -97,6 +97,7 @@ symbols/macintosh_vndr/Makefile
 symbols/nec_vndr/Makefile
 symbols/nokia_vndr/Makefile
 symbols/sgi_vndr/Makefile
+symbols/sharp_vndr/Makefile
 symbols/sony_vndr/Makefile
 symbols/sun_vndr/Makefile
 symbols/xfree68_vndr/Makefile
diff --git a/xorg-server/xkeyboard-config/rules/base.ml_s.part b/xorg-server/xkeyboard-config/rules/base.ml_s.part
index 5d3b46d61..7e0148672 100644
--- a/xorg-server/xkeyboard-config/rules/base.ml_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.ml_s.part
@@ -36,6 +36,11 @@
   olpc		$olpclayouts		=	olpc+%l%(m)
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
+  sl-c3x00	*			=	pc+sharp_vndr/sl-c3x00(basic)
+  ws003sh	*			=	pc+sharp_vndr/ws003sh(basic)
+  ws007sh	*			=	pc+sharp_vndr/ws007sh(basic)
+  ws011sh	*			=	pc+sharp_vndr/ws011sh(basic)
+  ws020sh	*			=	pc+sharp_vndr/ws020sh(basic)
   htcdream	$htcdreamlayouts	=	%l(htcdream)
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index c67a60088..af0322f0c 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 symbolsdir = $(xkb_base)/symbols
 symbols_DATA = \
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sharp_vndr/Makefile.am
new file mode 100644
index 000000000..5b2d4aafd
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/Makefile.am
@@ -0,0 +1,8 @@
+symbolsdir = $(xkb_base)/symbols/sharp_vndr
+
+dist_symbols_DATA = \
+sl-c3x00 \
+ws003sh \
+ws007sh \
+ws011sh \
+ws020sh
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00
new file mode 100644
index 000000000..d1dca0cb9
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00
@@ -0,0 +1,74 @@
+// $NetBSD: sl-c3x00,v 1.1 2009/12/13 04:54:51 nonaka Exp $
+// $OpenBSD: zaurus,v 1.2 2008/03/05 17:24:55 matthieu Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+	name[Group1]= "Sharp SL-C3x00";
+
+	// Upper row
+	key <AE01> { [ 1, exclam ] };
+	key <AE02> { [ 2, quotedbl ] };
+	key <AE03> { [ 3, numbersign ] };
+	key <AE04> { [ 4, dollar ] };
+	key <AE05> { [ 5, percent ] };
+	key <AE06> { [ 6, ampersand ] };
+	key <AE07> { [ 7, quoteright ] };
+	key <AE08> { [ 8, parenleft ] };
+	key <AE09> { [ 9, parenright ] };
+	key <AE10> { [ 0, asciitilde ] };
+	key <BKSP> { type="CTRL+ALT",
+		symbols[Group1]= [ BackSpace, Terminate_Server ] };
+
+	key <AD01> { [ q, Q ] };
+	key <AD02> { [ w, W, asciicircum ] };
+	key <AD03> { [ e, E, equal ] };
+	key <AD04> { [ r, R, plus ] };
+	key <AD05> { [ t, T, bracketleft ] };
+	key <AD06> { [ y, Y, bracketright ] };
+	key <AD07> { [ u, U, braceleft ] };
+	key <AD08> { [ i, I, braceright ] };
+	key <AD09> { [ o, O ] };
+	key <AD10> { [ p, P ] };
+	
+	key <TAB> { [ Tab, ISO_Left_Tab, Caps_Lock ] };
+
+	key <AC01> { [ a, A ] };
+	key <AC02> { [ s, S ] };
+	key <AC03> { [ d, D, quoteleft ] };
+	key <AC04> { [ f, F, backslash ] };
+	key <AC05> { [ g, G, semicolon ] };
+	key <AC06> { [ h, H, colon ] };
+	key <AC07> { [ j, J, asterisk ] };
+	key <AC08> { [ k, K, yen ] };
+	key <AC09> { [ l, L, bar ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z ] };
+	key <AB02> { [ x, X, SunCut ] };
+	key <AB03> { [ c, C, SunCopy ] };
+	key <AB04> { [ v, V, SunPaste ] };
+	key <AB05> { [ b, B, underscore ] };
+	key <AB06> { [ n, N ] };
+	key <AB07> { [ m, M ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+	
+	key <RALT> { [ ISO_Level3_Shift ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <AE11> { [ minus, minus, at ] };
+	key <SPCE> { [ space ] };
+	key <AB08> { [ comma, slash, less ] };
+	key <AB09> { [ period, question, greater ] };
+	// End alphanumeric section
+	
+	// keypad
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh
new file mode 100644
index 000000000..7c3d98fdf
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh
@@ -0,0 +1,73 @@
+// $NetBSD: ws003sh,v 1.1 2010/05/15 15:33:30 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+	name[Group1]= "Sharp WS003SH";
+
+	// Upper row
+	key <AE01> { [ 1, exclam ] };
+	key <AE02> { [ 2, quotedbl ] };
+	key <AE03> { [ 3, numbersign ] };
+	key <AE04> { [ 4, dollar ] };
+	key <AE05> { [ 5, percent ] };
+	key <AE06> { [ 6, ampersand ] };
+	key <AE07> { [ 7, quoteright, quoteleft ] };
+	key <AE08> { [ 8, parenleft, braceleft ] };
+	key <AE09> { [ 9, parenright, braceright ] };
+	key <AE10> { [ 0 ] };
+	key <AE11> { [ minus, equal, backslash ] };
+	key <BKSP> { [ BackSpace, BackSpace, Delete ] };
+
+	key <AD01> { [ q, Q ] };
+	key <AD02> { [ w, W, asciicircum ] };
+	key <AD03> { [ e, E, asciitilde ] };
+	key <AD04> { [ r, R, bar ] };
+	key <AD05> { [ t, T ] };
+	key <AD06> { [ y, Y ] };
+	key <AD07> { [ u, U, bracketleft ] };
+	key <AD08> { [ i, I, bracketright ] };
+	key <AD09> { [ o, O, underscore ] };
+	key <AD10> { [ p, P, at ] };
+	
+	key <TAB> { [ Tab, Tab, Escape ] };
+
+	key <AC01> { [ a, A ] };
+	key <AC02> { [ s, S ] };
+	key <AC03> { [ d, D ] };
+	key <AC04> { [ f, F ] };
+	key <AC05> { [ g, G ] };
+	key <AC06> { [ h, H ] };
+	key <AC07> { [ j, J ] };
+	key <AC08> { [ k, K, plus ] };
+	key <AC09> { [ l, L, asterisk ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z ] };
+	key <AB02> { [ x, X ] };
+	key <AB03> { [ c, C ] };
+	key <AB04> { [ v, V ] };
+	key <AB05> { [ b, B ] };
+	key <AB06> { [ n, N ] };
+	key <AB07> { [ m, M ] };
+	key <AB08> { [ comma, semicolon, less ] };
+	key <AB09> { [ period, colon, greater ] };
+	key <AB10> { [ slash, question ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+
+	key <RALT> { [ ISO_Level3_Shift ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <SPCE> { [ space ] };
+	// End alphanumeric section
+	
+	// keypad
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh
new file mode 100644
index 000000000..d287eb528
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh
@@ -0,0 +1,73 @@
+// $NetBSD: ws007sh,v 1.1 2010/05/15 15:33:30 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+	name[Group1]= "Sharp WS007SH";
+
+	// Upper row
+	key <AE01> { [ 1, exclam ] };
+	key <AE02> { [ 2, quotedbl ] };
+	key <AE03> { [ 3, numbersign ] };
+	key <AE04> { [ 4, dollar ] };
+	key <AE05> { [ 5, percent ] };
+	key <AE06> { [ 6, ampersand ] };
+	key <AE07> { [ 7, quoteright, quoteleft ] };
+	key <AE08> { [ 8, parenleft, braceleft ] };
+	key <AE09> { [ 9, parenright, braceright ] };
+	key <AE10> { [ 0 ] };
+	key <AE11> { [ minus, equal, backslash ] };
+	key <BKSP> { [ BackSpace, BackSpace, Delete ] };
+
+	key <AD01> { [ q, Q ] };
+	key <AD02> { [ w, W, asciicircum ] };
+	key <AD03> { [ e, E, asciitilde ] };
+	key <AD04> { [ r, R, bar ] };
+	key <AD05> { [ t, T ] };
+	key <AD06> { [ y, Y ] };
+	key <AD07> { [ u, U, bracketleft ] };
+	key <AD08> { [ i, I, bracketright ] };
+	key <AD09> { [ o, O, underscore ] };
+	key <AD10> { [ p, P, at ] };
+	
+	key <TAB> { [ Tab, Tab, Escape ] };
+
+	key <AC01> { [ a, A ] };
+	key <AC02> { [ s, S ] };
+	key <AC03> { [ d, D ] };
+	key <AC04> { [ f, F ] };
+	key <AC05> { [ g, G ] };
+	key <AC06> { [ h, H ] };
+	key <AC07> { [ j, J ] };
+	key <AC08> { [ k, K, plus ] };
+	key <AC09> { [ l, L, asterisk ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z ] };
+	key <AB02> { [ x, X ] };
+	key <AB03> { [ c, C ] };
+	key <AB04> { [ v, V ] };
+	key <AB05> { [ b, B ] };
+	key <AB06> { [ n, N ] };
+	key <AB07> { [ m, M ] };
+	key <AB08> { [ comma, semicolon, less ] };
+	key <AB09> { [ period, colon, greater ] };
+	key <AB10> { [ slash, question ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+
+	key <RALT> { [ ISO_Level3_Shift ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <SPCE> { [ space ] };
+	// End alphanumeric section
+	
+	// keypad
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh
new file mode 100644
index 000000000..45976dff9
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh
@@ -0,0 +1,78 @@
+// $NetBSD: ws011sh,v 1.2 2010/05/30 10:10:20 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+	name[Group1]= "Sharp WS011SH";
+
+	// Upper row
+	key <HZTG> {
+		type[Group1] = "THREE_LEVEL",
+		symbols[Group1] = [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ]
+	};
+
+	key <AD01> { [ q, Q, quotedbl ] };
+	key <AD02> { [ w, W, numbersign ] };
+	key <AD03> { [ e, E, dollar ] };
+	key <AD04> { [ r, R, percent ] };
+	key <AD05> { [ t, T, ampersand ] };
+	key <AD06> { [ y, Y, 1 ] };
+	key <AD07> { [ u, U, 2 ] };
+	key <AD08> { [ i, I, 3 ] };
+	key <AD09> { [ o, O, underscore ] };
+	key <AD10> { [ p, P, at ] };
+	key <BKSP> { [ BackSpace, BackSpace, Delete ] };
+	
+	key <TAB> { [ Tab, Tab, Escape ] };
+	key <AC01> { [ a, A, bracketleft ] };
+	key <AC02> { [ s, S, apostrophe ] };
+	key <AC03> { [ d, D, parenleft ] };
+	key <AC04> { [ f, F, parenright ] };
+	key <AC05> { [ g, G, asterisk ] };
+	key <AC06> { [ h, H, 4 ] };
+	key <AC07> { [ j, J, 5 ] };
+	key <AC08> { [ k, K, 6 ] };
+	key <AC09> { [ l, L, plus ] };
+	key <AE11> { [ minus, equal, backslash ] };
+	key <AE02> { [ grave, braceleft, braceright ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z, bracketright ] };
+	key <AB02> { [ x, X, asciicircum ] };
+	key <AB03> { [ c, C, asciitilde ] };
+	key <AB04> { [ v, V, bar ] };
+	key <AB05> { [ b, B, 7 ] };
+	key <AB06> { [ n, N, 8 ] };
+	key <AB07> { [ m, M, 9 ] };
+	key <AB08> { [ comma, less, semicolon ] };
+	key <AB09> { [ period, greater, colon ] };
+	key <AB10> { [ slash, question, 0 ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+
+	key <RALT> { [ ISO_Level3_Shift ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <SPCE> { [ space ] };
+	// End alphanumeric section
+	
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	// keypad
+	key <KP1> { [ 1 ] };
+	key <KP2> { [ 2 ] };
+	key <KP3> { [ 3 ] };
+	key <KP4> { [ 4 ] };
+	key <KP5> { [ 5 ] };
+	key <KP6> { [ 6 ] };
+	key <KP7> { [ 7 ] };
+	key <KP8> { [ 8 ] };
+	key <KP9> { [ 9 ] };
+	key <KP0> { [ 0 ] };
+
+	include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh
new file mode 100644
index 000000000..5231e1483
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh
@@ -0,0 +1,67 @@
+// $NetBSD: ws020sh,v 1.1 2010/05/25 13:12:51 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+	name[Group1]= "Sharp WS020SH";
+
+	// Upper row
+	key <HZTG> {
+		type[Group1]="THREE_LEVEL",
+		symbols[Group1]= [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ]
+	};
+
+	key <AD01> { [ q, Q, quotedbl ] };
+	key <AD02> { [ w, W, numbersign ] };
+	key <AD03> { [ e, E, dollar ] };
+	key <AD04> { [ r, R, percent ] };
+	key <AD05> { [ t, T, ampersand ] };
+	key <AD06> { [ y, Y, underscore ] };
+	key <AD07> { [ u, U, 1 ] };
+	key <AD08> { [ i, I, 2 ] };
+	key <AD09> { [ o, O, 3 ] };
+	key <AD10> { [ p, P, at ] };
+	key <BKSP> { [ BackSpace, BackSpace, Delete ] };
+	
+	key <TAB> { [ Tab, Tab, Escape ] };
+	key <AC01> { [ a, A, bracketleft ] };
+	key <AC02> { [ s, S, apostrophe ] };
+	key <AC03> { [ d, D, parenleft ] };
+	key <AC04> { [ f, F, parenright ] };
+	key <AC05> { [ g, G, asterisk ] };
+	key <AC06> { [ h, H, 4 ] };
+	key <AC07> { [ j, J, 5 ] };
+	key <AC08> { [ k, K, 6 ] };
+	key <AC09> { [ l, L, plus ] };
+	key <AE11> { [ minus, equal, backslash ] };
+	key <AE02> { [ grave, braceleft, braceright ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z, bracketright ] };
+	key <AB02> { [ x, X, asciicircum ] };
+	key <AB03> { [ c, C, asciitilde ] };
+	key <AB04> { [ v, V, bar ] };
+	key <AB05> { [ b, B, 7 ] };
+	key <AB06> { [ n, N, 8 ] };
+	key <AB07> { [ m, M, 9 ] };
+	key <AB08> { [ comma, less, semicolon ] };
+	key <AB09> { [ period, greater, colon ] };
+	key <AB10> { [ slash, question, 0 ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+
+	key <RALT> { [ ISO_Level3_Shift ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <SPCE> { [ space ] };
+	// End alphanumeric section
+	
+	// keypad
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	include "level3(ralt_switch)"
+};