… | |
… | |
257 | #endif |
257 | #endif |
258 | |
258 | |
259 | void |
259 | void |
260 | rxvt_term::commit_iso14755 () |
260 | rxvt_term::commit_iso14755 () |
261 | { |
261 | { |
262 | wchar_t ch[2]; |
|
|
263 | |
|
|
264 | ch[0] = iso14755buf & ISO_14755_MASK; |
262 | wchar_t ch = iso14755buf & ISO_14755_MASK; |
265 | ch[1] = 0; |
|
|
266 | |
263 | |
267 | if (iso14755buf & ISO_14755_51) |
264 | if (iso14755buf & ISO_14755_51) |
268 | { |
265 | { |
269 | char mb[16]; |
266 | char mb[MB_LEN_MAX]; |
270 | int len; |
267 | int len; |
271 | |
268 | |
272 | // allow verbatim 0-bytes and control-bytes to be entered |
269 | // allow verbatim 0-bytes and control-bytes to be entered |
273 | if (ch[0] >= 0x20) |
270 | if (ch >= 0x20) |
274 | len = wcstombs (mb, ch, 16); |
271 | len = wctomb (mb, ch); |
275 | else |
272 | else |
276 | { |
273 | { |
277 | mb[0] = ch[0]; |
274 | mb[0] = ch; |
278 | len = 1; |
275 | len = 1; |
279 | } |
276 | } |
280 | |
277 | |
281 | if (len > 0) |
278 | if (len > 0) |
282 | tt_write (mb, len); |
279 | tt_write (mb, len); |
… | |
… | |
569 | selection_request (ev.time); |
566 | selection_request (ev.time); |
570 | return; |
567 | return; |
571 | #if TODO |
568 | #if TODO |
572 | /* rxvt extras */ |
569 | /* rxvt extras */ |
573 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
570 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
574 | change_font (FONT_UP); |
|
|
575 | return; |
571 | return; |
576 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
572 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
577 | change_font (FONT_DN); |
|
|
578 | return; |
573 | return; |
579 | #endif |
574 | #endif |
580 | } |
575 | } |
581 | } |
576 | } |
582 | } |
577 | } |
… | |
… | |
992 | } |
987 | } |
993 | |
988 | |
994 | scr_refresh (); |
989 | scr_refresh (); |
995 | scrollBar.show (1); |
990 | scrollBar.show (1); |
996 | #ifdef USE_XIM |
991 | #ifdef USE_XIM |
997 | IMSendSpot (); |
992 | im_send_spot (); |
998 | #endif |
993 | #endif |
999 | } |
994 | } |
1000 | |
995 | |
1001 | display->flush (); |
996 | display->flush (); |
1002 | } |
997 | } |
… | |
… | |
1741 | want_refresh = 1; |
1736 | want_refresh = 1; |
1742 | |
1737 | |
1743 | #if USE_XIM |
1738 | #if USE_XIM |
1744 | if (Input_Context != NULL) |
1739 | if (Input_Context != NULL) |
1745 | { |
1740 | { |
1746 | IMSetPosition (); |
1741 | im_set_position (); |
1747 | XSetICFocus (Input_Context); |
1742 | XSetICFocus (Input_Context); |
1748 | } |
1743 | } |
1749 | #endif |
1744 | #endif |
1750 | #if CURSOR_BLINK |
1745 | #if CURSOR_BLINK |
1751 | if (option (Opt_cursorBlink)) |
1746 | if (option (Opt_cursorBlink)) |
… | |
… | |
2224 | wchar_t ch = NOCHAR; |
2219 | wchar_t ch = NOCHAR; |
2225 | char *seq_begin; // remember start of esc-sequence here |
2220 | char *seq_begin; // remember start of esc-sequence here |
2226 | |
2221 | |
2227 | for (;;) |
2222 | for (;;) |
2228 | { |
2223 | { |
2229 | if (expect_false (ch == NOCHAR)) |
2224 | if (ecb_unlikely (ch == NOCHAR)) |
2230 | { |
2225 | { |
2231 | seq_begin = cmdbuf_ptr; |
2226 | seq_begin = cmdbuf_ptr; |
2232 | ch = next_char (); |
2227 | ch = next_char (); |
2233 | |
2228 | |
2234 | if (ch == NOCHAR) |
2229 | if (ch == NOCHAR) |
2235 | break; |
2230 | break; |
2236 | } |
2231 | } |
2237 | |
2232 | |
2238 | 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)) |
2239 | { |
2234 | { |
2240 | if (expect_false (!seen_input)) |
2235 | if (ecb_unlikely (!seen_input)) |
2241 | { |
2236 | { |
2242 | seen_input = 1; |
2237 | seen_input = 1; |
2243 | // many badly-written programs (e.g. jed) contain a race condition: |
2238 | // many badly-written programs (e.g. jed) contain a race condition: |
2244 | // they first read the screensize and then install a SIGWINCH handler. |
2239 | // they first read the screensize and then install a SIGWINCH handler. |
2245 | // some window managers resize the window early, and these programs |
2240 | // some window managers resize the window early, and these programs |
… | |
… | |
2258 | wchar_t *str = buf; |
2253 | wchar_t *str = buf; |
2259 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2254 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2260 | |
2255 | |
2261 | for (;;) |
2256 | for (;;) |
2262 | { |
2257 | { |
2263 | 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))) |
2264 | break; |
2259 | break; |
2265 | |
2260 | |
2266 | *str++ = ch; |
2261 | *str++ = ch; |
2267 | |
2262 | |
2268 | if (expect_false (ch == C0_LF || str >= eol)) |
2263 | if (ecb_unlikely (ch == C0_LF || str >= eol)) |
2269 | { |
2264 | { |
2270 | if (ch == C0_LF) |
2265 | if (ch == C0_LF) |
2271 | nlines++; |
2266 | nlines++; |
2272 | |
2267 | |
2273 | refresh_count++; |
2268 | refresh_count++; |
… | |
… | |
2351 | rxvt_term::next_char () NOTHROW |
2346 | rxvt_term::next_char () NOTHROW |
2352 | { |
2347 | { |
2353 | while (cmdbuf_ptr < cmdbuf_endp) |
2348 | while (cmdbuf_ptr < cmdbuf_endp) |
2354 | { |
2349 | { |
2355 | // assume 7-bit to be ascii ALWAYS |
2350 | // assume 7-bit to be ascii ALWAYS |
2356 | if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2351 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2357 | return *cmdbuf_ptr++; |
2352 | return *cmdbuf_ptr++; |
2358 | |
2353 | |
2359 | wchar_t wc; |
2354 | wchar_t wc; |
2360 | 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); |
2361 | |
2356 | |
… | |
… | |
2491 | pclose_printer (fd); |
2486 | pclose_printer (fd); |
2492 | } |
2487 | } |
2493 | #endif /* PRINTPIPE */ |
2488 | #endif /* PRINTPIPE */ |
2494 | /*}}} */ |
2489 | /*}}} */ |
2495 | |
2490 | |
2496 | /* *INDENT-OFF* */ |
|
|
2497 | enum { |
2491 | enum { |
2498 | C1_40 = 0x40, |
2492 | C1_40 = 0x40, |
2499 | C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, |
2493 | C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, |
2500 | C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, |
2494 | C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, |
2501 | C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, |
2495 | C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, |
2502 | C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, |
2496 | C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, |
2503 | }; |
2497 | }; |
2504 | /* *INDENT-ON* */ |
|
|
2505 | |
2498 | |
2506 | /*{{{ process non-printing single characters */ |
2499 | /*{{{ process non-printing single characters */ |
2507 | void |
2500 | void |
2508 | rxvt_term::process_nonprinting (unicode_t ch) |
2501 | rxvt_term::process_nonprinting (unicode_t ch) |
2509 | { |
2502 | { |
… | |
… | |
2631 | return; |
2624 | return; |
2632 | } |
2625 | } |
2633 | |
2626 | |
2634 | switch (ch) |
2627 | switch (ch) |
2635 | { |
2628 | { |
2636 | /* case 1: do_tek_mode (); break; */ |
|
|
2637 | case '#': |
2629 | case '#': |
2638 | if (cmd_getc () == '8') |
2630 | if (cmd_getc () == '8') |
2639 | scr_E (); |
2631 | scr_E (); |
2640 | break; |
2632 | break; |
2641 | case '(': |
2633 | case '(': |
… | |
… | |
2680 | |
2672 | |
2681 | /* 8.3.87: NEXT LINE */ |
2673 | /* 8.3.87: NEXT LINE */ |
2682 | case C1_NEL: /* ESC E */ |
2674 | case C1_NEL: /* ESC E */ |
2683 | { |
2675 | { |
2684 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2676 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2685 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2677 | scr_add_lines (nlcr, ecb_array_length (nlcr), 1); |
2686 | } |
2678 | } |
2687 | break; |
2679 | break; |
2688 | |
2680 | |
2689 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2681 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2690 | case C1_ESA: /* ESC G */ |
2682 | case C1_ESA: /* ESC G */ |
… | |
… | |
2702 | case C1_RI: /* ESC M */ |
2694 | case C1_RI: /* ESC M */ |
2703 | scr_index (DN); |
2695 | scr_index (DN); |
2704 | break; |
2696 | break; |
2705 | |
2697 | |
2706 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2698 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2707 | /*case C1_SS2: scr_single_shift (2); break; */ |
2699 | /* case C1_SS2: break; */ |
2708 | |
2700 | |
2709 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2701 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2710 | /*case C1_SS3: scr_single_shift (3); break; */ |
2702 | /* case C1_SS3: break; */ |
2711 | |
2703 | |
2712 | /* 8.3.27: DEVICE CONTROL STRING */ |
2704 | /* 8.3.27: DEVICE CONTROL STRING */ |
2713 | case C1_DCS: /* ESC P */ |
2705 | case C1_DCS: /* ESC P */ |
2714 | process_dcs_seq (); |
2706 | process_dcs_seq (); |
2715 | break; |
2707 | break; |
… | |
… | |
2748 | } |
2740 | } |
2749 | } |
2741 | } |
2750 | /*}}} */ |
2742 | /*}}} */ |
2751 | |
2743 | |
2752 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
2744 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
2753 | /* *INDENT-OFF* */ |
|
|
2754 | enum { |
2745 | enum { |
2755 | CSI_ICH = 0x40, |
2746 | CSI_ICH = 0x40, |
2756 | CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, |
2747 | CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, |
2757 | CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , |
2748 | CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , |
2758 | CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, |
2749 | CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, |
… | |
… | |
2778 | make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ |
2769 | make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ |
2779 | make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ |
2770 | make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ |
2780 | make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ |
2771 | make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ |
2781 | make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ |
2772 | make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ |
2782 | }; |
2773 | }; |
2783 | /* *INDENT-ON* */ |
|
|
2784 | |
2774 | |
2785 | void |
2775 | void |
2786 | rxvt_term::process_csi_seq () |
2776 | rxvt_term::process_csi_seq () |
2787 | { |
2777 | { |
2788 | unicode_t ch, priv, i; |
2778 | unicode_t ch, priv, i; |
… | |
… | |
2868 | scr_soft_reset (); |
2858 | scr_soft_reset (); |
2869 | |
2859 | |
2870 | static const int pm_h[] = { 7, 25 }; |
2860 | static const int pm_h[] = { 7, 25 }; |
2871 | 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 }; |
2872 | |
2862 | |
2873 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2863 | process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); |
2874 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2864 | process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); |
2875 | } |
2865 | } |
2876 | break; |
2866 | break; |
2877 | } |
2867 | } |
2878 | |
2868 | |
2879 | return; |
2869 | return; |
… | |
… | |
3098 | } |
3088 | } |
3099 | } |
3089 | } |
3100 | /*}}} */ |
3090 | /*}}} */ |
3101 | |
3091 | |
3102 | #if !ENABLE_MINIMAL |
3092 | #if !ENABLE_MINIMAL |
3103 | /* ARGSUSED */ |
|
|
3104 | void |
3093 | void |
3105 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3094 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3106 | { |
3095 | { |
3107 | int x, y; |
3096 | int x, y; |
3108 | XWindowAttributes wattr; |
3097 | XWindowAttributes wattr; |
… | |
… | |
3615 | return state; |
3604 | return state; |
3616 | } |
3605 | } |
3617 | |
3606 | |
3618 | /* we're not using priv _yet_ */ |
3607 | /* we're not using priv _yet_ */ |
3619 | void |
3608 | void |
3620 | 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) |
3621 | { |
3610 | { |
3622 | unsigned int i, j; |
3611 | unsigned int i, j; |
3623 | int state; |
3612 | int state; |
3624 | |
3613 | |
3625 | static const struct |
3614 | static const struct |
… | |
… | |
3686 | for (i = 0; i < nargs; i++) |
3675 | for (i = 0; i < nargs; i++) |
3687 | { |
3676 | { |
3688 | state = -1; |
3677 | state = -1; |
3689 | |
3678 | |
3690 | /* basic handling */ |
3679 | /* basic handling */ |
3691 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3680 | for (j = 0; j < ecb_array_length (argtopriv); j++) |
3692 | if (argtopriv[j].argval == arg[i]) |
3681 | if (argtopriv[j].argval == arg[i]) |
3693 | { |
3682 | { |
3694 | state = privcases (mode, argtopriv[j].bit); |
3683 | state = privcases (mode, argtopriv[j].bit); |
3695 | break; |
3684 | break; |
3696 | } |
3685 | } |