… | |
… | |
268 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
269 | len = 1; |
269 | len = 1; |
270 | } |
270 | } |
271 | |
271 | |
272 | if (len > 0) |
272 | if (len > 0) |
273 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
274 | else |
274 | else |
275 | scr_bell (); |
275 | scr_bell (); |
276 | } |
276 | } |
277 | |
277 | |
278 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
306 | KeySym keysym; |
306 | KeySym keysym; |
307 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
309 | #endif |
309 | #endif |
310 | int valid_keysym; |
310 | int valid_keysym; |
311 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
312 | |
312 | |
313 | /* |
313 | /* |
314 | * 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 |
315 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
316 | * |
316 | * |
… | |
… | |
334 | Status status_return; |
334 | Status status_return; |
335 | |
335 | |
336 | #if 0 |
336 | #if 0 |
337 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
338 | 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 |
339 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
340 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
341 | else |
341 | else |
342 | #endif |
342 | #endif |
343 | #endif |
343 | #endif |
344 | { |
344 | { |
… | |
… | |
381 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
382 | } |
382 | } |
383 | else |
383 | else |
384 | #endif |
384 | #endif |
385 | { |
385 | { |
386 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
387 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
388 | } |
388 | } |
389 | |
389 | |
390 | if (valid_keysym) |
390 | if (valid_keysym) |
391 | { |
391 | { |
… | |
… | |
855 | { |
855 | { |
856 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
857 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
858 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
859 | { |
859 | { |
860 | unsigned char *ch; |
860 | char *ch; |
861 | |
861 | |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
863 | *ch |= 0x80; |
863 | *ch |= 0x80; |
864 | |
864 | |
865 | meta = 0; |
865 | meta = 0; |
… | |
… | |
898 | #ifdef META8_OPTION |
898 | #ifdef META8_OPTION |
899 | && meta_char == C0_ESC |
899 | && meta_char == C0_ESC |
900 | #endif |
900 | #endif |
901 | ) |
901 | ) |
902 | { |
902 | { |
903 | const unsigned char ch = C0_ESC; |
903 | const char ch = C0_ESC; |
904 | tt_write (&ch, 1); |
904 | tt_write (&ch, 1); |
905 | } |
905 | } |
906 | |
906 | |
907 | #if defined(DEBUG_CMD) |
907 | #if defined(DEBUG_CMD) |
908 | /* Display keyboard buffer contents */ |
908 | /* Display keyboard buffer contents */ |
… | |
… | |
920 | |
920 | |
921 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
922 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
922 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
923 | /* attempt to `write' count to the input buffer */ |
923 | /* attempt to `write' count to the input buffer */ |
924 | unsigned int |
924 | unsigned int |
925 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
925 | rxvt_term::cmd_write (const char *str, unsigned int count) |
926 | { |
926 | { |
927 | unsigned int n, s; |
927 | unsigned int n, s; |
928 | |
928 | |
929 | n = cmdbuf_ptr - cmdbuf_base; |
929 | n = cmdbuf_ptr - cmdbuf_base; |
930 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
930 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
2671 | bool |
2671 | bool |
2672 | rxvt_term::cmd_parse () |
2672 | rxvt_term::cmd_parse () |
2673 | { |
2673 | { |
2674 | bool flag = false; |
2674 | bool flag = false; |
2675 | unicode_t ch = NOCHAR; |
2675 | unicode_t ch = NOCHAR; |
2676 | unsigned char *seq_begin; // remember start of esc-sequence here |
2676 | char *seq_begin; // remember start of esc-sequence here |
2677 | |
2677 | |
2678 | for (;;) |
2678 | for (;;) |
2679 | { |
2679 | { |
2680 | if (ch == NOCHAR) |
2680 | if (ch == NOCHAR) |
2681 | { |
2681 | { |
… | |
… | |
2813 | rxvt_term::next_char () |
2813 | rxvt_term::next_char () |
2814 | { |
2814 | { |
2815 | while (cmdbuf_ptr < cmdbuf_endp) |
2815 | while (cmdbuf_ptr < cmdbuf_endp) |
2816 | { |
2816 | { |
2817 | // assume 7-bit to be ascii ALWAYS |
2817 | // assume 7-bit to be ascii ALWAYS |
2818 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2818 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2819 | return *cmdbuf_ptr++; |
2819 | return *cmdbuf_ptr++; |
2820 | |
2820 | |
2821 | wchar_t wc; |
2821 | wchar_t wc; |
2822 | 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); |
2823 | |
2823 | |
2824 | if (len == (size_t)-2) |
2824 | if (len == (size_t)-2) |
2825 | { |
2825 | { |
2826 | // the mbstate stores incomplete sequences. didn't know this :/ |
2826 | // the mbstate stores incomplete sequences. didn't know this :/ |
2827 | cmdbuf_ptr = cmdbuf_endp; |
2827 | cmdbuf_ptr = cmdbuf_endp; |
… | |
… | |
2966 | case C0_ESC: |
2966 | case C0_ESC: |
2967 | process_escape_seq (); |
2967 | process_escape_seq (); |
2968 | break; |
2968 | break; |
2969 | case C0_ENQ: /* terminal Status */ |
2969 | case C0_ENQ: /* terminal Status */ |
2970 | if (rs[Rs_answerbackstring]) |
2970 | if (rs[Rs_answerbackstring]) |
2971 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2971 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2972 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2973 | else |
2972 | else |
2974 | tt_write ((unsigned char *)VT100_ANS, |
2973 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2975 | (unsigned int)strlen (VT100_ANS)); |
|
|
2976 | break; |
2974 | break; |
2977 | case C0_BEL: /* bell */ |
2975 | case C0_BEL: /* bell */ |
2978 | scr_bell (); |
2976 | scr_bell (); |
2979 | break; |
2977 | break; |
2980 | case C0_BS: /* backspace */ |
2978 | case C0_BS: /* backspace */ |
… | |
… | |
3168 | process_dcs_seq (); |
3166 | process_dcs_seq (); |
3169 | break; |
3167 | break; |
3170 | |
3168 | |
3171 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3169 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3172 | case C1_SCI: /* ESC Z */ |
3170 | case C1_SCI: /* ESC Z */ |
3173 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3171 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3174 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3175 | break; /* steal obsolete ESC [ c */ |
3172 | break; /* steal obsolete ESC [ c */ |
3176 | |
3173 | |
3177 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3174 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3178 | case C1_CSI: /* ESC [ */ |
3175 | case C1_CSI: /* ESC [ */ |
3179 | process_csi_seq (); |
3176 | process_csi_seq (); |
… | |
… | |
3423 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3420 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3424 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3421 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3425 | break; |
3422 | break; |
3426 | |
3423 | |
3427 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3424 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3428 | tt_write ((const unsigned char *)VT100_ANS, |
3425 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3429 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3430 | break; |
3426 | break; |
3431 | |
3427 | |
3432 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3428 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3433 | process_sgr_mode (nargs, arg); |
3429 | process_sgr_mode (nargs, arg); |
3434 | break; |
3430 | break; |
… | |
… | |
3636 | /*----------------------------------------------------------------------*/ |
3632 | /*----------------------------------------------------------------------*/ |
3637 | /* |
3633 | /* |
3638 | * get input up until STRING TERMINATOR (or BEL) |
3634 | * get input up until STRING TERMINATOR (or BEL) |
3639 | * ends_how is terminator used. returned input must be free()'d |
3635 | * ends_how is terminator used. returned input must be free()'d |
3640 | */ |
3636 | */ |
3641 | unsigned char * |
3637 | char * |
3642 | rxvt_term::get_to_st (unicode_t &ends_how) |
3638 | rxvt_term::get_to_st (unicode_t &ends_how) |
3643 | { |
3639 | { |
3644 | unicode_t ch; |
3640 | unicode_t ch; |
3645 | bool seen_esc = false; |
3641 | bool seen_esc = false; |
3646 | unsigned int n = 0; |
3642 | unsigned int n = 0; |
… | |
… | |
3679 | |
3675 | |
3680 | string[n++] = '\0'; |
3676 | string[n++] = '\0'; |
3681 | |
3677 | |
3682 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3678 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3683 | |
3679 | |
3684 | return (unsigned char *)rxvt_wcstombs (string); |
3680 | return rxvt_wcstombs (string); |
3685 | } |
3681 | } |
3686 | |
3682 | |
3687 | /*----------------------------------------------------------------------*/ |
3683 | /*----------------------------------------------------------------------*/ |
3688 | /* |
3684 | /* |
3689 | * 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)' |
3690 | */ |
3686 | */ |
3691 | void |
3687 | void |
3692 | rxvt_term::process_dcs_seq () |
3688 | rxvt_term::process_dcs_seq () |
3693 | { |
3689 | { |
3694 | unsigned char *s; |
3690 | char *s; |
3695 | unicode_t eh; |
3691 | unicode_t eh; |
3696 | |
3692 | |
3697 | /* |
3693 | /* |
3698 | * Not handled yet |
3694 | * Not handled yet |
3699 | */ |
3695 | */ |
… | |
… | |
3718 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3714 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3719 | arg = arg * 10 + (ch - '0'); |
3715 | arg = arg * 10 + (ch - '0'); |
3720 | |
3716 | |
3721 | if (ch == ';') |
3717 | if (ch == ';') |
3722 | { |
3718 | { |
3723 | unsigned char *s = get_to_st (eh); |
3719 | char *s = get_to_st (eh); |
3724 | |
3720 | |
3725 | if (s) |
3721 | if (s) |
3726 | { |
3722 | { |
3727 | process_xterm_seq (arg, (char *)s, eh); |
3723 | process_xterm_seq (arg, s, eh); |
3728 | free (s); |
3724 | free (s); |
3729 | } |
3725 | } |
3730 | } |
3726 | } |
3731 | } |
3727 | } |
3732 | |
3728 | |
3733 | void |
3729 | void |
3734 | 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) |
3735 | { |
3731 | { |
3736 | if (str[0] == '?' && !str[1]) |
3732 | if (str[0] == '?' && !str[1]) |
3737 | { |
3733 | { |
3738 | unsigned short r, g, b; |
3734 | unsigned short r, g, b; |
3739 | pix_colors_focused[color].get (display, r, g, b); |
3735 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3745 | |
3741 | |
3746 | /* |
3742 | /* |
3747 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3743 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3748 | */ |
3744 | */ |
3749 | void |
3745 | void |
3750 | 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) |
3751 | { |
3747 | { |
3752 | int changed = 0; |
3748 | int changed = 0; |
3753 | int color; |
3749 | int color; |
3754 | char *buf, *name; |
3750 | char *buf, *name; |
3755 | bool query = str[0] == '?' && !str[1]; |
3751 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
4399 | */ |
4395 | */ |
4400 | void |
4396 | void |
4401 | rxvt_term::tt_printf (const char *fmt,...) |
4397 | rxvt_term::tt_printf (const char *fmt,...) |
4402 | { |
4398 | { |
4403 | va_list arg_ptr; |
4399 | va_list arg_ptr; |
4404 | unsigned char buf[256]; |
4400 | char buf[256]; |
4405 | |
4401 | |
4406 | va_start (arg_ptr, fmt); |
4402 | va_start (arg_ptr, fmt); |
4407 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4403 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4408 | va_end (arg_ptr); |
4404 | va_end (arg_ptr); |
4409 | tt_write (buf, strlen (buf)); |
4405 | tt_write (buf, strlen (buf)); |
… | |
… | |
4414 | * or generated by us in response to a query ESC sequence. |
4410 | * or generated by us in response to a query ESC sequence. |
4415 | */ |
4411 | */ |
4416 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4412 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4417 | |
4413 | |
4418 | void |
4414 | void |
4419 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4415 | rxvt_term::tt_write (const char *data, unsigned int len) |
4420 | { |
4416 | { |
4421 | if (v_buflen == 0) |
4417 | if (v_buflen == 0) |
4422 | { |
4418 | { |
4423 | 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)); |
4424 | |
4420 | |
… | |
… | |
4427 | |
4423 | |
4428 | data += written; |
4424 | data += written; |
4429 | len -= written; |
4425 | len -= written; |
4430 | } |
4426 | } |
4431 | |
4427 | |
4432 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4428 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4433 | |
4429 | |
4434 | memcpy (v_buffer + v_buflen, data, len); |
4430 | memcpy (v_buffer + v_buflen, data, len); |
4435 | v_buflen += len; |
4431 | v_buflen += len; |
4436 | |
4432 | |
4437 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4433 | pty_ev.set (EVENT_READ | EVENT_WRITE); |