summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSigrid Solveig Haflínudóttir <sigrid@ftrv.se>2022-10-06 19:45:25 +0000
committerSigrid Solveig Haflínudóttir <sigrid@ftrv.se>2022-10-06 19:45:25 +0000
commitb38a3d2a0d0f2022bab40eec4975179daa0ceee1 (patch)
treef9035da23a78ee6bea241206621b95834192c196
parent6960465997ff708b06410d0a93b629ec75e476c9 (diff)
nusb/kb, aux/kbdfs: add brightness down/up media keys
-rw-r--r--sys/include/keyboard.h14
-rw-r--r--sys/lib/kbmap/us4
-rw-r--r--sys/src/cmd/aux/kbdfs/kbdfs.c4
-rw-r--r--sys/src/cmd/nusb/kb/kb.c4
4 files changed, 14 insertions, 12 deletions
diff --git a/sys/include/keyboard.h b/sys/include/keyboard.h
index 126fb3c33..d95374797 100644
--- a/sys/include/keyboard.h
+++ b/sys/include/keyboard.h
@@ -45,12 +45,14 @@ enum {
Kscrollonedown= KF|0x21,
/* multimedia keys - no refunds */
- Ksbwd= KF|0x22,
- Ksfwd= KF|0x23,
- Kpause= KF|0x24,
- Kvoldn= KF|0x25,
- Kvolup= KF|0x26,
- Kmute= KF|0x27,
+ Ksbwd= KF|0x22, /* skip backwards */
+ Ksfwd= KF|0x23, /* skip forward */
+ Kpause= KF|0x24, /* play/pause */
+ Kvoldn= KF|0x25, /* volume decrement */
+ Kvolup= KF|0x26, /* volume increment */
+ Kmute= KF|0x27, /* (un)mute */
+ Kbrtdn= KF|0x28, /* brightness decrement */
+ Kbrtup= KF|0x29, /* brightness increment */
Ksoh= 0x01,
Kstx= 0x02,
diff --git a/sys/lib/kbmap/us b/sys/lib/kbmap/us
index 8bde39359..3877e3c7e 100644
--- a/sys/lib/kbmap/us
+++ b/sys/lib/kbmap/us
@@ -271,7 +271,7 @@
2 14 0
2 15 0
2 16 0xf022
-2 17 0
+2 17 0xf028
2 18 0
2 19 0
2 20 0
@@ -280,7 +280,7 @@
2 23 0
2 24 0
2 25 0xf023
-2 26 0
+2 26 0xf029
2 27 0
2 28 ^J
2 29 0xf862
diff --git a/sys/src/cmd/aux/kbdfs/kbdfs.c b/sys/src/cmd/aux/kbdfs/kbdfs.c
index d4900067c..425e768b8 100644
--- a/sys/src/cmd/aux/kbdfs/kbdfs.c
+++ b/sys/src/cmd/aux/kbdfs/kbdfs.c
@@ -171,8 +171,8 @@ Rune kbtabesc1[Nscan] =
{
[0x00] 0, 0, 0, 0, 0, 0, 0, 0,
[0x08] 0, 0, 0, 0, 0, 0, 0, 0,
-[0x10] Ksbwd, 0, 0, 0, 0, 0, 0, 0,
-[0x18] 0, Ksfwd, 0, 0, '\n', Kctl, 0, 0,
+[0x10] Ksbwd, Kbrtdn, 0, 0, 0, 0, 0, 0,
+[0x18] 0, Ksfwd, Kbrtup, 0, '\n', Kctl, 0, 0,
[0x20] Kmute, 0, Kpause, 0, 0, 0, 0, 0,
[0x28] 0, 0, 0, 0, 0, 0, Kvoldn, 0,
[0x30] Kvolup, 0, 0, 0, 0, '/', 0, Kprint,
diff --git a/sys/src/cmd/nusb/kb/kb.c b/sys/src/cmd/nusb/kb/kb.c
index 1e2085ec8..fc316fb12 100644
--- a/sys/src/cmd/nusb/kb/kb.c
+++ b/sys/src/cmd/nusb/kb/kb.c
@@ -152,8 +152,8 @@ static char sctab[2*256] =
[0x150] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
[0x158] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
[0x160] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-[0x168] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-[0x170] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+[0x168] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x9a,
+[0x170] 0x91, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
[0x178] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
[0x180] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
[0x188] 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,