ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/keyboard.C
(Generate patch)

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.40 by root, Thu Mar 24 17:34:28 2011 UTC vs.
Revision 1.71 by sf-exg, Thu Jan 15 14:30:04 2015 UTC

… …
6 * Copyright (c) 2005 WU Fengguang 6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de> 7 * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
24#include "../config.h" 24#include "../config.h"
25#include "rxvt.h" 25#include "rxvt.h"
26 26
27#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
28 28
29#include <cstring> 29#include <string.h>
30 30
31#include "rxvtperl.h" 31#include "rxvtperl.h"
32#include "keyboard.h" 32#include "keyboard.h"
33#include "command.h"
34 33
35/* an intro to the data structure: 34/* an intro to the data structure:
36 * 35 *
37 * vector keymap[] is grouped. 36 * vector keymap[] is grouped.
38 * 37 *
… …
62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK 61 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[]; 62 * 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]. 63 * Ni(the size of group i) = hash_bucket_size[Ii].
65 */ 64 */
66 65
67static void
68output_string (rxvt_term *rt, const char *str)
69{
70 if (strncmp (str, "command:", 8) == 0)
71 rt->cmdbuf_append (str + 8, strlen (str) - 8);
72 else if (strncmp (str, "perl:", 5) == 0)
73 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else
75 rt->tt_write (str, strlen (str));
76}
77
78// return: priority_of_a - priority_of_b 66// return: priority_of_a - priority_of_b
79static int 67static int
80compare_priority (keysym_t *a, keysym_t *b) 68compare_priority (keysym_t *a, keysym_t *b)
81{ 69{
82 // (the more '1's in state; the less range): the greater priority 70 // (the more '1's in state; the less range): the greater priority
83 int ca = rxvt_popcount (a->state /* & OtherModMask */); 71 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = rxvt_popcount (b->state /* & OtherModMask */); 72 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
85 73
86 if (ca != cb)
87 return ca - cb; 74 return ca - cb;
88//else if (a->state != b->state) // this behavior is to be discussed
89// return b->state - a->state;
90 else
91 return b->range - a->range;
92} 75}
93 76
94//////////////////////////////////////////////////////////////////////////////// 77////////////////////////////////////////////////////////////////////////////////
95keyboard_manager::keyboard_manager () 78keyboard_manager::keyboard_manager ()
96{ 79{
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 81 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 82}
100 83
101keyboard_manager::~keyboard_manager () 84keyboard_manager::~keyboard_manager ()
102{ 85{
103 clear (); 86 for (unsigned int i = 0; i < keymap.size (); ++i)
87 {
88 free (keymap [i]->str);
89 delete keymap [i];
90 }
104} 91}
105 92
106void 93void
107keyboard_manager::clear () 94keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
108{ 95{
109 hash [0] = 2;
110
111 for (unsigned int i = 0; i < keymap.size (); ++i) 96 for (unsigned int i = 0; i < keymap.size (); ++i)
97 if (keymap [i]->keysym == keysym
98 && keymap [i]->state == state)
112 { 99 {
113 free ((void *)keymap [i]->str); 100 free (keymap [i]->str);
114 delete keymap [i]; 101 delete keymap [i];
115 keymap [i] = 0; 102
103 if (i < keymap.size () - 1)
104 keymap [i] = keymap [keymap.size () - 1];
105 keymap.pop_back ();
106
107 break;
116 } 108 }
117
118 keymap.clear ();
119} 109}
120 110
121// a wrapper for register_keymap,
122// so that outside codes don't have to know so much details.
123//
124// the string 'trans' is copied to an internal managed buffer,
125// so the caller can free memory of 'trans' at any time.
126void 111void
127keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 112keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
128{ 113{
114 char *action = rxvt_wcstoutf8 (ws);
115
129 keysym_t *key = new keysym_t; 116 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc);
133 117
134 if (key && translation)
135 {
136 key->keysym = keysym; 118 key->keysym = keysym;
137 key->state = state; 119 key->state = state;
138 key->range = 1;
139 key->str = translation; 120 key->str = action;
140 key->type = keysym_t::STRING; 121 key->type = keysym_t::STRING;
141 122
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) 123 if (strncmp (action, "builtin:", 8) == 0)
158 key->type = keysym_t::BUILTIN; 124 key->type = keysym_t::BUILTIN;
125 else if (strncmp (action, "builtin-string:", 15) == 0)
126 key->type = keysym_t::BUILTIN_STRING;
159 127
160 register_keymap (key); 128 unregister_action (keysym, state);
161 }
162 else
163 {
164 delete key;
165 free ((void *)translation);
166 rxvt_fatal ("out of memory, aborting.\n");
167 }
168}
169 129
170void
171keyboard_manager::register_keymap (keysym_t *key)
172{
173 if (keymap.size () == keymap.capacity ()) 130 if (keymap.size () == keymap.capacity ())
174 keymap.reserve (keymap.size () * 2); 131 keymap.reserve (keymap.size () * 2);
175 132
176 keymap.push_back (key); 133 keymap.push_back (key);
177 hash[0] = 3; 134 hash[0] = 3;
178} 135}
179 136
180void
181keyboard_manager::register_done ()
182{
183 setup_hash ();
184}
185
186bool 137bool
187keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 138keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
188{ 139{
189 assert (hash[0] == 0 && "register_done() need to be called"); 140 assert (("register_done() need to be called", hash[0] == 0));
190 141
191 state &= OtherModMask; // mask out uninteresting modifiers 142 state &= OtherModMask; // mask out uninteresting modifiers
192 143
193 if (state & term->ModMetaMask) state |= MetaMask; 144 if (state & term->ModMetaMask) state |= MetaMask;
194 if (state & term->ModNumLockMask) state |= NumLockMask; 145 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
199 150
200 int index = find_keysym (keysym, state); 151 int index = find_keysym (keysym, state);
201 152
202 if (index >= 0) 153 if (index >= 0)
203 { 154 {
204 const keysym_t &key = *keymap [index]; 155 keysym_t *key = keymap [index];
205 156
157 if (key->type == keysym_t::BUILTIN_STRING)
158 {
159 term->tt_write_user_input (kbuf, len);
160 return true;
161 }
206 if (key.type != keysym_t::BUILTIN) 162 else if (key->type != keysym_t::BUILTIN)
207 { 163 {
208 int keysym_offset = keysym - key.keysym;
209
210 wchar_t *wc = rxvt_utf8towcs (key.str); 164 wchar_t *ws = rxvt_utf8towcs (key->str);
211 char *str = rxvt_wcstombs (wc); 165 char *str = rxvt_wcstombs (ws);
212 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 166 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
213 free (wc); 167 free (ws);
214 168
215 switch (key.type) 169 if (char *colon = strchr (str, ':'))
216 { 170 {
217 case keysym_t::STRING: 171 if (strncmp (str, "command:", 8) == 0)
218 output_string (term, str); 172 term->cmdbuf_append (str + 8, strlen (str) - 8);
219 break; 173 else if (strncmp (str, "string:", 7) == 0)
220 174 term->tt_write_user_input (colon + 1, strlen (colon + 1));
221 case keysym_t::LIST: 175 else if (strncmp (str, "perl:", 5) == 0)
176 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
222 { 177 else
223 char buf[STRING_MAX]; 178 HOOK_INVOKE ((term, HOOK_ACTION, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_INT, 0, DT_STR_LEN, kbuf, len, DT_END));
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 } 179 }
180 else
181 term->tt_write_user_input (str, strlen (str));
239 182
240 free (str); 183 free (str);
241 184
242 return true; 185 return true;
243 } 186 }
… …
245 188
246 return false; 189 return false;
247} 190}
248 191
249void 192void
250keyboard_manager::setup_hash () 193keyboard_manager::register_done ()
251{ 194{
252 unsigned int i, index, hashkey; 195 unsigned int i, index, hashkey;
253 vector <keysym_t *> sorted_keymap;
254 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 196 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
255 197
256 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 198 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
257 199
258 // determine hash bucket size 200 // determine hash bucket size
259 for (i = 0; i < keymap.size (); ++i) 201 for (i = 0; i < keymap.size (); ++i)
260 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
261 { 202 {
262 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 203 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
263 ++hash_bucket_size [hashkey]; 204 ++hash_bucket_size [hashkey];
264 } 205 }
265 206
266 // now we know the size of each bucket 207 // now we know the size of each bucket
267 // compute the index of each bucket 208 // compute the index of each bucket
268 hash [0] = 0;
269 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 209 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
270 { 210 {
271 index += hash_bucket_size [i - 1];
272 hash [i] = index; 211 hash [i] = index;
212 index += hash_bucket_size [i];
273 } 213 }
274 214
275 // and allocate just enough space 215 // and allocate just enough space
276 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 216 simplevec <keysym_t *> sorted_keymap (index, 0);
277 217
278 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 218 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
279 219
280 // fill in sorted_keymap 220 // fill in sorted_keymap
281 // it is sorted in each bucket 221 // it is sorted in each bucket
282 for (i = 0; i < keymap.size (); ++i) 222 for (i = 0; i < keymap.size (); ++i)
283 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
284 { 223 {
285 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 224 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
286 225
287 index = hash [hashkey] + hash_bucket_size [hashkey]; 226 index = hash [hashkey] + hash_bucket_size [hashkey];
288 227
289 while (index > hash [hashkey] 228 while (index > hash [hashkey]
290 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 229 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
291 { 230 {
292 sorted_keymap [index] = sorted_keymap [index - 1]; 231 sorted_keymap [index] = sorted_keymap [index - 1];
293 --index; 232 --index;
294 } 233 }
295 234
296 sorted_keymap [index] = keymap [i]; 235 sorted_keymap [index] = keymap [i];
297 ++hash_bucket_size [hashkey]; 236 ++hash_bucket_size [hashkey];
298 } 237 }
299 238
300 keymap.swap (sorted_keymap); 239 keymap.swap (sorted_keymap);
301 240
302#ifndef NDEBUG 241#ifndef NDEBUG
303 // check for invariants 242 // check for invariants
304 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) 243 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
305 { 244 {
306 index = hash[i]; 245 index = hash[i];
307 for (int j = 0; j < hash_bucket_size [i]; ++j) 246 for (int j = 0; j < hash_bucket_size [i]; ++j)
308 { 247 {
309 if (keymap [index + j]->range == 1)
310 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 248 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
311 249
312 if (j) 250 if (j)
313 assert (compare_priority (keymap [index + j - 1], 251 assert (compare_priority (keymap [index + j - 1],
314 keymap [index + j]) >= 0); 252 keymap [index + j]) >= 0);
315 } 253 }
… …
317 255
318 // this should be able to detect most possible bugs 256 // this should be able to detect most possible bugs
319 for (i = 0; i < sorted_keymap.size (); ++i) 257 for (i = 0; i < sorted_keymap.size (); ++i)
320 { 258 {
321 keysym_t *a = sorted_keymap[i]; 259 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); 260 int index = find_keysym (a->keysym, a->state);
325 261
326 assert (index >= 0); 262 assert (index >= 0);
327 keysym_t *b = keymap [index]; 263 keysym_t *b = keymap [index];
328 assert (i == index // the normally expected result 264 assert (i == index // the normally expected result
329 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) 265 || a->keysym == b->keysym
330 && compare_priority (a, b) <= 0); // is effectively the same or a closer match 266 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
331 }
332 } 267 }
333#endif 268#endif
334} 269}
335 270
336int 271int
… …
344 279
345 for (; index < end; ++index) 280 for (; index < end; ++index)
346 { 281 {
347 keysym_t *key = keymap [index]; 282 keysym_t *key = keymap [index];
348 283
349 if (key->keysym <= keysym && keysym < key->keysym + key->range 284 if (key->keysym == keysym
350 // match only the specified bits in state and ignore others 285 // match only the specified bits in state and ignore others
351 && (key->state & state) == key->state) 286 && (key->state & state) == key->state)
352 return index; 287 return index;
353 } 288 }
354 289

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines