1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
diff --git a/in_sdl.c b/in_sdl.c
index a84c781..bab649a 100644
--- a/in_sdl.c
+++ b/in_sdl.c
@@ -19,11 +19,18 @@
typedef unsigned long keybits_t;
#define KEYBITS_WORD_BITS (sizeof(keybits_t) * 8)
+enum mod_state {
+ MOD_NO,
+ MOD_MAYBE,
+ MOD_YES
+};
+
struct in_sdl_state {
const in_drv_t *drv;
SDL_Joystick *joy;
int joy_id;
int axis_keydown[2];
+ enum mod_state mod_state;
keybits_t keystate[SDLK_LAST / KEYBITS_WORD_BITS + 1];
// emulator keys should always be processed immediately lest one is lost
keybits_t emu_keys[SDLK_LAST / KEYBITS_WORD_BITS + 1];
@@ -259,6 +266,139 @@ static int get_keystate(keybits_t *keystate, int sym)
return !!(*ks_word & mask);
}
+static inline void switch_key(SDL_Event *event, keybits_t *keystate, short upkey, short downkey)
+{
+ event->type = SDL_KEYUP;
+ event->key.state = SDL_RELEASED;
+ event->key.keysym.sym = upkey;
+
+ update_keystate(keystate, upkey, 0);
+ SDL_PushEvent(event);
+
+ event->type = SDL_KEYDOWN;
+ event->key.state = SDL_PRESSED;
+ event->key.keysym.sym = downkey;
+
+ update_keystate(keystate, downkey, 1);
+ SDL_PushEvent(event);
+}
+
+static void translate_combo_event(struct in_sdl_state *state, SDL_Event *event, keybits_t *keystate)
+{
+ const struct in_pdata *pdata = state->drv->pdata;
+ const struct mod_keymap *map;
+ short key = (short)event->key.keysym.sym;
+ uint8_t type = event->type;
+ short mod_key = pdata->mod_key;
+ int i;
+
+ if (event->type != SDL_KEYDOWN && event->type != SDL_KEYUP) {
+ SDL_PushEvent(event);
+ return;
+ }
+
+ if (state->mod_state == MOD_NO && key != mod_key) {
+ update_keystate(keystate, event->key.keysym.sym, event->type == SDL_KEYDOWN);
+ SDL_PushEvent(event);
+ return;
+ }
+
+ if (key == mod_key) {
+ switch (state->mod_state) {
+ case MOD_NO:
+ if (type == SDL_KEYDOWN) {
+ /* Pressed mod, maybe a combo? Ignore the keypress
+ * until it's determined */
+ state->mod_state = MOD_MAYBE;
+
+ for (i = 0; i < pdata->modmap_size; i++) {
+ map = &pdata->mod_keymap[i];
+
+ if (get_keystate(keystate, map->inkey)) {
+ state->mod_state = MOD_YES;
+ switch_key(event, keystate, map->inkey, map->outkey);
+ }
+ }
+ } else {
+ SDL_PushEvent(event);
+ }
+ break;
+ case MOD_MAYBE:
+ if (type == SDL_KEYDOWN) {
+ SDL_PushEvent(event);
+ } else {
+ /* Released mod without combo, simulate down and up */
+ state->mod_state = MOD_NO;
+
+ event->type = SDL_KEYDOWN;
+ event->key.state = SDL_PRESSED;
+ SDL_PushEvent(event);
+
+ event->type = SDL_KEYUP;
+ event->key.state = SDL_RELEASED;
+ SDL_PushEvent(event);
+ }
+ break;
+ case MOD_YES:
+ if (type == SDL_KEYDOWN) {
+ SDL_PushEvent(event);
+ } else {
+ /* Released mod, switch all mod keys to unmod and ignore mod press */
+ state->mod_state = MOD_NO;
+
+ for (i = 0; i < pdata->modmap_size; i++) {
+ map = &pdata->mod_keymap[i];
+
+ if (get_keystate(keystate, map->outkey)) {
+ switch_key(event, keystate, map->outkey, map->inkey);
+ }
+ }
+ }
+ break;
+ default:
+ SDL_PushEvent(event);
+ break;
+ }
+ } else {
+ for (i = 0; i < pdata->modmap_size; i++) {
+ map = &pdata->mod_keymap[i];
+
+ if (map->inkey == key) {
+ state->mod_state = MOD_YES;
+
+ event->key.keysym.sym = map->outkey;
+ update_keystate(keystate, map->outkey, event->type == SDL_KEYDOWN);
+ SDL_PushEvent(event);
+ }
+ }
+ }
+}
+
+static void translate_combo_events(struct in_sdl_state *state, Uint32 mask)
+{
+ const struct in_pdata *pdata = state->drv->pdata;
+ SDL_Event events[10]; /* Must be bigger than events size in collect_events */
+ keybits_t keystate[SDLK_LAST / KEYBITS_WORD_BITS + 1];
+ int count;
+ int has_events;
+ int i;
+
+ if (!pdata->mod_key)
+ return;
+
+ has_events = SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, mask);
+
+ if (!has_events)
+ return;
+
+ memcpy(keystate, state->keystate, sizeof(keystate));
+
+ count = SDL_PeepEvents(events, (sizeof(events) / sizeof(events[0])), SDL_GETEVENT, mask);
+ for (i = 0; i < count; i++) {
+ translate_combo_event(state, &events[i], keystate);
+ }
+}
+
static int handle_event(struct in_sdl_state *state, SDL_Event *event,
int *kc_out, int *down_out, int *emu_out)
{
@@ -363,6 +503,9 @@ static int collect_events(struct in_sdl_state *state, int *one_kc, int *one_down
SDL_PumpEvents();
+ if (!state->joy)
+ translate_combo_events(state, mask);
+
num_events = SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, mask);
for (num_peeped_events = 0; num_peeped_events < num_events; num_peeped_events += count) {
diff --git a/input.h b/input.h
index 360b65b..895ad61 100644
--- a/input.h
+++ b/input.h
@@ -110,6 +110,11 @@ struct menu_keymap {
short pbtn;
};
+struct mod_keymap {
+ short inkey;
+ short outkey;
+};
+
struct in_pdata {
const struct in_default_bind *defbinds;
const struct menu_keymap *key_map;
@@ -117,6 +122,9 @@ struct in_pdata {
const struct menu_keymap *joy_map;
size_t jmap_size;
const char * const *key_names;
+ short mod_key;
+ const struct mod_keymap *mod_keymap;
+ size_t modmap_size;
};
/* to be called by drivers */
|
