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.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.510 by sf-exg, Fri May 25 08:27:47 2012 UTC

… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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}
… …
1017 refresh_count = 0; 1015 refresh_count = 0;
1018 flush (); 1016 flush ();
1019} 1017}
1020 1018
1021#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1022void 1035void
1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024{ 1037{
1025 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1026 want_refresh = 1; 1039 want_refresh = 1;
… …
1045 1058
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1060void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1062{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1065 {
1053 want_refresh = 1; 1066 want_refresh = 1;
1054 refresh_check (); 1067 refresh_check ();
1055 } 1068 }
1056 else 1069 else
… …
1476 } 1489 }
1477 else 1490 else
1478 { 1491 {
1479#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1493 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1494 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1495#endif
1488 } 1496 }
1489 1497
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1499 }
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1574 ;
1567 1575
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1577 {
1570 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1579 scrollBar.show (0);
1572 } 1580 }
1573 } 1581 }
1574 break; 1582 break;
1575 1583
… …
1641 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1642 } 1650 }
1643 else 1651 else
1644 { 1652 {
1645 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1655 }
1648 1656
1649 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1659 + 1;
… …
1663#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1664 } 1672 }
1665#endif 1673#endif
1666 } 1674 }
1667 } 1675 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1677 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1672 ; 1680 ;
1673 1681
1674 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1686 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1688 scrollBar.size ());
1681 want_refresh = 1; 1689 want_refresh = 1;
1682 scrollBar.show (1); 1690 scrollBar.show (1);
1683 } 1691 }
1684 break; 1692 break;
1685 } 1693 }
1686 1694
1687#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1697 }
1698#endif 1698#endif
1699 1699
1700#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1702 {
… …
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1729 } 1730 }
1730} 1731}
1731#endif 1732#endif
1732 1733
1733void 1734void
… …
1739 want_refresh = 1; 1740 want_refresh = 1;
1740 1741
1741#if USE_XIM 1742#if USE_XIM
1742 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1743 { 1744 {
1744 IMSetPosition (); 1745 im_set_position ();
1745 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1746 } 1747 }
1747#endif 1748#endif
1748#if CURSOR_BLINK 1749#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1980 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 1982 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 1984 direction = DN; /* down */
1984 1985
1985 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1986 /* 1987 /*
1987 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 1989 * move up if mouse is above slider
1989 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1990 * 1991 *
… …
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2031#endif
2031 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2032 { 2033 {
2033 if (direction == UP) 2034 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2035 else 2036 else
2036 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2037 } 2038 }
2038 } 2039 }
2039 else 2040 else
2040 switch (ev.button) 2041 switch (ev.button)
2041 { 2042 {
2042 case Button2: 2043 case Button2:
2043 switch (scrollBar.align) 2044 switch (scrollBar.align)
2044 { 2045 {
2045 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2046 csrO = 0; 2047 csrO = 0;
2047 break; 2048 break;
2048 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2051 break;
2051 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2054 break;
2054 } 2055 }
2055 2056
2056 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2061
2061 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2062 break; 2063 break;
2063 2064
2064 case Button1: 2065 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2068 2069
2069 case Button3: 2070 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2072 {
2072 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2075# else 2076# else
2076 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2077# endif 2078# endif
2078 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2081# else 2082# else
2082 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2083# endif 2084# endif
2084 else 2085 else
2085 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2086 } 2087 }
2087 else 2088 else
2088 { 2089 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2091 (nrow
2091 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2093 / scrollBar.size ()));
2093 } 2094 }
2094 2095
2095 break; 2096 break;
2096 } 2097 }
… …
2107 2108
2108 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2110 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2112
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2114 {
2114 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2116 scrollBar.show (0);
2116 } 2117 }
2117 2118
2118#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2169 case Button3: 2170 case Button3:
2170 selection_make (ev.time); 2171 selection_make (ev.time);
2171 break; 2172 break;
2172 2173
2173 case Button2: 2174 case Button2:
2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 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); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2177 break;
2177 2178
2178#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2179 case Button4: 2180 case Button4:
… …
2222 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2224 2225
2225 for (;;) 2226 for (;;)
2226 { 2227 {
2227 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2228 { 2229 {
2229 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2231 ch = next_char ();
2231 2232
2232 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2233 break; 2234 break;
2234 } 2235 }
2235 2236
2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2238 {
2238 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2239 { 2240 {
2240 seen_input = 1; 2241 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2256 wchar_t *str = buf; 2257 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2259
2259 for (;;) 2260 for (;;)
2260 { 2261 {
2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2263 break;
2263 2264
2264 *str++ = ch; 2265 *str++ = ch;
2265 2266
2266 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2268 {
2268 if (ch == C0_LF) 2269 if (ch == C0_LF)
2269 nlines++; 2270 nlines++;
2270 2271
2271 refresh_count++; 2272 refresh_count++;
… …
2349rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2350{ 2351{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2353 {
2353 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2356 2357
2357 wchar_t wc; 2358 wchar_t wc;
2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2359 2360
… …
2489 pclose_printer (fd); 2490 pclose_printer (fd);
2490} 2491}
2491#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2492/*}}} */ 2493/*}}} */
2493 2494
2494/* *INDENT-OFF* */
2495enum { 2495enum {
2496 C1_40 = 0x40, 2496 C1_40 = 0x40,
2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2501}; 2501};
2502/* *INDENT-ON* */
2503 2502
2504/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2505void 2504void
2506rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2507{ 2506{
… …
2600 break; 2599 break;
2601 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2603 break; 2602 break;
2604 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2605 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2606 break; 2605 break;
2607 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2608 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2609 /* unimplemented */ 2608 /* unimplemented */
2610 break; 2609 break;
… …
2629 return; 2628 return;
2630 } 2629 }
2631 2630
2632 switch (ch) 2631 switch (ch)
2633 { 2632 {
2634 /* case 1: do_tek_mode (); break; */
2635 case '#': 2633 case '#':
2636 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2637 scr_E (); 2635 scr_E ();
2638 break; 2636 break;
2639 case '(': 2637 case '(':
… …
2662#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2663 case '9': 2661 case '9':
2664 scr_forwardindex (); 2662 scr_forwardindex ();
2665 break; 2663 break;
2666#endif 2664#endif
2665 // DECPAM/DECPNM
2667 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2668 case '>': 2669 case '>':
2669 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2670 break; 2671 break;
2671 2672
2672 case C1_40: 2673 case C1_40:
2673 cmd_getc (); 2674 cmd_getc ();
2674 break; 2675 break;
… …
2678 2679
2679 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2680 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2681 { 2682 {
2682 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2684 } 2685 }
2685 break; 2686 break;
2686 2687
2687 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2688 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
… …
2700 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2701 scr_index (DN); 2702 scr_index (DN);
2702 break; 2703 break;
2703 2704
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2706 2707
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2709 2710
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2713 process_dcs_seq ();
2713 break; 2714 break;
… …
2746 } 2747 }
2747} 2748}
2748/*}}} */ 2749/*}}} */
2749 2750
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2752enum {
2753 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2780 };
2781/* *INDENT-ON* */
2782 2781
2783void 2782void
2784rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2785{ 2784{
2786 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2866 scr_soft_reset (); 2865 scr_soft_reset ();
2867 2866
2868 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2869
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2872 }
2874 break; 2873 break;
2875 } 2874 }
2876 2875
2877 return; 2876 return;
… …
2895 } 2894 }
2896 break; 2895 break;
2897#endif 2896#endif
2898 2897
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2905 break;
2907 2906
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3096 } 3095 }
3097} 3096}
3098/*}}} */ 3097/*}}} */
3099 3098
3100#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3100void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3102{
3105 int x, y; 3103 int x, y;
3106 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3143 break; 3141 break;
3144 3142
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3144 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3150 break; 3148 break;
3151 3149
3152 /* 3150 /*
3153 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3453#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3454 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3455 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3456 { 3454 {
3457 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3458 3465
3459 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3460 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3461 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3462 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3463 } 3470 }
3464 else 3471 else
3465 { 3472 {
3466 int changed = 0; 3473 bool changed = false;
3467 3474
3468 if (*str != ';') 3475 if (*str != ';')
3469 { 3476 {
3470 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0
3478 && image_vec[0].set_file_geometry (str))
3479 changed = true;
3480 else
3471 { 3481 {
3472 changed++; 3482 rxvt_image *image = new_image ();
3473 str = strchr (str, ';'); 3483 if (!image->set_file_geometry (str))
3474 if (str == NULL) 3484 image_vec.pop_back ();
3475 bg_set_default_geometry ();
3476 else 3485 else
3477 bg_set_geometry (str+1); 3486 changed = true;
3478 } 3487 }
3479 } 3488 }
3480 else 3489 else
3481 { 3490 {
3482 str++; 3491 str++;
3492 if (image_vec.size () > 0
3483 if (bg_set_geometry (str, true)) 3493 && image_vec[0].set_geometry (str, true))
3484 changed++; 3494 changed = true;
3485 } 3495 }
3486 3496
3487 if (changed) 3497 if (changed)
3488 { 3498 {
3489 if (bg_window_position_sensitive ()) 3499 if (bg_window_position_sensitive ())
… …
3595{ 3605{
3596 int state; 3606 int state;
3597 3607
3598 if (mode == 's') 3608 if (mode == 's')
3599 { 3609 {
3600 SavedModes |= (priv_modes & bit); 3610 if (priv_modes & bit)
3611 SavedModes |= bit;
3612 else
3613 SavedModes &= ~bit;
3601 return -1; 3614 return -1;
3602 } 3615 }
3603 else 3616 else
3604 { 3617 {
3605 if (mode == 'r') 3618 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3619 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3620 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3621 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 3622
3610 set_privmode (bit, state); 3623 if (state)
3624 priv_modes |= bit;
3625 else
3626 priv_modes &= ~bit;
3611 } 3627 }
3612 3628
3613 return state; 3629 return state;
3614} 3630}
3615 3631
3616/* we're not using priv _yet_ */ 3632/* we're not using priv _yet_ */
3617void 3633void
3618rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3634rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3619{ 3635{
3620 unsigned int i, j; 3636 unsigned int i, j;
3621 int state; 3637 int state;
3622 3638
3623 static const struct 3639 static const struct
3624 { 3640 {
3625 const int argval; 3641 const int argval;
3626 const unsigned long bit; 3642 const unsigned long bit;
3627 } argtopriv[] = { 3643 } argtopriv[] = {
3628 { 1, PrivMode_aplCUR }, // DECCKM 3644 { 1, PrivMode_aplCUR }, // DECCKM
3629 { 2, PrivMode_vt52 }, 3645 { 2, PrivMode_vt52 }, // DECANM
3630 { 3, PrivMode_132 }, // DECCOLM 3646 { 3, PrivMode_132 }, // DECCOLM
3631 { 4, PrivMode_smoothScroll }, // DECSCLM 3647 { 4, PrivMode_smoothScroll }, // DECSCLM
3632 { 5, PrivMode_rVideo }, // DECSCNM 3648 { 5, PrivMode_rVideo }, // DECSCNM
3633 { 6, PrivMode_relOrigin }, // DECOM 3649 { 6, PrivMode_relOrigin }, // DECOM
3634 { 7, PrivMode_Autowrap }, // DECAWM 3650 { 7, PrivMode_Autowrap }, // DECAWM
3635 // 8, auto-repeat keys // DECARM 3651 // 8, auto-repeat keys // DECARM
3636 { 9, PrivMode_MouseX10 }, 3652 { 9, PrivMode_MouseX10 },
3637 // 18 end FF to printer after print screen 3653 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region 3654 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3655 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3656#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3657 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3658#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3659 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK 3660 // 38, tektronix mode // DECTEK
3645 { 40, PrivMode_132OK }, 3661 { 40, PrivMode_132OK },
3646 // 41 xterm more fixes NYI 3662 // 41 xterm more fixes NYI
3647 // 45 margin bell NYI 3663 // 45 margin bell NYI
3648 // 46 start logging 3664 // 46 start logging
3649 { 47, PrivMode_Screen }, 3665 { 47, PrivMode_Screen },
3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3666 { 66, PrivMode_aplKP }, // DECNKM
3651#ifndef NO_BACKSPACE_KEY 3667#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, // DECBKM 3668 { 67, PrivMode_BackSpace }, // DECBKM
3653#endif 3669#endif
3654 { 1000, PrivMode_MouseX11 }, 3670 { 1000, PrivMode_MouseX11 },
3655 { 1002, PrivMode_MouseBtnEvent }, 3671 { 1002, PrivMode_MouseBtnEvent },
… …
3684 for (i = 0; i < nargs; i++) 3700 for (i = 0; i < nargs; i++)
3685 { 3701 {
3686 state = -1; 3702 state = -1;
3687 3703
3688 /* basic handling */ 3704 /* basic handling */
3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3705 for (j = 0; j < ecb_array_length (argtopriv); j++)
3690 if (argtopriv[j].argval == arg[i]) 3706 if (argtopriv[j].argval == arg[i])
3691 { 3707 {
3692 state = privcases (mode, argtopriv[j].bit); 3708 state = privcases (mode, argtopriv[j].bit);
3693 break; 3709 break;
3694 } 3710 }
… …
3720 case 2: /* VT52 mode */ 3736 case 2: /* VT52 mode */
3721 /* oddball mode. should be set regardless of set/reset 3737 /* oddball mode. should be set regardless of set/reset
3722 * parameter. Return from VT52 mode with an ESC < from 3738 * parameter. Return from VT52 mode with an ESC < from
3723 * within VT52 mode 3739 * within VT52 mode
3724 */ 3740 */
3725 set_privmode (PrivMode_vt52, 1); 3741 priv_modes |= PrivMode_vt52;
3726 break; 3742 break;
3727 case 3: /* 80/132 */ 3743 case 3: /* 80/132 */
3728 if (priv_modes & PrivMode_132OK) 3744 if (priv_modes & PrivMode_132OK)
3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3745 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3730 break; 3746 break;
… …
3745 if (state) /* orthogonal */ 3761 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3762 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3763 break;
3748#ifdef scrollBar_esc 3764#ifdef scrollBar_esc
3749 case scrollBar_esc: 3765 case scrollBar_esc:
3750 if (scrollBar.map (state)) 3766 scrollBar.map (state);
3751 {
3752 resize_all_windows (0, 0, 0); 3767 resize_all_windows (0, 0, 0);
3753 scr_touch (true); 3768 scr_touch (true);
3754 }
3755 break; 3769 break;
3756#endif 3770#endif
3757 case 25: /* visible/invisible cursor */ 3771 case 25: /* visible/invisible cursor */
3758 scr_cursor_visible (state); 3772 scr_cursor_visible (state);
3759 break; 3773 break;

Diff Legend

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