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

Diff Legend

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