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.55 by sf-exg, Sat Dec 3 11:47:19 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 *term, const char *str)
69{
70 if (strncmp (str, "command:", 8) == 0)
71 term->cmdbuf_append (str + 8, strlen (str) - 8);
72 else if (strncmp (str, "perl:", 5) == 0)
73 HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else
75 term->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 = ecb_popcount32 (a->state /* & OtherModMask */); 71 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = ecb_popcount32 (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{
… …
111keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) 94keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
112{ 95{
113 char *translation = rxvt_wcstoutf8 (ws); 96 char *translation = rxvt_wcstoutf8 (ws);
114 97
115 keysym_t *key = new keysym_t; 98 keysym_t *key = new keysym_t;
116
117 if (!key)
118 rxvt_fatal ("memory allocation failure. aborting.\n");
119 99
120 key->keysym = keysym; 100 key->keysym = keysym;
121 key->state = state; 101 key->state = state;
122 key->str = translation; 102 key->str = translation;
123 key->type = keysym_t::STRING; 103 key->type = keysym_t::STRING;
124 104
125 if (strncmp (translation, "builtin:", 8) == 0) 105 if (strncmp (translation, "builtin:", 8) == 0)
126 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;
127 109
128 if (keymap.size () == keymap.capacity ()) 110 if (keymap.size () == keymap.capacity ())
129 keymap.reserve (keymap.size () * 2); 111 keymap.reserve (keymap.size () * 2);
130 112
131 keymap.push_back (key); 113 keymap.push_back (key);
132 hash[0] = 3; 114 hash[0] = 3;
133} 115}
134 116
135bool 117bool
136keyboard_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)
137{ 119{
138 assert (("register_done() need to be called", hash[0] == 0)); 120 assert (("register_done() need to be called", hash[0] == 0));
139 121
140 state &= OtherModMask; // mask out uninteresting modifiers 122 state &= OtherModMask; // mask out uninteresting modifiers
141 123
… …
150 132
151 if (index >= 0) 133 if (index >= 0)
152 { 134 {
153 keysym_t *key = keymap [index]; 135 keysym_t *key = keymap [index];
154 136
137 if (key->type == keysym_t::BUILTIN_STRING)
138 {
139 term->tt_write_user_input (kbuf, len);
140 return true;
141 }
155 if (key->type != keysym_t::BUILTIN) 142 else if (key->type != keysym_t::BUILTIN)
156 { 143 {
157 wchar_t *ws = rxvt_utf8towcs (key->str); 144 wchar_t *ws = rxvt_utf8towcs (key->str);
158 char *str = rxvt_wcstombs (ws); 145 char *str = rxvt_wcstombs (ws);
159 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 146 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
160 free (ws); 147 free (ws);
161 148
162 output_string (term, str); 149 if (char *colon = strchr (str, ':'))
150 {
151 if (strncmp (str, "command:", 8) == 0)
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));
157 else
158 HOOK_INVOKE ((term, HOOK_KEYBOARD_DISPATCH, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_END));
159 }
160 else
161 term->tt_write_user_input (str, strlen (str));
163 162
164 free (str); 163 free (str);
165 164
166 return true; 165 return true;
167 } 166 }
… …
172 171
173void 172void
174keyboard_manager::register_done () 173keyboard_manager::register_done ()
175{ 174{
176 unsigned int i, index, hashkey; 175 unsigned int i, index, hashkey;
177 vector <keysym_t *> sorted_keymap;
178 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
179 177
180 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 178 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
181 179
182 // determine hash bucket size 180 // determine hash bucket size
… …
186 ++hash_bucket_size [hashkey]; 184 ++hash_bucket_size [hashkey];
187 } 185 }
188 186
189 // now we know the size of each bucket 187 // now we know the size of each bucket
190 // compute the index of each bucket 188 // compute the index of each bucket
191 hash [0] = 0;
192 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 189 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
193 { 190 {
194 index += hash_bucket_size [i - 1];
195 hash [i] = index; 191 hash [i] = index;
192 index += hash_bucket_size [i];
196 } 193 }
197 194
198 // and allocate just enough space 195 // and allocate just enough space
199 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 196 simplevec <keysym_t *> sorted_keymap (index, 0);
200 197
201 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 198 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
202 199
203 // fill in sorted_keymap 200 // fill in sorted_keymap
204 // it is sorted in each bucket 201 // it is sorted in each bucket

Diff Legend

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