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.16 by root, Fri Apr 22 02:09:39 2005 UTC vs.
Revision 1.26 by root, Mon Oct 9 23:12:45 2006 UTC

1/*----------------------------------------------------------------------*
2 * File: keyboard.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005 WU Fengguang
7 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
8 *
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
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *----------------------------------------------------------------------*/
23
1#include "../config.h" 24#include "../config.h"
2#include "rxvt.h" 25#include "rxvt.h"
3 26
4#ifdef KEYSYM_RESOURCE 27#ifdef KEYSYM_RESOURCE
5 28
6#include <cstring> 29#include <cstring>
7 30
31#include "rxvtperl.h"
8#include "keyboard.h" 32#include "keyboard.h"
9#include "command.h" 33#include "command.h"
10 34
11/* an intro to the data structure: 35/* an intro to the data structure:
12 * 36 *
… …
45// default keycode translation map and keyevent handlers 69// default keycode translation map and keyevent handlers
46 70
47keysym_t keyboard_manager::stock_keymap[] = { 71keysym_t keyboard_manager::stock_keymap[] = {
48 /* examples */ 72 /* examples */
49 /* keysym, state, range, handler, str */ 73 /* keysym, state, range, handler, str */
50//{XK_ISO_Left_Tab, 0, 1, keysym_t::NORMAL, "\033[Z"}, 74//{XK_ISO_Left_Tab, 0, 1, keysym_t::STRING, "\033[Z"},
51//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"}, 75//{ 'a', 0, 26, keysym_t::RANGE_META8, "a" "%c"},
52//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"}, 76//{ 'a', ControlMask, 26, keysym_t::RANGE_META8, "" "%c"},
53//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."}, 77//{ XK_Left, 0, 4, keysym_t::LIST, ".\033[.DACB."},
54//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."}, 78//{ XK_Left, ShiftMask, 4, keysym_t::LIST, ".\033[.dacb."},
55//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."}, 79//{ XK_Left, ControlMask, 4, keysym_t::LIST, ".\033O.dacb."},
56//{ XK_Tab, ControlMask, 1, keysym_t::NORMAL, "\033<C-Tab>"}, 80//{ XK_Tab, ControlMask, 1, keysym_t::STRING, "\033<C-Tab>"},
57//{ XK_apostrophe, ControlMask, 1, keysym_t::NORMAL, "\033<C-'>"}, 81//{ XK_apostrophe, ControlMask, 1, keysym_t::STRING, "\033<C-'>"},
58//{ XK_slash, ControlMask, 1, keysym_t::NORMAL, "\033<C-/>"}, 82//{ XK_slash, ControlMask, 1, keysym_t::STRING, "\033<C-/>"},
59//{ XK_semicolon, ControlMask, 1, keysym_t::NORMAL, "\033<C-;>"}, 83//{ XK_semicolon, ControlMask, 1, keysym_t::STRING, "\033<C-;>"},
60//{ XK_grave, ControlMask, 1, keysym_t::NORMAL, "\033<C-`>"}, 84//{ XK_grave, ControlMask, 1, keysym_t::STRING, "\033<C-`>"},
61//{ XK_comma, ControlMask, 1, keysym_t::NORMAL, "\033<C-\054>"}, 85//{ XK_comma, ControlMask, 1, keysym_t::STRING, "\033<C-\054>"},
62//{ XK_Return, ControlMask, 1, keysym_t::NORMAL, "\033<C-Return>"}, 86//{ XK_Return, ControlMask, 1, keysym_t::STRING, "\033<C-Return>"},
63//{ XK_Return, ShiftMask, 1, keysym_t::NORMAL, "\033<S-Return>"}, 87//{ XK_Return, ShiftMask, 1, keysym_t::STRING, "\033<S-Return>"},
64//{ ' ', ShiftMask, 1, keysym_t::NORMAL, "\033<S-Space>"}, 88//{ ' ', ShiftMask, 1, keysym_t::STRING, "\033<S-Space>"},
65//{ '.', ControlMask, 1, keysym_t::NORMAL, "\033<C-.>"}, 89//{ '.', ControlMask, 1, keysym_t::STRING, "\033<C-.>"},
66//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"}, 90//{ '0', ControlMask, 10, keysym_t::RANGE, "0" "\033<C-%c>"},
67//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"}, 91//{ '0', MetaMask|ControlMask, 10, keysym_t::RANGE, "0" "\033<M-C-%c>"},
68//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"}, 92//{ 'a', MetaMask|ControlMask, 26, keysym_t::RANGE, "a" "\033<M-C-%c>"},
69}; 93};
70#endif 94#endif
71 95
72static void 96static void
73output_string (rxvt_term *rt, const char *str) 97output_string (rxvt_term *rt, const char *str)
74{ 98{
75 if (strncmp (str, "command:", 8) == 0) 99 if (strncmp (str, "command:", 8) == 0)
76 rt->cmd_write ((unsigned char *)str + 8, strlen (str) - 8); 100 rt->cmd_write (str + 8, strlen (str) - 8);
101 else if (strncmp (str, "perl:", 5) == 0)
102 HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
77 else 103 else
78 rt->tt_write ((unsigned char *)str, strlen (str)); 104 rt->tt_write (str, strlen (str));
79} 105}
80 106
81static void 107static void
82output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen) 108output_string_meta8 (rxvt_term *rt, unsigned int state, char *buf, int buflen)
83{ 109{
… …
90 *ch |= 0x80; 116 *ch |= 0x80;
91 } 117 }
92 else if (rt->meta_char == C0_ESC) /* escape prefix */ 118 else if (rt->meta_char == C0_ESC) /* escape prefix */
93#endif 119#endif
94 { 120 {
95 const unsigned char ch = C0_ESC; 121 const char ch = C0_ESC;
96 rt->tt_write (&ch, 1); 122 rt->tt_write (&ch, 1);
97 } 123 }
98 } 124 }
99 125
100 rt->tt_write ((unsigned char *) buf, buflen); 126 rt->tt_write (buf, buflen);
101} 127}
102 128
103static int 129static int
104format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize) 130format_keyrange_string (const char *str, int keysym_offset, char *buf, int bufsize)
105{ 131{
… …
115} 141}
116 142
117//////////////////////////////////////////////////////////////////////////////// 143////////////////////////////////////////////////////////////////////////////////
118// return: #bits of '1' 144// return: #bits of '1'
119#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3) 145#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
120# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n); })) 146# define bitcount(n) (__extension__ ({ uint32_t n__ = (n); __builtin_popcount (n__); }))
121#else 147#else
122static int 148static int
123bitcount (uint16_t n) 149bitcount (uint16_t n)
124{ 150{
125 int i; 151 int i;
… …
189void 215void
190keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 216keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
191{ 217{
192 keysym_t *key = new keysym_t; 218 keysym_t *key = new keysym_t;
193 wchar_t *wc = rxvt_mbstowcs (trans); 219 wchar_t *wc = rxvt_mbstowcs (trans);
194 const char *translation = rxvt_wcstoutf8 (wc); 220 char *translation = rxvt_wcstoutf8 (wc);
195 free (wc); 221 free (wc);
196 222
197 if (key && translation) 223 if (key && translation)
198 { 224 {
199 key->keysym = keysym; 225 key->keysym = keysym;
200 key->state = state; 226 key->state = state;
201 key->range = 1; 227 key->range = 1;
202 key->str = translation; 228 key->str = translation;
203 key->type = keysym_t::NORMAL; 229 key->type = keysym_t::STRING;
204 230
205 if (strncmp (translation, "list", 4) == 0 && translation [4]) 231 if (strncmp (translation, "list", 4) == 0 && translation [4])
206 { 232 {
207 char *middle = strchr (translation + 5, translation [4]); 233 char *middle = strchr (translation + 5, translation [4]);
208 char *suffix = strrchr (translation + 5, translation [4]); 234 char *suffix = strrchr (translation + 5, translation [4]);
… …
210 if (suffix && middle && suffix > middle + 1) 236 if (suffix && middle && suffix > middle + 1)
211 { 237 {
212 key->type = keysym_t::LIST; 238 key->type = keysym_t::LIST;
213 key->range = suffix - middle - 1; 239 key->range = suffix - middle - 1;
214 240
215 strcpy (translation, translation + 4); 241 memmove (translation, translation + 4, strlen (translation + 4) + 1);
216 } 242 }
217 else 243 else
218 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation); 244 rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
219 } 245 }
220 else if (strncmp (translation, "builtin:", 8) == 0) 246 else if (strncmp (translation, "builtin:", 8) == 0)
… …
288 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 314 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
289 free (wc); 315 free (wc);
290 316
291 switch (key.type) 317 switch (key.type)
292 { 318 {
293 case keysym_t::NORMAL: 319 case keysym_t::STRING:
294 output_string (term, str); 320 output_string (term, str);
295 break; 321 break;
296 322
297 case keysym_t::RANGE: 323 case keysym_t::RANGE:
298 { 324 {
… …
417 ++hash_budget_counter [hashkey]; 443 ++hash_budget_counter [hashkey];
418 } 444 }
419 445
420 keymap.swap (sorted_keymap); 446 keymap.swap (sorted_keymap);
421 447
422#if defined (DEBUG_STRICT) || defined (DEBUG_KEYBOARD) 448#ifdef DEBUG_STRICT
423 // check for invariants 449 // check for invariants
424 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i) 450 for (i = 0; i < KEYSYM_HASH_BUDGETS; ++i)
425 { 451 {
426 index = hash[i]; 452 index = hash[i];
427 for (int j = 0; j < hash_budget_size [i]; ++j) 453 for (int j = 0; j < hash_budget_size [i]; ++j)

Diff Legend

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