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.49 by sf-exg, Sun Nov 27 12:12:49 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 *
… …
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 hash [0] = 2;
104
105 for (unsigned int i = 0; i < keymap.size (); ++i) 97 for (unsigned int i = 0; i < keymap.size (); ++i)
106 { 98 {
107 free (keymap [i]->str); 99 free (keymap [i]->str);
108 delete keymap [i]; 100 delete keymap [i];
109 keymap [i] = 0;
110 } 101 }
111
112 keymap.clear ();
113} 102}
114 103
115// a wrapper for register_translation that converts the input string
116// to utf-8 and expands 'list' syntax.
117void 104void
118keyboard_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)
119{ 106{
120 wchar_t *wc = rxvt_mbstowcs (trans);
121 char *translation = rxvt_wcstoutf8 (wc); 107 char *translation = rxvt_wcstoutf8 (ws);
122 free (wc);
123 108
124 if (strncmp (translation, "list", 4) == 0 && translation [4]
125 && strlen (translation) < STRING_MAX)
126 {
127 char *prefix = translation + 4;
128 char *middle = strchr (prefix + 1, translation [4]);
129 char *suffix = strrchr (prefix + 1, translation [4]);
130
131 if (suffix && middle && suffix > middle + 1)
132 {
133 int range = suffix - middle - 1;
134 int prefix_len = middle - prefix - 1;
135 char buf[STRING_MAX];
136
137 memcpy (buf, prefix + 1, prefix_len);
138 strcpy (buf + prefix_len + 1, suffix + 1);
139
140 for (int i = 0; i < range; i++)
141 {
142 buf [prefix_len] = middle [i + 1];
143 register_translation (keysym + i, state, strdup (buf));
144 }
145
146 free (translation);
147 return;
148 }
149 else
150 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
151 }
152
153 register_translation (keysym, state, translation);
154}
155
156void
157keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
158{
159 keysym_t *key = new keysym_t; 109 keysym_t *key = new keysym_t;
160 110
161 if (key && translation)
162 {
163 key->keysym = keysym; 111 key->keysym = keysym;
164 key->state = state; 112 key->state = state;
165 key->str = translation; 113 key->str = translation;
166 key->type = keysym_t::STRING; 114 key->type = keysym_t::STRING;
167 115
168 if (strncmp (translation, "builtin:", 8) == 0) 116 if (strncmp (translation, "builtin:", 8) == 0)
169 key->type = keysym_t::BUILTIN; 117 key->type = keysym_t::BUILTIN;
170 118
171 if (keymap.size () == keymap.capacity ()) 119 if (keymap.size () == keymap.capacity ())
172 keymap.reserve (keymap.size () * 2); 120 keymap.reserve (keymap.size () * 2);
173 121
174 keymap.push_back (key); 122 keymap.push_back (key);
175 hash[0] = 3; 123 hash[0] = 3;
176 }
177 else
178 {
179 delete key;
180 free (translation);
181 rxvt_fatal ("memory allocation failure. aborting.\n");
182 }
183} 124}
184 125
185bool 126bool
186keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 127keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
187{ 128{
… …
202 { 143 {
203 keysym_t *key = keymap [index]; 144 keysym_t *key = keymap [index];
204 145
205 if (key->type != keysym_t::BUILTIN) 146 if (key->type != keysym_t::BUILTIN)
206 { 147 {
207 wchar_t *wc = rxvt_utf8towcs (key->str); 148 wchar_t *ws = rxvt_utf8towcs (key->str);
208 char *str = rxvt_wcstombs (wc); 149 char *str = rxvt_wcstombs (ws);
209 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 150 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
210 free (wc); 151 free (ws);
211 152
212 output_string (term, str); 153 output_string (term, str);
213 154
214 free (str); 155 free (str);
215 156
… …
222 163
223void 164void
224keyboard_manager::register_done () 165keyboard_manager::register_done ()
225{ 166{
226 unsigned int i, index, hashkey; 167 unsigned int i, index, hashkey;
227 vector <keysym_t *> sorted_keymap;
228 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
229 169
230 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 170 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
231 171
232 // determine hash bucket size 172 // determine hash bucket size
… …
236 ++hash_bucket_size [hashkey]; 176 ++hash_bucket_size [hashkey];
237 } 177 }
238 178
239 // now we know the size of each bucket 179 // now we know the size of each bucket
240 // compute the index of each bucket 180 // compute the index of each bucket
241 hash [0] = 0;
242 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 181 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
243 { 182 {
244 index += hash_bucket_size [i - 1];
245 hash [i] = index; 183 hash [i] = index;
184 index += hash_bucket_size [i];
246 } 185 }
247 186
248 // and allocate just enough space 187 // and allocate just enough space
249 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 188 simplevec <keysym_t *> sorted_keymap (index, 0);
250 189
251 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 190 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
252 191
253 // fill in sorted_keymap 192 // fill in sorted_keymap
254 // it is sorted in each bucket 193 // it is sorted in each bucket

Diff Legend

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