| … | |
… | |
| 163 | void |
163 | void |
| 164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
| 165 | { |
165 | { |
| 166 | rxvt_fontset *fs = FONTSET (r); |
166 | rxvt_fontset *fs = FONTSET (r); |
| 167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
| 168 | wchar_t *chr, *alloc, ch2; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
| 169 | int len; |
169 | int len; |
|
|
170 | |
|
|
171 | fname = rxvt_utf8towcs (f->name); |
| 170 | |
172 | |
| 171 | #if ENABLE_COMBINING |
173 | #if ENABLE_COMBINING |
| 172 | if (IS_COMPOSE (ch)) |
174 | if (IS_COMPOSE (ch)) |
| 173 | { |
175 | { |
| 174 | len = rxvt_composite.expand (ch, 0); |
176 | len = rxvt_composite.expand (ch, 0); |
| … | |
… | |
| 183 | alloc = 0; |
185 | alloc = 0; |
| 184 | chr = &ch2; |
186 | chr = &ch2; |
| 185 | len = 1; |
187 | len = 1; |
| 186 | } |
188 | } |
| 187 | |
189 | |
| 188 | int width = strlen (f->name); |
190 | int width = wcswidth (fname, wcslen (fname)); |
| 189 | |
191 | |
| 190 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
192 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
| 191 | |
193 | |
| 192 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
194 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
| 193 | |
195 | |
| … | |
… | |
| 206 | #endif |
208 | #endif |
| 207 | scr_overlay_set (11, y, ch, r); |
209 | scr_overlay_set (11, y, ch, r); |
| 208 | scr_overlay_set (12, y, NOCHAR, r); |
210 | scr_overlay_set (12, y, NOCHAR, r); |
| 209 | } |
211 | } |
| 210 | |
212 | |
| 211 | scr_overlay_set (0, len, f->name); |
213 | scr_overlay_set (0, len, fname); |
|
|
214 | |
|
|
215 | free (fname); |
| 212 | |
216 | |
| 213 | #if ENABLE_COMBINING |
217 | #if ENABLE_COMBINING |
| 214 | if (alloc) |
218 | if (alloc) |
| 215 | delete [] alloc; |
219 | delete [] alloc; |
| 216 | #endif |
220 | #endif |
| … | |
… | |
| 316 | |
320 | |
| 317 | // the XOpenIM manpage lies about hardcoding the locale |
321 | // the XOpenIM manpage lies about hardcoding the locale |
| 318 | // at the point of XOpenIM, so temporarily switch locales |
322 | // at the point of XOpenIM, so temporarily switch locales |
| 319 | if (rs[Rs_imLocale]) |
323 | if (rs[Rs_imLocale]) |
| 320 | SET_LOCALE (rs[Rs_imLocale]); |
324 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
325 | |
| 321 | // assume wchar_t == unicode or better |
326 | // assume wchar_t == unicode or better |
| 322 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
327 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
| 323 | KBUFSZ, &keysym, &status_return); |
328 | KBUFSZ, &keysym, &status_return); |
|
|
329 | |
| 324 | if (rs[Rs_imLocale]) |
330 | if (rs[Rs_imLocale]) |
| 325 | SET_LOCALE (locale); |
331 | SET_LOCALE (locale); |
| 326 | |
332 | |
| 327 | if (status_return == XLookupChars |
333 | if (status_return == XLookupChars |
| 328 | || status_return == XLookupBoth) |
334 | || status_return == XLookupBoth) |
| … | |
… | |
| 3588 | else if (ch < 0x20) |
3594 | else if (ch < 0x20) |
| 3589 | return NULL; /* other control character - exit */ |
3595 | return NULL; /* other control character - exit */ |
| 3590 | |
3596 | |
| 3591 | seen_esc = false; |
3597 | seen_esc = false; |
| 3592 | |
3598 | |
| 3593 | if (n >= sizeof (string) - 1) |
3599 | if (n >= STRING_MAX - 1) |
| 3594 | // stop at some sane length |
3600 | // stop at some sane length |
| 3595 | return NULL; |
3601 | return NULL; |
| 3596 | |
3602 | |
| 3597 | if (ch == C0_SYN) |
3603 | if (ch == C0_SYN) |
| 3598 | string[n++] = cmd_get8 (); |
3604 | string[n++] = cmd_get8 (); |
