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.71 by sf-exg, Thu Jan 15 14:30:04 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{
… …
106 delete keymap [i]; 89 delete keymap [i];
107 } 90 }
108} 91}
109 92
110void 93void
94keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
95{
96 for (unsigned int i = 0; i < keymap.size (); ++i)
97 if (keymap [i]->keysym == keysym
98 && keymap [i]->state == state)
99 {
100 free (keymap [i]->str);
101 delete keymap [i];
102
103 if (i < keymap.size () - 1)
104 keymap [i] = keymap [keymap.size () - 1];
105 keymap.pop_back ();
106
107 break;
108 }
109}
110
111void
111keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) 112keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
112{ 113{
113 char *translation = rxvt_wcstoutf8 (ws); 114 char *action = rxvt_wcstoutf8 (ws);
114 115
115 keysym_t *key = new keysym_t; 116 keysym_t *key = new keysym_t;
116
117 if (!key)
118 rxvt_fatal ("memory allocation failure. aborting.\n");
119 117
120 key->keysym = keysym; 118 key->keysym = keysym;
121 key->state = state; 119 key->state = state;
122 key->str = translation; 120 key->str = action;
123 key->type = keysym_t::STRING; 121 key->type = keysym_t::STRING;
124 122
125 if (strncmp (translation, "builtin:", 8) == 0) 123 if (strncmp (action, "builtin:", 8) == 0)
126 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;
127
128 unregister_action (keysym, state);
127 129
128 if (keymap.size () == keymap.capacity ()) 130 if (keymap.size () == keymap.capacity ())
129 keymap.reserve (keymap.size () * 2); 131 keymap.reserve (keymap.size () * 2);
130 132
131 keymap.push_back (key); 133 keymap.push_back (key);
132 hash[0] = 3; 134 hash[0] = 3;
133} 135}
134 136
135bool 137bool
136keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 138keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len)
137{ 139{
138 assert (("register_done() need to be called", hash[0] == 0)); 140 assert (("register_done() need to be called", hash[0] == 0));
139 141
140 state &= OtherModMask; // mask out uninteresting modifiers 142 state &= OtherModMask; // mask out uninteresting modifiers
141 143
… …
150 152
151 if (index >= 0) 153 if (index >= 0)
152 { 154 {
153 keysym_t *key = keymap [index]; 155 keysym_t *key = keymap [index];
154 156
157 if (key->type == keysym_t::BUILTIN_STRING)
158 {
159 term->tt_write_user_input (kbuf, len);
160 return true;
161 }
155 if (key->type != keysym_t::BUILTIN) 162 else if (key->type != keysym_t::BUILTIN)
156 { 163 {
157 wchar_t *ws = rxvt_utf8towcs (key->str); 164 wchar_t *ws = rxvt_utf8towcs (key->str);
158 char *str = rxvt_wcstombs (ws); 165 char *str = rxvt_wcstombs (ws);
159 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 166 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
160 free (ws); 167 free (ws);
161 168
162 output_string (term, str); 169 if (char *colon = strchr (str, ':'))
170 {
171 if (strncmp (str, "command:", 8) == 0)
172 term->cmdbuf_append (str + 8, strlen (str) - 8);
173 else if (strncmp (str, "string:", 7) == 0)
174 term->tt_write_user_input (colon + 1, strlen (colon + 1));
175 else if (strncmp (str, "perl:", 5) == 0)
176 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
177 else
178 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));
179 }
180 else
181 term->tt_write_user_input (str, strlen (str));
163 182
164 free (str); 183 free (str);
165 184
166 return true; 185 return true;
167 } 186 }
… …
172 191
173void 192void
174keyboard_manager::register_done () 193keyboard_manager::register_done ()
175{ 194{
176 unsigned int i, index, hashkey; 195 unsigned int i, index, hashkey;
177 vector <keysym_t *> sorted_keymap;
178 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket 196 uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS]; // size of each bucket
179 197
180 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 198 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
181 199
182 // determine hash bucket size 200 // determine hash bucket size
… …
186 ++hash_bucket_size [hashkey]; 204 ++hash_bucket_size [hashkey];
187 } 205 }
188 206
189 // now we know the size of each bucket 207 // now we know the size of each bucket
190 // compute the index of each bucket 208 // compute the index of each bucket
191 hash [0] = 0;
192 for (index = 0, i = 1; i < KEYSYM_HASH_BUCKETS; ++i) 209 for (index = 0, i = 0; i < KEYSYM_HASH_BUCKETS; ++i)
193 { 210 {
194 index += hash_bucket_size [i - 1];
195 hash [i] = index; 211 hash [i] = index;
212 index += hash_bucket_size [i];
196 } 213 }
197 214
198 // and allocate just enough space 215 // and allocate just enough space
199 sorted_keymap.insert (sorted_keymap.begin (), index + hash_bucket_size [i - 1], 0); 216 simplevec <keysym_t *> sorted_keymap (index, 0);
200 217
201 memset (hash_bucket_size, 0, sizeof (hash_bucket_size)); 218 memset (hash_bucket_size, 0, sizeof (hash_bucket_size));
202 219
203 // fill in sorted_keymap 220 // fill in sorted_keymap
204 // it is sorted in each bucket 221 // it is sorted in each bucket

Diff Legend

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