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.47 by sf-exg, Sun Nov 27 10:49:25 2011 UTC vs.
Revision 1.73 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * 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 11 * 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 12 * the Free Software Foundation; either version 3 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
13 * 14 *
14 * This program is distributed in the hope that it will be useful, 15 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
24#include "../config.h" 25#include "../config.h"
25#include "rxvt.h" 26#include "rxvt.h"
26 27
27#ifdef KEYSYM_RESOURCE 28#ifdef KEYSYM_RESOURCE
28 29
29#include <cstring> 30#include <string.h>
30 31
31#include "rxvtperl.h" 32#include "rxvtperl.h"
32#include "keyboard.h" 33#include "keyboard.h"
33#include "command.h"
34 34
35/* an intro to the data structure: 35/* an intro to the data structure:
36 * 36 *
37 * vector keymap[] is grouped. 37 * vector keymap[] is grouped.
38 * 38 *
… …
62 * where hashkey of keymap[i]->keysym = keymap[i]->keysym & KEYSYM_HASH_MASK 62 * 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[]; 63 * 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]. 64 * Ni(the size of group i) = hash_bucket_size[Ii].
65 */ 65 */
66 66
67static void
68output_string (rxvt_term *rt, const char *str)
69{
70 if (strncmp (str, "command:", 8) == 0)
71 rt->cmdbuf_append (str + 8, strlen (str) - 8);
72 else if (strncmp (str, "perl:", 5) == 0)
73 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
74 else
75 rt->tt_write (str, strlen (str));
76}
77
78// return: priority_of_a - priority_of_b 67// return: priority_of_a - priority_of_b
79static int 68static int
80compare_priority (keysym_t *a, keysym_t *b) 69compare_priority (keysym_t *a, keysym_t *b)
81{ 70{
82 // (the more '1's in state; the less range): the greater priority 71 // (the more '1's in state; the less range): the greater priority
83 int ca = ecb_popcount32 (a->state /* & OtherModMask */); 72 int ca = ecb_popcount32 (a->state /* & OtherModMask */);
84 int cb = ecb_popcount32 (b->state /* & OtherModMask */); 73 int cb = ecb_popcount32 (b->state /* & OtherModMask */);
85 74
86 if (ca != cb)
87 return ca - cb; 75 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} 76}
93 77
94//////////////////////////////////////////////////////////////////////////////// 78////////////////////////////////////////////////////////////////////////////////
95keyboard_manager::keyboard_manager () 79keyboard_manager::keyboard_manager ()
96{ 80{
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 82 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 83}
100 84
101keyboard_manager::~keyboard_manager () 85keyboard_manager::~keyboard_manager ()
102{ 86{
103 hash [0] = 2;
104
105 for (unsigned int i = 0; i < keymap.size (); ++i) 87 for (unsigned int i = 0; i < keymap.size (); ++i)
106 { 88 {
107 free (keymap [i]->str); 89 free (keymap [i]->str);
108 delete keymap [i]; 90 delete keymap [i];
109 keymap [i] = 0;
110 } 91 }
111
112 keymap.clear ();
113} 92}
114 93
115// a wrapper for register_translation that converts the input string
116// to utf-8 and expands 'list' syntax.
117void 94void
118keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 95keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
119{ 96{
120 wchar_t *wc = rxvt_mbstowcs (trans); 97 for (unsigned int i = 0; i < keymap.size (); ++i)
121 char *translation = rxvt_wcstoutf8 (wc); 98 if (keymap [i]->keysym == keysym
122 free (wc); 99 && keymap [i]->state == state)
123
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 { 100 {
133 int range = suffix - middle - 1; 101 free (keymap [i]->str);
134 int prefix_len = middle - prefix - 1; 102 delete keymap [i];
135 char buf[STRING_MAX];
136 103
137 memcpy (buf, prefix + 1, prefix_len); 104 if (i < keymap.size () - 1)
138 strcpy (buf + prefix_len + 1, suffix + 1); 105 keymap [i] = keymap [keymap.size () - 1];
106 keymap.pop_back ();
139 107
140 for (int i = 0; i < range; i++) 108 break;
141 {
142 buf [prefix_len] = middle [i + 1];
143 register_translation (keysym + i, state, strdup (buf));
144 }
145
146 free (translation);
147 return;
148 } 109 }
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} 110}
155 111
156void 112void
157keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) 113keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
158{ 114{
115 char *action = rxvt_wcstoutf8 (ws);
116
159 keysym_t *key = new keysym_t; 117 keysym_t *key = new keysym_t;
160 118
161 if (key && translation)
162 {
163 key->keysym = keysym; 119 key->keysym = keysym;
164 key->state = state; 120 key->state = state;
165 key->str = translation; 121 key->str = action;
166 key->type = keysym_t::STRING; 122 key->type = keysym_t::STRING;
167 123
168 if (strncmp (translation, "builtin:", 8) == 0) 124 if (strncmp (action, "builtin:", 8) == 0)
169 key->type = keysym_t::BUILTIN; 125 key->type = keysym_t::BUILTIN;
126 else if (strncmp (action, "builtin-string:", 15) == 0)
127 key->type = keysym_t::BUILTIN_STRING;
170 128
129 unregister_action (keysym, state);
130
171 if (keymap.size () == keymap.capacity ()) 131 if (keymap.size () == keymap.capacity ())
172 keymap.reserve (keymap.size () * 2); 132 keymap.reserve (keymap.size () * 2);
173 133
174 keymap.push_back (key); 134 keymap.push_back (key);
175 hash[0] = 3; 135 hash[0] = 3;
176 }
177 else
178 {
179 delete key;
180 free (translation);
181 rxvt_fatal ("memory allocation failure. aborting.\n");
182 }
183} 136}
184 137
185bool 138keysym_t *
186keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 139keyboard_manager::lookup_keysym (rxvt_term *term, KeySym keysym, unsigned int state)
187{ 140{
188 assert (("register_done() need to be called", hash[0] == 0)); 141 assert (("register_done() need to be called", hash[0] == 0));
189 142
190 state &= OtherModMask; // mask out uninteresting modifiers 143 state &= OtherModMask; // mask out uninteresting modifiers
191 144
… …
196 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 149 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
197 state |= AppKeypadMask; 150 state |= AppKeypadMask;
198 151
199 int index = find_keysym (keysym, state); 152 int index = find_keysym (keysym, state);
200 153
201 if (index >= 0) 154 return index >= 0 ? keymap [index] : 0;
202 { 155}
203 const keysym_t &key = *keymap [index];
204 156
157bool
158keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
159{
160 keysym_t *key = lookup_keysym (term, keysym, state);
161
162 if (key)
163 {
205 if (key.type != keysym_t::BUILTIN) 164 if (key->type == keysym_t::BUILTIN_STRING)
206 { 165 {
207 wchar_t *wc = rxvt_utf8towcs (key.str); 166 term->tt_write_user_input (kbuf, len);
208 char *str = rxvt_wcstombs (wc);
209 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
210 free (wc);
211
212 output_string (term, str);
213
214 free (str);
215
216 return true; 167 return true;
217 } 168 }
169 else if (key->type != keysym_t::BUILTIN)
170 {
171 wchar_t *ws = rxvt_utf8towcs (key->str);
172 char *str = rxvt_wcstombs (ws);
173 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
174 free (ws);
175
176 if (char *colon = strchr (str, ':'))
177 {
178 if (strncmp (str, "command:", 8) == 0)
179 term->cmdbuf_append (str + 8, strlen (str) - 8);
180 else if (strncmp (str, "string:", 7) == 0)
181 term->tt_write_user_input (colon + 1, strlen (colon + 1));
182 else if (strncmp (str, "perl:", 5) == 0)
183 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
184 else
185 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));
186 }
187 else
188 term->tt_write_user_input (str, strlen (str));
189
190 free (str);
191
192 return true;
193 }
218 } 194 }
219 195
220 return false; 196 return false;
221} 197}
222 198
223void 199void
224keyboard_manager::register_done () 200keyboard_manager::register_done ()
225{ 201{
226 unsigned int i, index, hashkey; 202 unsigned int i, index, hashkey;
227 vector <keysym_t *> sorted_keymap;
228 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 203 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
229 204
230 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 205 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
231 206
232 // determine hash bucket size 207 // determine hash bucket size
… …
236 ++hash_bucket_size [hashkey]; 211 ++hash_bucket_size [hashkey];
237 } 212 }
238 213
239 // now we know the size of each bucket 214 // now we know the size of each bucket
240 // compute the index of each bucket 215 // compute the index of each bucket
241 hash [0] = 0;
242 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 216 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
243 { 217 {
244 index += hash_bucket_size [i - 1];
245 hash [i] = index; 218 hash [i] = index;
219 index += hash_bucket_size [i];
246 } 220 }
247 221
248 // and allocate just enough space 222 // and allocate just enough space
249 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 223 simplevec <keysym_t *> sorted_keymap (index, 0);
250 224
251 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 225 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
252 226
253 // fill in sorted_keymap 227 // fill in sorted_keymap
254 // it is sorted in each bucket 228 // it is sorted in each bucket

Diff Legend

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