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.41 by sf-exg, Sat Apr 30 18:45:38 2011 UTC

… …
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{
… …
133 133
134 if (key && translation) 134 if (key && translation)
135 { 135 {
136 key->keysym = keysym; 136 key->keysym = keysym;
137 key->state = state; 137 key->state = state;
138 key->range = 1;
139 key->str = translation; 138 key->str = translation;
140 key->type = keysym_t::STRING; 139 key->type = keysym_t::STRING;
141 140
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) 141 if (strncmp (translation, "builtin:", 8) == 0)
158 key->type = keysym_t::BUILTIN; 142 key->type = keysym_t::BUILTIN;
159 143
160 register_keymap (key); 144 register_keymap (key);
161 } 145 }
162 else 146 else
… …
203 { 187 {
204 const keysym_t &key = *keymap [index]; 188 const keysym_t &key = *keymap [index];
205 189
206 if (key.type != keysym_t::BUILTIN) 190 if (key.type != keysym_t::BUILTIN)
207 { 191 {
208 int keysym_offset = keysym - key.keysym;
209
210 wchar_t *wc = rxvt_utf8towcs (key.str); 192 wchar_t *wc = rxvt_utf8towcs (key.str);
211 char *str = rxvt_wcstombs (wc); 193 char *str = rxvt_wcstombs (wc);
212 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 194 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
213 free (wc); 195 free (wc);
214 196
215 switch (key.type) 197 switch (key.type)
216 { 198 {
217 case keysym_t::STRING: 199 case keysym_t::STRING:
218 output_string (term, str); 200 output_string (term, str);
219 break; 201 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 } 202 }
239 203
240 free (str); 204 free (str);
241 205
242 return true; 206 return true;
… …
255 219
256 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 220 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
257 221
258 // determine hash bucket size 222 // determine hash bucket size
259 for (i = 0; i < keymap.size (); ++i) 223 for (i = 0; i < keymap.size (); ++i)
260 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
261 { 224 {
262 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 225 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
263 ++hash_bucket_size [hashkey]; 226 ++hash_bucket_size [hashkey];
264 } 227 }
265 228
266 // now we know the size of each bucket 229 // now we know the size of each bucket
267 // compute the index of each bucket 230 // compute the index of each bucket
268 hash [0] = 0; 231 hash [0] = 0;
269 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 232 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i)
… …
278 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 241 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
279 242
280 // fill in sorted_keymap 243 // fill in sorted_keymap
281 // it is sorted in each bucket 244 // it is sorted in each bucket
282 for (i = 0; i < keymap.size (); ++i) 245 for (i = 0; i < keymap.size (); ++i)
283 for (int j = min (keymap [i]->range, KEYSYM_HASH_BUCKETS) - 1; j >= 0; --j)
284 { 246 {
285 hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; 247 hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK;
286 248
287 index = hash [hashkey] + hash_bucket_size [hashkey]; 249 index = hash [hashkey] + hash_bucket_size [hashkey];
288 250
289 while (index > hash [hashkey] 251 while (index > hash [hashkey]
290 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) 252 && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0)
291 { 253 {
292 sorted_keymap [index] = sorted_keymap [index - 1]; 254 sorted_keymap [index] = sorted_keymap [index - 1];
293 --index; 255 --index;
294 } 256 }
295 257
296 sorted_keymap [index] = keymap [i]; 258 sorted_keymap [index] = keymap [i];
297 ++hash_bucket_size [hashkey]; 259 ++hash_bucket_size [hashkey];
298 } 260 }
299 261
300 keymap.swap (sorted_keymap); 262 keymap.swap (sorted_keymap);
301 263
302#ifndef NDEBUG 264#ifndef NDEBUG
303 // check for invariants 265 // check for invariants
304 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i) 266 for (i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
305 { 267 {
306 index = hash[i]; 268 index = hash[i];
307 for (int j = 0; j < hash_bucket_size [i]; ++j) 269 for (int j = 0; j < hash_bucket_size [i]; ++j)
308 { 270 {
309 if (keymap [index + j]->range == 1)
310 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK)); 271 assert (i == (keymap [index + j]->keysym & KEYSYM_HASH_MASK));
311 272
312 if (j) 273 if (j)
313 assert (compare_priority (keymap [index + j - 1], 274 assert (compare_priority (keymap [index + j - 1],
314 keymap [index + j]) >= 0); 275 keymap [index + j]) >= 0);
315 } 276 }
… …
317 278
318 // this should be able to detect most possible bugs 279 // this should be able to detect most possible bugs
319 for (i = 0; i < sorted_keymap.size (); ++i) 280 for (i = 0; i < sorted_keymap.size (); ++i)
320 { 281 {
321 keysym_t *a = sorted_keymap[i]; 282 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); 283 int index = find_keysym (a->keysym, a->state);
325 284
326 assert (index >= 0); 285 assert (index >= 0);
327 keysym_t *b = keymap [index]; 286 keysym_t *b = keymap [index];
328 assert (i == index // the normally expected result 287 assert (i == index // the normally expected result
329 || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) 288 || a->keysym == b->keysym
330 && compare_priority (a, b) <= 0); // is effectively the same or a closer match 289 && compare_priority (a, b) <= 0); // is effectively the same or a closer match
331 }
332 } 290 }
333#endif 291#endif
334} 292}
335 293
336int 294int
… …
344 302
345 for (; index < end; ++index) 303 for (; index < end; ++index)
346 { 304 {
347 keysym_t *key = keymap [index]; 305 keysym_t *key = keymap [index];
348 306
349 if (key->keysym <= keysym && keysym < key->keysym + key->range 307 if (key->keysym == keysym
350 // match only the specified bits in state and ignore others 308 // match only the specified bits in state and ignore others
351 && (key->state & state) == key->state) 309 && (key->state & state) == key->state)
352 return index; 310 return index;
353 } 311 }
354 312

Diff Legend

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