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.47 by sf-exg, Sun Nov 27 10:49:25 2011 UTC vs.
Revision 1.51 by sf-exg, Thu Dec 1 11:27:34 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 hash [0] = 2;
104
105 for (unsigned int i = 0; i < keymap.size (); ++i) 103 for (unsigned int i = 0; i < keymap.size (); ++i)
106 { 104 {
107 free (keymap [i]->str); 105 free (keymap [i]->str);
108 delete keymap [i]; 106 delete keymap [i];
109 keymap [i] = 0;
110 } 107 }
111
112 keymap.clear ();
113} 108}
114 109
115// a wrapper for register_translation that converts the input string 110// a wrapper for register_translation that converts the input string
116// to utf-8 and expands 'list' syntax. 111// to utf-8 and expands 'list' syntax.
117void 112void
118keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 113keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
119{ 114{
120 wchar_t *wc = rxvt_mbstowcs (trans); 115 wchar_t *ws = rxvt_mbstowcs (trans);
121 char *translation = rxvt_wcstoutf8 (wc); 116 char *translation = rxvt_wcstoutf8 (ws);
122 free (wc); 117 free (ws);
123 118
124 if (strncmp (translation, "list", 4) == 0 && translation [4] 119 if (strncmp (translation, "list", 4) == 0 && translation [4]
125 && strlen (translation) < STRING_MAX) 120 && strlen (translation) < STRING_MAX)
126 { 121 {
127 char *prefix = translation + 4; 122 char *prefix = translation + 4;
… …
198 193
199 int index = find_keysym (keysym, state); 194 int index = find_keysym (keysym, state);
200 195
201 if (index >= 0) 196 if (index >= 0)
202 { 197 {
203 const keysym_t &key = *keymap [index]; 198 keysym_t *key = keymap [index];
204 199
205 if (key.type != keysym_t::BUILTIN) 200 if (key->type != keysym_t::BUILTIN)
206 { 201 {
207 wchar_t *wc = rxvt_utf8towcs (key.str); 202 wchar_t *ws = rxvt_utf8towcs (key->str);
208 char *str = rxvt_wcstombs (wc); 203 char *str = rxvt_wcstombs (ws);
209 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 204 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
210 free (wc); 205 free (ws);
211 206
212 output_string (term, str); 207 output_string (term, str);
213 208
214 free (str); 209 free (str);
215 210

Diff Legend

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