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.66 by root, Thu May 1 03:14:13 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 *
… …
62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK 61 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK
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
68output_string (rxvt_term *rt, const char *str)
69{
70 if (strncmp (str, "command:", 8) == 0)
71 rt->cmdbuf_append (str + 8, strlen (str) - 8);
72 else if (strncmp (str, "perl:", 5) == 0)
73 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else
75 rt->tt_write (str, strlen (str));
76}
77
78// return: priority_of_a - priority_of_b 66// return: priority_of_a - priority_of_b
79static int 67static int
80compare_priority (keysym_t *a, keysym_t *b) 68compare_priority (keysym_t *a, keysym_t *b)
81{ 69{
82 // (the more '1's in state; the less range): the greater priority 70 // (the more '1's in state; the less range): the greater priority
83 int ca = rxvt_popcount (a->state /* & OtherModMask */); 71 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = rxvt_popcount (b->state /* & OtherModMask */); 72 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
85 73
86 if (ca != cb)
87 return ca - cb; 74 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} 75}
93 76
94//////////////////////////////////////////////////////////////////////////////// 77////////////////////////////////////////////////////////////////////////////////
95keyboard_manager::keyboard_manager () 78keyboard_manager::keyboard_manager ()
96{ 79{
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 81 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 82}
100 83
101keyboard_manager::~keyboard_manager () 84keyboard_manager::~keyboard_manager ()
102{ 85{
103 clear (); 86 for (unsigned int i = 0; i < keymap.size (); ++i)
87 {
88 free (keymap [i]->str);
89 delete keymap [i];
90 }
104} 91}
105 92
106void 93void
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) 94keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
128{ 95{
96 char *translation = rxvt_wcstoutf8 (ws);
97
129 keysym_t *key = new keysym_t; 98 keysym_t *key = new keysym_t;
130 wchar_t *wc = rxvt_mbstowcs (trans);
131 char *translation = rxvt_wcstoutf8 (wc);
132 free (wc);
133 99
134 if (key && translation)
135 {
136 key->keysym = keysym; 100 key->keysym = keysym;
137 key->state = state; 101 key->state = state;
138 key->str = translation; 102 key->str = translation;
139 key->type = keysym_t::STRING; 103 key->type = keysym_t::STRING;
140 104
141 if (strncmp (translation, "builtin:", 8) == 0) 105 if (strncmp (translation, "builtin:", 8) == 0)
142 key->type = keysym_t::BUILTIN; 106 key->type = keysym_t::BUILTIN;
107 else if (strncmp (translation, "builtin-string:", 15) == 0)
108 key->type = keysym_t::BUILTIN_STRING;
143 109
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 ()) 110 if (keymap.size () == keymap.capacity ())
158 keymap.reserve (keymap.size () * 2); 111 keymap.reserve (keymap.size () * 2);
159 112
160 keymap.push_back (key); 113 keymap.push_back (key);
161 hash[0] = 3; 114 hash[0] = 3;
162} 115}
163 116
164void
165keyboard_manager::register_done ()
166{
167 setup_hash ();
168}
169
170bool 117bool
171keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 118keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
172{ 119{
173 assert (hash[0] == 0 && "register_done() need to be called"); 120 assert (("register_done() need to be called", hash[0] == 0));
174 121
175 state &= OtherModMask; // mask out uninteresting modifiers 122 state &= OtherModMask; // mask out uninteresting modifiers
176 123
177 if (state & term->ModMetaMask) state |= MetaMask; 124 if (state & term->ModMetaMask) state |= MetaMask;
178 if (state & term->ModNumLockMask) state |= NumLockMask; 125 if (state & term->ModNumLockMask) state |= NumLockMask;
… …
183 130
184 int index = find_keysym (keysym, state); 131 int index = find_keysym (keysym, state);
185 132
186 if (index >= 0) 133 if (index >= 0)
187 { 134 {
188 const keysym_t &key = *keymap [index]; 135 keysym_t *key = keymap [index];
189 136
137 if (key->type == keysym_t::BUILTIN_STRING)
138 {
139 term->tt_write_user_input (kbuf, len);
140 return true;
141 }
190 if (key.type != keysym_t::BUILTIN) 142 else if (key->type != keysym_t::BUILTIN)
191 { 143 {
192 wchar_t *wc = rxvt_utf8towcs (key.str); 144 wchar_t *ws = rxvt_utf8towcs (key->str);
193 char *str = rxvt_wcstombs (wc); 145 char *str = rxvt_wcstombs (ws);
194 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 146 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
195 free (wc); 147 free (ws);
196 148
197 switch (key.type) 149 if (char *colon = strchr (str, ':'))
198 { 150 {
199 case keysym_t::STRING: 151 if (strncmp (str, "command:", 8) == 0)
200 output_string (term, str); 152 term->cmdbuf_append (str + 8, strlen (str) - 8);
153 else if (strncmp (str, "string:", 7) == 0)
154 term->tt_write_user_input (colon + 1, strlen (colon + 1));
155 else if (strncmp (str, "perl:", 5) == 0)
156 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
201 break; 157 else
158 HOOK_INVOKE ((term, HOOK_KEYBOARD_DISPATCH, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_END));
202 } 159 }
160 else
161 term->tt_write_user_input (str, strlen (str));
203 162
204 free (str); 163 free (str);
205 164
206 return true; 165 return true;
207 } 166 }
… …
209 168
210 return false; 169 return false;
211} 170}
212 171
213void 172void
214keyboard_manager::setup_hash () 173keyboard_manager::register_done ()
215{ 174{
216 unsigned int i, index, hashkey; 175 unsigned int i, index, hashkey;
217 vector <keysym_t *> sorted_keymap;
218 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 176 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
219 177
220 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 178 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
221 179
222 // determine hash bucket size 180 // determine hash bucket size
… …
226 ++hash_bucket_size [hashkey]; 184 ++hash_bucket_size [hashkey];
227 } 185 }
228 186
229 // now we know the size of each bucket 187 // now we know the size of each bucket
230 // compute the index of each bucket 188 // compute the index of each bucket
231 hash [0] = 0;
232 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 189 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
233 { 190 {
234 index += hash_bucket_size [i - 1];
235 hash [i] = index; 191 hash [i] = index;
192 index += hash_bucket_size [i];
236 } 193 }
237 194
238 // and allocate just enough space 195 // and allocate just enough space
239 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 196 simplevec <keysym_t *> sorted_keymap (index, 0);
240 197
241 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 198 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
242 199
243 // fill in sorted_keymap 200 // fill in sorted_keymap
244 // it is sorted in each bucket 201 // it is sorted in each bucket

Diff Legend

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