From fe6927d79e02d01cce20ecf56c8721fcadc2d278 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 31 Jan 2010 14:39:32 +0000 Subject: svn merge ^/branches/released --- xorg-server/xkbdata.src/rules/Makefile.in | 5 ++- xorg-server/xkbdata.src/rules/base.lists.part | 7 ++- xorg-server/xkbdata.src/rules/base.m_g.part | 3 ++ xorg-server/xkbdata.src/rules/base.m_k.part | 1 + xorg-server/xkbdata.src/rules/base.m_s.part | 2 + xorg-server/xkbdata.src/rules/base.m_t.part | 1 + xorg-server/xkbdata.src/rules/base.ml1_s.part | 2 + xorg-server/xkbdata.src/rules/base.ml_s.part | 4 ++ xorg-server/xkbdata.src/rules/base.mlv_s.part | 1 + xorg-server/xkbdata.src/rules/base.o_s.part | 3 ++ xorg-server/xkbdata.src/rules/base.xml.in | 57 ++++++++++++++++++------ xorg-server/xkbdata.src/rules/bin/Makefile.in | 5 ++- xorg-server/xkbdata.src/rules/compat/Makefile.in | 5 ++- xorg-server/xkbdata.src/rules/evdev.xml.in | 57 ++++++++++++++++++------ xorg-server/xkbdata.src/rules/extras/Makefile.in | 5 ++- 15 files changed, 122 insertions(+), 36 deletions(-) (limited to 'xorg-server/xkbdata.src/rules') diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in index 583a1ce8f..1af7ed573 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.in +++ b/xorg-server/xkbdata.src/rules/Makefile.in @@ -118,6 +118,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -353,9 +354,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign rules/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu rules/Makefile + $(AUTOMAKE) --foreign rules/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part index d1927c537..27f081f8a 100644 --- a/xorg-server/xkbdata.src/rules/base.lists.part +++ b/xorg-server/xkbdata.src/rules/base.lists.part @@ -11,6 +11,9 @@ // Microsoft models (using MS geometry) ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose +// Nokia devices and keyboards +! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 + // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = latitude @@ -24,7 +27,7 @@ ! $maclaptop = ibook powerbook macbook78 macbook79 ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79 -! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us +! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk @@ -66,7 +69,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - toshiba_s3000 trust trustda \ + tm2030USB toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part index a925bfa8d..2ee139d20 100644 --- a/xorg-server/xkbdata.src/rules/base.m_g.part +++ b/xorg-server/xkbdata.src/rules/base.m_g.part @@ -5,6 +5,8 @@ latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) + hpmini110 = hp(mini110) + hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) $pcmodels = pc(%m) $pcgeometries = pc(%m) @@ -19,4 +21,5 @@ $macs = macintosh(macintosh) hhk = hhk(basic) kinesis = kinesis(model100) + $nokiamodels = nokia(%m) * = pc(pc104) diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index 30534f715..dd0c391d6 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -6,6 +6,7 @@ sun6euro = sun(type6tuv_usb) pc98 = xfree98(pc98) evdev = evdev + $nokiamodels = evdev olpc = evdev macintosh_hhk = macintosh(hhk) macintosh_old = macintosh(old) diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part index 13621e79c..a032e0a8f 100644 --- a/xorg-server/xkbdata.src/rules/base.m_s.part +++ b/xorg-server/xkbdata.src/rules/base.m_s.part @@ -42,6 +42,8 @@ targa_v811 = +inet(media_nav_acpi_common) thinkpad = +inet(media_nav_common) thinkpadz60 = +inet(thinkpad60) + tm2030USB-102 = +inet(media_nav_acpi_common) + tm2030USB-106 = +inet(media_nav_acpi_common) trust_slimline = +inet(media_nav_acpi_common) vsonku306 = +inet(microsoftprooem) $inetkbds = +inet(%m) diff --git a/xorg-server/xkbdata.src/rules/base.m_t.part b/xorg-server/xkbdata.src/rules/base.m_t.part index 4548d2694..d67750cce 100644 --- a/xorg-server/xkbdata.src/rules/base.m_t.part +++ b/xorg-server/xkbdata.src/rules/base.m_t.part @@ -1,2 +1,3 @@ $macs = complete+numpad(mac) + $nokiamodels = complete+nokia * = complete diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index 6a0787d21..6d5f57004 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -6,5 +6,7 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index c5fed0bed..1c16b6b7a 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -21,6 +21,10 @@ macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v) $macs en_US = pc+macintosh_vndr/us(extended) $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) + nokiarx44 * = nokia_vndr/rx-44(%l) + nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) + nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) + nokiasu8w * = nokia_vndr/su-8w(%l) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) diff --git a/xorg-server/xkbdata.src/rules/base.mlv_s.part b/xorg-server/xkbdata.src/rules/base.mlv_s.part index df4eef24d..1eecc55c0 100644 --- a/xorg-server/xkbdata.src/rules/base.mlv_s.part +++ b/xorg-server/xkbdata.src/rules/base.mlv_s.part @@ -1,3 +1,4 @@ classmate us intl = pc+us(classmate-intl) classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) + nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part index f9290dae7..47bfa004f 100644 --- a/xorg-server/xkbdata.src/rules/base.o_s.part +++ b/xorg-server/xkbdata.src/rules/base.o_s.part @@ -18,6 +18,7 @@ grp:alts_toggle = +group(alts_toggle) grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) + grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) grp:caps_toggle = +capslock(grouplock) grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) @@ -37,6 +38,7 @@ grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) + grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -66,6 +68,7 @@ compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) compose:menu = +compose(menu) + compose:lctrl = +compose(lctrl) compose:rctrl = +compose(rctrl) compose:caps = +compose(caps) compose:102 = +compose(102) diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index f43e651bb..24bfc2d6c 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -552,6 +552,13 @@ Hewlett-Packard + + + hpmini110 + <_description>Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + rapidaccess @@ -573,13 +580,6 @@ IBM - - - thinkpadintl - <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl - IBM - - thinkpad60 @@ -1277,6 +1277,7 @@ rus <_description>Russian phonetic + rus @@ -3018,12 +3019,6 @@ <_description>LEKPa - - - balticplus - <_description>Baltic+ - - @@ -3250,6 +3245,12 @@ rus + + + dvp + <_description>Programmer Dvorak + + @@ -3405,6 +3406,12 @@ <_description>Legacy + + + typewriter-legacy + <_description>Typewriter, legacy + + tt @@ -3703,6 +3710,12 @@ gsw + + + legacy + <_description>Legacy + + de_nodeadkeys @@ -4406,6 +4419,12 @@ <_description>Left Win (to first layout), Right Win/Menu (to last layout) + + + + + + hpmini110 + <_description>Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + rapidaccess @@ -573,13 +580,6 @@ IBM - - - thinkpadintl - <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl - IBM - - thinkpad60 @@ -1277,6 +1277,7 @@ rus <_description>Russian phonetic + rus @@ -3018,12 +3019,6 @@ <_description>LEKPa - - - balticplus - <_description>Baltic+ - - @@ -3250,6 +3245,12 @@ rus + + + dvp + <_description>Programmer Dvorak + + @@ -3405,6 +3406,12 @@ <_description>Legacy + + + typewriter-legacy + <_description>Typewriter, legacy + + tt @@ -3703,6 +3710,12 @@ gsw + + + legacy + <_description>Legacy + + de_nodeadkeys @@ -4406,6 +4419,12 @@ <_description>Left Win (to first layout), Right Win/Menu (to last layout) + + +