summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2009-09-15 16:25:19 +0100
committerSergey V. Udaltsov <svu@gnome.org>2009-09-15 16:25:19 +0100
commit2cf44a6732155838250eba958c6d50a88f8002f0 (patch)
treed075ad51aa19c0b69ee448f1fc6e037067cc63eb
parentd99fded6663ff2e13dbac287ea0de52130ef93eb (diff)
fixed Sun Type 6 model
https://bugs.freedesktop.org/show_bug.cgi?id=3952
-rw-r--r--ChangeLog3
-rw-r--r--keycodes/sun2
-rw-r--r--rules/base.m_k.part1
-rw-r--r--rules/base.ml_s.part3
-rw-r--r--symbols/sun_vndr/us2
5 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac7aebfd..53c9b6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
* symbols/es: addind dead_tilde,
https://bugs.freedesktop.org/show_bug.cgi?id=23876
+ * keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part,
+ symbols/sun_vndr/us: fixed Sun keyboard model for type6,
+ https://bugs.freedesktop.org/show_bug.cgi?id=3952
2009-09-08 Gaetan Nadon
diff --git a/keycodes/sun b/keycodes/sun
index cdf8694f..89d7fe66 100644
--- a/keycodes/sun
+++ b/keycodes/sun
@@ -590,7 +590,7 @@ xkb_keycodes "type6_usb" {
xkb_keycodes "type6tuv_usb" {
include "sun(type6_usb)"
-// <LSGT> = 94;
+ <LSGT> = 94;
// <BKSL> = 51;
};
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index b6433b2c..30534f71 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -3,6 +3,7 @@
sun4 = sun(type4_euro)
sun5 = sun(type5_euro)
sun6 = sun(type6_usb)
+ sun6euro = sun(type6tuv_usb)
pc98 = xfree98(pc98)
evdev = evdev
olpc = evdev
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 7e9b2d63..c5fed0be 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -10,6 +10,9 @@
sun6 us = sun_vndr/us(type6)
sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic)
sun6 * = sun_vndr/us(type6)+%l%(v)
+ sun6euro us = sun_vndr/us(type6)
+ sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic)
+ sun6euro * = sun_vndr/us(type6)+%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old en_US = macintosh_vndr/us(oldmac)
diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us
index 5378cf88..41670f01 100644
--- a/symbols/sun_vndr/us
+++ b/symbols/sun_vndr/us
@@ -257,6 +257,8 @@ xkb_symbols "type6" {
include "eurosign(4)"
key <SYRQ> { [ SunSys_Req ]};
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
+
};
xkb_symbols "pc101" {