ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.482 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.497 by sf-exg, Thu Sep 1 08:11:26 2011 UTC

… …
257#endif 257#endif
258 258
259void 259void
260rxvt_term::commit_iso14755 () 260rxvt_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}
… …
1047 1042
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1044void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1046{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1047 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1049 {
1055 want_refresh = 1; 1050 want_refresh = 1;
1056 refresh_check (); 1051 refresh_check ();
1057 } 1052 }
1058 else 1053 else
… …
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 }
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1558 ;
1569 1559
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1561 {
1572 scrollBar.state = STATE_IDLE; 1562 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1563 scrollBar.show (0);
1574 } 1564 }
1575 } 1565 }
1576 break; 1566 break;
1577 1567
… …
1665#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1666 } 1656 }
1667#endif 1657#endif
1668 } 1658 }
1669 } 1659 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1661 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1674 ; 1664 ;
1675 1665
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))
… …
1982 if (scrollBar.upButton (ev.y)) 1972 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 1973 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 1974 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 1975 direction = DN; /* down */
1986 1976
1987 scrollBar.state = STATE_IDLE; 1977 scrollBar.state = SB_STATE_IDLE;
1988 /* 1978 /*
1989 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 1980 * move up if mouse is above slider
1991 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1992 * 1982 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2022#endif
2033 if (scr_page (direction, 1)) 2023 if (scr_page (direction, 1))
2034 { 2024 {
2035 if (direction == UP) 2025 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2026 scrollBar.state = SB_STATE_UP;
2037 else 2027 else
2038 scrollBar.state = STATE_DOWN; 2028 scrollBar.state = SB_STATE_DOWN;
2039 } 2029 }
2040 } 2030 }
2041 else 2031 else
2042 switch (ev.button) 2032 switch (ev.button)
2043 { 2033 {
2044 case Button2: 2034 case Button2:
2045 switch (scrollBar.align) 2035 switch (scrollBar.align)
2046 { 2036 {
2047 case R_SB_ALIGN_TOP: 2037 case SB_ALIGN_TOP:
2048 csrO = 0; 2038 csrO = 0;
2049 break; 2039 break;
2050 case R_SB_ALIGN_CENTRE: 2040 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2041 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2042 break;
2053 case R_SB_ALIGN_BOTTOM: 2043 case SB_ALIGN_BOTTOM:
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 == SB_STYLE_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 = SB_STATE_MOTION;
2064 break; 2054 break;
2065 2055
2066 case Button1: 2056 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2070 2060
2071 case Button3: 2061 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != SB_STYLE_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
2086 else 2076 else
2087 scrollBar.state = STATE_MOTION; 2077 scrollBar.state = SB_STATE_MOTION;
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 }
… …
2109 2099
2110 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2101 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2103
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2104 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2105 {
2116 scrollBar.state = STATE_IDLE; 2106 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2107 scrollBar.show (0);
2118 } 2108 }
2119 2109
2120#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
… …
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++;
… …
2351rxvt_term::next_char () NOTHROW 2341rxvt_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
… …
2389 : NOCHAR; 2379 : NOCHAR;
2390} 2380}
2391 2381
2392static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2393 2383
2394/* rxvt_cmd_getc () - Return next input character */
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t 2384wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2386{
2402 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2403 2388
… …
2496 pclose_printer (fd); 2481 pclose_printer (fd);
2497} 2482}
2498#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2499/*}}} */ 2484/*}}} */
2500 2485
2501/* *INDENT-OFF* */
2502enum { 2486enum {
2503 C1_40 = 0x40, 2487 C1_40 = 0x40,
2504 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,
2505 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,
2506 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,
2507 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,
2508}; 2492};
2509/* *INDENT-ON* */
2510 2493
2511/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2512void 2495void
2513rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2497{
… …
2607 break; 2590 break;
2608 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2593 break;
2611 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2595 priv_modes &= ~PrivMode_vt52;
2613 break; 2596 break;
2614 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2616 /* unimplemented */ 2599 /* unimplemented */
2617 break; 2600 break;
… …
2636 return; 2619 return;
2637 } 2620 }
2638 2621
2639 switch (ch) 2622 switch (ch)
2640 { 2623 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2624 case '#':
2643 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2644 scr_E (); 2626 scr_E ();
2645 break; 2627 break;
2646 case '(': 2628 case '(':
… …
2669#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2670 case '9': 2652 case '9':
2671 scr_forwardindex (); 2653 scr_forwardindex ();
2672 break; 2654 break;
2673#endif 2655#endif
2656 // DECPAM/DECPNM
2674 case '=': 2657 case '=':
2658 priv_modes |= PrivMode_aplKP;
2659 break;
2675 case '>': 2660 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2661 priv_modes &= ~PrivMode_aplKP;
2677 break; 2662 break;
2678 2663
2679 case C1_40: 2664 case C1_40:
2680 cmd_getc (); 2665 cmd_getc ();
2681 break; 2666 break;
… …
2685 2670
2686 /* 8.3.87: NEXT LINE */ 2671 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2672 case C1_NEL: /* ESC E */
2688 { 2673 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2674 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2675 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2676 }
2692 break; 2677 break;
2693 2678
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2679 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2680 case C1_ESA: /* ESC G */
… …
2707 case C1_RI: /* ESC M */ 2692 case C1_RI: /* ESC M */
2708 scr_index (DN); 2693 scr_index (DN);
2709 break; 2694 break;
2710 2695
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2696 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2697 /* case C1_SS2: break; */
2713 2698
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2699 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2700 /* case C1_SS3: break; */
2716 2701
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2702 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2703 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2704 process_dcs_seq ();
2720 break; 2705 break;
… …
2753 } 2738 }
2754} 2739}
2755/*}}} */ 2740/*}}} */
2756 2741
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2742/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2743enum {
2760 CSI_ICH = 0x40, 2744 CSI_ICH = 0x40,
2761 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,
2762 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 ,
2763 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,
… …
2783 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, */
2784 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, */
2785 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, */
2786 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, {, |, }, ~, */
2787 }; 2771 };
2788/* *INDENT-ON* */
2789 2772
2790void 2773void
2791rxvt_term::process_csi_seq () 2774rxvt_term::process_csi_seq ()
2792{ 2775{
2793 unicode_t ch, priv, i; 2776 unicode_t ch, priv, i;
… …
2873 scr_soft_reset (); 2856 scr_soft_reset ();
2874 2857
2875 static const int pm_h[] = { 7, 25 }; 2858 static const int pm_h[] = { 7, 25 };
2876 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 };
2877 2860
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2861 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2862 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880 } 2863 }
2881 break; 2864 break;
2882 } 2865 }
2883 2866
2884 return; 2867 return;
… …
3103 } 3086 }
3104} 3087}
3105/*}}} */ 3088/*}}} */
3106 3089
3107#if !ENABLE_MINIMAL 3090#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3091void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3092rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3093{
3112 int x, y; 3094 int x, y;
3113 XWindowAttributes wattr; 3095 XWindowAttributes wattr;
… …
3468 min (h_align, 32767), min (v_align, 32767)); 3450 min (h_align, 32767), min (v_align, 32767));
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3451 process_xterm_seq (XTerm_title, str, CHAR_ST);
3470 } 3452 }
3471 else 3453 else
3472 { 3454 {
3473 int changed = 0; 3455 bool changed = false;
3474 3456
3475 if (*str != ';') 3457 if (*str != ';')
3476 { 3458 {
3477 if (bg_set_file (str)) /* change pixmap */ 3459 if (bg_set_file (str)) /* change pixmap */
3478 {
3479 changed++; 3460 changed = true;
3480 str = strchr (str, ';');
3481 if (str == NULL)
3482 bg_set_default_geometry ();
3483 else
3484 bg_set_geometry (str+1);
3485 }
3486 } 3461 }
3487 else 3462 else
3488 { 3463 {
3489 str++; 3464 str++;
3490 if (bg_set_geometry (str, true)) 3465 if (bg_set_geometry (str, true))
3491 changed++; 3466 changed = true;
3492 } 3467 }
3493 3468
3494 if (changed) 3469 if (changed)
3495 { 3470 {
3496 if (bg_window_position_sensitive ()) 3471 if (bg_window_position_sensitive ())
… …
3612 if (mode == 'r') 3587 if (mode == 'r')
3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3588 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614 else 3589 else
3615 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3590 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616 3591
3617 set_privmode (bit, state); 3592 if (state)
3593 priv_modes |= bit;
3594 else
3595 priv_modes &= ~bit;
3618 } 3596 }
3619 3597
3620 return state; 3598 return state;
3621} 3599}
3622 3600
3623/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
3624void 3602void
3625rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626{ 3604{
3627 unsigned int i, j; 3605 unsigned int i, j;
3628 int state; 3606 int state;
3629 3607
3630 static const struct 3608 static const struct
3631 { 3609 {
3632 const int argval; 3610 const int argval;
3633 const unsigned long bit; 3611 const unsigned long bit;
3634 } argtopriv[] = { 3612 } argtopriv[] = {
3635 { 1, PrivMode_aplCUR }, // DECCKM 3613 { 1, PrivMode_aplCUR }, // DECCKM
3636 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 }, // DECANM
3637 { 3, PrivMode_132 }, // DECCOLM 3615 { 3, PrivMode_132 }, // DECCOLM
3638 { 4, PrivMode_smoothScroll }, // DECSCLM 3616 { 4, PrivMode_smoothScroll }, // DECSCLM
3639 { 5, PrivMode_rVideo }, // DECSCNM 3617 { 5, PrivMode_rVideo }, // DECSCNM
3640 { 6, PrivMode_relOrigin }, // DECOM 3618 { 6, PrivMode_relOrigin }, // DECOM
3641 { 7, PrivMode_Autowrap }, // DECAWM 3619 { 7, PrivMode_Autowrap }, // DECAWM
3642 // 8, auto-repeat keys // DECARM 3620 // 8, auto-repeat keys // DECARM
3643 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
3644 // 18 end FF to printer after print screen 3622 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region 3623 // 19 Print screen prints full screen/scroll region
3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3624 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647#ifdef scrollBar_esc 3625#ifdef scrollBar_esc
3648 { scrollBar_esc, PrivMode_scrollBar }, 3626 { scrollBar_esc, PrivMode_scrollBar },
3649#endif 3627#endif
3650 { 35, PrivMode_ShiftKeys }, // rxvt extension 3628 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK 3629 // 38, tektronix mode // DECTEK
3652 { 40, PrivMode_132OK }, 3630 { 40, PrivMode_132OK },
3653 // 41 xterm more fixes NYI 3631 // 41 xterm more fixes NYI
3654 // 45 margin bell NYI 3632 // 45 margin bell NYI
3655 // 46 start logging 3633 // 46 start logging
3656 { 47, PrivMode_Screen }, 3634 { 47, PrivMode_Screen },
3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3635 { 66, PrivMode_aplKP }, // DECNKM
3658#ifndef NO_BACKSPACE_KEY 3636#ifndef NO_BACKSPACE_KEY
3659 { 67, PrivMode_BackSpace }, // DECBKM 3637 { 67, PrivMode_BackSpace }, // DECBKM
3660#endif 3638#endif
3661 { 1000, PrivMode_MouseX11 }, 3639 { 1000, PrivMode_MouseX11 },
3662 { 1002, PrivMode_MouseBtnEvent }, 3640 { 1002, PrivMode_MouseBtnEvent },
… …
3691 for (i = 0; i < nargs; i++) 3669 for (i = 0; i < nargs; i++)
3692 { 3670 {
3693 state = -1; 3671 state = -1;
3694 3672
3695 /* basic handling */ 3673 /* basic handling */
3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3674 for (j = 0; j < ecb_array_length (argtopriv); j++)
3697 if (argtopriv[j].argval == arg[i]) 3675 if (argtopriv[j].argval == arg[i])
3698 { 3676 {
3699 state = privcases (mode, argtopriv[j].bit); 3677 state = privcases (mode, argtopriv[j].bit);
3700 break; 3678 break;
3701 } 3679 }
… …
3727 case 2: /* VT52 mode */ 3705 case 2: /* VT52 mode */
3728 /* oddball mode. should be set regardless of set/reset 3706 /* oddball mode. should be set regardless of set/reset
3729 * parameter. Return from VT52 mode with an ESC < from 3707 * parameter. Return from VT52 mode with an ESC < from
3730 * within VT52 mode 3708 * within VT52 mode
3731 */ 3709 */
3732 set_privmode (PrivMode_vt52, 1); 3710 priv_modes |= PrivMode_vt52;
3733 break; 3711 break;
3734 case 3: /* 80/132 */ 3712 case 3: /* 80/132 */
3735 if (priv_modes & PrivMode_132OK) 3713 if (priv_modes & PrivMode_132OK)
3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3714 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737 break; 3715 break;
… …
3752 if (state) /* orthogonal */ 3730 if (state) /* orthogonal */
3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3731 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3732 break;
3755#ifdef scrollBar_esc 3733#ifdef scrollBar_esc
3756 case scrollBar_esc: 3734 case scrollBar_esc:
3757 if (scrollBar.map (state)) 3735 scrollBar.map (state);
3758 {
3759 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
3760 scr_touch (true); 3737 scr_touch (true);
3761 }
3762 break; 3738 break;
3763#endif 3739#endif
3764 case 25: /* visible/invisible cursor */ 3740 case 25: /* visible/invisible cursor */
3765 scr_cursor_visible (state); 3741 scr_cursor_visible (state);
3766 break; 3742 break;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines