1*4882a593SmuzhiyunFrom cba3de4125c7e91d8e9171199aa79da1a1dbd41a Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Jeffy Chen <jeffy.chen@rock-chips.com>
3*4882a593SmuzhiyunDate: Tue, 21 Apr 2020 17:53:45 +0800
4*4882a593SmuzhiyunSubject: [PATCH] Support key press and release events
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunFor example:
7*4882a593Smuzhiyun[Keys]
8*4882a593SmuzhiyunPOWER:1        = /usr/bin/power-key.sh press
9*4882a593SmuzhiyunPOWER:0        = /usr/bin/power-key.sh release
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunNOTE: Modifier events are only triggerred on release.
12*4882a593Smuzhiyun
13*4882a593SmuzhiyunSigned-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
14*4882a593Smuzhiyun---
15*4882a593Smuzhiyun input-event-daemon.c | 30 +++++++++++++++++++++---------
16*4882a593Smuzhiyun input-event-daemon.h |  1 +
17*4882a593Smuzhiyun 2 files changed, 22 insertions(+), 9 deletions(-)
18*4882a593Smuzhiyun
19*4882a593Smuzhiyundiff --git a/input-event-daemon.c b/input-event-daemon.c
20*4882a593Smuzhiyunindex b5651a6..4bf2a33 100644
21*4882a593Smuzhiyun--- a/input-event-daemon.c
22*4882a593Smuzhiyun+++ b/input-event-daemon.c
23*4882a593Smuzhiyun@@ -36,7 +36,7 @@ static int key_event_compare(const key_event_t *a, const key_event_t *b) {
24*4882a593Smuzhiyun             }
25*4882a593Smuzhiyun         }
26*4882a593Smuzhiyun     }
27*4882a593Smuzhiyun-    return 0;
28*4882a593Smuzhiyun+    return a->value - b->value;
29*4882a593Smuzhiyun }
30*4882a593Smuzhiyun
31*4882a593Smuzhiyun static const char *key_event_name(unsigned int code) {
32*4882a593Smuzhiyun@@ -77,6 +77,8 @@ static key_event_t
33*4882a593Smuzhiyun         .modifier_n = 0
34*4882a593Smuzhiyun     };
35*4882a593Smuzhiyun
36*4882a593Smuzhiyun+    current_key_event.value = pressed;
37*4882a593Smuzhiyun+
38*4882a593Smuzhiyun     if(pressed) {
39*4882a593Smuzhiyun
40*4882a593Smuzhiyun         /* ignore if repeated */
41*4882a593Smuzhiyun@@ -148,7 +150,9 @@ static key_event_t
42*4882a593Smuzhiyun                 sizeof(const char*),
43*4882a593Smuzhiyun                 (int (*)(const void *, const void *)) strcmp
44*4882a593Smuzhiyun             );
45*4882a593Smuzhiyun+        }
46*4882a593Smuzhiyun
47*4882a593Smuzhiyun+        if (current_key_event.code != NULL) {
48*4882a593Smuzhiyun             fired_key_event = bsearch(
49*4882a593Smuzhiyun                 &current_key_event,
50*4882a593Smuzhiyun                 key_events,
51*4882a593Smuzhiyun@@ -156,15 +160,9 @@ static key_event_t
52*4882a593Smuzhiyun                 sizeof(key_event_t),
53*4882a593Smuzhiyun                 (int (*)(const void *, const void *)) key_event_compare
54*4882a593Smuzhiyun             );
55*4882a593Smuzhiyun-
56*4882a593Smuzhiyun         }
57*4882a593Smuzhiyun
58*4882a593Smuzhiyun-        if(
59*4882a593Smuzhiyun-            current_key_event.code != NULL &&
60*4882a593Smuzhiyun-            strcmp(current_key_event.code, key_event_name(code)) == 0
61*4882a593Smuzhiyun-        ) {
62*4882a593Smuzhiyun-            current_key_event.code = NULL;
63*4882a593Smuzhiyun-        }
64*4882a593Smuzhiyun+        current_key_event.code = NULL;
65*4882a593Smuzhiyun
66*4882a593Smuzhiyun         /* remove released key from modifiers */
67*4882a593Smuzhiyun         modifier_code = key_event_modifier_name(key_event_name(code));
68*4882a593Smuzhiyun@@ -533,7 +531,7 @@ void config_parse_dir(const char *path) {
69*4882a593Smuzhiyun
70*4882a593Smuzhiyun static const char *config_key_event(char *shortcut, char *exec) {
71*4882a593Smuzhiyun     int i;
72*4882a593Smuzhiyun-    char *code, *modifier;
73*4882a593Smuzhiyun+    char *code, *value, *modifier;
74*4882a593Smuzhiyun     key_event_t *new_key_event;
75*4882a593Smuzhiyun
76*4882a593Smuzhiyun     if(key_event_n >= MAX_EVENTS) {
77*4882a593Smuzhiyun@@ -547,6 +545,10 @@ static const char *config_key_event(char *shortcut, char *exec) {
78*4882a593Smuzhiyun         new_key_event->modifiers[i] = NULL;
79*4882a593Smuzhiyun     }
80*4882a593Smuzhiyun
81*4882a593Smuzhiyun+    value = shortcut;
82*4882a593Smuzhiyun+    strsep(&value, ":");
83*4882a593Smuzhiyun+    shortcut = config_trim_string(shortcut);
84*4882a593Smuzhiyun+
85*4882a593Smuzhiyun     if((code = strrchr(shortcut, '+')) != NULL) {
86*4882a593Smuzhiyun         *code = '\0';
87*4882a593Smuzhiyun         code = config_trim_string(code+1);
88*4882a593Smuzhiyun@@ -570,6 +572,16 @@ static const char *config_key_event(char *shortcut, char *exec) {
89*4882a593Smuzhiyun     qsort(new_key_event->modifiers, new_key_event->modifier_n,
90*4882a593Smuzhiyun         sizeof(const char*), (int (*)(const void *, const void *)) strcmp);
91*4882a593Smuzhiyun
92*4882a593Smuzhiyun+    new_key_event->value = 1;
93*4882a593Smuzhiyun+    if(value != NULL) {
94*4882a593Smuzhiyun+        value = config_trim_string(value);
95*4882a593Smuzhiyun+        new_key_event->value = atoi(value);
96*4882a593Smuzhiyun+    }
97*4882a593Smuzhiyun+
98*4882a593Smuzhiyun+    /* only trigger modifiers on release */
99*4882a593Smuzhiyun+    if (new_key_event->modifier_n)
100*4882a593Smuzhiyun+        new_key_event->value = 0;
101*4882a593Smuzhiyun+
102*4882a593Smuzhiyun     return NULL;
103*4882a593Smuzhiyun }
104*4882a593Smuzhiyun
105*4882a593Smuzhiyundiff --git a/input-event-daemon.h b/input-event-daemon.h
106*4882a593Smuzhiyunindex 17ac906..7cab13d 100644
107*4882a593Smuzhiyun--- a/input-event-daemon.h
108*4882a593Smuzhiyun+++ b/input-event-daemon.h
109*4882a593Smuzhiyun@@ -37,6 +37,7 @@ struct {
110*4882a593Smuzhiyun
111*4882a593Smuzhiyun typedef struct key_event {
112*4882a593Smuzhiyun     const char *code;
113*4882a593Smuzhiyun+    int value;
114*4882a593Smuzhiyun     const char *modifiers[MAX_MODIFIERS];
115*4882a593Smuzhiyun     size_t     modifier_n;
116*4882a593Smuzhiyun     const char *exec;
117*4882a593Smuzhiyun--
118*4882a593Smuzhiyun2.20.1
119*4882a593Smuzhiyun
120