… | |
… | |
50 | #include "rxvtperl.h" |
50 | #include "rxvtperl.h" |
51 | #include "version.h" |
51 | #include "version.h" |
52 | #include "command.h" |
52 | #include "command.h" |
53 | |
53 | |
54 | #if HAVE_SCHED_YIELD |
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
55 | # include <sched.h> |
56 | //# include <sched.h> |
56 | #endif |
57 | #endif |
57 | |
58 | |
58 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
59 | # include "keyboard.h" |
60 | # include "keyboard.h" |
60 | #endif |
61 | #endif |
… | |
… | |
267 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
268 | len = 1; |
269 | len = 1; |
269 | } |
270 | } |
270 | |
271 | |
271 | if (len > 0) |
272 | if (len > 0) |
272 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
273 | else |
274 | else |
274 | scr_bell (); |
275 | scr_bell (); |
275 | } |
276 | } |
276 | |
277 | |
277 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
305 | KeySym keysym; |
306 | KeySym keysym; |
306 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
307 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | #endif |
309 | #endif |
309 | int valid_keysym; |
310 | int valid_keysym; |
310 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
311 | |
312 | |
312 | /* |
313 | /* |
313 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
315 | * |
316 | * |
… | |
… | |
333 | Status status_return; |
334 | Status status_return; |
334 | |
335 | |
335 | #if 0 |
336 | #if 0 |
336 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
337 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
339 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
340 | else |
341 | else |
341 | #endif |
342 | #endif |
342 | #endif |
343 | #endif |
343 | { |
344 | { |
… | |
… | |
380 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
381 | } |
382 | } |
382 | else |
383 | else |
383 | #endif |
384 | #endif |
384 | { |
385 | { |
385 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
386 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
387 | } |
388 | } |
388 | |
389 | |
389 | if (valid_keysym) |
390 | if (valid_keysym) |
390 | { |
391 | { |
… | |
… | |
854 | { |
855 | { |
855 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
856 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
857 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
858 | { |
859 | { |
859 | unsigned char *ch; |
860 | char *ch; |
860 | |
861 | |
861 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | *ch |= 0x80; |
863 | *ch |= 0x80; |
863 | |
864 | |
864 | meta = 0; |
865 | meta = 0; |
… | |
… | |
897 | #ifdef META8_OPTION |
898 | #ifdef META8_OPTION |
898 | && meta_char == C0_ESC |
899 | && meta_char == C0_ESC |
899 | #endif |
900 | #endif |
900 | ) |
901 | ) |
901 | { |
902 | { |
902 | const unsigned char ch = C0_ESC; |
903 | const char ch = C0_ESC; |
903 | tt_write (&ch, 1); |
904 | tt_write (&ch, 1); |
904 | } |
905 | } |
905 | |
906 | |
906 | #if defined(DEBUG_CMD) |
907 | #if defined(DEBUG_CMD) |
907 | /* Display keyboard buffer contents */ |
908 | /* Display keyboard buffer contents */ |
… | |
… | |
919 | |
920 | |
920 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
922 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
922 | /* attempt to `write' count to the input buffer */ |
923 | /* attempt to `write' count to the input buffer */ |
923 | unsigned int |
924 | unsigned int |
924 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
925 | rxvt_term::cmd_write (const char *str, unsigned int count) |
925 | { |
926 | { |
926 | unsigned int n, s; |
927 | unsigned int n, s; |
927 | |
928 | |
928 | n = cmdbuf_ptr - cmdbuf_base; |
929 | n = cmdbuf_ptr - cmdbuf_base; |
929 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
930 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
1095 | { |
1096 | { |
1096 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1097 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1097 | |
1098 | |
1098 | if (CBUFSIZ == n) |
1099 | if (CBUFSIZ == n) |
1099 | { |
1100 | { |
1100 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1101 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1101 | n = 0; |
1102 | n = 0; |
1102 | } |
1103 | } |
1103 | |
1104 | |
1104 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1105 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1105 | cmdbuf_ptr = cmdbuf_base; |
1106 | cmdbuf_ptr = cmdbuf_base; |
… | |
… | |
1113 | return true; |
1114 | return true; |
1114 | } |
1115 | } |
1115 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1116 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1116 | { |
1117 | { |
1117 | #if HAVE_SCHED_YIELD |
1118 | #if HAVE_SCHED_YIELD |
|
|
1119 | if (display->is_local) |
1118 | event_handler.cw_yield.start (); |
1120 | event_handler.cw_yield.start (); |
1119 | #endif |
1121 | #endif |
1120 | } |
1122 | } |
1121 | else |
1123 | else |
1122 | { |
1124 | { |
1123 | pty_ev.stop (); |
1125 | pty_ev.stop (); |
… | |
… | |
1794 | rxvt_term::button_press (XButtonEvent &ev) |
1796 | rxvt_term::button_press (XButtonEvent &ev) |
1795 | { |
1797 | { |
1796 | int reportmode = 0, clickintime; |
1798 | int reportmode = 0, clickintime; |
1797 | |
1799 | |
1798 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1800 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1801 | |
1799 | if (!bypass_keystate) |
1802 | if (!bypass_keystate) |
1800 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1803 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1801 | |
1804 | |
1802 | /* |
1805 | /* |
1803 | * VT window processing of button press |
1806 | * VT window processing of button press |
… | |
… | |
1852 | else |
1855 | else |
1853 | { |
1856 | { |
1854 | if (ev.button != MEvent.button) |
1857 | if (ev.button != MEvent.button) |
1855 | MEvent.clicks = 0; |
1858 | MEvent.clicks = 0; |
1856 | |
1859 | |
|
|
1860 | if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) |
1857 | switch (ev.button) |
1861 | switch (ev.button) |
1858 | { |
1862 | { |
1859 | case Button1: |
1863 | case Button1: |
1860 | /* allow meta + click to select rectangular areas */ |
1864 | /* allow meta + click to select rectangular areas */ |
1861 | /* should be done in screen.C */ |
1865 | /* should be done in screen.C */ |
1862 | #if ENABLE_FRILLS |
1866 | #if ENABLE_FRILLS |
1863 | selection.rect = !!(ev.state & ModMetaMask); |
1867 | selection.rect = !!(ev.state & ModMetaMask); |
1864 | #else |
1868 | #else |
1865 | selection.rect = false; |
1869 | selection.rect = false; |
1866 | #endif |
1870 | #endif |
1867 | |
1871 | |
1868 | /* allow shift+left click to extend selection */ |
1872 | /* allow shift+left click to extend selection */ |
1869 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1873 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1870 | { |
1874 | { |
1871 | if (MEvent.button == Button1 && clickintime) |
1875 | if (MEvent.button == Button1 && clickintime) |
1872 | selection_rotate (ev.x, ev.y); |
1876 | selection_rotate (ev.x, ev.y); |
1873 | else |
1877 | else |
1874 | selection_extend (ev.x, ev.y, 1); |
1878 | selection_extend (ev.x, ev.y, 1); |
1875 | } |
1879 | } |
1876 | else |
1880 | else |
1877 | { |
1881 | { |
1878 | if (MEvent.button == Button1 && clickintime) |
1882 | if (MEvent.button == Button1 && clickintime) |
1879 | MEvent.clicks++; |
1883 | MEvent.clicks++; |
1880 | else |
1884 | else |
1881 | MEvent.clicks = 1; |
1885 | MEvent.clicks = 1; |
1882 | |
1886 | |
1883 | selection_click (MEvent.clicks, ev.x, ev.y); |
1887 | selection_click (MEvent.clicks, ev.x, ev.y); |
1884 | } |
1888 | } |
1885 | |
1889 | |
1886 | MEvent.button = Button1; |
1890 | MEvent.button = Button1; |
1887 | break; |
1891 | break; |
1888 | |
1892 | |
1889 | case Button3: |
1893 | case Button3: |
1890 | if (MEvent.button == Button3 && clickintime) |
1894 | if (MEvent.button == Button3 && clickintime) |
1891 | selection_rotate (ev.x, ev.y); |
1895 | selection_rotate (ev.x, ev.y); |
1892 | else |
1896 | else |
1893 | selection_extend (ev.x, ev.y, 1); |
1897 | selection_extend (ev.x, ev.y, 1); |
1894 | |
1898 | |
1895 | MEvent.button = Button3; |
1899 | MEvent.button = Button3; |
1896 | break; |
1900 | break; |
1897 | } |
1901 | } |
1898 | } |
1902 | } |
1899 | |
1903 | |
1900 | MEvent.time = ev.time; |
1904 | MEvent.time = ev.time; |
1901 | return; |
1905 | return; |
1902 | } |
1906 | } |
1903 | |
1907 | |
… | |
… | |
2667 | bool |
2671 | bool |
2668 | rxvt_term::cmd_parse () |
2672 | rxvt_term::cmd_parse () |
2669 | { |
2673 | { |
2670 | bool flag = false; |
2674 | bool flag = false; |
2671 | unicode_t ch = NOCHAR; |
2675 | unicode_t ch = NOCHAR; |
2672 | unsigned char *seq_begin; // remember start of esc-sequence here |
2676 | char *seq_begin; // remember start of esc-sequence here |
2673 | |
2677 | |
2674 | for (;;) |
2678 | for (;;) |
2675 | { |
2679 | { |
2676 | if (ch == NOCHAR) |
2680 | if (ch == NOCHAR) |
2677 | { |
2681 | { |
… | |
… | |
2809 | rxvt_term::next_char () |
2813 | rxvt_term::next_char () |
2810 | { |
2814 | { |
2811 | while (cmdbuf_ptr < cmdbuf_endp) |
2815 | while (cmdbuf_ptr < cmdbuf_endp) |
2812 | { |
2816 | { |
2813 | // assume 7-bit to be ascii ALWAYS |
2817 | // assume 7-bit to be ascii ALWAYS |
2814 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2818 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2815 | return *cmdbuf_ptr++; |
2819 | return *cmdbuf_ptr++; |
2816 | |
2820 | |
2817 | wchar_t wc; |
2821 | wchar_t wc; |
2818 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2822 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2819 | |
2823 | |
2820 | if (len == (size_t)-2) |
2824 | if (len == (size_t)-2) |
2821 | { |
2825 | { |
2822 | // the mbstate stores incomplete sequences. didn't know this :/ |
2826 | // the mbstate stores incomplete sequences. didn't know this :/ |
2823 | cmdbuf_ptr = cmdbuf_endp; |
2827 | cmdbuf_ptr = cmdbuf_endp; |
… | |
… | |
2962 | case C0_ESC: |
2966 | case C0_ESC: |
2963 | process_escape_seq (); |
2967 | process_escape_seq (); |
2964 | break; |
2968 | break; |
2965 | case C0_ENQ: /* terminal Status */ |
2969 | case C0_ENQ: /* terminal Status */ |
2966 | if (rs[Rs_answerbackstring]) |
2970 | if (rs[Rs_answerbackstring]) |
2967 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2971 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2968 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2969 | else |
2972 | else |
2970 | tt_write ((unsigned char *)VT100_ANS, |
2973 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2971 | (unsigned int)strlen (VT100_ANS)); |
|
|
2972 | break; |
2974 | break; |
2973 | case C0_BEL: /* bell */ |
2975 | case C0_BEL: /* bell */ |
2974 | scr_bell (); |
2976 | scr_bell (); |
2975 | break; |
2977 | break; |
2976 | case C0_BS: /* backspace */ |
2978 | case C0_BS: /* backspace */ |
… | |
… | |
3164 | process_dcs_seq (); |
3166 | process_dcs_seq (); |
3165 | break; |
3167 | break; |
3166 | |
3168 | |
3167 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3169 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3168 | case C1_SCI: /* ESC Z */ |
3170 | case C1_SCI: /* ESC Z */ |
3169 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3171 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3170 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3171 | break; /* steal obsolete ESC [ c */ |
3172 | break; /* steal obsolete ESC [ c */ |
3172 | |
3173 | |
3173 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3174 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3174 | case C1_CSI: /* ESC [ */ |
3175 | case C1_CSI: /* ESC [ */ |
3175 | process_csi_seq (); |
3176 | process_csi_seq (); |
… | |
… | |
3419 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3420 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3420 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3421 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3421 | break; |
3422 | break; |
3422 | |
3423 | |
3423 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3424 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3424 | tt_write ((const unsigned char *)VT100_ANS, |
3425 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3425 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3426 | break; |
3426 | break; |
3427 | |
3427 | |
3428 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3428 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3429 | process_sgr_mode (nargs, arg); |
3429 | process_sgr_mode (nargs, arg); |
3430 | break; |
3430 | break; |
… | |
… | |
3632 | /*----------------------------------------------------------------------*/ |
3632 | /*----------------------------------------------------------------------*/ |
3633 | /* |
3633 | /* |
3634 | * get input up until STRING TERMINATOR (or BEL) |
3634 | * get input up until STRING TERMINATOR (or BEL) |
3635 | * ends_how is terminator used. returned input must be free()'d |
3635 | * ends_how is terminator used. returned input must be free()'d |
3636 | */ |
3636 | */ |
3637 | unsigned char * |
3637 | char * |
3638 | rxvt_term::get_to_st (unicode_t &ends_how) |
3638 | rxvt_term::get_to_st (unicode_t &ends_how) |
3639 | { |
3639 | { |
3640 | unicode_t ch; |
3640 | unicode_t ch; |
3641 | bool seen_esc = false; |
3641 | bool seen_esc = false; |
3642 | unsigned int n = 0; |
3642 | unsigned int n = 0; |
… | |
… | |
3675 | |
3675 | |
3676 | string[n++] = '\0'; |
3676 | string[n++] = '\0'; |
3677 | |
3677 | |
3678 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3678 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3679 | |
3679 | |
3680 | return (unsigned char *)rxvt_wcstombs (string); |
3680 | return rxvt_wcstombs (string); |
3681 | } |
3681 | } |
3682 | |
3682 | |
3683 | /*----------------------------------------------------------------------*/ |
3683 | /*----------------------------------------------------------------------*/ |
3684 | /* |
3684 | /* |
3685 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3685 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3686 | */ |
3686 | */ |
3687 | void |
3687 | void |
3688 | rxvt_term::process_dcs_seq () |
3688 | rxvt_term::process_dcs_seq () |
3689 | { |
3689 | { |
3690 | unsigned char *s; |
3690 | char *s; |
3691 | unicode_t eh; |
3691 | unicode_t eh; |
3692 | |
3692 | |
3693 | /* |
3693 | /* |
3694 | * Not handled yet |
3694 | * Not handled yet |
3695 | */ |
3695 | */ |
… | |
… | |
3714 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3714 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3715 | arg = arg * 10 + (ch - '0'); |
3715 | arg = arg * 10 + (ch - '0'); |
3716 | |
3716 | |
3717 | if (ch == ';') |
3717 | if (ch == ';') |
3718 | { |
3718 | { |
3719 | unsigned char *s = get_to_st (eh); |
3719 | char *s = get_to_st (eh); |
3720 | |
3720 | |
3721 | if (s) |
3721 | if (s) |
3722 | { |
3722 | { |
3723 | process_xterm_seq (arg, (char *)s, eh); |
3723 | process_xterm_seq (arg, s, eh); |
3724 | free (s); |
3724 | free (s); |
3725 | } |
3725 | } |
3726 | } |
3726 | } |
3727 | } |
3727 | } |
3728 | |
3728 | |
3729 | void |
3729 | void |
3730 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3730 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3731 | { |
3731 | { |
3732 | if (str[0] == '?' && !str[1]) |
3732 | if (str[0] == '?' && !str[1]) |
3733 | { |
3733 | { |
3734 | unsigned short r, g, b; |
3734 | unsigned short r, g, b; |
3735 | pix_colors_focused[color].get (display, r, g, b); |
3735 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3741 | |
3741 | |
3742 | /* |
3742 | /* |
3743 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3743 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3744 | */ |
3744 | */ |
3745 | void |
3745 | void |
3746 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3746 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3747 | { |
3747 | { |
3748 | int changed = 0; |
3748 | int changed = 0; |
3749 | int color; |
3749 | int color; |
3750 | char *buf, *name; |
3750 | char *buf, *name; |
3751 | bool query = str[0] == '?' && !str[1]; |
3751 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3958 | } |
3958 | } |
3959 | break; |
3959 | break; |
3960 | |
3960 | |
3961 | case URxvt_view_up: |
3961 | case URxvt_view_up: |
3962 | case URxvt_view_down: |
3962 | case URxvt_view_down: |
|
|
3963 | { |
3963 | int lines = atoi (str); |
3964 | int lines = atoi (str); |
3964 | |
3965 | |
3965 | if (lines) |
3966 | if (lines) |
3966 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3967 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3967 | else |
3968 | else |
3968 | { |
|
|
3969 | scr_erase_savelines (); |
3969 | scr_erase_savelines (); |
3970 | } |
3970 | } |
3971 | |
3971 | |
|
|
3972 | break; |
|
|
3973 | #endif |
|
|
3974 | |
|
|
3975 | #if ENABLE_PERL |
|
|
3976 | case URxvt_perl: |
|
|
3977 | if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
|
|
3978 | ; // no responses yet |
3972 | break; |
3979 | break; |
3973 | #endif |
3980 | #endif |
3974 | } |
3981 | } |
3975 | } |
3982 | } |
3976 | /*----------------------------------------------------------------------*/ |
3983 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4333 | scr_color (Color_bg, Color_bg); |
4340 | scr_color (Color_bg, Color_bg); |
4334 | break; |
4341 | break; |
4335 | |
4342 | |
4336 | //case 50: // not variable spacing |
4343 | //case 50: // not variable spacing |
4337 | |
4344 | |
4338 | #ifndef NO_BRIGHTCOLOR |
4345 | #if ENABLE_FRILLS |
4339 | case 90: |
4346 | case 90: |
4340 | case 91: /* set bright fg color */ |
4347 | case 91: /* set bright fg color */ |
4341 | case 92: |
4348 | case 92: |
4342 | case 93: |
4349 | case 93: |
4343 | case 94: |
4350 | case 94: |
… | |
… | |
4388 | */ |
4395 | */ |
4389 | void |
4396 | void |
4390 | rxvt_term::tt_printf (const char *fmt,...) |
4397 | rxvt_term::tt_printf (const char *fmt,...) |
4391 | { |
4398 | { |
4392 | va_list arg_ptr; |
4399 | va_list arg_ptr; |
4393 | unsigned char buf[256]; |
4400 | char buf[256]; |
4394 | |
4401 | |
4395 | va_start (arg_ptr, fmt); |
4402 | va_start (arg_ptr, fmt); |
4396 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4403 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4397 | va_end (arg_ptr); |
4404 | va_end (arg_ptr); |
4398 | tt_write (buf, strlen (buf)); |
4405 | tt_write (buf, strlen (buf)); |
… | |
… | |
4403 | * or generated by us in response to a query ESC sequence. |
4410 | * or generated by us in response to a query ESC sequence. |
4404 | */ |
4411 | */ |
4405 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4412 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4406 | |
4413 | |
4407 | void |
4414 | void |
4408 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4415 | rxvt_term::tt_write (const char *data, unsigned int len) |
4409 | { |
4416 | { |
4410 | if (v_buflen == 0) |
4417 | if (v_buflen == 0) |
4411 | { |
4418 | { |
4412 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4419 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4413 | |
4420 | |
… | |
… | |
4416 | |
4423 | |
4417 | data += written; |
4424 | data += written; |
4418 | len -= written; |
4425 | len -= written; |
4419 | } |
4426 | } |
4420 | |
4427 | |
4421 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4428 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4422 | |
4429 | |
4423 | memcpy (v_buffer + v_buflen, data, len); |
4430 | memcpy (v_buffer + v_buflen, data, len); |
4424 | v_buflen += len; |
4431 | v_buflen += len; |
4425 | |
4432 | |
4426 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4433 | pty_ev.set (EVENT_READ | EVENT_WRITE); |