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.46 by sf-exg, Sun Nov 27 10:14:51 2011 UTC vs.
Revision 1.59 by root, Fri May 18 00:10:47 2012 UTC

… …
24#include "../config.h" 24#include "../config.h"
25#include "rxvt.h" 25#include "rxvt.h"
26 26
27#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
28 28
29#include <cstring> 29#include <string.h>
30 30
31#include "rxvtperl.h" 31#include "rxvtperl.h"
32#include "keyboard.h" 32#include "keyboard.h"
33#include "command.h"
34 33
35/* an intro to the data structure: 34/* an intro to the data structure:
36 * 35 *
37 * vector keymap[] is grouped. 36 * vector keymap[] is grouped.
38 * 37 *
… …
63 * n(the number of groups) = the number of non-zero member of hash_bucket_size[]; 62 * 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]. 63 * Ni(the size of group i) = hash_bucket_size[Ii].
65 */ 64 */
66 65
67static void 66static void
68output_string (rxvt_term *rt, const char *str) 67output_string (rxvt_term *term, const char *str)
69{ 68{
70 if (strncmp (str, "command:", 8) == 0) 69 if (strncmp (str, "command:", 8) == 0)
71 rt->cmdbuf_append (str + 8, strlen (str) - 8); 70 term->cmdbuf_append (str + 8, strlen (str) - 8);
72 else if (strncmp (str, "perl:", 5) == 0) 71 else if (strncmp (str, "perl:", 5) == 0)
73 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END)); 72 HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else 73 else
75 rt->tt_write (str, strlen (str)); 74 term->tt_write (str, strlen (str));
76} 75}
77 76
78// return: priority_of_a - priority_of_b 77// return: priority_of_a - priority_of_b
79static int 78static int
80compare_priority (keysym_t *a, keysym_t *b) 79compare_priority (keysym_t *a, keysym_t *b)
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 97 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 98}
100 99
101keyboard_manager::~keyboard_manager () 100keyboard_manager::~keyboard_manager ()
102{ 101{
103 clear ();
104}
105
106void
107keyboard_manager::clear ()
108{
109 hash [0] = 2;
110
111 for (unsigned int i = 0; i < keymap.size (); ++i) 102 for (unsigned int i = 0; i < keymap.size (); ++i)
112 { 103 {
113 free (keymap [i]->str); 104 free (keymap [i]->str);
114 delete keymap [i]; 105 delete keymap [i];
115 keymap [i] = 0;
116 } 106 }
117
118 keymap.clear ();
119} 107}
120 108
121// a wrapper for register_translation that converts the input string
122// to utf-8 and expands 'list' syntax.
123void 109void
124keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 110keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
125{ 111{
126 wchar_t *wc = rxvt_mbstowcs (trans);
127 char *translation = rxvt_wcstoutf8 (wc); 112 char *translation = rxvt_wcstoutf8 (ws);
128 free (wc);
129 113
130 if (strncmp (translation, "list", 4) == 0 && translation [4]
131 && strlen (translation) < STRING_MAX)
132 {
133 char *prefix = translation + 4;
134 char *middle = strchr (prefix + 1, translation [4]);
135 char *suffix = strrchr (prefix + 1, translation [4]);
136
137 if (suffix && middle && suffix > middle + 1)
138 {
139 int range = suffix - middle - 1;
140 int prefix_len = middle - prefix - 1;
141 char buf[STRING_MAX];
142
143 memcpy (buf, prefix + 1, prefix_len);
144 strcpy (buf + prefix_len + 1, suffix + 1);
145
146 for (int i = 0; i < range; i++)
147 {
148 buf [prefix_len] = middle [i + 1];
149 register_translation (keysym + i, state, strdup (buf));
150 }
151
152 free (translation);
153 return;
154 }
155 else
156 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
157 }
158
159 register_translation (keysym, state, translation);
160}
161
162void
163keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
164{
165 keysym_t *key = new keysym_t; 114 keysym_t *key = new keysym_t;
166 115
167 if (key && translation)
168 {
169 key->keysym = keysym; 116 key->keysym = keysym;
170 key->state = state; 117 key->state = state;
171 key->str = translation; 118 key->str = translation;
172 key->type = keysym_t::STRING; 119 key->type = keysym_t::STRING;
173 120
174 if (strncmp (translation, "builtin:", 8) == 0) 121 if (strncmp (translation, "builtin:", 8) == 0)
175 key->type = keysym_t::BUILTIN; 122 key->type = keysym_t::BUILTIN;
176 123
177 register_keymap (key);
178 }
179 else
180 {
181 delete key;
182 free (translation);
183 rxvt_fatal ("memory allocation failure. aborting.\n");
184 }
185}
186
187void
188keyboard_manager::register_keymap (keysym_t *key)
189{
190 if (keymap.size () == keymap.capacity ()) 124 if (keymap.size () == keymap.capacity ())
191 keymap.reserve (keymap.size () * 2); 125 keymap.reserve (keymap.size () * 2);
192 126
193 keymap.push_back (key); 127 keymap.push_back (key);
194 hash[0] = 3; 128 hash[0] = 3;
195}
196
197void
198keyboard_manager::register_done ()
199{
200 setup_hash ();
201} 129}
202 130
203bool 131bool
204keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 132keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
205{ 133{
… …
216 144
217 int index = find_keysym (keysym, state); 145 int index = find_keysym (keysym, state);
218 146
219 if (index >= 0) 147 if (index >= 0)
220 { 148 {
221 const keysym_t &key = *keymap [index]; 149 keysym_t *key = keymap [index];
222 150
223 if (key.type != keysym_t::BUILTIN) 151 if (key->type != keysym_t::BUILTIN)
224 { 152 {
225 wchar_t *wc = rxvt_utf8towcs (key.str); 153 wchar_t *ws = rxvt_utf8towcs (key->str);
226 char *str = rxvt_wcstombs (wc); 154 char *str = rxvt_wcstombs (ws);
227 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 155 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
228 free (wc); 156 free (ws);
229 157
230 output_string (term, str); 158 output_string (term, str);
231 159
232 free (str); 160 free (str);
233 161
… …
237 165
238 return false; 166 return false;
239} 167}
240 168
241void 169void
242keyboard_manager::setup_hash () 170keyboard_manager::register_done ()
243{ 171{
244 unsigned int i, index, hashkey; 172 unsigned int i, index, hashkey;
245 vector <keysym_t *> sorted_keymap;
246 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 173 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
247 174
248 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 175 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
249 176
250 // determine hash bucket size 177 // determine hash bucket size
… …
262 index += hash_bucket_size [i - 1]; 189 index += hash_bucket_size [i - 1];
263 hash [i] = index; 190 hash [i] = index;
264 } 191 }
265 192
266 // and allocate just enough space 193 // and allocate just enough space
267 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 194 simplevec <keysym_t *> sorted_keymap (index + hash_bucket_size [i - 1], 0);
268 195
269 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 196 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
270 197
271 // fill in sorted_keymap 198 // fill in sorted_keymap
272 // it is sorted in each bucket 199 // it is sorted in each bucket

Diff Legend

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