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.45 by sf-exg, Sun Nov 27 09:19:04 2011 UTC vs.
Revision 1.48 by sf-exg, Sun Nov 27 12:12:33 2011 UTC

… …
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->cmdbuf_append (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)
… …
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 ();
104}
105
106void
107keyboard_manager::clear ()
108{
109 hash [0] = 2; 103 hash [0] = 2;
110 104
111 for (unsigned int i = 0; i < keymap.size (); ++i) 105 for (unsigned int i = 0; i < keymap.size (); ++i)
112 { 106 {
113 free (keymap [i]->str); 107 free (keymap [i]->str);
… …
151 145
152 free (translation); 146 free (translation);
153 return; 147 return;
154 } 148 }
155 else 149 else
156 rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation); 150 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
157 } 151 }
158 152
159 register_translation (keysym, state, translation); 153 register_translation (keysym, state, translation);
160} 154}
161 155
… …
172 key->type = keysym_t::STRING; 166 key->type = keysym_t::STRING;
173 167
174 if (strncmp (translation, "builtin:", 8) == 0) 168 if (strncmp (translation, "builtin:", 8) == 0)
175 key->type = keysym_t::BUILTIN; 169 key->type = keysym_t::BUILTIN;
176 170
177 register_keymap (key); 171 if (keymap.size () == keymap.capacity ())
172 keymap.reserve (keymap.size () * 2);
173
174 keymap.push_back (key);
175 hash[0] = 3;
178 } 176 }
179 else 177 else
180 { 178 {
181 delete key; 179 delete key;
182 free (translation); 180 free (translation);
183 rxvt_fatal ("out of memory, aborting.\n"); 181 rxvt_fatal ("memory allocation failure. aborting.\n");
184 } 182 }
185}
186
187void
188keyboard_manager::register_keymap (keysym_t *key)
189{
190 if (keymap.size () == keymap.capacity ())
191 keymap.reserve (keymap.size () * 2);
192
193 keymap.push_back (key);
194 hash[0] = 3;
195}
196
197void
198keyboard_manager::register_done ()
199{
200 setup_hash ();
201} 183}
202 184
203bool 185bool
204keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 186keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
205{ 187{
206 assert (hash[0] == 0 && "register_done() need to be called"); 188 assert (("register_done() need to be called", hash[0] == 0));
207 189
208 state &= OtherModMask; // mask out uninteresting modifiers 190 state &= OtherModMask; // mask out uninteresting modifiers
209 191
210 if (state & term->ModMetaMask) state |= MetaMask; 192 if (state & term->ModMetaMask) state |= MetaMask;
211 if (state & term->ModNumLockMask) state |= NumLockMask; 193 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
237 219
238 return false; 220 return false;
239} 221}
240 222
241void 223void
242keyboard_manager::setup_hash () 224keyboard_manager::register_done ()
243{ 225{
244 unsigned int i, index, hashkey; 226 unsigned int i, index, hashkey;
245 vector <keysym_t *> sorted_keymap; 227 vector <keysym_t *> sorted_keymap;
246 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 228 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
247 229

Diff Legend

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