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.503 by sf-exg, Mon Dec 5 13:36:56 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 }
… …
781 } 776 }
782 777
783 if (newlen) 778 if (newlen)
784 len = strlen (kbuf); 779 len = strlen (kbuf);
785 780
781 if (len > 0)
782 {
786 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
787 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
788 */ 797 */
789#ifdef META8_OPTION 798#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
792#endif 801#endif
802 }
793 803
794 } 804 }
795 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
796 { 806 {
797 len = 1; 807 len = 1;
… …
830 if (view_start) 840 if (view_start)
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849 845
850 /* escape prefix */ 846 /* escape prefix */
851 if (meta 847 if (meta
852#ifdef META8_OPTION 848#ifdef META8_OPTION
853 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
992 } 988 }
993 989
994 scr_refresh (); 990 scr_refresh ();
995 scrollBar.show (1); 991 scrollBar.show (1);
996#ifdef USE_XIM 992#ifdef USE_XIM
997 IMSendSpot (); 993 im_send_spot ();
998#endif 994#endif
999 } 995 }
1000 996
1001 display->flush (); 997 display->flush ();
1002} 998}
… …
1047 1043
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1045void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1047{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1050 {
1055 want_refresh = 1; 1051 want_refresh = 1;
1056 refresh_check (); 1052 refresh_check ();
1057 } 1053 }
1058 else 1054 else
… …
1478 } 1474 }
1479 else 1475 else
1480 { 1476 {
1481#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1478 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1479 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1480#endif
1490 } 1481 }
1491 1482
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1484 }
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1559 ;
1569 1560
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1562 {
1572 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1564 scrollBar.show (0);
1574 } 1565 }
1575 } 1566 }
1576 break; 1567 break;
1577 1568
… …
1665#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1666 } 1657 }
1667#endif 1658#endif
1668 } 1659 }
1669 } 1660 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1662 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1674 ; 1665 ;
1675 1666
1676 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1671 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1673 scrollBar.size ());
1683 want_refresh = 1; 1674 want_refresh = 1;
1684 scrollBar.show (1); 1675 scrollBar.show (1);
1685 } 1676 }
1686 break; 1677 break;
… …
1726 if (XWMHints *h = XGetWMHints (dpy, parent)) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1718 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h); 1720 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1731 } 1723 }
1732} 1724}
1733#endif 1725#endif
1734 1726
1735void 1727void
… …
1741 want_refresh = 1; 1733 want_refresh = 1;
1742 1734
1743#if USE_XIM 1735#if USE_XIM
1744 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1745 { 1737 {
1746 IMSetPosition (); 1738 im_set_position ();
1747 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1748 } 1740 }
1749#endif 1741#endif
1750#if CURSOR_BLINK 1742#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1982 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 1975 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 1977 direction = DN; /* down */
1986 1978
1987 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1988 /* 1980 /*
1989 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 1982 * move up if mouse is above slider
1991 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1992 * 1984 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2024#endif
2033 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2034 { 2026 {
2035 if (direction == UP) 2027 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2037 else 2029 else
2038 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2039 } 2031 }
2040 } 2032 }
2041 else 2033 else
2042 switch (ev.button) 2034 switch (ev.button)
2043 { 2035 {
2044 case Button2: 2036 case Button2:
2045 switch (scrollBar.align) 2037 switch (scrollBar.align)
2046 { 2038 {
2047 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2048 csrO = 0; 2040 csrO = 0;
2049 break; 2041 break;
2050 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2044 break;
2053 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2047 break;
2056 } 2048 }
2057 2049
2058 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2054
2063 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2064 break; 2056 break;
2065 2057
2066 case Button1: 2058 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2070 2062
2071 case Button3: 2063 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2065 {
2074 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2077# else 2069# else
2078 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2079# endif 2071# endif
2080 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2083# else 2075# else
2084 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2085# endif 2077# endif
2086 else 2078 else
2087 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2088 } 2080 }
2089 else 2081 else
2090 { 2082 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2084 (nrow
2093 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2086 / scrollBar.size ()));
2095 } 2087 }
2096 2088
2097 break; 2089 break;
2098 } 2090 }
… …
2109 2101
2110 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2103 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2105
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2107 {
2116 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2109 scrollBar.show (0);
2118 } 2110 }
2119 2111
2120#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2224 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2226 2218
2227 for (;;) 2219 for (;;)
2228 { 2220 {
2229 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2230 { 2222 {
2231 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2224 ch = next_char ();
2233 2225
2234 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2235 break; 2227 break;
2236 } 2228 }
2237 2229
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2231 {
2240 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2241 { 2233 {
2242 seen_input = 1; 2234 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2250 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2252
2261 for (;;) 2253 for (;;)
2262 { 2254 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2256 break;
2265 2257
2266 *str++ = ch; 2258 *str++ = ch;
2267 2259
2268 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2261 {
2270 if (ch == C0_LF) 2262 if (ch == C0_LF)
2271 nlines++; 2263 nlines++;
2272 2264
2273 refresh_count++; 2265 refresh_count++;
… …
2351rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2352{ 2344{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2346 {
2355 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2358 2350
2359 wchar_t wc; 2351 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2353
… …
2389 : NOCHAR; 2381 : NOCHAR;
2390} 2382}
2391 2383
2392static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2393 2385
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 2386wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2388{
2402 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2403 2390
… …
2496 pclose_printer (fd); 2483 pclose_printer (fd);
2497} 2484}
2498#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2499/*}}} */ 2486/*}}} */
2500 2487
2501/* *INDENT-OFF* */
2502enum { 2488enum {
2503 C1_40 = 0x40, 2489 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 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, 2491 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, 2492 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, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2494};
2509/* *INDENT-ON* */
2510 2495
2511/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2512void 2497void
2513rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2499{
… …
2607 break; 2592 break;
2608 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2595 break;
2611 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2613 break; 2598 break;
2614 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2616 /* unimplemented */ 2601 /* unimplemented */
2617 break; 2602 break;
… …
2636 return; 2621 return;
2637 } 2622 }
2638 2623
2639 switch (ch) 2624 switch (ch)
2640 { 2625 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2626 case '#':
2643 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2644 scr_E (); 2628 scr_E ();
2645 break; 2629 break;
2646 case '(': 2630 case '(':
… …
2669#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2670 case '9': 2654 case '9':
2671 scr_forwardindex (); 2655 scr_forwardindex ();
2672 break; 2656 break;
2673#endif 2657#endif
2658 // DECPAM/DECPNM
2674 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2675 case '>': 2662 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2677 break; 2664 break;
2678 2665
2679 case C1_40: 2666 case C1_40:
2680 cmd_getc (); 2667 cmd_getc ();
2681 break; 2668 break;
… …
2685 2672
2686 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2688 { 2675 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2678 }
2692 break; 2679 break;
2693 2680
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
… …
2707 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2708 scr_index (DN); 2695 scr_index (DN);
2709 break; 2696 break;
2710 2697
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2713 2700
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2716 2703
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2706 process_dcs_seq ();
2720 break; 2707 break;
… …
2753 } 2740 }
2754} 2741}
2755/*}}} */ 2742/*}}} */
2756 2743
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2745enum {
2760 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2761 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,
2762 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 ,
2763 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,
… …
2783 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, */
2784 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, */
2785 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, */
2786 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, {, |, }, ~, */
2787 }; 2773 };
2788/* *INDENT-ON* */
2789 2774
2790void 2775void
2791rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2792{ 2777{
2793 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2873 scr_soft_reset (); 2858 scr_soft_reset ();
2874 2859
2875 static const int pm_h[] = { 7, 25 }; 2860 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 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877 2862
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880 } 2865 }
2881 break; 2866 break;
2882 } 2867 }
2883 2868
2884 return; 2869 return;
… …
2902 } 2887 }
2903 break; 2888 break;
2904#endif 2889#endif
2905 2890
2906 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2907 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2908 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2909 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2910 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2911 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2912 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2913 break; 2898 break;
2914 2899
2915 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2916 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3103 } 3088 }
3104} 3089}
3105/*}}} */ 3090/*}}} */
3106 3091
3107#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3093void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3095{
3112 int x, y; 3096 int x, y;
3113 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3468 min (h_align, 32767), min (v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3470 } 3454 }
3471 else 3455 else
3472 { 3456 {
3473 int changed = 0; 3457 bool changed = false;
3474 3458
3475 if (*str != ';') 3459 if (*str != ';')
3476 { 3460 {
3477 if (bg_set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3478 {
3479 changed++; 3462 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 } 3463 }
3487 else 3464 else
3488 { 3465 {
3489 str++; 3466 str++;
3490 if (bg_set_geometry (str, true)) 3467 if (bg_set_geometry (str, true))
3491 changed++; 3468 changed = true;
3492 } 3469 }
3493 3470
3494 if (changed) 3471 if (changed)
3495 { 3472 {
3496 if (bg_window_position_sensitive ()) 3473 if (bg_window_position_sensitive ())
… …
3612 if (mode == 'r') 3589 if (mode == 'r')
3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614 else 3591 else
3615 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616 3593
3617 set_privmode (bit, state); 3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3618 } 3598 }
3619 3599
3620 return state; 3600 return state;
3621} 3601}
3622 3602
3623/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3624void 3604void
3625rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626{ 3606{
3627 unsigned int i, j; 3607 unsigned int i, j;
3628 int state; 3608 int state;
3629 3609
3630 static const struct 3610 static const struct
3631 { 3611 {
3632 const int argval; 3612 const int argval;
3633 const unsigned long bit; 3613 const unsigned long bit;
3634 } argtopriv[] = { 3614 } argtopriv[] = {
3635 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3636 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3637 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3638 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3639 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3640 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3641 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3642 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3643 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3644 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3648 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3649#endif 3629#endif
3650 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3652 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3653 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3654 // 45 margin bell NYI 3634 // 45 margin bell NYI
3655 // 46 start logging 3635 // 46 start logging
3656 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3658#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3659 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3660#endif 3640#endif
3661 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3662 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3691 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3692 { 3672 {
3693 state = -1; 3673 state = -1;
3694 3674
3695 /* basic handling */ 3675 /* basic handling */
3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3697 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3698 { 3678 {
3699 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3700 break; 3680 break;
3701 } 3681 }
… …
3727 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3728 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3729 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3730 * within VT52 mode 3710 * within VT52 mode
3731 */ 3711 */
3732 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3733 break; 3713 break;
3734 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3735 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737 break; 3717 break;
… …
3752 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3734 break;
3755#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3756 case scrollBar_esc: 3736 case scrollBar_esc:
3757 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3758 {
3759 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3760 scr_touch (true); 3739 scr_touch (true);
3761 }
3762 break; 3740 break;
3763#endif 3741#endif
3764 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3765 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3766 break; 3744 break;

Diff Legend

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