… | |
… | |
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); |
… | |
… | |
990 | } |
987 | } |
991 | |
988 | |
992 | scr_refresh (); |
989 | scr_refresh (); |
993 | scrollBar.show (1); |
990 | scrollBar.show (1); |
994 | #ifdef USE_XIM |
991 | #ifdef USE_XIM |
995 | IMSendSpot (); |
992 | im_send_spot (); |
996 | #endif |
993 | #endif |
997 | } |
994 | } |
998 | |
995 | |
999 | display->flush (); |
996 | display->flush (); |
1000 | } |
997 | } |
… | |
… | |
1045 | |
1042 | |
1046 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1043 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1047 | void |
1044 | void |
1048 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1045 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1049 | { |
1046 | { |
1050 | if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) |
1047 | if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN) |
1051 | && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) |
1048 | && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1)) |
1052 | { |
1049 | { |
1053 | want_refresh = 1; |
1050 | want_refresh = 1; |
1054 | refresh_check (); |
1051 | refresh_check (); |
1055 | } |
1052 | } |
1056 | else |
1053 | else |
… | |
… | |
1476 | } |
1473 | } |
1477 | else |
1474 | else |
1478 | { |
1475 | { |
1479 | #ifdef HAVE_BG_PIXMAP |
1476 | #ifdef HAVE_BG_PIXMAP |
1480 | if (moved) |
1477 | if (moved) |
1481 | { |
|
|
1482 | if (mapped) |
|
|
1483 | update_background (); |
1478 | update_background (); |
1484 | else |
|
|
1485 | bg_invalidate (); |
|
|
1486 | } |
|
|
1487 | #endif |
1479 | #endif |
1488 | } |
1480 | } |
1489 | |
1481 | |
1490 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1482 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1491 | } |
1483 | } |
… | |
… | |
1565 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1557 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1566 | ; |
1558 | ; |
1567 | |
1559 | |
1568 | if (scrollBar.state && ev.xany.window == scrollBar.win) |
1560 | if (scrollBar.state && ev.xany.window == scrollBar.win) |
1569 | { |
1561 | { |
1570 | scrollBar.state = STATE_IDLE; |
1562 | scrollBar.state = SB_STATE_IDLE; |
1571 | scrollBar.show (0); |
1563 | scrollBar.show (0); |
1572 | } |
1564 | } |
1573 | } |
1565 | } |
1574 | break; |
1566 | break; |
1575 | |
1567 | |
… | |
… | |
1663 | #ifdef MOUSE_THRESHOLD |
1655 | #ifdef MOUSE_THRESHOLD |
1664 | } |
1656 | } |
1665 | #endif |
1657 | #endif |
1666 | } |
1658 | } |
1667 | } |
1659 | } |
1668 | else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) |
1660 | else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) |
1669 | { |
1661 | { |
1670 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1662 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1671 | MotionNotify, &ev)) |
1663 | MotionNotify, &ev)) |
1672 | ; |
1664 | ; |
1673 | |
1665 | |
1674 | XQueryPointer (dpy, scrollBar.win, |
1666 | XQueryPointer (dpy, scrollBar.win, |
1675 | &unused_root, &unused_child, |
1667 | &unused_root, &unused_child, |
1676 | &unused_root_x, &unused_root_y, |
1668 | &unused_root_x, &unused_root_y, |
1677 | &ev.xbutton.x, &ev.xbutton.y, |
1669 | &ev.xbutton.x, &ev.xbutton.y, |
1678 | &unused_mask); |
1670 | &unused_mask); |
1679 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1671 | scr_move_to (scrollBar.position (ev.xbutton.y) - csrO, |
1680 | scrollBar.size ()); |
1672 | scrollBar.size ()); |
1681 | want_refresh = 1; |
1673 | want_refresh = 1; |
1682 | scrollBar.show (1); |
1674 | scrollBar.show (1); |
1683 | } |
1675 | } |
1684 | break; |
1676 | break; |
… | |
… | |
1739 | want_refresh = 1; |
1731 | want_refresh = 1; |
1740 | |
1732 | |
1741 | #if USE_XIM |
1733 | #if USE_XIM |
1742 | if (Input_Context != NULL) |
1734 | if (Input_Context != NULL) |
1743 | { |
1735 | { |
1744 | IMSetPosition (); |
1736 | im_set_position (); |
1745 | XSetICFocus (Input_Context); |
1737 | XSetICFocus (Input_Context); |
1746 | } |
1738 | } |
1747 | #endif |
1739 | #endif |
1748 | #if CURSOR_BLINK |
1740 | #if CURSOR_BLINK |
1749 | if (option (Opt_cursorBlink)) |
1741 | if (option (Opt_cursorBlink)) |
… | |
… | |
1980 | if (scrollBar.upButton (ev.y)) |
1972 | if (scrollBar.upButton (ev.y)) |
1981 | direction = UP; /* up */ |
1973 | direction = UP; /* up */ |
1982 | else if (scrollBar.dnButton (ev.y)) |
1974 | else if (scrollBar.dnButton (ev.y)) |
1983 | direction = DN; /* down */ |
1975 | direction = DN; /* down */ |
1984 | |
1976 | |
1985 | scrollBar.state = STATE_IDLE; |
1977 | scrollBar.state = SB_STATE_IDLE; |
1986 | /* |
1978 | /* |
1987 | * Rxvt-style scrollbar: |
1979 | * Rxvt-style scrollbar: |
1988 | * move up if mouse is above slider |
1980 | * move up if mouse is above slider |
1989 | * move dn if mouse is below slider |
1981 | * move dn if mouse is below slider |
1990 | * |
1982 | * |
… | |
… | |
2029 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2021 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2030 | #endif |
2022 | #endif |
2031 | if (scr_page (direction, 1)) |
2023 | if (scr_page (direction, 1)) |
2032 | { |
2024 | { |
2033 | if (direction == UP) |
2025 | if (direction == UP) |
2034 | scrollBar.state = STATE_UP; |
2026 | scrollBar.state = SB_STATE_UP; |
2035 | else |
2027 | else |
2036 | scrollBar.state = STATE_DOWN; |
2028 | scrollBar.state = SB_STATE_DOWN; |
2037 | } |
2029 | } |
2038 | } |
2030 | } |
2039 | else |
2031 | else |
2040 | switch (ev.button) |
2032 | switch (ev.button) |
2041 | { |
2033 | { |
2042 | case Button2: |
2034 | case Button2: |
2043 | switch (scrollBar.align) |
2035 | switch (scrollBar.align) |
2044 | { |
2036 | { |
2045 | case R_SB_ALIGN_TOP: |
2037 | case SB_ALIGN_TOP: |
2046 | csrO = 0; |
2038 | csrO = 0; |
2047 | break; |
2039 | break; |
2048 | case R_SB_ALIGN_CENTRE: |
2040 | case SB_ALIGN_CENTRE: |
2049 | csrO = (scrollBar.bot - scrollBar.top) / 2; |
2041 | csrO = (scrollBar.bot - scrollBar.top) / 2; |
2050 | break; |
2042 | break; |
2051 | case R_SB_ALIGN_BOTTOM: |
2043 | case SB_ALIGN_BOTTOM: |
2052 | csrO = scrollBar.bot - scrollBar.top; |
2044 | csrO = scrollBar.bot - scrollBar.top; |
2053 | break; |
2045 | break; |
2054 | } |
2046 | } |
2055 | |
2047 | |
2056 | if (scrollBar.style == R_SB_XTERM |
2048 | if (scrollBar.style == SB_STYLE_XTERM |
2057 | || scrollbar_above_slider (ev.y) |
2049 | || scrollBar.above_slider (ev.y) |
2058 | || scrollbar_below_slider (ev.y)) |
2050 | || scrollBar.below_slider (ev.y)) |
2059 | scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); |
2051 | scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); |
2060 | |
2052 | |
2061 | scrollBar.state = STATE_MOTION; |
2053 | scrollBar.state = SB_STATE_MOTION; |
2062 | break; |
2054 | break; |
2063 | |
2055 | |
2064 | case Button1: |
2056 | case Button1: |
2065 | if (scrollBar.align == R_SB_ALIGN_CENTRE) |
2057 | if (scrollBar.align == SB_ALIGN_CENTRE) |
2066 | csrO = ev.y - scrollBar.top; |
2058 | csrO = ev.y - scrollBar.top; |
2067 | /* FALLTHROUGH */ |
2059 | /* FALLTHROUGH */ |
2068 | |
2060 | |
2069 | case Button3: |
2061 | case Button3: |
2070 | if (scrollBar.style != R_SB_XTERM) |
2062 | if (scrollBar.style != SB_STYLE_XTERM) |
2071 | { |
2063 | { |
2072 | if (scrollbar_above_slider (ev.y)) |
2064 | if (scrollBar.above_slider (ev.y)) |
2073 | # ifdef RXVT_SCROLL_FULL |
2065 | # ifdef RXVT_SCROLL_FULL |
2074 | scr_page (UP, nrow - 1); |
2066 | scr_page (UP, nrow - 1); |
2075 | # else |
2067 | # else |
2076 | scr_page (UP, nrow / 4); |
2068 | scr_page (UP, nrow / 4); |
2077 | # endif |
2069 | # endif |
2078 | else if (scrollbar_below_slider (ev.y)) |
2070 | else if (scrollBar.below_slider (ev.y)) |
2079 | # ifdef RXVT_SCROLL_FULL |
2071 | # ifdef RXVT_SCROLL_FULL |
2080 | scr_page (DN, nrow - 1); |
2072 | scr_page (DN, nrow - 1); |
2081 | # else |
2073 | # else |
2082 | scr_page (DN, nrow / 4); |
2074 | scr_page (DN, nrow / 4); |
2083 | # endif |
2075 | # endif |
2084 | else |
2076 | else |
2085 | scrollBar.state = STATE_MOTION; |
2077 | scrollBar.state = SB_STATE_MOTION; |
2086 | } |
2078 | } |
2087 | else |
2079 | else |
2088 | { |
2080 | { |
2089 | scr_page ((ev.button == Button1 ? DN : UP), |
2081 | scr_page ((ev.button == Button1 ? DN : UP), |
2090 | (nrow |
2082 | (nrow |
2091 | * scrollbar_position (ev.y) |
2083 | * scrollBar.position (ev.y) |
2092 | / scrollBar.size ())); |
2084 | / scrollBar.size ())); |
2093 | } |
2085 | } |
2094 | |
2086 | |
2095 | break; |
2087 | break; |
2096 | } |
2088 | } |
… | |
… | |
2107 | |
2099 | |
2108 | csrO = 0; /* reset csr Offset */ |
2100 | csrO = 0; /* reset csr Offset */ |
2109 | if (!bypass_keystate) |
2101 | if (!bypass_keystate) |
2110 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
2102 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
2111 | |
2103 | |
2112 | if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) |
2104 | if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN) |
2113 | { |
2105 | { |
2114 | scrollBar.state = STATE_IDLE; |
2106 | scrollBar.state = SB_STATE_IDLE; |
2115 | scrollBar.show (0); |
2107 | scrollBar.show (0); |
2116 | } |
2108 | } |
2117 | |
2109 | |
2118 | #ifdef SELECTION_SCROLLING |
2110 | #ifdef SELECTION_SCROLLING |
2119 | sel_scroll_ev.stop(); |
2111 | sel_scroll_ev.stop(); |
… | |
… | |
2222 | wchar_t ch = NOCHAR; |
2214 | wchar_t ch = NOCHAR; |
2223 | char *seq_begin; // remember start of esc-sequence here |
2215 | char *seq_begin; // remember start of esc-sequence here |
2224 | |
2216 | |
2225 | for (;;) |
2217 | for (;;) |
2226 | { |
2218 | { |
2227 | if (expect_false (ch == NOCHAR)) |
2219 | if (ecb_unlikely (ch == NOCHAR)) |
2228 | { |
2220 | { |
2229 | seq_begin = cmdbuf_ptr; |
2221 | seq_begin = cmdbuf_ptr; |
2230 | ch = next_char (); |
2222 | ch = next_char (); |
2231 | |
2223 | |
2232 | if (ch == NOCHAR) |
2224 | if (ch == NOCHAR) |
2233 | break; |
2225 | break; |
2234 | } |
2226 | } |
2235 | |
2227 | |
2236 | 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)) |
2237 | { |
2229 | { |
2238 | if (expect_false (!seen_input)) |
2230 | if (ecb_unlikely (!seen_input)) |
2239 | { |
2231 | { |
2240 | seen_input = 1; |
2232 | seen_input = 1; |
2241 | // many badly-written programs (e.g. jed) contain a race condition: |
2233 | // many badly-written programs (e.g. jed) contain a race condition: |
2242 | // they first read the screensize and then install a SIGWINCH handler. |
2234 | // they first read the screensize and then install a SIGWINCH handler. |
2243 | // some window managers resize the window early, and these programs |
2235 | // some window managers resize the window early, and these programs |
… | |
… | |
2256 | wchar_t *str = buf; |
2248 | wchar_t *str = buf; |
2257 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2249 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2258 | |
2250 | |
2259 | for (;;) |
2251 | for (;;) |
2260 | { |
2252 | { |
2261 | 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))) |
2262 | break; |
2254 | break; |
2263 | |
2255 | |
2264 | *str++ = ch; |
2256 | *str++ = ch; |
2265 | |
2257 | |
2266 | if (expect_false (ch == C0_LF || str >= eol)) |
2258 | if (ecb_unlikely (ch == C0_LF || str >= eol)) |
2267 | { |
2259 | { |
2268 | if (ch == C0_LF) |
2260 | if (ch == C0_LF) |
2269 | nlines++; |
2261 | nlines++; |
2270 | |
2262 | |
2271 | refresh_count++; |
2263 | refresh_count++; |
… | |
… | |
2349 | rxvt_term::next_char () NOTHROW |
2341 | rxvt_term::next_char () NOTHROW |
2350 | { |
2342 | { |
2351 | while (cmdbuf_ptr < cmdbuf_endp) |
2343 | while (cmdbuf_ptr < cmdbuf_endp) |
2352 | { |
2344 | { |
2353 | // assume 7-bit to be ascii ALWAYS |
2345 | // assume 7-bit to be ascii ALWAYS |
2354 | if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2346 | if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) |
2355 | return *cmdbuf_ptr++; |
2347 | return *cmdbuf_ptr++; |
2356 | |
2348 | |
2357 | wchar_t wc; |
2349 | wchar_t wc; |
2358 | 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); |
2359 | |
2351 | |
… | |
… | |
2598 | break; |
2590 | break; |
2599 | case 'Z': /* identify the terminal type */ |
2591 | case 'Z': /* identify the terminal type */ |
2600 | tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2592 | tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ |
2601 | break; |
2593 | break; |
2602 | case '<': /* turn off VT52 mode */ |
2594 | case '<': /* turn off VT52 mode */ |
2603 | set_privmode (PrivMode_vt52, 0); |
2595 | priv_modes &= ~PrivMode_vt52; |
2604 | break; |
2596 | break; |
2605 | case 'F': /* use special graphics character set */ |
2597 | case 'F': /* use special graphics character set */ |
2606 | case 'G': /* use regular character set */ |
2598 | case 'G': /* use regular character set */ |
2607 | /* unimplemented */ |
2599 | /* unimplemented */ |
2608 | break; |
2600 | break; |
… | |
… | |
2627 | return; |
2619 | return; |
2628 | } |
2620 | } |
2629 | |
2621 | |
2630 | switch (ch) |
2622 | switch (ch) |
2631 | { |
2623 | { |
2632 | /* case 1: do_tek_mode (); break; */ |
|
|
2633 | case '#': |
2624 | case '#': |
2634 | if (cmd_getc () == '8') |
2625 | if (cmd_getc () == '8') |
2635 | scr_E (); |
2626 | scr_E (); |
2636 | break; |
2627 | break; |
2637 | case '(': |
2628 | case '(': |
… | |
… | |
2660 | #if !ENABLE_MINIMAL |
2651 | #if !ENABLE_MINIMAL |
2661 | case '9': |
2652 | case '9': |
2662 | scr_forwardindex (); |
2653 | scr_forwardindex (); |
2663 | break; |
2654 | break; |
2664 | #endif |
2655 | #endif |
|
|
2656 | // DECPAM/DECPNM |
2665 | case '=': |
2657 | case '=': |
|
|
2658 | priv_modes |= PrivMode_aplKP; |
|
|
2659 | break; |
2666 | case '>': |
2660 | case '>': |
2667 | set_privmode (PrivMode_aplKP, ch == '='); |
2661 | priv_modes &= ~PrivMode_aplKP; |
2668 | break; |
2662 | break; |
2669 | |
2663 | |
2670 | case C1_40: |
2664 | case C1_40: |
2671 | cmd_getc (); |
2665 | cmd_getc (); |
2672 | break; |
2666 | break; |
… | |
… | |
2676 | |
2670 | |
2677 | /* 8.3.87: NEXT LINE */ |
2671 | /* 8.3.87: NEXT LINE */ |
2678 | case C1_NEL: /* ESC E */ |
2672 | case C1_NEL: /* ESC E */ |
2679 | { |
2673 | { |
2680 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2674 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
2681 | scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); |
2675 | scr_add_lines (nlcr, ecb_array_length (nlcr), 1); |
2682 | } |
2676 | } |
2683 | break; |
2677 | break; |
2684 | |
2678 | |
2685 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2679 | /* kidnapped escape sequence: Should be 8.3.48 */ |
2686 | case C1_ESA: /* ESC G */ |
2680 | case C1_ESA: /* ESC G */ |
… | |
… | |
2698 | case C1_RI: /* ESC M */ |
2692 | case C1_RI: /* ESC M */ |
2699 | scr_index (DN); |
2693 | scr_index (DN); |
2700 | break; |
2694 | break; |
2701 | |
2695 | |
2702 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2696 | /* 8.3.142: SINGLE-SHIFT TWO */ |
2703 | /*case C1_SS2: scr_single_shift (2); break; */ |
2697 | /* case C1_SS2: break; */ |
2704 | |
2698 | |
2705 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2699 | /* 8.3.143: SINGLE-SHIFT THREE */ |
2706 | /*case C1_SS3: scr_single_shift (3); break; */ |
2700 | /* case C1_SS3: break; */ |
2707 | |
2701 | |
2708 | /* 8.3.27: DEVICE CONTROL STRING */ |
2702 | /* 8.3.27: DEVICE CONTROL STRING */ |
2709 | case C1_DCS: /* ESC P */ |
2703 | case C1_DCS: /* ESC P */ |
2710 | process_dcs_seq (); |
2704 | process_dcs_seq (); |
2711 | break; |
2705 | break; |
… | |
… | |
2862 | scr_soft_reset (); |
2856 | scr_soft_reset (); |
2863 | |
2857 | |
2864 | static const int pm_h[] = { 7, 25 }; |
2858 | static const int pm_h[] = { 7, 25 }; |
2865 | 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 }; |
2866 | |
2860 | |
2867 | process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); |
2861 | process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); |
2868 | process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); |
2862 | process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); |
2869 | } |
2863 | } |
2870 | break; |
2864 | break; |
2871 | } |
2865 | } |
2872 | |
2866 | |
2873 | return; |
2867 | return; |
… | |
… | |
3456 | min (h_align, 32767), min (v_align, 32767)); |
3450 | min (h_align, 32767), min (v_align, 32767)); |
3457 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3451 | process_xterm_seq (XTerm_title, str, CHAR_ST); |
3458 | } |
3452 | } |
3459 | else |
3453 | else |
3460 | { |
3454 | { |
3461 | int changed = 0; |
3455 | bool changed = false; |
3462 | |
3456 | |
3463 | if (*str != ';') |
3457 | if (*str != ';') |
3464 | { |
3458 | { |
3465 | if (bg_set_file (str)) /* change pixmap */ |
3459 | if (bg_set_file (str)) /* change pixmap */ |
3466 | { |
|
|
3467 | changed++; |
3460 | changed = true; |
3468 | str = strchr (str, ';'); |
|
|
3469 | if (str == NULL) |
|
|
3470 | bg_set_default_geometry (); |
|
|
3471 | else |
|
|
3472 | bg_set_geometry (str+1); |
|
|
3473 | } |
|
|
3474 | } |
3461 | } |
3475 | else |
3462 | else |
3476 | { |
3463 | { |
3477 | str++; |
3464 | str++; |
3478 | if (bg_set_geometry (str, true)) |
3465 | if (bg_set_geometry (str, true)) |
3479 | changed++; |
3466 | changed = true; |
3480 | } |
3467 | } |
3481 | |
3468 | |
3482 | if (changed) |
3469 | if (changed) |
3483 | { |
3470 | { |
3484 | if (bg_window_position_sensitive ()) |
3471 | if (bg_window_position_sensitive ()) |
… | |
… | |
3600 | if (mode == 'r') |
3587 | if (mode == 'r') |
3601 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3588 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3602 | else |
3589 | else |
3603 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3590 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3604 | |
3591 | |
3605 | set_privmode (bit, state); |
3592 | if (state) |
|
|
3593 | priv_modes |= bit; |
|
|
3594 | else |
|
|
3595 | priv_modes &= ~bit; |
3606 | } |
3596 | } |
3607 | |
3597 | |
3608 | return state; |
3598 | return state; |
3609 | } |
3599 | } |
3610 | |
3600 | |
3611 | /* we're not using priv _yet_ */ |
3601 | /* we're not using priv _yet_ */ |
3612 | void |
3602 | void |
3613 | 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) |
3614 | { |
3604 | { |
3615 | unsigned int i, j; |
3605 | unsigned int i, j; |
3616 | int state; |
3606 | int state; |
3617 | |
3607 | |
3618 | static const struct |
3608 | static const struct |
3619 | { |
3609 | { |
3620 | const int argval; |
3610 | const int argval; |
3621 | const unsigned long bit; |
3611 | const unsigned long bit; |
3622 | } argtopriv[] = { |
3612 | } argtopriv[] = { |
3623 | { 1, PrivMode_aplCUR }, // DECCKM |
3613 | { 1, PrivMode_aplCUR }, // DECCKM |
3624 | { 2, PrivMode_vt52 }, |
3614 | { 2, PrivMode_vt52 }, // DECANM |
3625 | { 3, PrivMode_132 }, // DECCOLM |
3615 | { 3, PrivMode_132 }, // DECCOLM |
3626 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3616 | { 4, PrivMode_smoothScroll }, // DECSCLM |
3627 | { 5, PrivMode_rVideo }, // DECSCNM |
3617 | { 5, PrivMode_rVideo }, // DECSCNM |
3628 | { 6, PrivMode_relOrigin }, // DECOM |
3618 | { 6, PrivMode_relOrigin }, // DECOM |
3629 | { 7, PrivMode_Autowrap }, // DECAWM |
3619 | { 7, PrivMode_Autowrap }, // DECAWM |
3630 | // 8, auto-repeat keys // DECARM |
3620 | // 8, auto-repeat keys // DECARM |
3631 | { 9, PrivMode_MouseX10 }, |
3621 | { 9, PrivMode_MouseX10 }, |
3632 | // 18 end FF to printer after print screen |
3622 | // 18 end FF to printer after print screen |
3633 | // 19 Print screen prints full screen/scroll region |
3623 | // 19 Print screen prints full screen/scroll region |
3634 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3624 | { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis |
3635 | #ifdef scrollBar_esc |
3625 | #ifdef scrollBar_esc |
3636 | { scrollBar_esc, PrivMode_scrollBar }, |
3626 | { scrollBar_esc, PrivMode_scrollBar }, |
3637 | #endif |
3627 | #endif |
3638 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3628 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3639 | // 38, tektronix mode // DECTEK |
3629 | // 38, tektronix mode // DECTEK |
3640 | { 40, PrivMode_132OK }, |
3630 | { 40, PrivMode_132OK }, |
3641 | // 41 xterm more fixes NYI |
3631 | // 41 xterm more fixes NYI |
3642 | // 45 margin bell NYI |
3632 | // 45 margin bell NYI |
3643 | // 46 start logging |
3633 | // 46 start logging |
3644 | { 47, PrivMode_Screen }, |
3634 | { 47, PrivMode_Screen }, |
3645 | { 66, PrivMode_aplKP }, // DECPAM/DECPNM |
3635 | { 66, PrivMode_aplKP }, // DECNKM |
3646 | #ifndef NO_BACKSPACE_KEY |
3636 | #ifndef NO_BACKSPACE_KEY |
3647 | { 67, PrivMode_BackSpace }, // DECBKM |
3637 | { 67, PrivMode_BackSpace }, // DECBKM |
3648 | #endif |
3638 | #endif |
3649 | { 1000, PrivMode_MouseX11 }, |
3639 | { 1000, PrivMode_MouseX11 }, |
3650 | { 1002, PrivMode_MouseBtnEvent }, |
3640 | { 1002, PrivMode_MouseBtnEvent }, |
… | |
… | |
3679 | for (i = 0; i < nargs; i++) |
3669 | for (i = 0; i < nargs; i++) |
3680 | { |
3670 | { |
3681 | state = -1; |
3671 | state = -1; |
3682 | |
3672 | |
3683 | /* basic handling */ |
3673 | /* basic handling */ |
3684 | for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) |
3674 | for (j = 0; j < ecb_array_length (argtopriv); j++) |
3685 | if (argtopriv[j].argval == arg[i]) |
3675 | if (argtopriv[j].argval == arg[i]) |
3686 | { |
3676 | { |
3687 | state = privcases (mode, argtopriv[j].bit); |
3677 | state = privcases (mode, argtopriv[j].bit); |
3688 | break; |
3678 | break; |
3689 | } |
3679 | } |
… | |
… | |
3715 | case 2: /* VT52 mode */ |
3705 | case 2: /* VT52 mode */ |
3716 | /* oddball mode. should be set regardless of set/reset |
3706 | /* oddball mode. should be set regardless of set/reset |
3717 | * parameter. Return from VT52 mode with an ESC < from |
3707 | * parameter. Return from VT52 mode with an ESC < from |
3718 | * within VT52 mode |
3708 | * within VT52 mode |
3719 | */ |
3709 | */ |
3720 | set_privmode (PrivMode_vt52, 1); |
3710 | priv_modes |= PrivMode_vt52; |
3721 | break; |
3711 | break; |
3722 | case 3: /* 80/132 */ |
3712 | case 3: /* 80/132 */ |
3723 | if (priv_modes & PrivMode_132OK) |
3713 | if (priv_modes & PrivMode_132OK) |
3724 | set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); |
3714 | set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); |
3725 | break; |
3715 | break; |
… | |
… | |
3740 | if (state) /* orthogonal */ |
3730 | if (state) /* orthogonal */ |
3741 | priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3731 | priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3742 | break; |
3732 | break; |
3743 | #ifdef scrollBar_esc |
3733 | #ifdef scrollBar_esc |
3744 | case scrollBar_esc: |
3734 | case scrollBar_esc: |
3745 | if (scrollBar.map (state)) |
3735 | scrollBar.map (state); |
3746 | { |
|
|
3747 | resize_all_windows (0, 0, 0); |
3736 | resize_all_windows (0, 0, 0); |
3748 | scr_touch (true); |
3737 | scr_touch (true); |
3749 | } |
|
|
3750 | break; |
3738 | break; |
3751 | #endif |
3739 | #endif |
3752 | case 25: /* visible/invisible cursor */ |
3740 | case 25: /* visible/invisible cursor */ |
3753 | scr_cursor_visible (state); |
3741 | scr_cursor_visible (state); |
3754 | break; |
3742 | break; |