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.49 by sf-exg, Sun Nov 27 12:12:49 2011 UTC vs.
Revision 1.53 by sf-exg, Fri Dec 2 09:13:50 2011 UTC

… …
98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data 98 hash [0] = 1; // hash[0] != 0 indicates uninitialized data
99} 99}
100 100
101keyboard_manager::~keyboard_manager () 101keyboard_manager::~keyboard_manager ()
102{ 102{
103 hash [0] = 2;
104
105 for (unsigned int i = 0; i < keymap.size (); ++i) 103 for (unsigned int i = 0; i < keymap.size (); ++i)
106 { 104 {
107 free (keymap [i]->str); 105 free (keymap [i]->str);
108 delete keymap [i]; 106 delete keymap [i];
109 keymap [i] = 0;
110 } 107 }
111
112 keymap.clear ();
113} 108}
114 109
115// a wrapper for register_translation that converts the input string 110// a wrapper for register_translation that converts the input string
116// to utf-8 and expands 'list' syntax. 111// to utf-8 and expands 'list' syntax.
117void 112void
118keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans) 113keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
119{ 114{
120 wchar_t *wc = rxvt_mbstowcs (trans);
121 char *translation = rxvt_wcstoutf8 (wc); 115 char *translation = rxvt_wcstoutf8 (ws);
122 free (wc);
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 {
133 int range = suffix - middle - 1;
134 int prefix_len = middle - prefix - 1;
135 char buf[STRING_MAX];
136
137 memcpy (buf, prefix + 1, prefix_len);
138 strcpy (buf + prefix_len + 1, suffix + 1);
139
140 for (int i = 0; i < range; i++)
141 {
142 buf [prefix_len] = middle [i + 1];
143 register_translation (keysym + i, state, strdup (buf));
144 }
145
146 free (translation);
147 return;
148 }
149 else
150 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
151 }
152 116
153 register_translation (keysym, state, translation); 117 register_translation (keysym, state, translation);
154} 118}
155 119
156void 120void
… …
202 { 166 {
203 keysym_t *key = keymap [index]; 167 keysym_t *key = keymap [index];
204 168
205 if (key->type != keysym_t::BUILTIN) 169 if (key->type != keysym_t::BUILTIN)
206 { 170 {
207 wchar_t *wc = rxvt_utf8towcs (key->str); 171 wchar_t *ws = rxvt_utf8towcs (key->str);
208 char *str = rxvt_wcstombs (wc); 172 char *str = rxvt_wcstombs (ws);
209 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.) 173 // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
210 free (wc); 174 free (ws);
211 175
212 output_string (term, str); 176 output_string (term, str);
213 177
214 free (str); 178 free (str);
215 179

Diff Legend

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