… | |
… | |
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 |
… | |
… | |
2642 | /* Read a text string from the input buffer */ |
2646 | /* Read a text string from the input buffer */ |
2643 | unicode_t buf[UBUFSIZ]; |
2647 | unicode_t buf[UBUFSIZ]; |
2644 | bool refreshnow = false; |
2648 | bool refreshnow = false; |
2645 | int nlines = 0; |
2649 | int nlines = 0; |
2646 | unicode_t *str = buf; |
2650 | unicode_t *str = buf; |
|
|
2651 | unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); |
2647 | |
2652 | |
2648 | for (;;) |
2653 | for (;;) |
2649 | { |
2654 | { |
2650 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2655 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2651 | break; |
2656 | break; |
2652 | |
2657 | |
2653 | *str++ = ch; |
2658 | *str++ = ch; |
2654 | |
2659 | |
2655 | if (ch == C0_LF) |
2660 | if (ch == C0_LF || str >= eol) |
2656 | { |
2661 | { |
2657 | nlines++; |
2662 | nlines++; |
2658 | refresh_count++; |
2663 | refresh_count++; |
2659 | |
2664 | |
2660 | if (!(options & Opt_jumpScroll) |
2665 | if (!(options & Opt_jumpScroll) |
… | |
… | |
2669 | if (nlines >= TermWin.nrow - 1) |
2674 | if (nlines >= TermWin.nrow - 1) |
2670 | { |
2675 | { |
2671 | scr_add_lines (buf, nlines, str - buf); |
2676 | scr_add_lines (buf, nlines, str - buf); |
2672 | nlines = 0; |
2677 | nlines = 0; |
2673 | str = buf; |
2678 | str = buf; |
|
|
2679 | eol = str + min (TermWin.ncol, UBUFSIZ); |
2674 | } |
2680 | } |
2675 | } |
|
|
2676 | |
2681 | |
2677 | if (str >= buf + UBUFSIZ) |
2682 | if (str >= eol) |
2678 | { |
2683 | { |
|
|
2684 | if (eol >= buf + UBUFSIZ) |
|
|
2685 | { |
2679 | ch = NOCHAR; |
2686 | ch = NOCHAR; |
2680 | break; |
2687 | break; |
|
|
2688 | } |
|
|
2689 | else |
|
|
2690 | eol = min (eol + TermWin.ncol, buf + UBUFSIZ); |
|
|
2691 | } |
|
|
2692 | |
2681 | } |
2693 | } |
2682 | |
2694 | |
2683 | seq_begin = cmdbuf_ptr; |
2695 | seq_begin = cmdbuf_ptr; |
2684 | ch = next_char (); |
2696 | ch = next_char (); |
2685 | } |
2697 | } |