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.59 by root, Fri May 18 00:10:47 2012 UTC

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

Diff Legend

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