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.42 by sf-exg, Sat May 7 18:29:18 2011 UTC vs.
Revision 1.56 by sf-exg, Mon Dec 5 12:22:50 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)
81{ 81{
82 // (the more '1's in state; the less range): the greater priority 82 // (the more '1's in state; the less range): the greater priority
83 int ca = rxvt_popcount (a->state /* & OtherModMask */); 83 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = rxvt_popcount (b->state /* & OtherModMask */); 84 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
85 85
86 if (ca != cb) 86 if (ca != cb)
87 return ca - cb; 87 return ca - cb;
88//else if (a->state != b->state) // this behavior is to be discussed 88//else if (a->state != b->state) // this behavior is to be discussed
89// return b->state - a->state; 89// return b->state - a->state;
… …
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 (); 103 for (unsigned int i = 0; i < keymap.size (); ++i)
104 {
105 free (keymap [i]->str);
106 delete keymap [i];
107 }
104} 108}
105 109
106void 110void
107keyboard_manager::clear ()
108{
109 hash [0] = 2;
110
111 for (unsigned int i = 0; i < keymap.size (); ++i)
112 {
113 free ((void *)keymap [i]->str);
114 delete keymap [i];
115 keymap [i] = 0;
116 }
117
118 keymap.clear ();
119}
120
121// a wrapper for register_translation that converts the input string
122// to utf-8 and expands 'list' syntax.
123void
124keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 111keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
125{ 112{
126 wchar_t *wc = rxvt_mbstowcs (trans);
127 char *translation = rxvt_wcstoutf8 (wc); 113 char *translation = rxvt_wcstoutf8 (ws);
128 free (wc);
129 114
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 ("cannot 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; 115 keysym_t *key = new keysym_t;
166 116
167 if (key && translation)
168 {
169 key->keysym = keysym; 117 key->keysym = keysym;
170 key->state = state; 118 key->state = state;
171 key->str = translation; 119 key->str = translation;
172 key->type = keysym_t::STRING; 120 key->type = keysym_t::STRING;
173 121
174 if (strncmp (translation, "builtin:", 8) == 0) 122 if (strncmp (translation, "builtin:", 8) == 0)
175 key->type = keysym_t::BUILTIN; 123 key->type = keysym_t::BUILTIN;
176 124
177 register_keymap (key);
178 }
179 else
180 {
181 delete key;
182 free ((void *)translation);
183 rxvt_fatal ("out of memory, aborting.\n");
184 }
185}
186
187void
188keyboard_manager::register_keymap (keysym_t *key)
189{
190 if (keymap.size () == keymap.capacity ()) 125 if (keymap.size () == keymap.capacity ())
191 keymap.reserve (keymap.size () * 2); 126 keymap.reserve (keymap.size () * 2);
192 127
193 keymap.push_back (key); 128 keymap.push_back (key);
194 hash[0] = 3; 129 hash[0] = 3;
195} 130}
196 131
197void
198keyboard_manager::register_done ()
199{
200 setup_hash ();
201}
202
203bool 132bool
204keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 133keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
205{ 134{
206 assert (hash[0] == 0 && "register_done() need to be called"); 135 assert (("register_done() need to be called", hash[0] == 0));
207 136
208 state &= OtherModMask; // mask out uninteresting modifiers 137 state &= OtherModMask; // mask out uninteresting modifiers
209 138
210 if (state & term->ModMetaMask) state |= MetaMask; 139 if (state & term->ModMetaMask) state |= MetaMask;
211 if (state & term->ModNumLockMask) state |= NumLockMask; 140 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
216 145
217 int index = find_keysym (keysym, state); 146 int index = find_keysym (keysym, state);
218 147
219 if (index >= 0) 148 if (index >= 0)
220 { 149 {
221 const keysym_t &key = *keymap [index]; 150 keysym_t *key = keymap [index];
222 151
223 if (key.type != keysym_t::BUILTIN) 152 if (key->type != keysym_t::BUILTIN)
224 { 153 {
225 wchar_t *wc = rxvt_utf8towcs (key.str); 154 wchar_t *ws = rxvt_utf8towcs (key->str);
226 char *str = rxvt_wcstombs (wc); 155 char *str = rxvt_wcstombs (ws);
227 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 156 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
228 free (wc); 157 free (ws);
229 158
230 switch (key.type)
231 {
232 case keysym_t::STRING:
233 output_string (term, str); 159 output_string (term, str);
234 break;
235 }
236 160
237 free (str); 161 free (str);
238 162
239 return true; 163 return true;
240 } 164 }
… …
242 166
243 return false; 167 return false;
244} 168}
245 169
246void 170void
247keyboard_manager::setup_hash () 171keyboard_manager::register_done ()
248{ 172{
249 unsigned int i, index, hashkey; 173 unsigned int i, index, hashkey;
250 vector <keysym_t *> sorted_keymap; 174 vector <keysym_t *> sorted_keymap;
251 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 175 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
252 176

Diff Legend

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