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.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.204 by root, Wed Jul 13 02:47:02 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 {
2655 nlines++; 2662 nlines++;
2656 refresh_count++; 2663 refresh_count++;
2657 2664
2658 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
… …
2667 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= TermWin.nrow - 1)
2668 { 2675 {
2669 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2670 nlines = 0; 2677 nlines = 0;
2671 str = buf; 2678 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ);
2672 } 2680 }
2673 }
2674 2681
2675 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2676 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2677 ch = NOCHAR; 2686 ch = NOCHAR;
2678 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2691 }
2692
2679 } 2693 }
2680 2694
2681 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2696 ch = next_char ();
2683 } 2697 }
… …
3588 else if (ch < 0x20) 3602 else if (ch < 0x20)
3589 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3590 3604
3591 seen_esc = false; 3605 seen_esc = false;
3592 3606
3593 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3594 // stop at some sane length 3608 // stop at some sane length
3595 return NULL; 3609 return NULL;
3596 3610
3597 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3598 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3666 set_window_color (color, str); 3680 set_window_color (color, str);
3667} 3681}
3668 3682
3669/* 3683/*
3670 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3671 * 0 = change iconName/title
3672 * 1 = change iconName
3673 * 2 = change title
3674 * 4 = change color
3675 * 10 = change fg color
3676 * 11 = change bg color
3677 * 12 = change text color
3678 * 13 = change mouse foreground color
3679 * 17 = change highlight character colour
3680 * 18 = change bold character color
3681 * 19 = change underlined character color
3682 * 46 = change logfile (not implemented)
3683 * 50 = change font
3684 *
3685 * rxvt extensions:
3686 * 20 = bg pixmap
3687 * 39 = change default fg color
3688 * 49 = change default bg color
3689 * 55 = dump scrollback buffer and all of screen
3690 * 701 = change locale
3691 * 702 = find font
3692 * 703 = menu
3693 */ 3685 */
3694void 3686void
3695rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3696{ 3688{
3697 int changed = 0; 3689 int changed = 0;
… …
3796 break; 3788 break;
3797#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3798 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3799 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3800 break; 3792 break;
3801 case XTerm_Color_IT:
3802 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3803 break;
3804 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3805 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3806 break; 3795 break;
3807 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3808 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3809 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3810#endif 3802#endif
3811#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3812 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3813 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3814 check_our_parents (); 3806 check_our_parents ();
3815 if (am_transparent) 3807 if (am_transparent)
3816 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3817 break; 3809 break;
3818#endif 3810#endif
… …
3852 3844
3853 case XTerm_logfile: 3845 case XTerm_logfile:
3854 // TODO, when secure mode? 3846 // TODO, when secure mode?
3855 break; 3847 break;
3856 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3857 case XTerm_font: 3867 case XTerm_font:
3858 op = URxvt_font; 3868 op = URxvt_font;
3859 case URxvt_font: 3869 case URxvt_font:
3860#if ENABLE_STYLES 3870#if ENABLE_STYLES
3861 case URxvt_boldFont: 3871 case URxvt_boldFont:
… …
3876 set_fonts (); 3886 set_fonts ();
3877 } 3887 }
3878 break; 3888 break;
3879 3889
3880#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3881 case XTerm_locale: 3891 case URxvt_locale:
3882 if (query) 3892 if (query)
3883 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3884 else 3894 else
3885 { 3895 {
3886 set_locale (str); 3896 set_locale (str);
3887 pty.set_utf8_mode (enc_utf8); 3897 pty.set_utf8_mode (enc_utf8);
3888 init_xlocale (); 3898 init_xlocale ();
3889 } 3899 }
3890 break; 3900 break;
3891#endif
3892 3901
3893#ifdef MENUBAR 3902 case URxvt_view_up:
3894 case XTerm_Menu: 3903 case URxvt_view_down:
3895 if (options & Opt_insecure) 3904 int lines = atoi (str);
3896 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3897 break; 3906 if (lines)
3898#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3899#if 0
3900 case XTerm_dumpscreen: /* no error notices */
3901 { 3908 else
3902 int fd;
3903 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3904 { 3909 {
3905 scr_dump (fd); 3910 scr_erase_savelines ();
3906 close (fd);
3907 } 3911 }
3908 } 3912
3909 break; 3913 break;
3910#endif 3914#endif
3911 } 3915 }
3912} 3916}
3913/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/

Diff Legend

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