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.48 by sf-exg, Sun Nov 27 12:12:33 2011 UTC vs.
Revision 1.72 by sf-exg, Tue Mar 17 09:23:08 2015 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
… …
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{
… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 81 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 82}
100 83
101keyboard_manager::~keyboard_manager () 84keyboard_manager::~keyboard_manager ()
102{ 85{
103 hash [0] = 2;
104
105 for (unsigned int i = 0; i < keymap.size (); ++i) 86 for (unsigned int i = 0; i < keymap.size (); ++i)
106 { 87 {
107 free (keymap [i]->str); 88 free (keymap [i]->str);
108 delete keymap [i]; 89 delete keymap [i];
109 keymap [i] = 0;
110 } 90 }
111
112 keymap.clear ();
113} 91}
114 92
115// a wrapper for register_translation that converts the input string
116// to utf-8 and expands 'list' syntax.
117void 93void
118keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 94keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
119{ 95{
120 wchar_t *wc = rxvt_mbstowcs (trans); 96 for (unsigned int i = 0; i < keymap.size (); ++i)
121 char *translation = rxvt_wcstoutf8 (wc); 97 if (keymap [i]->keysym == keysym
122 free (wc); 98 && 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 { 99 {
133 int range = suffix - middle - 1; 100 free (keymap [i]->str);
134 int prefix_len = middle - prefix - 1; 101 delete keymap [i];
135 char buf[STRING_MAX];
136 102
137 memcpy (buf, prefix + 1, prefix_len); 103 if (i < keymap.size () - 1)
138 strcpy (buf + prefix_len + 1, suffix + 1); 104 keymap [i] = keymap [keymap.size () - 1];
105 keymap.pop_back ();
139 106
140 for (int i = 0; i < range; i++) 107 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 } 108 }
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} 109}
155 110
156void 111void
157keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation) 112keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
158{ 113{
114 char *action = rxvt_wcstoutf8 (ws);
115
159 keysym_t *key = new keysym_t; 116 keysym_t *key = new keysym_t;
160 117
161 if (key && translation)
162 {
163 key->keysym = keysym; 118 key->keysym = keysym;
164 key->state = state; 119 key->state = state;
165 key->str = translation; 120 key->str = action;
166 key->type = keysym_t::STRING; 121 key->type = keysym_t::STRING;
167 122
168 if (strncmp (translation, "builtin:", 8) == 0) 123 if (strncmp (action, "builtin:", 8) == 0)
169 key->type = keysym_t::BUILTIN; 124 key->type = keysym_t::BUILTIN;
125 else if (strncmp (action, "builtin-string:", 15) == 0)
126 key->type = keysym_t::BUILTIN_STRING;
170 127
128 unregister_action (keysym, state);
129
171 if (keymap.size () == keymap.capacity ()) 130 if (keymap.size () == keymap.capacity ())
172 keymap.reserve (keymap.size () * 2); 131 keymap.reserve (keymap.size () * 2);
173 132
174 keymap.push_back (key); 133 keymap.push_back (key);
175 hash[0] = 3; 134 hash[0] = 3;
176 }
177 else
178 {
179 delete key;
180 free (translation);
181 rxvt_fatal ("memory allocation failure. aborting.\n");
182 }
183} 135}
184 136
185bool 137keysym_t *
186keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 138keyboard_manager::lookup_keysym (rxvt_term *term, KeySym keysym, unsigned int state)
187{ 139{
188 assert (("register_done() need to be called", hash[0] == 0)); 140 assert (("register_done() need to be called", hash[0] == 0));
189 141
190 state &= OtherModMask; // mask out uninteresting modifiers 142 state &= OtherModMask; // mask out uninteresting modifiers
191 143
… …
196 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask)) 148 if (!!(term->priv_modes & PrivMode_aplKP) != !!(state & ShiftMask))
197 state |= AppKeypadMask; 149 state |= AppKeypadMask;
198 150
199 int index = find_keysym (keysym, state); 151 int index = find_keysym (keysym, state);
200 152
201 if (index >= 0) 153 return index >= 0 ? keymap [index] : 0;
202 { 154}
203 const keysym_t &key = *keymap [index];
204 155
156bool
157keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
158{
159 keysym_t *key = lookup_keysym (term, keysym, state);
160
161 if (key)
162 {
205 if (key.type != keysym_t::BUILTIN) 163 if (key->type == keysym_t::BUILTIN_STRING)
206 { 164 {
207 wchar_t *wc = rxvt_utf8towcs (key.str); 165 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; 166 return true;
217 } 167 }
168 else if (key->type != keysym_t::BUILTIN)
169 {
170 wchar_t *ws = rxvt_utf8towcs (key->str);
171 char *str = rxvt_wcstombs (ws);
172 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
173 free (ws);
174
175 if (char *colon = strchr (str, ':'))
176 {
177 if (strncmp (str, "command:", 8) == 0)
178 term->cmdbuf_append (str + 8, strlen (str) - 8);
179 else if (strncmp (str, "string:", 7) == 0)
180 term->tt_write_user_input (colon + 1, strlen (colon + 1));
181 else if (strncmp (str, "perl:", 5) == 0)
182 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
183 else
184 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));
185 }
186 else
187 term->tt_write_user_input (str, strlen (str));
188
189 free (str);
190
191 return true;
192 }
218 } 193 }
219 194
220 return false; 195 return false;
221} 196}
222 197
223void 198void
224keyboard_manager::register_done () 199keyboard_manager::register_done ()
225{ 200{
226 unsigned int i, index, hashkey; 201 unsigned int i, index, hashkey;
227 vector <keysym_t *> sorted_keymap;
228 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 202 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
229 203
230 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 204 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
231 205
232 // determine hash bucket size 206 // determine hash bucket size
… …
236 ++hash_bucket_size [hashkey]; 210 ++hash_bucket_size [hashkey];
237 } 211 }
238 212
239 // now we know the size of each bucket 213 // now we know the size of each bucket
240 // compute the index of each bucket 214 // compute the index of each bucket
241 hash [0] = 0;
242 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 215 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
243 { 216 {
244 index += hash_bucket_size [i - 1];
245 hash [i] = index; 217 hash [i] = index;
218 index += hash_bucket_size [i];
246 } 219 }
247 220
248 // and allocate just enough space 221 // and allocate just enough space
249 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 222 simplevec <keysym_t *> sorted_keymap (index, 0);
250 223
251 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 224 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
252 225
253 // fill in sorted_keymap 226 // fill in sorted_keymap
254 // it is sorted in each bucket 227 // it is sorted in each bucket

Diff Legend

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