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.50 by sf-exg, Wed Nov 30 20:01:41 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;
110
111 for (unsigned int i = 0; i < keymap.size (); ++i) 103 for (unsigned int i = 0; i < keymap.size (); ++i)
112 { 104 {
113 free (keymap [i]->str); 105 free (keymap [i]->str);
114 delete keymap [i]; 106 delete keymap [i];
115 keymap [i] = 0;
116 } 107 }
117
118 keymap.clear ();
119} 108}
120 109
121// a wrapper for register_translation that converts the input string 110// a wrapper for register_translation that converts the input string
122// to utf-8 and expands 'list' syntax. 111// to utf-8 and expands 'list' syntax.
123void 112void
… …
151 140
152 free (translation); 141 free (translation);
153 return; 142 return;
154 } 143 }
155 else 144 else
156 rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation); 145 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
157 } 146 }
158 147
159 register_translation (keysym, state, translation); 148 register_translation (keysym, state, translation);
160} 149}
161 150
… …
172 key->type = keysym_t::STRING; 161 key->type = keysym_t::STRING;
173 162
174 if (strncmp (translation, "builtin:", 8) == 0) 163 if (strncmp (translation, "builtin:", 8) == 0)
175 key->type = keysym_t::BUILTIN; 164 key->type = keysym_t::BUILTIN;
176 165
177 register_keymap (key); 166 if (keymap.size () == keymap.capacity ())
167 keymap.reserve (keymap.size () * 2);
168
169 keymap.push_back (key);
170 hash[0] = 3;
178 } 171 }
179 else 172 else
180 { 173 {
181 delete key; 174 delete key;
182 free (translation); 175 free (translation);
183 rxvt_fatal ("out of memory, aborting.\n"); 176 rxvt_fatal ("memory allocation failure. aborting.\n");
184 } 177 }
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} 178}
202 179
203bool 180bool
204keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 181keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
205{ 182{
206 assert (hash[0] == 0 && "register_done() need to be called"); 183 assert (("register_done() need to be called", hash[0] == 0));
207 184
208 state &= OtherModMask; // mask out uninteresting modifiers 185 state &= OtherModMask; // mask out uninteresting modifiers
209 186
210 if (state & term->ModMetaMask) state |= MetaMask; 187 if (state & term->ModMetaMask) state |= MetaMask;
211 if (state & term->ModNumLockMask) state |= NumLockMask; 188 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
216 193
217 int index = find_keysym (keysym, state); 194 int index = find_keysym (keysym, state);
218 195
219 if (index >= 0) 196 if (index >= 0)
220 { 197 {
221 const keysym_t &key = *keymap [index]; 198 keysym_t *key = keymap [index];
222 199
223 if (key.type != keysym_t::BUILTIN) 200 if (key->type != keysym_t::BUILTIN)
224 { 201 {
225 wchar_t *wc = rxvt_utf8towcs (key.str); 202 wchar_t *wc = rxvt_utf8towcs (key->str);
226 char *str = rxvt_wcstombs (wc); 203 char *str = rxvt_wcstombs (wc);
227 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 204 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
228 free (wc); 205 free (wc);
229 206
230 output_string (term, str); 207 output_string (term, str);
… …
237 214
238 return false; 215 return false;
239} 216}
240 217
241void 218void
242keyboard_manager::setup_hash () 219keyboard_manager::register_done ()
243{ 220{
244 unsigned int i, index, hashkey; 221 unsigned int i, index, hashkey;
245 vector <keysym_t *> sorted_keymap; 222 vector <keysym_t *> sorted_keymap;
246 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 223 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
247 224

Diff Legend

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