From b08ba56019b146786e1cde553c036dd0c4fd02e5 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 14 Sep 2012 11:09:08 +0200 Subject: fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 --- xorg-server/xkeyboard-config/NEWS | 3 + xorg-server/xkeyboard-config/configure.in | 3 +- xorg-server/xkeyboard-config/rules/base.ml_s.part | 5 ++ xorg-server/xkeyboard-config/symbols/Makefile.am | 2 +- .../symbols/sharp_vndr/Makefile.am | 8 +++ .../xkeyboard-config/symbols/sharp_vndr/sl-c3x00 | 74 ++++++++++++++++++++ .../xkeyboard-config/symbols/sharp_vndr/ws003sh | 73 ++++++++++++++++++++ .../xkeyboard-config/symbols/sharp_vndr/ws007sh | 73 ++++++++++++++++++++ .../xkeyboard-config/symbols/sharp_vndr/ws011sh | 78 ++++++++++++++++++++++ .../xkeyboard-config/symbols/sharp_vndr/ws020sh | 67 +++++++++++++++++++ 10 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/Makefile.am create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/sl-c3x00 create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/ws003sh create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/ws007sh create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/ws011sh create mode 100644 xorg-server/xkeyboard-config/symbols/sharp_vndr/ws020sh (limited to 'xorg-server') 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 { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, quoteright ] }; + key { [ 8, parenleft ] }; + key { [ 9, parenright ] }; + key { [ 0, asciitilde ] }; + key { type="CTRL+ALT", + symbols[Group1]= [ BackSpace, Terminate_Server ] }; + + key { [ q, Q ] }; + key { [ w, W, asciicircum ] }; + key { [ e, E, equal ] }; + key { [ r, R, plus ] }; + key { [ t, T, bracketleft ] }; + key { [ y, Y, bracketright ] }; + key { [ u, U, braceleft ] }; + key { [ i, I, braceright ] }; + key { [ o, O ] }; + key { [ p, P ] }; + + key { [ Tab, ISO_Left_Tab, Caps_Lock ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D, quoteleft ] }; + key { [ f, F, backslash ] }; + key { [ g, G, semicolon ] }; + key { [ h, H, colon ] }; + key { [ j, J, asterisk ] }; + key { [ k, K, yen ] }; + key { [ l, L, bar ] }; + + key { [ Shift_L ] }; + key { [ z, Z ] }; + key { [ x, X, SunCut ] }; + key { [ c, C, SunCopy ] }; + key { [ v, V, SunPaste ] }; + key { [ b, B, underscore ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ Shift_R ] }; + key { [ Return ] }; + + key { [ ISO_Level3_Shift ] }; + + key { [ Control_L ] }; + key { [ minus, minus, at ] }; + key { [ space ] }; + key { [ comma, slash, less ] }; + key { [ period, question, greater ] }; + // End alphanumeric section + + // keypad + key { [ Up, Up, Prior ] }; + key { [ Left, Left, Home ] }; + key { [ Down, Down, Next ] }; + key { [ Right, Right, End ] }; + + key { [ 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 { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, quoteright, quoteleft ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0 ] }; + key { [ minus, equal, backslash ] }; + key { [ BackSpace, BackSpace, Delete ] }; + + key { [ q, Q ] }; + key { [ w, W, asciicircum ] }; + key { [ e, E, asciitilde ] }; + key { [ r, R, bar ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U, bracketleft ] }; + key { [ i, I, bracketright ] }; + key { [ o, O, underscore ] }; + key { [ p, P, at ] }; + + key { [ Tab, Tab, Escape ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K, plus ] }; + key { [ l, L, asterisk ] }; + + key { [ Shift_L ] }; + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, semicolon, less ] }; + key { [ period, colon, greater ] }; + key { [ slash, question ] }; + key { [ Shift_R ] }; + key { [ Return ] }; + + key { [ ISO_Level3_Shift ] }; + + key { [ Control_L ] }; + key { [ space ] }; + // End alphanumeric section + + // keypad + key { [ Up, Up, Prior ] }; + key { [ Left, Left, Home ] }; + key { [ Down, Down, Next ] }; + key { [ Right, Right, End ] }; + + key { [ 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 { [ 1, exclam ] }; + key { [ 2, quotedbl ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar ] }; + key { [ 5, percent ] }; + key { [ 6, ampersand ] }; + key { [ 7, quoteright, quoteleft ] }; + key { [ 8, parenleft, braceleft ] }; + key { [ 9, parenright, braceright ] }; + key { [ 0 ] }; + key { [ minus, equal, backslash ] }; + key { [ BackSpace, BackSpace, Delete ] }; + + key { [ q, Q ] }; + key { [ w, W, asciicircum ] }; + key { [ e, E, asciitilde ] }; + key { [ r, R, bar ] }; + key { [ t, T ] }; + key { [ y, Y ] }; + key { [ u, U, bracketleft ] }; + key { [ i, I, bracketright ] }; + key { [ o, O, underscore ] }; + key { [ p, P, at ] }; + + key { [ Tab, Tab, Escape ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K, plus ] }; + key { [ l, L, asterisk ] }; + + key { [ Shift_L ] }; + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, semicolon, less ] }; + key { [ period, colon, greater ] }; + key { [ slash, question ] }; + key { [ Shift_R ] }; + key { [ Return ] }; + + key { [ ISO_Level3_Shift ] }; + + key { [ Control_L ] }; + key { [ space ] }; + // End alphanumeric section + + // keypad + key { [ Up, Up, Prior ] }; + key { [ Left, Left, Home ] }; + key { [ Down, Down, Next ] }; + key { [ Right, Right, End ] }; + + key { [ 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 { + type[Group1] = "THREE_LEVEL", + symbols[Group1] = [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ] + }; + + key { [ q, Q, quotedbl ] }; + key { [ w, W, numbersign ] }; + key { [ e, E, dollar ] }; + key { [ r, R, percent ] }; + key { [ t, T, ampersand ] }; + key { [ y, Y, 1 ] }; + key { [ u, U, 2 ] }; + key { [ i, I, 3 ] }; + key { [ o, O, underscore ] }; + key { [ p, P, at ] }; + key { [ BackSpace, BackSpace, Delete ] }; + + key { [ Tab, Tab, Escape ] }; + key { [ a, A, bracketleft ] }; + key { [ s, S, apostrophe ] }; + key { [ d, D, parenleft ] }; + key { [ f, F, parenright ] }; + key { [ g, G, asterisk ] }; + key { [ h, H, 4 ] }; + key { [ j, J, 5 ] }; + key { [ k, K, 6 ] }; + key { [ l, L, plus ] }; + key { [ minus, equal, backslash ] }; + key { [ grave, braceleft, braceright ] }; + + key { [ Shift_L ] }; + key { [ z, Z, bracketright ] }; + key { [ x, X, asciicircum ] }; + key { [ c, C, asciitilde ] }; + key { [ v, V, bar ] }; + key { [ b, B, 7 ] }; + key { [ n, N, 8 ] }; + key { [ m, M, 9 ] }; + key { [ comma, less, semicolon ] }; + key { [ period, greater, colon ] }; + key { [ slash, question, 0 ] }; + key { [ Shift_R ] }; + key { [ Return ] }; + + key { [ ISO_Level3_Shift ] }; + + key { [ Control_L ] }; + key { [ space ] }; + // End alphanumeric section + + key { [ Up, Up, Prior ] }; + key { [ Left, Left, Home ] }; + key { [ Down, Down, Next ] }; + key { [ Right, Right, End ] }; + + key { [ Escape ] }; + + // keypad + key { [ 1 ] }; + key { [ 2 ] }; + key { [ 3 ] }; + key { [ 4 ] }; + key { [ 5 ] }; + key { [ 6 ] }; + key { [ 7 ] }; + key { [ 8 ] }; + key { [ 9 ] }; + key { [ 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 { + type[Group1]="THREE_LEVEL", + symbols[Group1]= [ Zenkaku_Hankaku, Zenkaku_Hankaku, exclam ] + }; + + key { [ q, Q, quotedbl ] }; + key { [ w, W, numbersign ] }; + key { [ e, E, dollar ] }; + key { [ r, R, percent ] }; + key { [ t, T, ampersand ] }; + key { [ y, Y, underscore ] }; + key { [ u, U, 1 ] }; + key { [ i, I, 2 ] }; + key { [ o, O, 3 ] }; + key { [ p, P, at ] }; + key { [ BackSpace, BackSpace, Delete ] }; + + key { [ Tab, Tab, Escape ] }; + key { [ a, A, bracketleft ] }; + key { [ s, S, apostrophe ] }; + key { [ d, D, parenleft ] }; + key { [ f, F, parenright ] }; + key { [ g, G, asterisk ] }; + key { [ h, H, 4 ] }; + key { [ j, J, 5 ] }; + key { [ k, K, 6 ] }; + key { [ l, L, plus ] }; + key { [ minus, equal, backslash ] }; + key { [ grave, braceleft, braceright ] }; + + key { [ Shift_L ] }; + key { [ z, Z, bracketright ] }; + key { [ x, X, asciicircum ] }; + key { [ c, C, asciitilde ] }; + key { [ v, V, bar ] }; + key { [ b, B, 7 ] }; + key { [ n, N, 8 ] }; + key { [ m, M, 9 ] }; + key { [ comma, less, semicolon ] }; + key { [ period, greater, colon ] }; + key { [ slash, question, 0 ] }; + key { [ Shift_R ] }; + key { [ Return ] }; + + key { [ ISO_Level3_Shift ] }; + + key { [ Control_L ] }; + key { [ space ] }; + // End alphanumeric section + + // keypad + key { [ Up, Up, Prior ] }; + key { [ Left, Left, Home ] }; + key { [ Down, Down, Next ] }; + key { [ Right, Right, End ] }; + + key { [ Escape ] }; + + include "level3(ralt_switch)" +}; -- cgit v1.2.3