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.43 by sf-exg, Mon May 30 18:39:03 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.
… …
66 66
67static void 67static void
68output_string (rxvt_term *rt, const char *str) 68output_string (rxvt_term *rt, 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 rt->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((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else 74 else
75 rt->tt_write (str, strlen (str)); 75 rt->tt_write (str, strlen (str));
76} 76}
… …
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{
… …
116 } 116 }
117 117
118 keymap.clear (); 118 keymap.clear ();
119} 119}
120 120
121// a wrapper for register_keymap, 121// a wrapper for register_translation that converts the input string
122// so that outside codes don't have to know so much details. 122// 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.
126void 123void
127keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 124keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
128{ 125{
129 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans); 126 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc); 127 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc); 128 free (wc);
133 129
130 if (strncmp (translation, "list", 4) == 0 && translation [4]
131 && strlen (translation) < STRING_MAX)
132 {
133 char *prefix = translation + 4;
134 char *middle = strchr (prefix + 1, translation [4]);
135 char *suffix = strrchr (prefix + 1, translation [4]);
136
137 if (suffix && middle && suffix > middle + 1)
138 {
139 int range = suffix - middle - 1;
140 int prefix_len = middle - prefix - 1;
141 char buf[STRING_MAX];
142
143 memcpy (buf, prefix + 1, prefix_len);
144 strcpy (buf + prefix_len + 1, suffix + 1);
145
146 for (int i = 0; i < range; i++)
147 {
148 buf [prefix_len] = middle [i + 1];
149 register_translation (keysym + i, state, strdup (buf));
150 }
151
152 free (translation);
153 return;
154 }
155 else
156 rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation);
157 }
158
159 register_translation (keysym, state, translation);
160}
161
162void
163keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
164{
165 keysym_t *key = new keysym_t;
166
134 if (key && translation) 167 if (key && translation)
135 { 168 {
136 key->keysym = keysym; 169 key->keysym = keysym;
137 key->state = state; 170 key->state = state;
138 key->range = 1;
139 key->str = translation; 171 key->str = translation;
140 key->type = keysym_t::STRING; 172 key->type = keysym_t::STRING;
141 173
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) 174 if (strncmp (translation, "builtin:", 8) == 0)
158 key->type = keysym_t::BUILTIN; 175 key->type = keysym_t::BUILTIN;
159 176
160 register_keymap (key); 177 register_keymap (key);
161 } 178 }
162 else 179 else
… …
203 { 220 {
204 const keysym_t &key = *keymap [index]; 221 const keysym_t &key = *keymap [index];
205 222
206 if (key.type != keysym_t::BUILTIN) 223 if (key.type != keysym_t::BUILTIN)
207 { 224 {
208 int keysym_offset = keysym - key.keysym;
209
210 wchar_t *wc = rxvt_utf8towcs (key.str); 225 wchar_t *wc = rxvt_utf8towcs (key.str);
211 char *str = rxvt_wcstombs (wc); 226 char *str = rxvt_wcstombs (wc);
212 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 227 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
213 free (wc); 228 free (wc);
214 229
215 switch (key.type) 230 switch (key.type)
216 { 231 {
217 case keysym_t::STRING: 232 case keysym_t::STRING:
218 output_string (term, str); 233 output_string (term, str);
219 break; 234 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 } 235 }
239 236
240 free (str); 237 free (str);
241 238
242 return true; 239 return true;
… …
255 252
256 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 253 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
257 254
258 // determine hash bucket size 255 // determine hash bucket size
259 for (i = 0; i < keymap.size (); ++i) 256 for (i = 0; i < keymap.size (); ++i)
260 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
261 { 257 {
262 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 258 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
263 ++hash_bucket_size [hashkey]; 259 ++hash_bucket_size [hashkey];
264 } 260 }
265 261
266 // now we know the size of each bucket 262 // now we know the size of each bucket
267 // compute the index of each bucket 263 // compute the index of each bucket
268 hash [0] = 0; 264 hash [0] = 0;
269 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 265 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
… …
278 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 274 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
279 275
280 // fill in sorted_keymap 276 // fill in sorted_keymap
281 // it is sorted in each bucket 277 // it is sorted in each bucket
282 for (i = 0; i < keymap.size (); ++i) 278 for (i = 0; i < keymap.size (); ++i)
283 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
284 { 279 {
285 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 280 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
286 281
287 index = hash [hashkey] + hash_bucket_size [hashkey]; 282 index = hash [hashkey] + hash_bucket_size [hashkey];
288 283
289 while (index > hash [hashkey] 284 while (index > hash [hashkey]
290 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 285 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
291 { 286 {
292 sorted_keymap [index] = sorted_keymap [index - 1]; 287 sorted_keymap [index] = sorted_keymap [index - 1];
293 --index; 288 --index;
294 } 289 }
295 290
296 sorted_keymap [index] = keymap [i]; 291 sorted_keymap [index] = keymap [i];
297 ++hash_bucket_size [hashkey]; 292 ++hash_bucket_size [hashkey];
298 } 293 }
299 294
300 keymap.swap (sorted_keymap); 295 keymap.swap (sorted_keymap);
301 296
302#ifndef NDEBUG 297#ifndef NDEBUG
303 // check for invariants 298 // check for invariants
304 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) 299 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
305 { 300 {
306 index = hash[i]; 301 index = hash[i];
307 for (int j = 0; j < hash_bucket_size [i]; ++j) 302 for (int j = 0; j < hash_bucket_size [i]; ++j)
308 { 303 {
309 if (keymap [index + j]->range == 1)
310 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 304 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
311 305
312 if (j) 306 if (j)
313 assert (compare_priority (keymap [index + j - 1], 307 assert (compare_priority (keymap [index + j - 1],
314 keymap [index + j]) >= 0); 308 keymap [index + j]) >= 0);
315 } 309 }
… …
317 311
318 // this should be able to detect most possible bugs 312 // this should be able to detect most possible bugs
319 for (i = 0; i < sorted_keymap.size (); ++i) 313 for (i = 0; i < sorted_keymap.size (); ++i)
320 { 314 {
321 keysym_t *a = sorted_keymap[i]; 315 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); 316 int index = find_keysym (a->keysym, a->state);
325 317
326 assert (index >= 0); 318 assert (index >= 0);
327 keysym_t *b = keymap [index]; 319 keysym_t *b = keymap [index];
328 assert (i == index // the normally expected result 320 assert (i == index // the normally expected result
329 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) 321 || a->keysym == b->keysym
330 && compare_priority (a, b) <= 0); // is effectively the same or a closer match 322 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
331 }
332 } 323 }
333#endif 324#endif
334} 325}
335 326
336int 327int
… …
344 335
345 for (; index < end; ++index) 336 for (; index < end; ++index)
346 { 337 {
347 keysym_t *key = keymap [index]; 338 keysym_t *key = keymap [index];
348 339
349 if (key->keysym <= keysym && keysym < key->keysym + key->range 340 if (key->keysym == keysym
350 // match only the specified bits in state and ignore others 341 // match only the specified bits in state and ignore others
351 && (key->state & state) == key->state) 342 && (key->state & state) == key->state)
352 return index; 343 return index;
353 } 344 }
354 345

Diff Legend

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