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.61 by sf-exg, Sat Apr 26 15:05:17 2014 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)
81{ 80{
82 // (the more '1's in state; the less range): the greater priority 81 // (the more '1's in state; the less range): the greater priority
83 int ca = ecb_popcount32 (a->state /* & OtherModMask */); 82 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = ecb_popcount32 (b->state /* & OtherModMask */); 83 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
85 84
86 if (ca != cb)
87 return ca - cb; 85 return ca - cb;
88//else if (a->state != b->state) // this behavior is to be discussed
89// return b->state - a->state;
90 else
91 return 0;
92} 86}
93 87
94//////////////////////////////////////////////////////////////////////////////// 88////////////////////////////////////////////////////////////////////////////////
95keyboard_manager::keyboard_manager () 89keyboard_manager::keyboard_manager ()
96{ 90{
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 92 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 93}
100 94
101keyboard_manager::~keyboard_manager () 95keyboard_manager::~keyboard_manager ()
102{ 96{
103 clear ();
104}
105
106void
107keyboard_manager::clear ()
108{
109 hash [0] = 2;
110
111 for (unsigned int i = 0; i < keymap.size (); ++i) 97 for (unsigned int i = 0; i < keymap.size (); ++i)
112 { 98 {
113 free (keymap [i]->str); 99 free (keymap [i]->str);
114 delete keymap [i]; 100 delete keymap [i];
115 keymap [i] = 0;
116 } 101 }
117
118 keymap.clear ();
119} 102}
120 103
121// a wrapper for register_translation that converts the input string
122// to utf-8 and expands 'list' syntax.
123void 104void
124keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 105keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
125{ 106{
126 wchar_t *wc = rxvt_mbstowcs (trans);
127 char *translation = rxvt_wcstoutf8 (wc); 107 char *translation = rxvt_wcstoutf8 (ws);
128 free (wc);
129 108
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; 109 keysym_t *key = new keysym_t;
166 110
167 if (key && translation)
168 {
169 key->keysym = keysym; 111 key->keysym = keysym;
170 key->state = state; 112 key->state = state;
171 key->str = translation; 113 key->str = translation;
172 key->type = keysym_t::STRING; 114 key->type = keysym_t::STRING;
173 115
174 if (strncmp (translation, "builtin:", 8) == 0) 116 if (strncmp (translation, "builtin:", 8) == 0)
175 key->type = keysym_t::BUILTIN; 117 key->type = keysym_t::BUILTIN;
176 118
177 register_keymap (key);
178 }
179 else
180 {
181 delete key;
182 free (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 ()) 119 if (keymap.size () == keymap.capacity ())
191 keymap.reserve (keymap.size () * 2); 120 keymap.reserve (keymap.size () * 2);
192 121
193 keymap.push_back (key); 122 keymap.push_back (key);
194 hash[0] = 3; 123 hash[0] = 3;
195} 124}
196 125
197void
198keyboard_manager::register_done ()
199{
200 setup_hash ();
201}
202
203bool 126bool
204keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 127keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
205{ 128{
206 assert (hash[0] == 0 && "register_done() need to be called"); 129 assert (("register_done() need to be called", hash[0] == 0));
207 130
208 state &= OtherModMask; // mask out uninteresting modifiers 131 state &= OtherModMask; // mask out uninteresting modifiers
209 132
210 if (state & term->ModMetaMask) state |= MetaMask; 133 if (state & term->ModMetaMask) state |= MetaMask;
211 if (state & term->ModNumLockMask) state |= NumLockMask; 134 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
216 139
217 int index = find_keysym (keysym, state); 140 int index = find_keysym (keysym, state);
218 141
219 if (index >= 0) 142 if (index >= 0)
220 { 143 {
221 const keysym_t &key = *keymap [index]; 144 keysym_t *key = keymap [index];
222 145
223 if (key.type != keysym_t::BUILTIN) 146 if (key->type != keysym_t::BUILTIN)
224 { 147 {
225 wchar_t *wc = rxvt_utf8towcs (key.str); 148 wchar_t *ws = rxvt_utf8towcs (key->str);
226 char *str = rxvt_wcstombs (wc); 149 char *str = rxvt_wcstombs (ws);
227 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 150 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
228 free (wc); 151 free (ws);
229 152
230 output_string (term, str); 153 output_string (term, str);
231 154
232 free (str); 155 free (str);
233 156
… …
237 160
238 return false; 161 return false;
239} 162}
240 163
241void 164void
242keyboard_manager::setup_hash () 165keyboard_manager::register_done ()
243{ 166{
244 unsigned int i, index, hashkey; 167 unsigned int i, index, hashkey;
245 vector <keysym_t *> sorted_keymap;
246 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 168 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
247 169
248 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 170 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
249 171
250 // determine hash bucket size 172 // determine hash bucket size
… …
254 ++hash_bucket_size [hashkey]; 176 ++hash_bucket_size [hashkey];
255 } 177 }
256 178
257 // now we know the size of each bucket 179 // now we know the size of each bucket
258 // compute the index of each bucket 180 // compute the index of each bucket
259 hash [0] = 0;
260 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 181 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
261 { 182 {
262 index += hash_bucket_size [i - 1];
263 hash [i] = index; 183 hash [i] = index;
184 index += hash_bucket_size [i];
264 } 185 }
265 186
266 // and allocate just enough space 187 // and allocate just enough space
267 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 188 simplevec <keysym_t *> sorted_keymap (index, 0);
268 189
269 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 190 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
270 191
271 // fill in sorted_keymap 192 // fill in sorted_keymap
272 // it is sorted in each bucket 193 // it is sorted in each bucket

Diff Legend

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