summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvu <svu>2007-08-14 21:22:01 +0000
committersvu <svu>2007-08-14 21:22:01 +0000
commit87a484c818de50b2c9ba9fd01f4a8f9198a6c393 (patch)
treec25e09813dbdc3d114ae91d9bc741333d8d1a543
parent4fa8626d14b0454090411117cf9fcba42acca7de (diff)
Added asus_laptop, b.fd.o#11936
-rw-r--r--ChangeLog5
-rw-r--r--rules/base.lists.part4
-rw-r--r--rules/base.xml.in7
-rw-r--r--symbols/inet40
4 files changed, 38 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f4fd06..f9b3ecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-14 Sergey Udaltsov
+
+ * symbols/inet, rules/base.xml.in: added asus_laptop,
+ https://bugs.freedesktop.org/show_bug.cgi?id=11936
+
2007-08-12 Sergey Udaltsov
* symbols/ru: fixed ebreve in ru(ch),
diff --git a/rules/base.lists.part b/rules/base.lists.part
index 078c531..a6b1b28 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -25,8 +25,8 @@
! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
acer_c300 acer_ferrari4k acer_laptop \
- acpi airkey armada azonaRF2300 \
- apple \
+ acpi airkey \
+ apple armada asus_laptop azonaRF2300 \
benqx brother \
btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \
cherryblue cherrybluea cherryblueb cherrycyboard \
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6899909..10e046b 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -854,6 +854,13 @@
</model>
<model>
<configItem>
+ <name>asus_laptop</name>
+ <_description>Asus Laptop</_description>
+ <vendor>Asus</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>apple</name>
<_description>Apple</_description>
<vendor>Apple</vendor>
diff --git a/symbols/inet b/symbols/inet
index b48ca38..584f52c 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -209,6 +209,22 @@ xkb_symbols "airkey" {
key <I63> { [ XF86Standby ] };
};
+// Acer C300 Laptop
+partial alphanumeric_keys
+xkb_symbols "acer_c300" {
+
+ key <I17> { [ F14 ] };
+ key <I1F> { [ F13 ] };
+ key <I20> { [ XF86AudioMute ] };
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I32> { [ XF86Mail ] };
+ key <I5E> { [ XF86Launch2 ] };
+ key <I6C> { [ XF86WWW ] };
+ key <I75> { [ Help ] };
+ key <XFER> { [ XF86Launch1 ] };
+};
+
// Acer Ferrari 4000 Keyboard
// From Alex Dubov <oakad@yahoo.com>
partial alphanumeric_keys
@@ -262,6 +278,14 @@ xkb_symbols "acer_laptop" {
// key <K5E> { [ dollar ] }; // Dollar (HAL)
};
+// Asus
+partial alphanumeric_keys
+xkb_symbols "asus_laptop" {
+ include "inet(media_common)"
+ key <I32> { [ XF86WWW ] };
+ key <I6C> { [ XF86Mail ] };
+};
+
// Azona
// Azona RF2300 wireless Internet Keyboard
@@ -1976,22 +2000,6 @@ xkb_symbols "sp_inet" {
key <I6C> { [ XF86Mail ] };
};
-// Acer C300 Laptop
-partial alphanumeric_keys
-xkb_symbols "acer_c300" {
-
- key <I17> { [ F14 ] };
- key <I1F> { [ F13 ] };
- key <I30> { [ XF86AudioRaiseVolume ] };
- key <I2E> { [ XF86AudioLowerVolume ] };
- key <I20> { [ XF86AudioMute ] };
- key <I6C> { [ XF86WWW ] };
- key <I32> { [ XF86Mail ] };
- key <I75> { [ Help ] };
- key <XFER> { [ XF86Launch1 ] };
- key <I5E> { [ XF86Launch2 ] };
-};
-
// Apple keyboards (macbooks, powerbooks, powermac G5, etc)
partial xkb_symbols "apple" {
// Really brightness up/down