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.199 by root, Sun Feb 20 02:00:43 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)
… …
1330 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1331 break; 1337 break;
1332 1338
1333 case ClientMessage: 1339 case ClientMessage:
1334 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1338#if ENABLE_XEMBED 1352#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32 1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1354 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1356 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1358 focus_out ();
… …
2633 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2648 bool refreshnow = false;
2636 int nlines = 0; 2649 int nlines = 0;
2637 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2638 2652
2639 for (;;) 2653 for (;;)
2640 { 2654 {
2641 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))
2642 break; 2656 break;
2643 2657
2644 *str++ = ch; 2658 *str++ = ch;
2645 2659
2646 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2647 { 2661 {
2662 if (ch == C0_LF)
2648 nlines++; 2663 nlines++;
2664
2649 refresh_count++; 2665 refresh_count++;
2650 2666
2651 if (!(options & Opt_jumpScroll) 2667 if (!(options & Opt_jumpScroll)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2653 { 2669 {
… …
2660 if (nlines >= TermWin.nrow - 1) 2676 if (nlines >= TermWin.nrow - 1)
2661 { 2677 {
2662 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2663 nlines = 0; 2679 nlines = 0;
2664 str = buf; 2680 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ);
2665 } 2682 }
2666 }
2667 2683
2668 if (str >= buf + UBUFSIZ) 2684 if (str >= eol)
2669 { 2685 {
2686 if (eol >= buf + UBUFSIZ)
2687 {
2670 ch = NOCHAR; 2688 ch = NOCHAR;
2671 break; 2689 break;
2690 }
2691 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2693 }
2694
2672 } 2695 }
2673 2696
2674 seq_begin = cmdbuf_ptr; 2697 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2698 ch = next_char ();
2676 } 2699 }
… …
3581 else if (ch < 0x20) 3604 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3605 return NULL; /* other control character - exit */
3583 3606
3584 seen_esc = false; 3607 seen_esc = false;
3585 3608
3586 if (n >= sizeof (string) - 1) 3609 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3610 // stop at some sane length
3588 return NULL; 3611 return NULL;
3589 3612
3590 if (ch == C0_SYN) 3613 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 (); 3614 string[n++] = cmd_get8 ();
… …
3659 set_window_color (color, str); 3682 set_window_color (color, str);
3660} 3683}
3661 3684
3662/* 3685/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3687 */
3687void 3688void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3689{ 3690{
3690 int changed = 0; 3691 int changed = 0;
… …
3789 break; 3790 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE 3791#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD: 3792 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break; 3794 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL: 3795 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break; 3797 break;
3800 case XTerm_Color_RV: 3798 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break; 3800 break;
3801 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break;
3803#endif 3804#endif
3804#if TRANSPARENT && TINTING 3805#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint: 3806 case URxvt_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3807 check_our_parents (); 3808 check_our_parents ();
3808 if (am_transparent) 3809 if (am_transparent)
3809 want_full_refresh = want_refresh = 1; 3810 want_full_refresh = want_refresh = 1;
3810 break; 3811 break;
3811#endif 3812#endif
… …
3845 3846
3846 case XTerm_logfile: 3847 case XTerm_logfile:
3847 // TODO, when secure mode? 3848 // TODO, when secure mode?
3848 break; 3849 break;
3849 3850
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0
3858 case XTerm_dumpscreen: /* no error notices */
3859 {
3860 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 {
3863 scr_dump (fd);
3864 close (fd);
3865 }
3866 }
3867 break;
3868#endif
3850 case XTerm_font: 3869 case XTerm_font:
3851 op = URxvt_font; 3870 op = URxvt_font;
3852 case URxvt_font: 3871 case URxvt_font:
3853#if ENABLE_STYLES 3872#if ENABLE_STYLES
3854 case URxvt_boldFont: 3873 case URxvt_boldFont:
… …
3869 set_fonts (); 3888 set_fonts ();
3870 } 3889 }
3871 break; 3890 break;
3872 3891
3873#if ENABLE_FRILLS 3892#if ENABLE_FRILLS
3874 case XTerm_locale: 3893 case URxvt_locale:
3875 if (query) 3894 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3877 else 3896 else
3878 { 3897 {
3879 set_locale (str); 3898 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3899 pty.set_utf8_mode (enc_utf8);
3881 init_xlocale (); 3900 init_xlocale ();
3882 } 3901 }
3883 break; 3902 break;
3884#endif
3885 3903
3886#ifdef MENUBAR 3904 case URxvt_view_up:
3887 case XTerm_Menu: 3905 case URxvt_view_down:
3888 if (options & Opt_insecure) 3906 int lines = atoi (str);
3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3907
3890 break; 3908 if (lines)
3891#endif 3909 scr_page (op == URxvt_view_up ? UP : DN, lines);
3892#if 0
3893 case XTerm_dumpscreen: /* no error notices */
3894 { 3910 else
3895 int fd;
3896 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3897 { 3911 {
3898 scr_dump (fd); 3912 scr_erase_savelines ();
3899 close (fd);
3900 } 3913 }
3901 } 3914
3902 break; 3915 break;
3903#endif 3916#endif
3904 } 3917 }
3905} 3918}
3906/*----------------------------------------------------------------------*/ 3919/*----------------------------------------------------------------------*/

Diff Legend

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