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.57 by sf-exg, Wed Dec 21 11:14:43 2011 UTC vs.
Revision 1.64 by sf-exg, Tue Apr 29 13:10:06 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 33
34/* an intro to the data structure: 34/* an intro to the data structure:
… …
61 * 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
62 * 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[];
63 * Ni(the size of group i) = hash_bucket_size[Ii]. 63 * Ni(the size of group i) = hash_bucket_size[Ii].
64 */ 64 */
65 65
66static void
67output_string (rxvt_term *term, const char *str)
68{
69 if (strncmp (str, "command:", 8) == 0)
70 term->cmdbuf_append (str + 8, strlen (str) - 8);
71 else if (strncmp (str, "perl:", 5) == 0)
72 HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
73 else
74 term->tt_write (str, strlen (str));
75}
76
77// return: priority_of_a - priority_of_b 66// return: priority_of_a - priority_of_b
78static int 67static int
79compare_priority (keysym_t *a, keysym_t *b) 68compare_priority (keysym_t *a, keysym_t *b)
80{ 69{
81 // (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
82 int ca = ecb_popcount32 (a->state /* & OtherModMask */); 71 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
83 int cb = ecb_popcount32 (b->state /* & OtherModMask */); 72 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
84 73
85 if (ca != cb)
86 return ca - cb; 74 return ca - cb;
87//else if (a->state != b->state) // this behavior is to be discussed
88// return b->state - a->state;
89 else
90 return 0;
91} 75}
92 76
93//////////////////////////////////////////////////////////////////////////////// 77////////////////////////////////////////////////////////////////////////////////
94keyboard_manager::keyboard_manager () 78keyboard_manager::keyboard_manager ()
95{ 79{
… …
127 keymap.push_back (key); 111 keymap.push_back (key);
128 hash[0] = 3; 112 hash[0] = 3;
129} 113}
130 114
131bool 115bool
132keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 116keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
133{ 117{
134 assert (("register_done() need to be called", hash[0] == 0)); 118 assert (("register_done() need to be called", hash[0] == 0));
135 119
136 state &= OtherModMask; // mask out uninteresting modifiers 120 state &= OtherModMask; // mask out uninteresting modifiers
137 121
… …
153 wchar_t *ws = rxvt_utf8towcs (key->str); 137 wchar_t *ws = rxvt_utf8towcs (key->str);
154 char *str = rxvt_wcstombs (ws); 138 char *str = rxvt_wcstombs (ws);
155 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 139 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
156 free (ws); 140 free (ws);
157 141
158 output_string (term, str); 142 if (char *colon = strchr (str, ':'))
143 {
144 if (strncmp (str, "command:", 8) == 0)
145 term->cmdbuf_append (str + 8, strlen (str) - 8);
146 else if (strncmp (str, "string:", 7) == 0)
147 term->tt_write_user_input (colon + 1, strlen (colon + 1));
148 else if (strncmp (str, "perl:", 8) == 0)
149 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
150 else
151 HOOK_INVOKE ((term, HOOK_KEYBOARD_DISPATCH, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_END));
152 }
153 else
154 term->tt_write_user_input (str, strlen (str));
159 155
160 free (str); 156 free (str);
161 157
162 return true; 158 return true;
163 } 159 }
… …
168 164
169void 165void
170keyboard_manager::register_done () 166keyboard_manager::register_done ()
171{ 167{
172 unsigned int i, index, hashkey; 168 unsigned int i, index, hashkey;
173 vector <keysym_t *> sorted_keymap;
174 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 169 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
175 170
176 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 171 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
177 172
178 // determine hash bucket size 173 // determine hash bucket size
… …
182 ++hash_bucket_size [hashkey]; 177 ++hash_bucket_size [hashkey];
183 } 178 }
184 179
185 // now we know the size of each bucket 180 // now we know the size of each bucket
186 // compute the index of each bucket 181 // compute the index of each bucket
187 hash [0] = 0;
188 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 182 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
189 { 183 {
190 index += hash_bucket_size [i - 1];
191 hash [i] = index; 184 hash [i] = index;
185 index += hash_bucket_size [i];
192 } 186 }
193 187
194 // and allocate just enough space 188 // and allocate just enough space
195 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 189 simplevec <keysym_t *> sorted_keymap (index, 0);
196 190
197 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 191 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
198 192
199 // fill in sorted_keymap 193 // fill in sorted_keymap
200 // it is sorted in each bucket 194 // it is sorted in each bucket

Diff Legend

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