| … | |
… | |
| 2219 | wchar_t ch = NOCHAR; |
2219 | wchar_t ch = NOCHAR; |
| 2220 | char *seq_begin; // remember start of esc-sequence here |
2220 | char *seq_begin; // remember start of esc-sequence here |
| 2221 | |
2221 | |
| 2222 | for (;;) |
2222 | for (;;) |
| 2223 | { |
2223 | { |
| 2224 | if (expect_false (ch == NOCHAR)) |
2224 | if (ecb_unlikely (ch == NOCHAR)) |
| 2225 | { |
2225 | { |
| 2226 | seq_begin = cmdbuf_ptr; |
2226 | seq_begin = cmdbuf_ptr; |
| 2227 | ch = next_char (); |
2227 | ch = next_char (); |
| 2228 | |
2228 | |
| 2229 | if (ch == NOCHAR) |
2229 | if (ch == NOCHAR) |
| 2230 | break; |
2230 | break; |
| 2231 | } |
2231 | } |
| 2232 | |
2232 | |
| 2233 | if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
2233 | if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
| 2234 | { |
2234 | { |
| 2235 | if (expect_false (!seen_input)) |
2235 | if (ecb_unlikely (!seen_input)) |
| 2236 | { |
2236 | { |
| 2237 | seen_input = 1; |
2237 | seen_input = 1; |
| 2238 | // many badly-written programs (e.g. jed) contain a race condition: |
2238 | // many badly-written programs (e.g. jed) contain a race condition: |
| 2239 | // they first read the screensize and then install a SIGWINCH handler. |
2239 | // they first read the screensize and then install a SIGWINCH handler. |
| 2240 | // some window managers resize the window early, and these programs |
2240 | // some window managers resize the window early, and these programs |
| … | |
… | |
| 2253 | wchar_t *str = buf; |
2253 | wchar_t *str = buf; |
| 2254 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2254 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
| 2255 | |
2255 | |
| 2256 | for (;;) |
2256 | for (;;) |
| 2257 | { |
2257 | { |
| 2258 | if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
2258 | if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
| 2259 | break; |
2259 | break; |
| 2260 | |
2260 | |
| 2261 | *str++ = ch; |
2261 | *str++ = ch; |
| 2262 | |
2262 | |
| 2263 | if (expect_false (ch == C0_LF || str >= eol)) |
2263 | if (ecb_unlikely (ch == C0_LF || str >= eol)) |
| 2264 | { |
2264 | { |
| 2265 | if (ch == C0_LF) |
2265 | if (ch == C0_LF) |
| 2266 | nlines++; |
2266 | nlines++; |
| 2267 | |
2267 | |
| 2268 | refresh_count++; |
2268 | refresh_count++; |
| … | |
… | |
| 2346 | rxvt_term::next_char () NOTHROW |
2346 | rxvt_term::next_char () NOTHROW |
| 2347 | { |
2347 | { |
| 2348 | while (cmdbuf_ptr < cmdbuf_endp) |
2348 | while (cmdbuf_ptr < cmdbuf_endp) |
| 2349 | { |
2349 | { |
| 2350 | // assume 7-bit to be ascii ALWAYS |
2350 | // assume 7-bit to be ascii ALWAYS |
| 2351 | if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2351 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
| 2352 | return *cmdbuf_ptr++; |
2352 | return *cmdbuf_ptr++; |
| 2353 | |
2353 | |
| 2354 | wchar_t wc; |
2354 | wchar_t wc; |
| 2355 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2355 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
| 2356 | |
2356 | |
| … | |
… | |
| 2672 | |
2672 | |
| 2673 | /* 8.3.87: NEXT LINE */ |
2673 | /* 8.3.87: NEXT LINE */ |
| 2674 | case C1_NEL: /* ESC E */ |
2674 | case C1_NEL: /* ESC E */ |
| 2675 | { |
2675 | { |
| 2676 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2676 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
| 2677 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2677 | scr_add_lines (nlcr, ecb_array_length (nlcr), 1); |
| 2678 | } |
2678 | } |
| 2679 | break; |
2679 | break; |
| 2680 | |
2680 | |
| 2681 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2681 | /* kidnapped escape sequence: Should be 8.3.48 */ |
| 2682 | case C1_ESA: /* ESC G */ |
2682 | case C1_ESA: /* ESC G */ |
| … | |
… | |
| 2858 | scr_soft_reset (); |
2858 | scr_soft_reset (); |
| 2859 | |
2859 | |
| 2860 | static const int pm_h[] = { 7, 25 }; |
2860 | static const int pm_h[] = { 7, 25 }; |
| 2861 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2861 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
| 2862 | |
2862 | |
| 2863 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2863 | process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); |
| 2864 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2864 | process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); |
| 2865 | } |
2865 | } |
| 2866 | break; |
2866 | break; |
| 2867 | } |
2867 | } |
| 2868 | |
2868 | |
| 2869 | return; |
2869 | return; |
| … | |
… | |
| 3604 | return state; |
3604 | return state; |
| 3605 | } |
3605 | } |
| 3606 | |
3606 | |
| 3607 | /* we're not using priv _yet_ */ |
3607 | /* we're not using priv _yet_ */ |
| 3608 | void |
3608 | void |
| 3609 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
3609 | rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg) |
| 3610 | { |
3610 | { |
| 3611 | unsigned int i, j; |
3611 | unsigned int i, j; |
| 3612 | int state; |
3612 | int state; |
| 3613 | |
3613 | |
| 3614 | static const struct |
3614 | static const struct |
| … | |
… | |
| 3675 | for (i = 0; i < nargs; i++) |
3675 | for (i = 0; i < nargs; i++) |
| 3676 | { |
3676 | { |
| 3677 | state = -1; |
3677 | state = -1; |
| 3678 | |
3678 | |
| 3679 | /* basic handling */ |
3679 | /* basic handling */ |
| 3680 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3680 | for (j = 0; j < ecb_array_length (argtopriv); j++) |
| 3681 | if (argtopriv[j].argval == arg[i]) |
3681 | if (argtopriv[j].argval == arg[i]) |
| 3682 | { |
3682 | { |
| 3683 | state = privcases (mode, argtopriv[j].bit); |
3683 | state = privcases (mode, argtopriv[j].bit); |
| 3684 | break; |
3684 | break; |
| 3685 | } |
3685 | } |
