… | |
… | |
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 | } |
… | |
… | |
1478 | } |
1473 | } |
1479 | else |
1474 | else |
1480 | { |
1475 | { |
1481 | #ifdef HAVE_BG_PIXMAP |
1476 | #ifdef HAVE_BG_PIXMAP |
1482 | if (moved) |
1477 | if (moved) |
1483 | { |
|
|
1484 | if (mapped) |
|
|
1485 | update_background (); |
1478 | update_background (); |
1486 | else |
|
|
1487 | bg_invalidate (); |
|
|
1488 | } |
|
|
1489 | #endif |
1479 | #endif |
1490 | } |
1480 | } |
1491 | |
1481 | |
1492 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1482 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1493 | } |
1483 | } |
… | |
… | |
1676 | XQueryPointer (dpy, scrollBar.win, |
1666 | XQueryPointer (dpy, scrollBar.win, |
1677 | &unused_root, &unused_child, |
1667 | &unused_root, &unused_child, |
1678 | &unused_root_x, &unused_root_y, |
1668 | &unused_root_x, &unused_root_y, |
1679 | &ev.xbutton.x, &ev.xbutton.y, |
1669 | &ev.xbutton.x, &ev.xbutton.y, |
1680 | &unused_mask); |
1670 | &unused_mask); |
1681 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1671 | scr_move_to (scrollBar.position (ev.xbutton.y) - csrO, |
1682 | scrollBar.size ()); |
1672 | scrollBar.size ()); |
1683 | want_refresh = 1; |
1673 | want_refresh = 1; |
1684 | scrollBar.show (1); |
1674 | scrollBar.show (1); |
1685 | } |
1675 | } |
1686 | break; |
1676 | break; |
… | |
… | |
1741 | want_refresh = 1; |
1731 | want_refresh = 1; |
1742 | |
1732 | |
1743 | #if USE_XIM |
1733 | #if USE_XIM |
1744 | if (Input_Context != NULL) |
1734 | if (Input_Context != NULL) |
1745 | { |
1735 | { |
1746 | IMSetPosition (); |
1736 | im_set_position (); |
1747 | XSetICFocus (Input_Context); |
1737 | XSetICFocus (Input_Context); |
1748 | } |
1738 | } |
1749 | #endif |
1739 | #endif |
1750 | #if CURSOR_BLINK |
1740 | #if CURSOR_BLINK |
1751 | if (option (Opt_cursorBlink)) |
1741 | if (option (Opt_cursorBlink)) |
… | |
… | |
2054 | csrO = scrollBar.bot - scrollBar.top; |
2044 | csrO = scrollBar.bot - scrollBar.top; |
2055 | break; |
2045 | break; |
2056 | } |
2046 | } |
2057 | |
2047 | |
2058 | if (scrollBar.style == R_SB_XTERM |
2048 | if (scrollBar.style == R_SB_XTERM |
2059 | || scrollbar_above_slider (ev.y) |
2049 | || scrollBar.above_slider (ev.y) |
2060 | || scrollbar_below_slider (ev.y)) |
2050 | || scrollBar.below_slider (ev.y)) |
2061 | scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); |
2051 | scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); |
2062 | |
2052 | |
2063 | scrollBar.state = STATE_MOTION; |
2053 | scrollBar.state = STATE_MOTION; |
2064 | break; |
2054 | break; |
2065 | |
2055 | |
2066 | case Button1: |
2056 | case Button1: |
… | |
… | |
2069 | /* FALLTHROUGH */ |
2059 | /* FALLTHROUGH */ |
2070 | |
2060 | |
2071 | case Button3: |
2061 | case Button3: |
2072 | if (scrollBar.style != R_SB_XTERM) |
2062 | if (scrollBar.style != R_SB_XTERM) |
2073 | { |
2063 | { |
2074 | if (scrollbar_above_slider (ev.y)) |
2064 | if (scrollBar.above_slider (ev.y)) |
2075 | # ifdef RXVT_SCROLL_FULL |
2065 | # ifdef RXVT_SCROLL_FULL |
2076 | scr_page (UP, nrow - 1); |
2066 | scr_page (UP, nrow - 1); |
2077 | # else |
2067 | # else |
2078 | scr_page (UP, nrow / 4); |
2068 | scr_page (UP, nrow / 4); |
2079 | # endif |
2069 | # endif |
2080 | else if (scrollbar_below_slider (ev.y)) |
2070 | else if (scrollBar.below_slider (ev.y)) |
2081 | # ifdef RXVT_SCROLL_FULL |
2071 | # ifdef RXVT_SCROLL_FULL |
2082 | scr_page (DN, nrow - 1); |
2072 | scr_page (DN, nrow - 1); |
2083 | # else |
2073 | # else |
2084 | scr_page (DN, nrow / 4); |
2074 | scr_page (DN, nrow / 4); |
2085 | # endif |
2075 | # endif |
… | |
… | |
2088 | } |
2078 | } |
2089 | else |
2079 | else |
2090 | { |
2080 | { |
2091 | scr_page ((ev.button == Button1 ? DN : UP), |
2081 | scr_page ((ev.button == Button1 ? DN : UP), |
2092 | (nrow |
2082 | (nrow |
2093 | * scrollbar_position (ev.y) |
2083 | * scrollBar.position (ev.y) |
2094 | / scrollBar.size ())); |
2084 | / scrollBar.size ())); |
2095 | } |
2085 | } |
2096 | |
2086 | |
2097 | break; |
2087 | break; |
2098 | } |
2088 | } |
… | |
… | |
2224 | wchar_t ch = NOCHAR; |
2214 | wchar_t ch = NOCHAR; |
2225 | char *seq_begin; // remember start of esc-sequence here |
2215 | char *seq_begin; // remember start of esc-sequence here |
2226 | |
2216 | |
2227 | for (;;) |
2217 | for (;;) |
2228 | { |
2218 | { |
2229 | if (expect_false (ch == NOCHAR)) |
2219 | if (ecb_unlikely (ch == NOCHAR)) |
2230 | { |
2220 | { |
2231 | seq_begin = cmdbuf_ptr; |
2221 | seq_begin = cmdbuf_ptr; |
2232 | ch = next_char (); |
2222 | ch = next_char (); |
2233 | |
2223 | |
2234 | if (ch == NOCHAR) |
2224 | if (ch == NOCHAR) |
2235 | break; |
2225 | break; |
2236 | } |
2226 | } |
2237 | |
2227 | |
2238 | if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
2228 | if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) |
2239 | { |
2229 | { |
2240 | if (expect_false (!seen_input)) |
2230 | if (ecb_unlikely (!seen_input)) |
2241 | { |
2231 | { |
2242 | seen_input = 1; |
2232 | seen_input = 1; |
2243 | // many badly-written programs (e.g. jed) contain a race condition: |
2233 | // many badly-written programs (e.g. jed) contain a race condition: |
2244 | // they first read the screensize and then install a SIGWINCH handler. |
2234 | // they first read the screensize and then install a SIGWINCH handler. |
2245 | // some window managers resize the window early, and these programs |
2235 | // some window managers resize the window early, and these programs |
… | |
… | |
2258 | wchar_t *str = buf; |
2248 | wchar_t *str = buf; |
2259 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2249 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2260 | |
2250 | |
2261 | for (;;) |
2251 | for (;;) |
2262 | { |
2252 | { |
2263 | if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
2253 | if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) |
2264 | break; |
2254 | break; |
2265 | |
2255 | |
2266 | *str++ = ch; |
2256 | *str++ = ch; |
2267 | |
2257 | |
2268 | if (expect_false (ch == C0_LF || str >= eol)) |
2258 | if (ecb_unlikely (ch == C0_LF || str >= eol)) |
2269 | { |
2259 | { |
2270 | if (ch == C0_LF) |
2260 | if (ch == C0_LF) |
2271 | nlines++; |
2261 | nlines++; |
2272 | |
2262 | |
2273 | refresh_count++; |
2263 | refresh_count++; |
… | |
… | |
2351 | rxvt_term::next_char () NOTHROW |
2341 | rxvt_term::next_char () NOTHROW |
2352 | { |
2342 | { |
2353 | while (cmdbuf_ptr < cmdbuf_endp) |
2343 | while (cmdbuf_ptr < cmdbuf_endp) |
2354 | { |
2344 | { |
2355 | // assume 7-bit to be ascii ALWAYS |
2345 | // assume 7-bit to be ascii ALWAYS |
2356 | if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2346 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2357 | return *cmdbuf_ptr++; |
2347 | return *cmdbuf_ptr++; |
2358 | |
2348 | |
2359 | wchar_t wc; |
2349 | wchar_t wc; |
2360 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2350 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2361 | |
2351 | |
… | |
… | |
2491 | pclose_printer (fd); |
2481 | pclose_printer (fd); |
2492 | } |
2482 | } |
2493 | #endif /* PRINTPIPE */ |
2483 | #endif /* PRINTPIPE */ |
2494 | /*}}} */ |
2484 | /*}}} */ |
2495 | |
2485 | |
2496 | /* *INDENT-OFF* */ |
|
|
2497 | enum { |
2486 | enum { |
2498 | C1_40 = 0x40, |
2487 | C1_40 = 0x40, |
2499 | C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, |
2488 | 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, |
2489 | 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, |
2490 | 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, |
2491 | C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, |
2503 | }; |
2492 | }; |
2504 | /* *INDENT-ON* */ |
|
|
2505 | |
2493 | |
2506 | /*{{{ process non-printing single characters */ |
2494 | /*{{{ process non-printing single characters */ |
2507 | void |
2495 | void |
2508 | rxvt_term::process_nonprinting (unicode_t ch) |
2496 | rxvt_term::process_nonprinting (unicode_t ch) |
2509 | { |
2497 | { |
… | |
… | |
2602 | break; |
2590 | break; |
2603 | case 'Z': /* identify the terminal type */ |
2591 | case 'Z': /* identify the terminal type */ |
2604 | tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2592 | tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2605 | break; |
2593 | break; |
2606 | case '<': /* turn off VT52 mode */ |
2594 | case '<': /* turn off VT52 mode */ |
2607 | set_privmode (PrivMode_vt52, 0); |
2595 | priv_modes &= ~PrivMode_vt52; |
2608 | break; |
2596 | break; |
2609 | case 'F': /* use special graphics character set */ |
2597 | case 'F': /* use special graphics character set */ |
2610 | case 'G': /* use regular character set */ |
2598 | case 'G': /* use regular character set */ |
2611 | /* unimplemented */ |
2599 | /* unimplemented */ |
2612 | break; |
2600 | break; |
… | |
… | |
2631 | return; |
2619 | return; |
2632 | } |
2620 | } |
2633 | |
2621 | |
2634 | switch (ch) |
2622 | switch (ch) |
2635 | { |
2623 | { |
2636 | /* case 1: do_tek_mode (); break; */ |
|
|
2637 | case '#': |
2624 | case '#': |
2638 | if (cmd_getc () == '8') |
2625 | if (cmd_getc () == '8') |
2639 | scr_E (); |
2626 | scr_E (); |
2640 | break; |
2627 | break; |
2641 | case '(': |
2628 | case '(': |
… | |
… | |
2664 | #if !ENABLE_MINIMAL |
2651 | #if !ENABLE_MINIMAL |
2665 | case '9': |
2652 | case '9': |
2666 | scr_forwardindex (); |
2653 | scr_forwardindex (); |
2667 | break; |
2654 | break; |
2668 | #endif |
2655 | #endif |
|
|
2656 | // DECPAM/DECPNM |
2669 | case '=': |
2657 | case '=': |
|
|
2658 | priv_modes |= PrivMode_aplKP; |
|
|
2659 | break; |
2670 | case '>': |
2660 | case '>': |
2671 | set_privmode (PrivMode_aplKP, ch == '='); |
2661 | priv_modes &= ~PrivMode_aplKP; |
2672 | break; |
2662 | break; |
2673 | |
2663 | |
2674 | case C1_40: |
2664 | case C1_40: |
2675 | cmd_getc (); |
2665 | cmd_getc (); |
2676 | break; |
2666 | break; |
… | |
… | |
2680 | |
2670 | |
2681 | /* 8.3.87: NEXT LINE */ |
2671 | /* 8.3.87: NEXT LINE */ |
2682 | case C1_NEL: /* ESC E */ |
2672 | case C1_NEL: /* ESC E */ |
2683 | { |
2673 | { |
2684 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2674 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2685 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2675 | scr_add_lines (nlcr, ecb_array_length (nlcr), 1); |
2686 | } |
2676 | } |
2687 | break; |
2677 | break; |
2688 | |
2678 | |
2689 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2679 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2690 | case C1_ESA: /* ESC G */ |
2680 | case C1_ESA: /* ESC G */ |
… | |
… | |
2702 | case C1_RI: /* ESC M */ |
2692 | case C1_RI: /* ESC M */ |
2703 | scr_index (DN); |
2693 | scr_index (DN); |
2704 | break; |
2694 | break; |
2705 | |
2695 | |
2706 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2696 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2707 | /*case C1_SS2: scr_single_shift (2); break; */ |
2697 | /* case C1_SS2: break; */ |
2708 | |
2698 | |
2709 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2699 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2710 | /*case C1_SS3: scr_single_shift (3); break; */ |
2700 | /* case C1_SS3: break; */ |
2711 | |
2701 | |
2712 | /* 8.3.27: DEVICE CONTROL STRING */ |
2702 | /* 8.3.27: DEVICE CONTROL STRING */ |
2713 | case C1_DCS: /* ESC P */ |
2703 | case C1_DCS: /* ESC P */ |
2714 | process_dcs_seq (); |
2704 | process_dcs_seq (); |
2715 | break; |
2705 | break; |
… | |
… | |
2748 | } |
2738 | } |
2749 | } |
2739 | } |
2750 | /*}}} */ |
2740 | /*}}} */ |
2751 | |
2741 | |
2752 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
2742 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
2753 | /* *INDENT-OFF* */ |
|
|
2754 | enum { |
2743 | enum { |
2755 | CSI_ICH = 0x40, |
2744 | CSI_ICH = 0x40, |
2756 | CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, |
2745 | 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 , |
2746 | 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, |
2747 | 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, */ |
2767 | 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, */ |
2768 | 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, */ |
2769 | 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, {, |, }, ~, */ |
2770 | make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ |
2782 | }; |
2771 | }; |
2783 | /* *INDENT-ON* */ |
|
|
2784 | |
2772 | |
2785 | void |
2773 | void |
2786 | rxvt_term::process_csi_seq () |
2774 | rxvt_term::process_csi_seq () |
2787 | { |
2775 | { |
2788 | unicode_t ch, priv, i; |
2776 | unicode_t ch, priv, i; |
… | |
… | |
2868 | scr_soft_reset (); |
2856 | scr_soft_reset (); |
2869 | |
2857 | |
2870 | static const int pm_h[] = { 7, 25 }; |
2858 | 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 }; |
2859 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2872 | |
2860 | |
2873 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2861 | process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); |
2874 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2862 | process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); |
2875 | } |
2863 | } |
2876 | break; |
2864 | break; |
2877 | } |
2865 | } |
2878 | |
2866 | |
2879 | return; |
2867 | return; |
… | |
… | |
3098 | } |
3086 | } |
3099 | } |
3087 | } |
3100 | /*}}} */ |
3088 | /*}}} */ |
3101 | |
3089 | |
3102 | #if !ENABLE_MINIMAL |
3090 | #if !ENABLE_MINIMAL |
3103 | /* ARGSUSED */ |
|
|
3104 | void |
3091 | void |
3105 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3092 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3106 | { |
3093 | { |
3107 | int x, y; |
3094 | int x, y; |
3108 | XWindowAttributes wattr; |
3095 | XWindowAttributes wattr; |
… | |
… | |
3463 | min (h_align, 32767), min (v_align, 32767)); |
3450 | min (h_align, 32767), min (v_align, 32767)); |
3464 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3451 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3465 | } |
3452 | } |
3466 | else |
3453 | else |
3467 | { |
3454 | { |
3468 | int changed = 0; |
3455 | bool changed = false; |
3469 | |
3456 | |
3470 | if (*str != ';') |
3457 | if (*str != ';') |
3471 | { |
3458 | { |
3472 | if (bg_set_file (str)) /* change pixmap */ |
3459 | if (bg_set_file (str)) /* change pixmap */ |
3473 | { |
|
|
3474 | changed++; |
3460 | changed = true; |
3475 | str = strchr (str, ';'); |
|
|
3476 | if (str == NULL) |
|
|
3477 | bg_set_default_geometry (); |
|
|
3478 | else |
|
|
3479 | bg_set_geometry (str+1); |
|
|
3480 | } |
|
|
3481 | } |
3461 | } |
3482 | else |
3462 | else |
3483 | { |
3463 | { |
3484 | str++; |
3464 | str++; |
3485 | if (bg_set_geometry (str, true)) |
3465 | if (bg_set_geometry (str, true)) |
3486 | changed++; |
3466 | changed = true; |
3487 | } |
3467 | } |
3488 | |
3468 | |
3489 | if (changed) |
3469 | if (changed) |
3490 | { |
3470 | { |
3491 | if (bg_window_position_sensitive ()) |
3471 | if (bg_window_position_sensitive ()) |
… | |
… | |
3607 | if (mode == 'r') |
3587 | if (mode == 'r') |
3608 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3588 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3609 | else |
3589 | else |
3610 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3590 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3611 | |
3591 | |
3612 | set_privmode (bit, state); |
3592 | if (state) |
|
|
3593 | priv_modes |= bit; |
|
|
3594 | else |
|
|
3595 | priv_modes &= ~bit; |
3613 | } |
3596 | } |
3614 | |
3597 | |
3615 | return state; |
3598 | return state; |
3616 | } |
3599 | } |
3617 | |
3600 | |
3618 | /* we're not using priv _yet_ */ |
3601 | /* we're not using priv _yet_ */ |
3619 | void |
3602 | void |
3620 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
3603 | rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg) |
3621 | { |
3604 | { |
3622 | unsigned int i, j; |
3605 | unsigned int i, j; |
3623 | int state; |
3606 | int state; |
3624 | |
3607 | |
3625 | static const struct |
3608 | static const struct |
3626 | { |
3609 | { |
3627 | const int argval; |
3610 | const int argval; |
3628 | const unsigned long bit; |
3611 | const unsigned long bit; |
3629 | } argtopriv[] = { |
3612 | } argtopriv[] = { |
3630 | { 1, PrivMode_aplCUR }, // DECCKM |
3613 | { 1, PrivMode_aplCUR }, // DECCKM |
3631 | { 2, PrivMode_vt52 }, |
3614 | { 2, PrivMode_vt52 }, // DECANM |
3632 | { 3, PrivMode_132 }, // DECCOLM |
3615 | { 3, PrivMode_132 }, // DECCOLM |
3633 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3616 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3634 | { 5, PrivMode_rVideo }, // DECSCNM |
3617 | { 5, PrivMode_rVideo }, // DECSCNM |
3635 | { 6, PrivMode_relOrigin }, // DECOM |
3618 | { 6, PrivMode_relOrigin }, // DECOM |
3636 | { 7, PrivMode_Autowrap }, // DECAWM |
3619 | { 7, PrivMode_Autowrap }, // DECAWM |
3637 | // 8, auto-repeat keys // DECARM |
3620 | // 8, auto-repeat keys // DECARM |
3638 | { 9, PrivMode_MouseX10 }, |
3621 | { 9, PrivMode_MouseX10 }, |
3639 | // 18 end FF to printer after print screen |
3622 | // 18 end FF to printer after print screen |
3640 | // 19 Print screen prints full screen/scroll region |
3623 | // 19 Print screen prints full screen/scroll region |
3641 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3624 | { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis |
3642 | #ifdef scrollBar_esc |
3625 | #ifdef scrollBar_esc |
3643 | { scrollBar_esc, PrivMode_scrollBar }, |
3626 | { scrollBar_esc, PrivMode_scrollBar }, |
3644 | #endif |
3627 | #endif |
3645 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3628 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3646 | // 38, tektronix mode // DECTEK |
3629 | // 38, tektronix mode // DECTEK |
3647 | { 40, PrivMode_132OK }, |
3630 | { 40, PrivMode_132OK }, |
3648 | // 41 xterm more fixes NYI |
3631 | // 41 xterm more fixes NYI |
3649 | // 45 margin bell NYI |
3632 | // 45 margin bell NYI |
3650 | // 46 start logging |
3633 | // 46 start logging |
3651 | { 47, PrivMode_Screen }, |
3634 | { 47, PrivMode_Screen }, |
3652 | { 66, PrivMode_aplKP }, // DECPAM/DECPNM |
3635 | { 66, PrivMode_aplKP }, // DECNKM |
3653 | #ifndef NO_BACKSPACE_KEY |
3636 | #ifndef NO_BACKSPACE_KEY |
3654 | { 67, PrivMode_BackSpace }, // DECBKM |
3637 | { 67, PrivMode_BackSpace }, // DECBKM |
3655 | #endif |
3638 | #endif |
3656 | { 1000, PrivMode_MouseX11 }, |
3639 | { 1000, PrivMode_MouseX11 }, |
3657 | { 1002, PrivMode_MouseBtnEvent }, |
3640 | { 1002, PrivMode_MouseBtnEvent }, |
… | |
… | |
3686 | for (i = 0; i < nargs; i++) |
3669 | for (i = 0; i < nargs; i++) |
3687 | { |
3670 | { |
3688 | state = -1; |
3671 | state = -1; |
3689 | |
3672 | |
3690 | /* basic handling */ |
3673 | /* basic handling */ |
3691 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3674 | for (j = 0; j < ecb_array_length (argtopriv); j++) |
3692 | if (argtopriv[j].argval == arg[i]) |
3675 | if (argtopriv[j].argval == arg[i]) |
3693 | { |
3676 | { |
3694 | state = privcases (mode, argtopriv[j].bit); |
3677 | state = privcases (mode, argtopriv[j].bit); |
3695 | break; |
3678 | break; |
3696 | } |
3679 | } |
… | |
… | |
3722 | case 2: /* VT52 mode */ |
3705 | case 2: /* VT52 mode */ |
3723 | /* oddball mode. should be set regardless of set/reset |
3706 | /* oddball mode. should be set regardless of set/reset |
3724 | * parameter. Return from VT52 mode with an ESC < from |
3707 | * parameter. Return from VT52 mode with an ESC < from |
3725 | * within VT52 mode |
3708 | * within VT52 mode |
3726 | */ |
3709 | */ |
3727 | set_privmode (PrivMode_vt52, 1); |
3710 | priv_modes |= PrivMode_vt52; |
3728 | break; |
3711 | break; |
3729 | case 3: /* 80/132 */ |
3712 | case 3: /* 80/132 */ |
3730 | if (priv_modes & PrivMode_132OK) |
3713 | if (priv_modes & PrivMode_132OK) |
3731 | set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); |
3714 | set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); |
3732 | break; |
3715 | break; |
… | |
… | |
3747 | if (state) /* orthogonal */ |
3730 | if (state) /* orthogonal */ |
3748 | priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3731 | priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3749 | break; |
3732 | break; |
3750 | #ifdef scrollBar_esc |
3733 | #ifdef scrollBar_esc |
3751 | case scrollBar_esc: |
3734 | case scrollBar_esc: |
3752 | if (scrollBar.map (state)) |
3735 | scrollBar.map (state); |
3753 | { |
|
|
3754 | resize_all_windows (0, 0, 0); |
3736 | resize_all_windows (0, 0, 0); |
3755 | scr_touch (true); |
3737 | scr_touch (true); |
3756 | } |
|
|
3757 | break; |
3738 | break; |
3758 | #endif |
3739 | #endif |
3759 | case 25: /* visible/invisible cursor */ |
3740 | case 25: /* visible/invisible cursor */ |
3760 | scr_cursor_visible (state); |
3741 | scr_cursor_visible (state); |
3761 | break; |
3742 | break; |