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.66 by root, Thu May 1 03:14:13 2014 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
… …
89 delete keymap [i]; 89 delete keymap [i];
90 } 90 }
91} 91}
92 92
93void 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
94keyboard_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)
95{ 113{
96 char *translation = rxvt_wcstoutf8 (ws); 114 char *action = rxvt_wcstoutf8 (ws);
97 115
98 keysym_t *key = new keysym_t; 116 keysym_t *key = new keysym_t;
99 117
100 key->keysym = keysym; 118 key->keysym = keysym;
101 key->state = state; 119 key->state = state;
102 key->str = translation; 120 key->str = action;
103 key->type = keysym_t::STRING; 121 key->type = keysym_t::STRING;
104 122
105 if (strncmp (translation, "builtin:", 8) == 0) 123 if (strncmp (action, "builtin:", 8) == 0)
106 key->type = keysym_t::BUILTIN; 124 key->type = keysym_t::BUILTIN;
107 else if (strncmp (translation, "builtin-string:", 15) == 0) 125 else if (strncmp (action, "builtin-string:", 15) == 0)
108 key->type = keysym_t::BUILTIN_STRING; 126 key->type = keysym_t::BUILTIN_STRING;
127
128 unregister_action (keysym, state);
109 129
110 if (keymap.size () == keymap.capacity ()) 130 if (keymap.size () == keymap.capacity ())
111 keymap.reserve (keymap.size () * 2); 131 keymap.reserve (keymap.size () * 2);
112 132
113 keymap.push_back (key); 133 keymap.push_back (key);
… …
153 else if (strncmp (str, "string:", 7) == 0) 173 else if (strncmp (str, "string:", 7) == 0)
154 term->tt_write_user_input (colon + 1, strlen (colon + 1)); 174 term->tt_write_user_input (colon + 1, strlen (colon + 1));
155 else if (strncmp (str, "perl:", 5) == 0) 175 else if (strncmp (str, "perl:", 5) == 0)
156 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END)); 176 HOOK_INVOKE ((term, HOOK_USER_COMMAND, DT_STR, colon + 1, DT_END));
157 else 177 else
158 HOOK_INVOKE ((term, HOOK_KEYBOARD_DISPATCH, DT_STR_LEN, str, colon - str, DT_STR, colon + 1, DT_END)); 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));
159 } 179 }
160 else 180 else
161 term->tt_write_user_input (str, strlen (str)); 181 term->tt_write_user_input (str, strlen (str));
162 182
163 free (str); 183 free (str);

Diff Legend

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