ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.205 by root, Wed Jul 13 03:11:51 2005 UTC

… …
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_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)
… …
2640 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2641 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2642 bool refreshnow = false; 2648 bool refreshnow = false;
2643 int nlines = 0; 2649 int nlines = 0;
2644 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2645 2652
2646 for (;;) 2653 for (;;)
2647 { 2654 {
2648 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))
2649 break; 2656 break;
2650 2657
2651 *str++ = ch; 2658 *str++ = ch;
2652 2659
2653 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2654 { 2661 {
2662 if (ch == C0_LF)
2655 nlines++; 2663 nlines++;
2664
2656 refresh_count++; 2665 refresh_count++;
2657 2666
2658 if (!(options & Opt_jumpScroll) 2667 if (!(options & Opt_jumpScroll)
2659 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2660 { 2669 {
… …
2667 if (nlines >= TermWin.nrow - 1) 2676 if (nlines >= TermWin.nrow - 1)
2668 { 2677 {
2669 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2679 nlines = 0;
2671 str = buf; 2680 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ);
2672 } 2682 }
2673 }
2674 2683
2675 if (str >= buf + UBUFSIZ) 2684 if (str >= eol)
2676 { 2685 {
2686 if (eol >= buf + UBUFSIZ)
2687 {
2677 ch = NOCHAR; 2688 ch = NOCHAR;
2678 break; 2689 break;
2690 }
2691 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2693 }
2694
2679 } 2695 }
2680 2696
2681 seq_begin = cmdbuf_ptr; 2697 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2698 ch = next_char ();
2683 } 2699 }
… …
3588 else if (ch < 0x20) 3604 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3605 return NULL; /* other control character - exit */
3590 3606
3591 seen_esc = false; 3607 seen_esc = false;
3592 3608
3593 if (n >= sizeof (string) - 1) 3609 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3610 // stop at some sane length
3595 return NULL; 3611 return NULL;
3596 3612
3597 if (ch == C0_SYN) 3613 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3614 string[n++] = cmd_get8 ();

Diff Legend

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