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.52 by sf-exg, Fri Dec 2 09:02:05 2011 UTC vs.
Revision 1.56 by sf-exg, Mon Dec 5 12:22:50 2011 UTC

105 free (keymap [i]->str); 105 free (keymap [i]->str);
106 delete keymap [i]; 106 delete keymap [i];
107 } 107 }
108} 108}
109 109
110// a wrapper for register_translation that converts the input string
111// to utf-8 and expands 'list' syntax.
112void 110void
113keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws) 111keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
114{ 112{
115 char *translation = rxvt_wcstoutf8 (ws); 113 char *translation = rxvt_wcstoutf8 (ws);
116 114
117 if (strncmp (translation, "list", 4) == 0 && translation [4]
118 && strlen (translation) < STRING_MAX)
119 {
120 char *prefix = translation + 4;
121 char *middle = strchr (prefix + 1, translation [4]);
122 char *suffix = strrchr (prefix + 1, translation [4]);
123
124 if (suffix && middle && suffix > middle + 1)
125 {
126 int range = suffix - middle - 1;
127 int prefix_len = middle - prefix - 1;
128 char buf[STRING_MAX];
129
130 memcpy (buf, prefix + 1, prefix_len);
131 strcpy (buf + prefix_len + 1, suffix + 1);
132
133 for (int i = 0; i < range; i++)
134 {
135 buf [prefix_len] = middle [i + 1];
136 register_translation (keysym + i, state, strdup (buf));
137 }
138
139 free (translation);
140 return;
141 }
142 else
143 rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
144 }
145
146 register_translation (keysym, state, translation);
147}
148
149void
150keyboard_manager::register_translation (KeySym keysym, unsigned int state, char *translation)
151{
152 keysym_t *key = new keysym_t; 115 keysym_t *key = new keysym_t;
153 116
154 if (key && translation)
155 {
156 key->keysym = keysym; 117 key->keysym = keysym;
157 key->state = state; 118 key->state = state;
158 key->str = translation; 119 key->str = translation;
159 key->type = keysym_t::STRING; 120 key->type = keysym_t::STRING;
160 121
161 if (strncmp (translation, "builtin:", 8) == 0) 122 if (strncmp (translation, "builtin:", 8) == 0)
162 key->type = keysym_t::BUILTIN; 123 key->type = keysym_t::BUILTIN;
163 124
164 if (keymap.size () == keymap.capacity ()) 125 if (keymap.size () == keymap.capacity ())
165 keymap.reserve (keymap.size () * 2); 126 keymap.reserve (keymap.size () * 2);
166 127
167 keymap.push_back (key); 128 keymap.push_back (key);
168 hash[0] = 3; 129 hash[0] = 3;
169 }
170 else
171 {
172 delete key;
173 free (translation);
174 rxvt_fatal ("memory allocation failure. aborting.\n");
175 }
176} 130}
177 131
178bool 132bool
179keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state) 133keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
180{ 134{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines