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.38 by sf-exg, Wed Jan 5 17:00:17 2011 UTC vs.
Revision 1.52 by sf-exg, Fri Dec 2 09:02:05 2011 UTC

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

Diff Legend

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