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.54 by sf-exg, Sat Dec 3 11:31:56 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_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) 111keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
128{ 112{
113 char *translation = rxvt_wcstoutf8 (ws);
114
129 keysym_t *key = new keysym_t; 115 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc);
133 116
134 if (key && translation) 117 if (key && translation)
135 { 118 {
136 key->keysym = keysym; 119 key->keysym = keysym;
137 key->state = state; 120 key->state = state;
… …
139 key->type = keysym_t::STRING; 122 key->type = keysym_t::STRING;
140 123
141 if (strncmp (translation, "builtin:", 8) == 0) 124 if (strncmp (translation, "builtin:", 8) == 0)
142 key->type = keysym_t::BUILTIN; 125 key->type = keysym_t::BUILTIN;
143 126
144 register_keymap (key); 127 if (keymap.size () == keymap.capacity ())
128 keymap.reserve (keymap.size () * 2);
129
130 keymap.push_back (key);
131 hash[0] = 3;
145 } 132 }
146 else 133 else
147 { 134 {
148 delete key; 135 delete key;
149 free ((void *)translation); 136 free (translation);
150 rxvt_fatal ("out of memory, aborting.\n"); 137 rxvt_fatal ("memory allocation failure. aborting.\n");
151 } 138 }
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} 139}
169 140
170bool 141bool
171keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 142keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
172{ 143{
173 assert (hash[0] == 0 && "register_done() need to be called"); 144 assert (("register_done() need to be called", hash[0] == 0));
174 145
175 state &= OtherModMask; // mask out uninteresting modifiers 146 state &= OtherModMask; // mask out uninteresting modifiers
176 147
177 if (state & term->ModMetaMask) state |= MetaMask; 148 if (state & term->ModMetaMask) state |= MetaMask;
178 if (state & term->ModNumLockMask) state |= NumLockMask; 149 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
183 154
184 int index = find_keysym (keysym, state); 155 int index = find_keysym (keysym, state);
185 156
186 if (index >= 0) 157 if (index >= 0)
187 { 158 {
188 const keysym_t &key = *keymap [index]; 159 keysym_t *key = keymap [index];
189 160
190 if (key.type != keysym_t::BUILTIN) 161 if (key->type != keysym_t::BUILTIN)
191 { 162 {
192 wchar_t *wc = rxvt_utf8towcs (key.str); 163 wchar_t *ws = rxvt_utf8towcs (key->str);
193 char *str = rxvt_wcstombs (wc); 164 char *str = rxvt_wcstombs (ws);
194 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 165 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
195 free (wc); 166 free (ws);
196 167
197 switch (key.type)
198 {
199 case keysym_t::STRING:
200 output_string (term, str); 168 output_string (term, str);
201 break;
202 }
203 169
204 free (str); 170 free (str);
205 171
206 return true; 172 return true;
207 } 173 }
… …
209 175
210 return false; 176 return false;
211} 177}
212 178
213void 179void
214keyboard_manager::setup_hash () 180keyboard_manager::register_done ()
215{ 181{
216 unsigned int i, index, hashkey; 182 unsigned int i, index, hashkey;
217 vector <keysym_t *> sorted_keymap; 183 vector <keysym_t *> sorted_keymap;
218 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 184 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
219 185

Diff Legend

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