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.22 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.28 by ayin, Wed Oct 31 09:55:23 2007 UTC

1/*----------------------------------------------------------------------*
2 * File: keyboard.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
8 *
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
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/
23
1#include "../config.h" 24#include "../config.h"
2#include "rxvt.h" 25#include "rxvt.h"
3 26
4#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
5 28
… …
74output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
75{ 98{
76 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
77 rt->cmd_write (str + 8, strlen (str) - 8); 100 rt->cmd_write (str + 8, strlen (str) - 8);
78 else if (strncmp (str, "perl:", 5) == 0) 101 else if (strncmp (str, "perl:", 5) == 0)
79 HOOK_INVOKE((rt, HOOK_KEYBOARD_COMMAND, DT_STR, str + 5, DT_END)); 102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
80 else 103 else
81 rt->tt_write (str, strlen (str)); 104 rt->tt_write (str, strlen (str));
82} 105}
83 106
84static void 107static void
… …
114 *buf = 0; 137 *buf = 0;
115 } 138 }
116 139
117 return len; 140 return len;
118} 141}
119
120////////////////////////////////////////////////////////////////////////////////
121// return: #bits of '1'
122#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
123# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
124#else
125static int
126bitcount (uint16_t n)
127{
128 int i;
129
130 for (i = 0; n; ++i, n &= n - 1)
131 ;
132
133 return i;
134}
135#endif
136 142
137// return: priority_of_a - priority_of_b 143// return: priority_of_a - priority_of_b
138static int 144static int
139compare_priority (keysym_t *a, keysym_t *b) 145compare_priority (keysym_t *a, keysym_t *b)
140{ 146{
141 // (the more '1's in state; the less range): the greater priority 147 // (the more '1's in state; the less range): the greater priority
142 int ca = bitcount (a->state /* & OtherModMask */); 148 int ca = popcount (a->state /* & OtherModMask */);
143 int cb = bitcount (b->state /* & OtherModMask */); 149 int cb = popcount (b->state /* & OtherModMask */);
144 150
145 if (ca != cb) 151 if (ca != cb)
146 return ca - cb; 152 return ca - cb;
147//else if (a->state != b->state) // this behavior is to be disscussed 153//else if (a->state != b->state) // this behavior is to be disscussed
148// return b->state - a->state; 154// return b->state - a->state;
… …
207 213
208 if (strncmp (translation, "list", 4) == 0 && translation [4]) 214 if (strncmp (translation, "list", 4) == 0 && translation [4])
209 { 215 {
210 char *middle = strchr (translation + 5, translation [4]); 216 char *middle = strchr (translation + 5, translation [4]);
211 char *suffix = strrchr (translation + 5, translation [4]); 217 char *suffix = strrchr (translation + 5, translation [4]);
212 218
213 if (suffix && middle && suffix > middle + 1) 219 if (suffix && middle && suffix > middle + 1)
214 { 220 {
215 key->type = keysym_t::LIST; 221 key->type = keysym_t::LIST;
216 key->range = suffix - middle - 1; 222 key->range = suffix - middle - 1;
217 223
218 strcpy (translation, translation + 4); 224 memmove (translation, translation + 4, strlen (translation + 4) + 1);
219 } 225 }
220 else 226 else
221 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 227 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
222 } 228 }
223 else if (strncmp (translation, "builtin:", 8) == 0) 229 else if (strncmp (translation, "builtin:", 8) == 0)
… …
420 ++hash_budget_counter [hashkey]; 426 ++hash_budget_counter [hashkey];
421 } 427 }
422 428
423 keymap.swap (sorted_keymap); 429 keymap.swap (sorted_keymap);
424 430
425#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 431#ifdef DEBUG_STRICT
426 // check for invariants 432 // check for invariants
427 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 433 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
428 { 434 {
429 index = hash[i]; 435 index = hash[i];
430 for (int j = 0; j < hash_budget_size [i]; ++j) 436 for (int j = 0; j < hash_budget_size [i]; ++j)
… …
459keyboard_manager::find_keysym (KeySym keysym, unsigned int state) 465keyboard_manager::find_keysym (KeySym keysym, unsigned int state)
460{ 466{
461 int hashkey = keysym & KEYSYM_HASH_MASK; 467 int hashkey = keysym & KEYSYM_HASH_MASK;
462 unsigned int index = hash [hashkey]; 468 unsigned int index = hash [hashkey];
463 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 469 unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1
464 ? hash [hashkey + 1] 470 ? hash [hashkey + 1]
465 : keymap.size (); 471 : keymap.size ();
466 472
467 for (; index < end; ++index) 473 for (; index < end; ++index)
468 { 474 {
469 keysym_t *key = keymap [index]; 475 keysym_t *key = keymap [index];

Diff Legend

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