… | |
… | |
239 | const keysym_t &key = *keymap [index]; |
239 | const keysym_t &key = *keymap [index]; |
240 | |
240 | |
241 | int keysym_offset = keysym - key.keysym; |
241 | int keysym_offset = keysym - key.keysym; |
242 | |
242 | |
243 | wchar_t *wc = rxvt_utf8towcs (key.str); |
243 | wchar_t *wc = rxvt_utf8towcs (key.str); |
244 | |
|
|
245 | char *str = rxvt_wcstombs (wc); |
244 | char *str = rxvt_wcstombs (wc); |
246 | // TODO: do translations, unescaping etc, here (allow \u escape etc.) |
245 | // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) |
247 | free (wc); |
246 | free (wc); |
248 | |
247 | |
249 | switch (key.type) |
248 | switch (key.type) |
250 | { |
249 | { |
251 | case keysym_t::NORMAL: |
250 | case keysym_t::NORMAL: |
… | |
… | |
294 | free (str); |
293 | free (str); |
295 | |
294 | |
296 | return true; |
295 | return true; |
297 | } |
296 | } |
298 | else |
297 | else |
299 | { |
|
|
300 | // fprintf(stderr,"[%x:%x]",state,keysym); |
|
|
301 | return false; |
298 | return false; |
302 | } |
|
|
303 | } |
299 | } |
304 | |
300 | |
305 | // purge duplicate keymap entries |
301 | // purge duplicate keymap entries |
306 | void keyboard_manager::purge_duplicate_keymap () |
302 | void keyboard_manager::purge_duplicate_keymap () |
307 | { |
303 | { |
… | |
… | |
317 | if (i < keymap.size ()) |
313 | if (i < keymap.size ()) |
318 | { |
314 | { |
319 | keymap[i] = keymap.back (); |
315 | keymap[i] = keymap.back (); |
320 | keymap.pop_back (); |
316 | keymap.pop_back (); |
321 | } |
317 | } |
|
|
318 | |
322 | break; |
319 | break; |
323 | } |
320 | } |
324 | } |
321 | } |
325 | } |
322 | } |
326 | } |
323 | } |
… | |
… | |
334 | uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget |
331 | uint16_t hash_budget_counter[KEYSYM_HASH_BUDGETS]; // #elements in each budget |
335 | |
332 | |
336 | memset (hash_budget_size, 0, sizeof (hash_budget_size)); |
333 | memset (hash_budget_size, 0, sizeof (hash_budget_size)); |
337 | memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); |
334 | memset (hash_budget_counter, 0, sizeof (hash_budget_counter)); |
338 | |
335 | |
339 | // count keysyms for corresponding hash budgets |
336 | // determine hash bucket size |
340 | for (i = 0; i < keymap.size (); ++i) |
337 | for (i = 0; i < keymap.size (); ++i) |
|
|
338 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) |
341 | { |
339 | { |
342 | hashkey = keymap [i]->keysym & KEYSYM_HASH_MASK; |
340 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
343 | ++hash_budget_size [hashkey]; |
341 | ++hash_budget_size [hashkey]; |
344 | } |
|
|
345 | |
|
|
346 | // a keysym_t with range>1 is counted one more time for every keysym that |
|
|
347 | // lies in its range |
|
|
348 | for (i = 0; i < keymap.size (); ++i) |
|
|
349 | { |
|
|
350 | if (keymap[i]->range > 1) |
|
|
351 | { |
|
|
352 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j > 0; --j) |
|
|
353 | { |
|
|
354 | hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); |
|
|
355 | if (hash_budget_size [hashkey]) |
|
|
356 | ++hash_budget_size [hashkey]; |
|
|
357 | } |
|
|
358 | } |
342 | } |
359 | } |
|
|
360 | |
343 | |
361 | // now we know the size of each budget |
344 | // now we know the size of each budget |
362 | // compute the index of each budget |
345 | // compute the index of each budget |
363 | hash [0] = 0; |
346 | hash [0] = 0; |
364 | for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) |
347 | for (index = 0, i = 1; i < KEYSYM_HASH_BUDGETS; ++i) |
365 | { |
348 | { |
366 | index += hash_budget_size [i - 1]; |
349 | index += hash_budget_size [i - 1]; |
367 | hash[i] = (hash_budget_size [i] ? index : hash [i - 1]); |
350 | hash [i] = index; |
368 | } |
351 | } |
369 | |
352 | |
370 | // and allocate just enough space |
353 | // and allocate just enough space |
371 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); |
354 | sorted_keymap.insert (sorted_keymap.begin (), index + hash_budget_size [i - 1], 0); |
372 | |
355 | |
373 | // fill in sorted_keymap |
356 | // fill in sorted_keymap |
374 | // it is sorted in each budget |
357 | // it is sorted in each budget |
375 | for (i = 0; i < keymap.size (); ++i) |
358 | for (i = 0; i < keymap.size (); ++i) |
376 | { |
|
|
377 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) |
359 | for (int j = min (keymap [i]->range, KEYSYM_HASH_BUDGETS) - 1; j >= 0; --j) |
378 | { |
360 | { |
379 | hashkey = ((keymap [i]->keysym + j) & KEYSYM_HASH_MASK); |
361 | hashkey = (keymap [i]->keysym + j) & KEYSYM_HASH_MASK; |
380 | |
362 | |
381 | if (hash_budget_size [hashkey]) |
|
|
382 | { |
|
|
383 | index = hash [hashkey] + hash_budget_counter [hashkey]; |
363 | index = hash [hashkey] + hash_budget_counter [hashkey]; |
384 | |
364 | |
385 | while (index > hash [hashkey] |
365 | while (index > hash [hashkey] |
386 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
366 | && compare_priority (keymap [i], sorted_keymap [index - 1]) > 0) |
387 | { |
367 | { |
388 | sorted_keymap [index] = sorted_keymap [index - 1]; |
368 | sorted_keymap [index] = sorted_keymap [index - 1]; |
389 | --index; |
369 | --index; |
390 | } |
370 | } |
391 | |
371 | |
392 | sorted_keymap [index] = keymap [i]; |
372 | sorted_keymap [index] = keymap [i]; |
393 | ++hash_budget_counter [hashkey]; |
373 | ++hash_budget_counter [hashkey]; |
394 | } |
|
|
395 | } |
374 | } |
396 | } |
|
|
397 | |
375 | |
398 | keymap.swap (sorted_keymap); |
376 | keymap.swap (sorted_keymap); |
399 | |
377 | |
400 | #if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) |
378 | #if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) |
401 | // check for invariants |
379 | // check for invariants |
… | |
… | |
433 | int |
411 | int |
434 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
412 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
435 | { |
413 | { |
436 | int hashkey = keysym & KEYSYM_HASH_MASK; |
414 | int hashkey = keysym & KEYSYM_HASH_MASK; |
437 | unsigned int index = hash [hashkey]; |
415 | unsigned int index = hash [hashkey]; |
|
|
416 | unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 |
|
|
417 | ? hash [hashkey + 1] |
|
|
418 | : keymap.size (); |
438 | |
419 | |
439 | for (; index < keymap.size (); ++index) |
420 | for (; index < end; ++index) |
440 | { |
421 | { |
441 | keysym_t *key = keymap [index]; |
422 | keysym_t *key = keymap [index]; |
442 | |
423 | |
443 | if (key->keysym <= keysym && key->keysym + key->range > keysym |
424 | if (key->keysym <= keysym && keysym < key->keysym + key->range |
444 | // match only the specified bits in state and ignore others |
425 | // match only the specified bits in state and ignore others |
445 | && (key->state & state) == key->state) |
426 | && (key->state & state) == key->state) |
446 | return index; |
427 | return index; |
447 | else if ((key->keysym & KEYSYM_HASH_MASK) > hashkey && key->range == 1) |
|
|
448 | return -1; |
|
|
449 | } |
428 | } |
450 | |
429 | |
451 | return -1; |
430 | return -1; |
452 | } |
431 | } |
453 | |
432 | |