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.58 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.69 by root, Thu May 22 18:54:33 2014 UTC

… …
6 * Copyright (c) 2005 WU Fengguang 6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de> 7 * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 3 of the License, or
12 * (at your option) any later version. 12 * (at your option) any later version.
13 * 13 *
14 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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{
… …
105 delete keymap [i]; 89 delete keymap [i];
106 } 90 }
107} 91}
108 92
109void 93void
110keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) 94keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
111{ 95{
112 char *translation = rxvt_wcstoutf8 (ws); 96 char *translation = rxvt_wcstoutf8 (ws);
113 97
114 keysym_t *key = new keysym_t; 98 keysym_t *key = new keysym_t;
115 99
… …
118 key->str = translation; 102 key->str = translation;
119 key->type = keysym_t::STRING; 103 key->type = keysym_t::STRING;
120 104
121 if (strncmp (translation, "builtin:", 8) == 0) 105 if (strncmp (translation, "builtin:", 8) == 0)
122 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;
123 109
124 if (keymap.size () == keymap.capacity ()) 110 if (keymap.size () == keymap.capacity ())
125 keymap.reserve (keymap.size () * 2); 111 keymap.reserve (keymap.size () * 2);
126 112
127 keymap.push_back (key); 113 keymap.push_back (key);
128 hash[0] = 3; 114 hash[0] = 3;
129} 115}
130 116
131bool 117bool
132keyboard_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)
133{ 119{
134 assert (("register_done() need to be called", hash[0] == 0)); 120 assert (("register_done() need to be called", hash[0] == 0));
135 121
136 state &= OtherModMask; // mask out uninteresting modifiers 122 state &= OtherModMask; // mask out uninteresting modifiers
137 123
… …
146 132
147 if (index >= 0) 133 if (index >= 0)
148 { 134 {
149 keysym_t *key = keymap [index]; 135 keysym_t *key = keymap [index];
150 136
137 if (key->type == keysym_t::BUILTIN_STRING)
138 {
139 term->tt_write_user_input (kbuf, len);
140 return true;
141 }
151 if (key->type != keysym_t::BUILTIN) 142 else if (key->type != keysym_t::BUILTIN)
152 { 143 {
153 wchar_t *ws = rxvt_utf8towcs (key->str); 144 wchar_t *ws = rxvt_utf8towcs (key->str);
154 char *str = rxvt_wcstombs (ws); 145 char *str = rxvt_wcstombs (ws);
155 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 146 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
156 free (ws); 147 free (ws);
157 148
158 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_ACTION, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_INT, 0, DT_STR_LEN, kbuf, len, DT_END));
159 }
160 else
161 term->tt_write_user_input (str, strlen (str));
159 162
160 free (str); 163 free (str);
161 164
162 return true; 165 return true;
163 } 166 }
… …
168 171
169void 172void
170keyboard_manager::register_done () 173keyboard_manager::register_done ()
171{ 174{
172 unsigned int i, index, hashkey; 175 unsigned int i, index, hashkey;
173 vector <keysym_t *> sorted_keymap;
174 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
175 177
176 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 178 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
177 179
178 // determine hash bucket size 180 // determine hash bucket size
… …
182 ++hash_bucket_size [hashkey]; 184 ++hash_bucket_size [hashkey];
183 } 185 }
184 186
185 // now we know the size of each bucket 187 // now we know the size of each bucket
186 // compute the index of each bucket 188 // compute the index of each bucket
187 hash [0] = 0;
188 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 189 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
189 { 190 {
190 index += hash_bucket_size [i - 1];
191 hash [i] = index; 191 hash [i] = index;
192 index += hash_bucket_size [i];
192 } 193 }
193 194
194 // and allocate just enough space 195 // and allocate just enough space
195 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 196 simplevec <keysym_t *> sorted_keymap (index, 0);
196 197
197 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 198 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
198 199
199 // fill in sorted_keymap 200 // fill in sorted_keymap
200 // it is sorted in each bucket 201 // it is sorted in each bucket

Diff Legend

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