|
|
1
|
+From e92efc63acd7b377faa9e534f4bf52aaa86be2a9 Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
3
|
+Date: Tue, 27 Jul 2021 11:46:19 +1000
|
|
|
4
|
+Subject: [PATCH] makekeys: handle the new _EVDEVK xorgproto symbols
|
|
|
5
|
+
|
|
|
6
|
+These keys are all defined through a macro in the form:
|
|
|
7
|
+ #define XF86XK_BrightnessAuto _EVDEVK(0x0F4)
|
|
|
8
|
+
|
|
|
9
|
+The _EVDEVK macro is simply an offset of 0x10081000.
|
|
|
10
|
+Let's parse these lines correctly so those keysyms end up in our
|
|
|
11
|
+hashtables.
|
|
|
12
|
+
|
|
|
13
|
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
14
|
+---
|
|
|
15
|
+ src/util/makekeys.c | 12 ++++++++++++
|
|
|
16
|
+ 1 file changed, 12 insertions(+)
|
|
|
17
|
+
|
|
|
18
|
+diff --git a/src/util/makekeys.c b/src/util/makekeys.c
|
|
|
19
|
+index e847ef4c..4896cc53 100644
|
|
|
20
|
+--- a/src/util/makekeys.c
|
|
|
21
|
++++ b/src/util/makekeys.c
|
|
|
22
|
+@@ -78,6 +78,18 @@ parse_line(const char *buf, char *key, KeySym *val, char *prefix)
|
|
|
23
|
+ return 1;
|
|
|
24
|
+ }
|
|
|
25
|
+
|
|
|
26
|
++ /* See if we can parse one of the _EVDEVK symbols */
|
|
|
27
|
++ i = sscanf(buf, "#define %127s _EVDEVK(0x%lx)", key, val);
|
|
|
28
|
++ if (i == 2 && (tmp = strstr(key, "XK_"))) {
|
|
|
29
|
++ memcpy(prefix, key, (size_t)(tmp - key));
|
|
|
30
|
++ prefix[tmp - key] = '\0';
|
|
|
31
|
++ tmp += 3;
|
|
|
32
|
++ memmove(key, tmp, strlen(tmp) + 1);
|
|
|
33
|
++
|
|
|
34
|
++ *val += 0x10081000;
|
|
|
35
|
++ return 1;
|
|
|
36
|
++ }
|
|
|
37
|
++
|
|
|
38
|
+ /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
|
|
|
39
|
+ * immediately: if the target is in the form XF86XK_foo, we need to
|
|
|
40
|
+ * canonicalise this to XF86foo before we do the lookup. */
|
|
|
41
|
+--
|
|
|
42
|
+2.32.0
|
|
|
43
|
+
|