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.60 by sf-exg, Fri Dec 28 13:29:05 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)
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 = rxvt_popcount (a->state /* & OtherModMask */); 82 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = rxvt_popcount (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 (); 97 for (unsigned int i = 0; i < keymap.size (); ++i)
98 {
99 free (keymap [i]->str);
100 delete keymap [i];
101 }
104} 102}
105 103
106void 104void
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_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
127keyboard_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)
128{ 106{
107 char *translation = rxvt_wcstoutf8 (ws);
108
129 keysym_t *key = new keysym_t; 109 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc);
133 110
134 if (key && translation)
135 {
136 key->keysym = keysym; 111 key->keysym = keysym;
137 key->state = state; 112 key->state = state;
138 key->str = translation; 113 key->str = translation;
139 key->type = keysym_t::STRING; 114 key->type = keysym_t::STRING;
140 115
141 if (strncmp (translation, "builtin:", 8) == 0) 116 if (strncmp (translation, "builtin:", 8) == 0)
142 key->type = keysym_t::BUILTIN; 117 key->type = keysym_t::BUILTIN;
143 118
144 register_keymap (key);
145 }
146 else
147 {
148 delete key;
149 free ((void *)translation);
150 rxvt_fatal ("out of memory, aborting.\n");
151 }
152}
153
154void
155keyboard_manager::register_keymap (keysym_t *key)
156{
157 if (keymap.size () == keymap.capacity ()) 119 if (keymap.size () == keymap.capacity ())
158 keymap.reserve (keymap.size () * 2); 120 keymap.reserve (keymap.size () * 2);
159 121
160 keymap.push_back (key); 122 keymap.push_back (key);
161 hash[0] = 3; 123 hash[0] = 3;
162} 124}
163 125
164void
165keyboard_manager::register_done ()
166{
167 setup_hash ();
168}
169
170bool 126bool
171keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 127keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
172{ 128{
173 assert (hash[0] == 0 && "register_done() need to be called"); 129 assert (("register_done() need to be called", hash[0] == 0));
174 130
175 state &= OtherModMask; // mask out uninteresting modifiers 131 state &= OtherModMask; // mask out uninteresting modifiers
176 132
177 if (state & term->ModMetaMask) state |= MetaMask; 133 if (state & term->ModMetaMask) state |= MetaMask;
178 if (state & term->ModNumLockMask) state |= NumLockMask; 134 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
183 139
184 int index = find_keysym (keysym, state); 140 int index = find_keysym (keysym, state);
185 141
186 if (index >= 0) 142 if (index >= 0)
187 { 143 {
188 const keysym_t &key = *keymap [index]; 144 keysym_t *key = keymap [index];
189 145
190 if (key.type != keysym_t::BUILTIN) 146 if (key->type != keysym_t::BUILTIN)
191 { 147 {
192 wchar_t *wc = rxvt_utf8towcs (key.str); 148 wchar_t *ws = rxvt_utf8towcs (key->str);
193 char *str = rxvt_wcstombs (wc); 149 char *str = rxvt_wcstombs (ws);
194 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 150 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
195 free (wc); 151 free (ws);
196 152
197 switch (key.type)
198 {
199 case keysym_t::STRING:
200 output_string (term, str); 153 output_string (term, str);
201 break;
202 }
203 154
204 free (str); 155 free (str);
205 156
206 return true; 157 return true;
207 } 158 }
… …
209 160
210 return false; 161 return false;
211} 162}
212 163
213void 164void
214keyboard_manager::setup_hash () 165keyboard_manager::register_done ()
215{ 166{
216 unsigned int i, index, hashkey; 167 unsigned int i, index, hashkey;
217 vector <keysym_t *> sorted_keymap;
218 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
219 169
220 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 170 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
221 171
222 // determine hash bucket size 172 // determine hash bucket size
… …
226 ++hash_bucket_size [hashkey]; 176 ++hash_bucket_size [hashkey];
227 } 177 }
228 178
229 // now we know the size of each bucket 179 // now we know the size of each bucket
230 // compute the index of each bucket 180 // compute the index of each bucket
231 hash [0] = 0;
232 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 181 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
233 { 182 {
234 index += hash_bucket_size [i - 1];
235 hash [i] = index; 183 hash [i] = index;
184 index += hash_bucket_size [i];
236 } 185 }
237 186
238 // and allocate just enough space 187 // and allocate just enough space
239 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 188 simplevec <keysym_t *> sorted_keymap (index, 0);
240 189
241 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 190 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
242 191
243 // fill in sorted_keymap 192 // fill in sorted_keymap
244 // it is sorted in each bucket 193 // it is sorted in each bucket

Diff Legend

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