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.41 by sf-exg, Sat Apr 30 18:45:38 2011 UTC vs.
Revision 1.53 by sf-exg, Fri Dec 2 09:13: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
110// a wrapper for register_translation that converts the input string
111// to utf-8 and expands 'list' syntax.
106void 112void
107keyboard_manager::clear () 113keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
108{ 114{
109 hash [0] = 2; 115 char *translation = rxvt_wcstoutf8 (ws);
110 116
111 for (unsigned int i = 0; i < keymap.size (); ++i) 117 register_translation (keysym, state, translation);
112 {
113 free ((void *)keymap [i]->str);
114 delete keymap [i];
115 keymap [i] = 0;
116 }
117
118 keymap.clear ();
119} 118}
120 119
121// a wrapper for register_keymap,
122// so that outside codes don't have to know so much details.
123//
124// the string 'trans' is copied to an internal managed buffer,
125// so the caller can free memory of 'trans' at any time.
126void 120void
127keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 121keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
128{ 122{
129 keysym_t *key = new keysym_t; 123 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc);
133 124
134 if (key && translation) 125 if (key && translation)
135 { 126 {
136 key->keysym = keysym; 127 key->keysym = keysym;
137 key->state = state; 128 key->state = state;
… …
139 key->type = keysym_t::STRING; 130 key->type = keysym_t::STRING;
140 131
141 if (strncmp (translation, "builtin:", 8) == 0) 132 if (strncmp (translation, "builtin:", 8) == 0)
142 key->type = keysym_t::BUILTIN; 133 key->type = keysym_t::BUILTIN;
143 134
144 register_keymap (key); 135 if (keymap.size () == keymap.capacity ())
136 keymap.reserve (keymap.size () * 2);
137
138 keymap.push_back (key);
139 hash[0] = 3;
145 } 140 }
146 else 141 else
147 { 142 {
148 delete key; 143 delete key;
149 free ((void *)translation); 144 free (translation);
150 rxvt_fatal ("out of memory, aborting.\n"); 145 rxvt_fatal ("memory allocation failure. aborting.\n");
151 } 146 }
152}
153
154void
155keyboard_manager::register_keymap (keysym_t *key)
156{
157 if (keymap.size () == keymap.capacity ())
158 keymap.reserve (keymap.size () * 2);
159
160 keymap.push_back (key);
161 hash[0] = 3;
162}
163
164void
165keyboard_manager::register_done ()
166{
167 setup_hash ();
168} 147}
169 148
170bool 149bool
171keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 150keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
172{ 151{
173 assert (hash[0] == 0 && "register_done() need to be called"); 152 assert (("register_done() need to be called", hash[0] == 0));
174 153
175 state &= OtherModMask; // mask out uninteresting modifiers 154 state &= OtherModMask; // mask out uninteresting modifiers
176 155
177 if (state & term->ModMetaMask) state |= MetaMask; 156 if (state & term->ModMetaMask) state |= MetaMask;
178 if (state & term->ModNumLockMask) state |= NumLockMask; 157 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
183 162
184 int index = find_keysym (keysym, state); 163 int index = find_keysym (keysym, state);
185 164
186 if (index >= 0) 165 if (index >= 0)
187 { 166 {
188 const keysym_t &key = *keymap [index]; 167 keysym_t *key = keymap [index];
189 168
190 if (key.type != keysym_t::BUILTIN) 169 if (key->type != keysym_t::BUILTIN)
191 { 170 {
192 wchar_t *wc = rxvt_utf8towcs (key.str); 171 wchar_t *ws = rxvt_utf8towcs (key->str);
193 char *str = rxvt_wcstombs (wc); 172 char *str = rxvt_wcstombs (ws);
194 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 173 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
195 free (wc); 174 free (ws);
196 175
197 switch (key.type)
198 {
199 case keysym_t::STRING:
200 output_string (term, str); 176 output_string (term, str);
201 break;
202 }
203 177
204 free (str); 178 free (str);
205 179
206 return true; 180 return true;
207 } 181 }
… …
209 183
210 return false; 184 return false;
211} 185}
212 186
213void 187void
214keyboard_manager::setup_hash () 188keyboard_manager::register_done ()
215{ 189{
216 unsigned int i, index, hashkey; 190 unsigned int i, index, hashkey;
217 vector <keysym_t *> sorted_keymap; 191 vector <keysym_t *> sorted_keymap;
218 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 192 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
219 193

Diff Legend

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