… | |
… | |
63 | * n(the number of groups) = the number of non-zero member of hash_bucket_size[]; |
63 | * n(the number of groups) = the number of non-zero member of hash_bucket_size[]; |
64 | * Ni(the size of group i) = hash_bucket_size[Ii]. |
64 | * Ni(the size of group i) = hash_bucket_size[Ii]. |
65 | */ |
65 | */ |
66 | |
66 | |
67 | static void |
67 | static void |
68 | output_string (rxvt_term *rt, const char *str) |
68 | output_string (rxvt_term *term, const char *str) |
69 | { |
69 | { |
70 | if (strncmp (str, "command:", 8) == 0) |
70 | if (strncmp (str, "command:", 8) == 0) |
71 | rt->cmd_write (str + 8, strlen (str) - 8); |
71 | term->cmdbuf_append (str + 8, strlen (str) - 8); |
72 | else if (strncmp (str, "perl:", 5) == 0) |
72 | else if (strncmp (str, "perl:", 5) == 0) |
73 | HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); |
73 | HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); |
74 | else |
74 | else |
75 | rt->tt_write (str, strlen (str)); |
75 | term->tt_write (str, strlen (str)); |
76 | } |
76 | } |
77 | |
77 | |
78 | // return: priority_of_a - priority_of_b |
78 | // return: priority_of_a - priority_of_b |
79 | static int |
79 | static int |
80 | compare_priority (keysym_t *a, keysym_t *b) |
80 | compare_priority (keysym_t *a, keysym_t *b) |
81 | { |
81 | { |
82 | // (the more '1's in state; the less range): the greater priority |
82 | // (the more '1's in state; the less range): the greater priority |
83 | int ca = rxvt_popcount (a->state /* & OtherModMask */); |
83 | int ca = ecb_popcount32 (a->state /* & OtherModMask */); |
84 | int cb = rxvt_popcount (b->state /* & OtherModMask */); |
84 | int cb = ecb_popcount32 (b->state /* & OtherModMask */); |
85 | |
85 | |
86 | if (ca != cb) |
86 | if (ca != cb) |
87 | return ca - cb; |
87 | return ca - cb; |
88 | //else if (a->state != b->state) // this behavior is to be discussed |
88 | //else if (a->state != b->state) // this behavior is to be discussed |
89 | // return b->state - a->state; |
89 | // return b->state - a->state; |
90 | else |
90 | else |
91 | return b->range - a->range; |
91 | return 0; |
92 | } |
92 | } |
93 | |
93 | |
94 | //////////////////////////////////////////////////////////////////////////////// |
94 | //////////////////////////////////////////////////////////////////////////////// |
95 | keyboard_manager::keyboard_manager () |
95 | keyboard_manager::keyboard_manager () |
96 | { |
96 | { |
… | |
… | |
98 | hash [0] = 1; // hash[0] != 0 indicates uninitialized data |
98 | hash [0] = 1; // hash[0] != 0 indicates uninitialized data |
99 | } |
99 | } |
100 | |
100 | |
101 | keyboard_manager::~keyboard_manager () |
101 | keyboard_manager::~keyboard_manager () |
102 | { |
102 | { |
103 | clear (); |
|
|
104 | } |
|
|
105 | |
|
|
106 | void |
|
|
107 | keyboard_manager::clear () |
|
|
108 | { |
|
|
109 | hash [0] = 2; |
|
|
110 | |
|
|
111 | for (unsigned int i = 0; i < keymap.size (); ++i) |
103 | for (unsigned int i = 0; i < keymap.size (); ++i) |
112 | { |
104 | { |
113 | free ((void *)keymap [i]->str); |
105 | free (keymap [i]->str); |
114 | delete keymap [i]; |
106 | delete keymap [i]; |
115 | keymap [i] = 0; |
|
|
116 | } |
107 | } |
117 | |
|
|
118 | keymap.clear (); |
|
|
119 | } |
108 | } |
120 | |
109 | |
121 | // a wrapper for register_keymap, |
110 | // a wrapper for register_translation that converts the input string |
122 | // so that outside codes don't have to know so much details. |
111 | // to utf-8 and expands 'list' syntax. |
123 | // |
|
|
124 | // the string 'trans' is copied to an internal managed buffer, |
|
|
125 | // so the caller can free memory of 'trans' at any time. |
|
|
126 | void |
112 | void |
127 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
113 | keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) |
128 | { |
114 | { |
129 | keysym_t *key = new keysym_t; |
|
|
130 | wchar_t *wc = rxvt_mbstowcs (trans); |
115 | wchar_t *wc = rxvt_mbstowcs (trans); |
131 | char *translation = rxvt_wcstoutf8 (wc); |
116 | char *translation = rxvt_wcstoutf8 (wc); |
132 | free (wc); |
117 | free (wc); |
133 | |
118 | |
|
|
119 | if (strncmp (translation, "list", 4) == 0 && translation [4] |
|
|
120 | && strlen (translation) < STRING_MAX) |
|
|
121 | { |
|
|
122 | char *prefix = translation + 4; |
|
|
123 | char *middle = strchr (prefix + 1, translation [4]); |
|
|
124 | char *suffix = strrchr (prefix + 1, translation [4]); |
|
|
125 | |
|
|
126 | if (suffix && middle && suffix > middle + 1) |
|
|
127 | { |
|
|
128 | int range = suffix - middle - 1; |
|
|
129 | int prefix_len = middle - prefix - 1; |
|
|
130 | char buf[STRING_MAX]; |
|
|
131 | |
|
|
132 | memcpy (buf, prefix + 1, prefix_len); |
|
|
133 | strcpy (buf + prefix_len + 1, suffix + 1); |
|
|
134 | |
|
|
135 | for (int i = 0; i < range; i++) |
|
|
136 | { |
|
|
137 | buf [prefix_len] = middle [i + 1]; |
|
|
138 | register_translation (keysym + i, state, strdup (buf)); |
|
|
139 | } |
|
|
140 | |
|
|
141 | free (translation); |
|
|
142 | return; |
|
|
143 | } |
|
|
144 | else |
|
|
145 | rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation); |
|
|
146 | } |
|
|
147 | |
|
|
148 | register_translation (keysym, state, translation); |
|
|
149 | } |
|
|
150 | |
|
|
151 | void |
|
|
152 | keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) |
|
|
153 | { |
|
|
154 | keysym_t *key = new keysym_t; |
|
|
155 | |
134 | if (key && translation) |
156 | if (key && translation) |
135 | { |
157 | { |
136 | key->keysym = keysym; |
158 | key->keysym = keysym; |
137 | key->state = state; |
159 | key->state = state; |
138 | key->range = 1; |
|
|
139 | key->str = translation; |
160 | key->str = translation; |
140 | key->type = keysym_t::STRING; |
161 | key->type = keysym_t::STRING; |
141 | |
162 | |
142 | if (strncmp (translation, "list", 4) == 0 && translation [4]) |
|
|
143 | { |
|
|
144 | char *middle = strchr (translation + 5, translation [4]); |
|
|
145 | char *suffix = strrchr (translation + 5, translation [4]); |
|
|
146 | |
|
|
147 | if (suffix && middle && suffix > middle + 1) |
|
|
148 | { |
|
|
149 | key->type = keysym_t::LIST; |
|
|
150 | key->range = suffix - middle - 1; |
|
|
151 | |
|
|
152 | memmove (translation, translation + 4, strlen (translation + 4) + 1); |
|
|
153 | } |
|
|
154 | else |
|
|
155 | rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); |
|
|
156 | } |
|
|
157 | else if (strncmp (translation, "builtin:", 8) == 0) |
163 | if (strncmp (translation, "builtin:", 8) == 0) |
158 | key->type = keysym_t::BUILTIN; |
164 | key->type = keysym_t::BUILTIN; |
159 | |
165 | |
160 | register_keymap (key); |
166 | if (keymap.size () == keymap.capacity ()) |
|
|
167 | keymap.reserve (keymap.size () * 2); |
|
|
168 | |
|
|
169 | keymap.push_back (key); |
|
|
170 | hash[0] = 3; |
161 | } |
171 | } |
162 | else |
172 | else |
163 | { |
173 | { |
164 | delete key; |
174 | delete key; |
165 | free ((void *)translation); |
175 | free (translation); |
166 | rxvt_fatal ("out of memory, aborting.\n"); |
176 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
167 | } |
177 | } |
168 | } |
|
|
169 | |
|
|
170 | void |
|
|
171 | keyboard_manager::register_keymap (keysym_t *key) |
|
|
172 | { |
|
|
173 | if (keymap.size () == keymap.capacity ()) |
|
|
174 | keymap.reserve (keymap.size () * 2); |
|
|
175 | |
|
|
176 | keymap.push_back (key); |
|
|
177 | hash[0] = 3; |
|
|
178 | } |
|
|
179 | |
|
|
180 | void |
|
|
181 | keyboard_manager::register_done () |
|
|
182 | { |
|
|
183 | setup_hash (); |
|
|
184 | } |
178 | } |
185 | |
179 | |
186 | bool |
180 | bool |
187 | keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) |
181 | keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) |
188 | { |
182 | { |
189 | assert (hash[0] == 0 && "register_done() need to be called"); |
183 | assert (("register_done() need to be called", hash[0] == 0)); |
190 | |
184 | |
191 | state &= OtherModMask; // mask out uninteresting modifiers |
185 | state &= OtherModMask; // mask out uninteresting modifiers |
192 | |
186 | |
193 | if (state & term->ModMetaMask) state |= MetaMask; |
187 | if (state & term->ModMetaMask) state |= MetaMask; |
194 | if (state & term->ModNumLockMask) state |= NumLockMask; |
188 | if (state & term->ModNumLockMask) state |= NumLockMask; |
… | |
… | |
199 | |
193 | |
200 | int index = find_keysym (keysym, state); |
194 | int index = find_keysym (keysym, state); |
201 | |
195 | |
202 | if (index >= 0) |
196 | if (index >= 0) |
203 | { |
197 | { |
204 | const keysym_t &key = *keymap [index]; |
198 | keysym_t *key = keymap [index]; |
205 | |
199 | |
206 | if (key.type != keysym_t::BUILTIN) |
200 | if (key->type != keysym_t::BUILTIN) |
207 | { |
201 | { |
208 | int keysym_offset = keysym - key.keysym; |
|
|
209 | |
|
|
210 | wchar_t *wc = rxvt_utf8towcs (key.str); |
202 | wchar_t *wc = rxvt_utf8towcs (key->str); |
211 | char *str = rxvt_wcstombs (wc); |
203 | char *str = rxvt_wcstombs (wc); |
212 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
204 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
213 | free (wc); |
205 | free (wc); |
214 | |
206 | |
215 | switch (key.type) |
|
|
216 | { |
|
|
217 | case keysym_t::STRING: |
|
|
218 | output_string (term, str); |
207 | output_string (term, str); |
219 | break; |
|
|
220 | |
|
|
221 | case keysym_t::LIST: |
|
|
222 | { |
|
|
223 | char buf[STRING_MAX]; |
|
|
224 | |
|
|
225 | char *prefix, *middle, *suffix; |
|
|
226 | |
|
|
227 | prefix = str; |
|
|
228 | middle = strchr (prefix + 1, *prefix); |
|
|
229 | suffix = strrchr (middle + 1, *prefix); |
|
|
230 | |
|
|
231 | memcpy (buf, prefix + 1, middle - prefix - 1); |
|
|
232 | buf [middle - prefix - 1] = middle [keysym_offset + 1]; |
|
|
233 | strcpy (buf + (middle - prefix), suffix + 1); |
|
|
234 | |
|
|
235 | output_string (term, buf); |
|
|
236 | } |
|
|
237 | break; |
|
|
238 | } |
|
|
239 | |
208 | |
240 | free (str); |
209 | free (str); |
241 | |
210 | |
242 | return true; |
211 | return true; |
243 | } |
212 | } |
… | |
… | |
245 | |
214 | |
246 | return false; |
215 | return false; |
247 | } |
216 | } |
248 | |
217 | |
249 | void |
218 | void |
250 | keyboard_manager::setup_hash () |
219 | keyboard_manager::register_done () |
251 | { |
220 | { |
252 | unsigned int i, index, hashkey; |
221 | unsigned int i, index, hashkey; |
253 | vector <keysym_t *> sorted_keymap; |
222 | vector <keysym_t *> sorted_keymap; |
254 | uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket |
223 | uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket |
255 | |
224 | |
256 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
225 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
257 | |
226 | |
258 | // determine hash bucket size |
227 | // determine hash bucket size |
259 | for (i = 0; i < keymap.size (); ++i) |
228 | for (i = 0; i < keymap.size (); ++i) |
260 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
|
|
261 | { |
229 | { |
262 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
230 | hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; |
263 | ++hash_bucket_size [hashkey]; |
231 | ++hash_bucket_size [hashkey]; |
264 | } |
232 | } |
265 | |
233 | |
266 | // now we know the size of each bucket |
234 | // now we know the size of each bucket |
267 | // compute the index of each bucket |
235 | // compute the index of each bucket |
268 | hash [0] = 0; |
236 | hash [0] = 0; |
269 | for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) |
237 | for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) |
… | |
… | |
278 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
246 | memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); |
279 | |
247 | |
280 | // fill in sorted_keymap |
248 | // fill in sorted_keymap |
281 | // it is sorted in each bucket |
249 | // it is sorted in each bucket |
282 | for (i = 0; i < keymap.size (); ++i) |
250 | for (i = 0; i < keymap.size (); ++i) |
283 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j) |
|
|
284 | { |
251 | { |
285 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
252 | hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; |
286 | |
253 | |
287 | index = hash [hashkey] + hash_bucket_size [hashkey]; |
254 | index = hash [hashkey] + hash_bucket_size [hashkey]; |
288 | |
255 | |
289 | while (index > hash [hashkey] |
256 | while (index > hash [hashkey] |
290 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
257 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
291 | { |
258 | { |
292 | sorted_keymap [index] = sorted_keymap [index - 1]; |
259 | sorted_keymap [index] = sorted_keymap [index - 1]; |
293 | --index; |
260 | --index; |
294 | } |
261 | } |
295 | |
262 | |
296 | sorted_keymap [index] = keymap [i]; |
263 | sorted_keymap [index] = keymap [i]; |
297 | ++hash_bucket_size [hashkey]; |
264 | ++hash_bucket_size [hashkey]; |
298 | } |
265 | } |
299 | |
266 | |
300 | keymap.swap (sorted_keymap); |
267 | keymap.swap (sorted_keymap); |
301 | |
268 | |
302 | #ifndef NDEBUG |
269 | #ifndef NDEBUG |
303 | // check for invariants |
270 | // check for invariants |
304 | for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) |
271 | for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) |
305 | { |
272 | { |
306 | index = hash[i]; |
273 | index = hash[i]; |
307 | for (int j = 0; j < hash_bucket_size [i]; ++j) |
274 | for (int j = 0; j < hash_bucket_size [i]; ++j) |
308 | { |
275 | { |
309 | if (keymap [index + j]->range == 1) |
|
|
310 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
276 | assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); |
311 | |
277 | |
312 | if (j) |
278 | if (j) |
313 | assert (compare_priority (keymap [index + j - 1], |
279 | assert (compare_priority (keymap [index + j - 1], |
314 | keymap [index + j]) >= 0); |
280 | keymap [index + j]) >= 0); |
315 | } |
281 | } |
… | |
… | |
317 | |
283 | |
318 | // this should be able to detect most possible bugs |
284 | // this should be able to detect most possible bugs |
319 | for (i = 0; i < sorted_keymap.size (); ++i) |
285 | for (i = 0; i < sorted_keymap.size (); ++i) |
320 | { |
286 | { |
321 | keysym_t *a = sorted_keymap[i]; |
287 | keysym_t *a = sorted_keymap[i]; |
322 | for (int j = 0; j < a->range; ++j) |
|
|
323 | { |
|
|
324 | int index = find_keysym (a->keysym + j, a->state); |
288 | int index = find_keysym (a->keysym, a->state); |
325 | |
289 | |
326 | assert (index >= 0); |
290 | assert (index >= 0); |
327 | keysym_t *b = keymap [index]; |
291 | keysym_t *b = keymap [index]; |
328 | assert (i == index // the normally expected result |
292 | assert (i == index // the normally expected result |
329 | || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) |
293 | || a->keysym == b->keysym |
330 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
294 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
331 | } |
|
|
332 | } |
295 | } |
333 | #endif |
296 | #endif |
334 | } |
297 | } |
335 | |
298 | |
336 | int |
299 | int |
… | |
… | |
344 | |
307 | |
345 | for (; index < end; ++index) |
308 | for (; index < end; ++index) |
346 | { |
309 | { |
347 | keysym_t *key = keymap [index]; |
310 | keysym_t *key = keymap [index]; |
348 | |
311 | |
349 | if (key->keysym <= keysym && keysym < key->keysym + key->range |
312 | if (key->keysym == keysym |
350 | // match only the specified bits in state and ignore others |
313 | // match only the specified bits in state and ignore others |
351 | && (key->state & state) == key->state) |
314 | && (key->state & state) == key->state) |
352 | return index; |
315 | return index; |
353 | } |
316 | } |
354 | |
317 | |