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.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.504 by sf-exg, Mon Jan 9 21:12:08 2012 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);
… …
779 } 776 }
780 777
781 if (newlen) 778 if (newlen)
782 len = strlen (kbuf); 779 len = strlen (kbuf);
783 780
781 if (len > 0)
782 {
784 /* 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 /*
785 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
786 */ 797 */
787#ifdef META8_OPTION 798#ifdef META8_OPTION
788 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
789 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
790#endif 801#endif
802 }
791 803
792 } 804 }
793 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
794 { 806 {
795 len = 1; 807 len = 1;
… …
828 if (view_start) 840 if (view_start)
829 { 841 {
830 view_start = 0; 842 view_start = 0;
831 want_refresh = 1; 843 want_refresh = 1;
832 } 844 }
833
834 /*
835 * these modifications only affect the static keybuffer
836 * pass Shift/Control indicators for function keys ending with `~'
837 *
838 * eg,
839 * Prior = "ESC[5~"
840 * Shift+Prior = "ESC[5$"
841 * Ctrl+Prior = "ESC[5^"
842 * Ctrl+Shift+Prior = "ESC[5@"
843 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844 */
845 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847 845
848 /* escape prefix */ 846 /* escape prefix */
849 if (meta 847 if (meta
850#ifdef META8_OPTION 848#ifdef META8_OPTION
851 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
990 } 988 }
991 989
992 scr_refresh (); 990 scr_refresh ();
993 scrollBar.show (1); 991 scrollBar.show (1);
994#ifdef USE_XIM 992#ifdef USE_XIM
995 IMSendSpot (); 993 im_send_spot ();
996#endif 994#endif
997 } 995 }
998 996
999 display->flush (); 997 display->flush ();
1000} 998}
… …
1045 1043
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1045void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1047{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1050 {
1053 want_refresh = 1; 1051 want_refresh = 1;
1054 refresh_check (); 1052 refresh_check ();
1055 } 1053 }
1056 else 1054 else
… …
1476 } 1474 }
1477 else 1475 else
1478 { 1476 {
1479#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1478 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1479 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1480#endif
1488 } 1481 }
1489 1482
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1484 }
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1559 ;
1567 1560
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1562 {
1570 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1564 scrollBar.show (0);
1572 } 1565 }
1573 } 1566 }
1574 break; 1567 break;
1575 1568
… …
1641 dist = int_bwidth - ev.xbutton.y; 1634 dist = int_bwidth - ev.xbutton.y;
1642 } 1635 }
1643 else 1636 else
1644 { 1637 {
1645 scroll_selection_dir = DN; 1638 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1639 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1640 }
1648 1641
1649 scroll_selection_lines = Pixel2Height (dist) 1642 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1643 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1644 + 1;
… …
1663#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1664 } 1657 }
1665#endif 1658#endif
1666 } 1659 }
1667 } 1660 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1662 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1672 ; 1665 ;
1673 1666
1674 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1671 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1673 scrollBar.size ());
1681 want_refresh = 1; 1674 want_refresh = 1;
1682 scrollBar.show (1); 1675 scrollBar.show (1);
1683 } 1676 }
1684 break; 1677 break;
… …
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1718 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1720 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1729 } 1723 }
1730} 1724}
1731#endif 1725#endif
1732 1726
1733void 1727void
… …
1739 want_refresh = 1; 1733 want_refresh = 1;
1740 1734
1741#if USE_XIM 1735#if USE_XIM
1742 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1743 { 1737 {
1744 IMSetPosition (); 1738 im_set_position ();
1745 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1746 } 1740 }
1747#endif 1741#endif
1748#if CURSOR_BLINK 1742#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1980 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 1975 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 1977 direction = DN; /* down */
1984 1978
1985 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1986 /* 1980 /*
1987 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 1982 * move up if mouse is above slider
1989 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1990 * 1984 *
… …
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2024#endif
2031 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2032 { 2026 {
2033 if (direction == UP) 2027 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2035 else 2029 else
2036 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2037 } 2031 }
2038 } 2032 }
2039 else 2033 else
2040 switch (ev.button) 2034 switch (ev.button)
2041 { 2035 {
2042 case Button2: 2036 case Button2:
2043 switch (scrollBar.align) 2037 switch (scrollBar.align)
2044 { 2038 {
2045 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2046 csrO = 0; 2040 csrO = 0;
2047 break; 2041 break;
2048 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2044 break;
2051 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2047 break;
2054 } 2048 }
2055 2049
2056 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2054
2061 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2062 break; 2056 break;
2063 2057
2064 case Button1: 2058 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2068 2062
2069 case Button3: 2063 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2065 {
2072 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2075# else 2069# else
2076 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2077# endif 2071# endif
2078 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2081# else 2075# else
2082 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2083# endif 2077# endif
2084 else 2078 else
2085 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2086 } 2080 }
2087 else 2081 else
2088 { 2082 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2084 (nrow
2091 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2086 / scrollBar.size ()));
2093 } 2087 }
2094 2088
2095 break; 2089 break;
2096 } 2090 }
… …
2107 2101
2108 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2103 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2105
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2107 {
2114 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2109 scrollBar.show (0);
2116 } 2110 }
2117 2111
2118#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2169 case Button3: 2163 case Button3:
2170 selection_make (ev.time); 2164 selection_make (ev.time);
2171 break; 2165 break;
2172 2166
2173 case Button2: 2167 case Button2:
2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2170 break;
2177 2171
2178#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2179 case Button4: 2173 case Button4:
… …
2222 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2224 2218
2225 for (;;) 2219 for (;;)
2226 { 2220 {
2227 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2228 { 2222 {
2229 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2224 ch = next_char ();
2231 2225
2232 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2233 break; 2227 break;
2234 } 2228 }
2235 2229
2236 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))
2237 { 2231 {
2238 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2239 { 2233 {
2240 seen_input = 1; 2234 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2250 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2252
2259 for (;;) 2253 for (;;)
2260 { 2254 {
2261 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)))
2262 break; 2256 break;
2263 2257
2264 *str++ = ch; 2258 *str++ = ch;
2265 2259
2266 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2261 {
2268 if (ch == C0_LF) 2262 if (ch == C0_LF)
2269 nlines++; 2263 nlines++;
2270 2264
2271 refresh_count++; 2265 refresh_count++;
… …
2349rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2350{ 2344{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2346 {
2353 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2356 2350
2357 wchar_t wc; 2351 wchar_t wc;
2358 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);
2359 2353
… …
2598 break; 2592 break;
2599 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2601 break; 2595 break;
2602 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2603 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2604 break; 2598 break;
2605 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2606 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2607 /* unimplemented */ 2601 /* unimplemented */
2608 break; 2602 break;
… …
2627 return; 2621 return;
2628 } 2622 }
2629 2623
2630 switch (ch) 2624 switch (ch)
2631 { 2625 {
2632 /* case 1: do_tek_mode (); break; */
2633 case '#': 2626 case '#':
2634 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2635 scr_E (); 2628 scr_E ();
2636 break; 2629 break;
2637 case '(': 2630 case '(':
… …
2660#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2661 case '9': 2654 case '9':
2662 scr_forwardindex (); 2655 scr_forwardindex ();
2663 break; 2656 break;
2664#endif 2657#endif
2658 // DECPAM/DECPNM
2665 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2666 case '>': 2662 case '>':
2667 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2668 break; 2664 break;
2669 2665
2670 case C1_40: 2666 case C1_40:
2671 cmd_getc (); 2667 cmd_getc ();
2672 break; 2668 break;
… …
2676 2672
2677 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2678 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2679 { 2675 {
2680 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2682 } 2678 }
2683 break; 2679 break;
2684 2680
2685 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2686 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
… …
2698 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2699 scr_index (DN); 2695 scr_index (DN);
2700 break; 2696 break;
2701 2697
2702 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2703 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2704 2700
2705 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2706 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2707 2703
2708 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2709 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2710 process_dcs_seq (); 2706 process_dcs_seq ();
2711 break; 2707 break;
… …
2862 scr_soft_reset (); 2858 scr_soft_reset ();
2863 2859
2864 static const int pm_h[] = { 7, 25 }; 2860 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 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866 2862
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2869 } 2865 }
2870 break; 2866 break;
2871 } 2867 }
2872 2868
2873 return; 2869 return;
… …
2891 } 2887 }
2892 break; 2888 break;
2893#endif 2889#endif
2894 2890
2895 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2897 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2898 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2899 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2900 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2901 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2902 break; 2898 break;
2903 2899
2904 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2905 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3138 break; 3134 break;
3139 3135
3140 //case 9: NYI, TODO, restore maximized window or maximize window 3136 //case 9: NYI, TODO, restore maximized window or maximize window
3141 default: 3137 default:
3142 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3143 set_widthheight ((unsigned int)width, 3139 set_widthheight ((unsigned int)vt_width,
3144 (unsigned int) (args[1] * fheight)); 3140 (unsigned int) (args[1] * fheight));
3145 break; 3141 break;
3146 3142
3147 /* 3143 /*
3148 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
… …
3456 min (h_align, 32767), min (v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3457 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 } 3454 }
3459 else 3455 else
3460 { 3456 {
3461 int changed = 0; 3457 bool changed = false;
3462 3458
3463 if (*str != ';') 3459 if (*str != ';')
3464 { 3460 {
3465 if (bg_set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3466 {
3467 changed++; 3462 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 } 3463 }
3475 else 3464 else
3476 { 3465 {
3477 str++; 3466 str++;
3478 if (bg_set_geometry (str, true)) 3467 if (bg_set_geometry (str, true))
3479 changed++; 3468 changed = true;
3480 } 3469 }
3481 3470
3482 if (changed) 3471 if (changed)
3483 { 3472 {
3484 if (bg_window_position_sensitive ()) 3473 if (bg_window_position_sensitive ())
… …
3600 if (mode == 'r') 3589 if (mode == 'r')
3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3602 else 3591 else
3603 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604 3593
3605 set_privmode (bit, state); 3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3606 } 3598 }
3607 3599
3608 return state; 3600 return state;
3609} 3601}
3610 3602
3611/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3612void 3604void
3613rxvt_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)
3614{ 3606{
3615 unsigned int i, j; 3607 unsigned int i, j;
3616 int state; 3608 int state;
3617 3609
3618 static const struct 3610 static const struct
3619 { 3611 {
3620 const int argval; 3612 const int argval;
3621 const unsigned long bit; 3613 const unsigned long bit;
3622 } argtopriv[] = { 3614 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3625 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3632 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3635#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3636 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3637#endif 3629#endif
3638 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3640 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3641 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3642 // 45 margin bell NYI 3634 // 45 margin bell NYI
3643 // 46 start logging 3635 // 46 start logging
3644 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3646#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3647 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3648#endif 3640#endif
3649 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3650 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3679 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3680 { 3672 {
3681 state = -1; 3673 state = -1;
3682 3674
3683 /* basic handling */ 3675 /* basic handling */
3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3685 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3686 { 3678 {
3687 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3688 break; 3680 break;
3689 } 3681 }
… …
3715 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3716 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3717 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3718 * within VT52 mode 3710 * within VT52 mode
3719 */ 3711 */
3720 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3721 break; 3713 break;
3722 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3723 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3725 break; 3717 break;
… …
3740 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3742 break; 3734 break;
3743#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3744 case scrollBar_esc: 3736 case scrollBar_esc:
3745 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3746 {
3747 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3748 scr_touch (true); 3739 scr_touch (true);
3749 }
3750 break; 3740 break;
3751#endif 3741#endif
3752 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3753 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3754 break; 3744 break;

Diff Legend

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