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.53 by sf-exg, Fri Dec 2 09:13:50 2011 UTC vs.
Revision 1.63 by root, Sat Apr 26 20:51:12 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{
… …
105 free (keymap [i]->str); 88 free (keymap [i]->str);
106 delete keymap [i]; 89 delete keymap [i];
107 } 90 }
108} 91}
109 92
110// a wrapper for register_translation that converts the input string
111// to utf-8 and expands 'list' syntax.
112void 93void
113keyboard_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)
114{ 95{
115 char *translation = rxvt_wcstoutf8 (ws); 96 char *translation = rxvt_wcstoutf8 (ws);
116 97
117 register_translation (keysym, state, translation);
118}
119
120void
121keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
122{
123 keysym_t *key = new keysym_t; 98 keysym_t *key = new keysym_t;
124 99
125 if (key && translation)
126 {
127 key->keysym = keysym; 100 key->keysym = keysym;
128 key->state = state; 101 key->state = state;
129 key->str = translation; 102 key->str = translation;
130 key->type = keysym_t::STRING; 103 key->type = keysym_t::STRING;
131 104
132 if (strncmp (translation, "builtin:", 8) == 0) 105 if (strncmp (translation, "builtin:", 8) == 0)
133 key->type = keysym_t::BUILTIN; 106 key->type = keysym_t::BUILTIN;
134 107
135 if (keymap.size () == keymap.capacity ()) 108 if (keymap.size () == keymap.capacity ())
136 keymap.reserve (keymap.size () * 2); 109 keymap.reserve (keymap.size () * 2);
137 110
138 keymap.push_back (key); 111 keymap.push_back (key);
139 hash[0] = 3; 112 hash[0] = 3;
140 }
141 else
142 {
143 delete key;
144 free (translation);
145 rxvt_fatal ("memory allocation failure. aborting.\n");
146 }
147} 113}
148 114
149bool 115bool
150keyboard_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)
151{ 117{
152 assert (("register_done() need to be called", hash[0] == 0)); 118 assert (("register_done() need to be called", hash[0] == 0));
153 119
154 state &= OtherModMask; // mask out uninteresting modifiers 120 state &= OtherModMask; // mask out uninteresting modifiers
155 121
… …
171 wchar_t *ws = rxvt_utf8towcs (key->str); 137 wchar_t *ws = rxvt_utf8towcs (key->str);
172 char *str = rxvt_wcstombs (ws); 138 char *str = rxvt_wcstombs (ws);
173 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 139 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
174 free (ws); 140 free (ws);
175 141
176 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 (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 (str, strlen (str));
177 155
178 free (str); 156 free (str);
179 157
180 return true; 158 return true;
181 } 159 }
… …
186 164
187void 165void
188keyboard_manager::register_done () 166keyboard_manager::register_done ()
189{ 167{
190 unsigned int i, index, hashkey; 168 unsigned int i, index, hashkey;
191 vector <keysym_t *> sorted_keymap;
192 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
193 170
194 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 171 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
195 172
196 // determine hash bucket size 173 // determine hash bucket size
… …
200 ++hash_bucket_size [hashkey]; 177 ++hash_bucket_size [hashkey];
201 } 178 }
202 179
203 // now we know the size of each bucket 180 // now we know the size of each bucket
204 // compute the index of each bucket 181 // compute the index of each bucket
205 hash [0] = 0;
206 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 182 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
207 { 183 {
208 index += hash_bucket_size [i - 1];
209 hash [i] = index; 184 hash [i] = index;
185 index += hash_bucket_size [i];
210 } 186 }
211 187
212 // and allocate just enough space 188 // and allocate just enough space
213 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 189 simplevec <keysym_t *> sorted_keymap (index, 0);
214 190
215 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 191 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
216 192
217 // fill in sorted_keymap 193 // fill in sorted_keymap
218 // it is sorted in each bucket 194 // it is sorted in each bucket

Diff Legend

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