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.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC vs.
Revision 1.511 by sf-exg, Fri May 25 18:45:40 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)
… …
776 } 776 }
777 777
778 if (newlen) 778 if (newlen)
779 len = strlen (kbuf); 779 len = strlen (kbuf);
780 780
781 if (len > 0)
782 {
781 /* 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 /*
782 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
783 */ 797 */
784#ifdef META8_OPTION 798#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
787#endif 801#endif
802 }
788 803
789 } 804 }
790 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
791 { 806 {
792 len = 1; 807 len = 1;
… …
825 if (view_start) 840 if (view_start)
826 { 841 {
827 view_start = 0; 842 view_start = 0;
828 want_refresh = 1; 843 want_refresh = 1;
829 } 844 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844 845
845 /* escape prefix */ 846 /* escape prefix */
846 if (meta 847 if (meta
847#ifdef META8_OPTION 848#ifdef META8_OPTION
848 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
987 } 988 }
988 989
989 scr_refresh (); 990 scr_refresh ();
990 scrollBar.show (1); 991 scrollBar.show (1);
991#ifdef USE_XIM 992#ifdef USE_XIM
992 IMSendSpot (); 993 im_send_spot ();
993#endif 994#endif
994 } 995 }
995 996
996 display->flush (); 997 display->flush ();
997} 998}
… …
1014 refresh_count = 0; 1015 refresh_count = 0;
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#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
1019void 1035void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1037{
1022 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1039 want_refresh = 1;
… …
1042 1058
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1060void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1062{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1065 {
1050 want_refresh = 1; 1066 want_refresh = 1;
1051 refresh_check (); 1067 refresh_check ();
1052 } 1068 }
1053 else 1069 else
… …
1473 } 1489 }
1474 else 1490 else
1475 { 1491 {
1476#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1493 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1494 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1495#endif
1485 } 1496 }
1486 1497
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1499 }
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1574 ;
1564 1575
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1577 {
1567 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1579 scrollBar.show (0);
1569 } 1580 }
1570 } 1581 }
1571 break; 1582 break;
1572 1583
… …
1638 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1639 } 1650 }
1640 else 1651 else
1641 { 1652 {
1642 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1655 }
1645 1656
1646 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1659 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1661 } 1672 }
1662#endif 1673#endif
1663 } 1674 }
1664 } 1675 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1677 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1669 ; 1680 ;
1670 1681
1671 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1686 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1688 scrollBar.size ());
1678 want_refresh = 1; 1689 want_refresh = 1;
1679 scrollBar.show (1); 1690 scrollBar.show (1);
1680 } 1691 }
1681 break; 1692 break;
1682 } 1693 }
1683 1694
1684#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1694 }
1695#endif 1698#endif
1696 1699
1697#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1702 {
… …
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1725 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1727 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1726 } 1730 }
1727} 1731}
1728#endif 1732#endif
1729 1733
1730void 1734void
… …
1736 want_refresh = 1; 1740 want_refresh = 1;
1737 1741
1738#if USE_XIM 1742#if USE_XIM
1739 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1740 { 1744 {
1741 IMSetPosition (); 1745 im_set_position ();
1742 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1743 } 1747 }
1744#endif 1748#endif
1745#if CURSOR_BLINK 1749#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1977 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1982 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1984 direction = DN; /* down */
1981 1985
1982 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1983 /* 1987 /*
1984 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1989 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1987 * 1991 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2031#endif
2028 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2029 { 2033 {
2030 if (direction == UP) 2034 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2032 else 2036 else
2033 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2034 } 2038 }
2035 } 2039 }
2036 else 2040 else
2037 switch (ev.button) 2041 switch (ev.button)
2038 { 2042 {
2039 case Button2: 2043 case Button2:
2040 switch (scrollBar.align) 2044 switch (scrollBar.align)
2041 { 2045 {
2042 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2043 csrO = 0; 2047 csrO = 0;
2044 break; 2048 break;
2045 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2051 break;
2048 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2054 break;
2051 } 2055 }
2052 2056
2053 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2061
2058 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2059 break; 2063 break;
2060 2064
2061 case Button1: 2065 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2065 2069
2066 case Button3: 2070 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2072 {
2069 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2072# else 2076# else
2073 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2074# endif 2078# endif
2075 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2078# else 2082# else
2079 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2080# endif 2084# endif
2081 else 2085 else
2082 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2083 } 2087 }
2084 else 2088 else
2085 { 2089 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2091 (nrow
2088 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2093 / scrollBar.size ()));
2090 } 2094 }
2091 2095
2092 break; 2096 break;
2093 } 2097 }
… …
2104 2108
2105 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2110 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2112
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2114 {
2111 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2116 scrollBar.show (0);
2113 } 2117 }
2114 2118
2115#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2166 case Button3: 2170 case Button3:
2167 selection_make (ev.time); 2171 selection_make (ev.time);
2168 break; 2172 break;
2169 2173
2170 case Button2: 2174 case Button2:
2171 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?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2177 break;
2174 2178
2175#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2176 case Button4: 2180 case Button4:
… …
2219 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2221 2225
2222 for (;;) 2226 for (;;)
2223 { 2227 {
2224 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2225 { 2229 {
2226 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2231 ch = next_char ();
2228 2232
2229 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2230 break; 2234 break;
2231 } 2235 }
2232 2236
2233 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))
2234 { 2238 {
2235 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2236 { 2240 {
2237 seen_input = 1; 2241 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2257 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2259
2256 for (;;) 2260 for (;;)
2257 { 2261 {
2258 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)))
2259 break; 2263 break;
2260 2264
2261 *str++ = ch; 2265 *str++ = ch;
2262 2266
2263 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2268 {
2265 if (ch == C0_LF) 2269 if (ch == C0_LF)
2266 nlines++; 2270 nlines++;
2267 2271
2268 refresh_count++; 2272 refresh_count++;
… …
2346rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2347{ 2351{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2353 {
2350 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2353 2357
2354 wchar_t wc; 2358 wchar_t wc;
2355 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);
2356 2360
… …
2595 break; 2599 break;
2596 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2602 break;
2599 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2601 break; 2605 break;
2602 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2604 /* unimplemented */ 2608 /* unimplemented */
2605 break; 2609 break;
… …
2656#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2657 case '9': 2661 case '9':
2658 scr_forwardindex (); 2662 scr_forwardindex ();
2659 break; 2663 break;
2660#endif 2664#endif
2665 // DECPAM/DECPNM
2661 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2662 case '>': 2669 case '>':
2663 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2664 break; 2671 break;
2665 2672
2666 case C1_40: 2673 case C1_40:
2667 cmd_getc (); 2674 cmd_getc ();
2668 break; 2675 break;
… …
2672 2679
2673 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2674 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2675 { 2682 {
2676 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2677 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2678 } 2685 }
2679 break; 2686 break;
2680 2687
2681 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2682 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
… …
2858 scr_soft_reset (); 2865 scr_soft_reset ();
2859 2866
2860 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2861 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 };
2862 2869
2863 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2865 } 2872 }
2866 break; 2873 break;
2867 } 2874 }
2868 2875
2869 return; 2876 return;
… …
2887 } 2894 }
2888 break; 2895 break;
2889#endif 2896#endif
2890 2897
2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2892 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2893 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2894 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2896 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2897 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2898 break; 2905 break;
2899 2906
2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3134 break; 3141 break;
3135 3142
3136 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3137 default: 3144 default:
3138 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3139 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3140 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3141 break; 3148 break;
3142 3149
3143 /* 3150 /*
3144 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3444#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3447 { 3454 {
3448 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 }
3449 3465
3450 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767), 3467 h_scale, v_scale,
3452 min (h_align, 32767), min (v_align, 32767)); 3468 h_align, v_align);
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3470 }
3455 else 3471 else
3456 { 3472 {
3457 int changed = 0; 3473 bool changed = false;
3458 3474
3459 if (*str != ';') 3475 if (*str != ';')
3460 { 3476 {
3461 if (bg_set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3462 { 3480 {
3463 changed++; 3481 rxvt_image *image = new_image ();
3464 str = strchr (str, ';'); 3482 if (!image->set_file_geometry (str))
3465 if (str == NULL) 3483 image_vec.pop_back ();
3466 bg_set_default_geometry ();
3467 else 3484 else
3468 bg_set_geometry (str+1); 3485 changed = true;
3469 } 3486 }
3470 } 3487 }
3471 else 3488 else
3472 { 3489 {
3473 str++; 3490 str++;
3491 if (image_vec.size () > 0)
3474 if (bg_set_geometry (str, true)) 3492 changed = image_vec[0].set_geometry (str, true);
3475 changed++;
3476 } 3493 }
3477 3494
3478 if (changed) 3495 if (changed)
3479 { 3496 {
3480 if (bg_window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
… …
3586{ 3603{
3587 int state; 3604 int state;
3588 3605
3589 if (mode == 's') 3606 if (mode == 's')
3590 { 3607 {
3591 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3592 return -1; 3612 return -1;
3593 } 3613 }
3594 else 3614 else
3595 { 3615 {
3596 if (mode == 'r') 3616 if (mode == 'r')
3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3598 else 3618 else
3599 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3600 3620
3601 set_privmode (bit, state); 3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3602 } 3625 }
3603 3626
3604 return state; 3627 return state;
3605} 3628}
3606 3629
3607/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3608void 3631void
3609rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3610{ 3633{
3611 unsigned int i, j; 3634 unsigned int i, j;
3612 int state; 3635 int state;
3613 3636
3614 static const struct 3637 static const struct
3615 { 3638 {
3616 const int argval; 3639 const int argval;
3617 const unsigned long bit; 3640 const unsigned long bit;
3618 } argtopriv[] = { 3641 } argtopriv[] = {
3619 { 1, PrivMode_aplCUR }, // DECCKM 3642 { 1, PrivMode_aplCUR }, // DECCKM
3620 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 }, // DECANM
3621 { 3, PrivMode_132 }, // DECCOLM 3644 { 3, PrivMode_132 }, // DECCOLM
3622 { 4, PrivMode_smoothScroll }, // DECSCLM 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3623 { 5, PrivMode_rVideo }, // DECSCNM 3646 { 5, PrivMode_rVideo }, // DECSCNM
3624 { 6, PrivMode_relOrigin }, // DECOM 3647 { 6, PrivMode_relOrigin }, // DECOM
3625 { 7, PrivMode_Autowrap }, // DECAWM 3648 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM 3649 // 8, auto-repeat keys // DECARM
3627 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3628 // 18 end FF to printer after print screen 3651 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region 3652 // 19 Print screen prints full screen/scroll region
3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3653 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3631#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3632 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3633#endif 3656#endif
3634 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK 3658 // 38, tektronix mode // DECTEK
3636 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3637 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3638 // 45 margin bell NYI 3661 // 45 margin bell NYI
3639 // 46 start logging 3662 // 46 start logging
3640 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3664 { 66, PrivMode_aplKP }, // DECNKM
3642#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, // DECBKM 3666 { 67, PrivMode_BackSpace }, // DECBKM
3644#endif 3667#endif
3645 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3646 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
… …
3675 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3676 { 3699 {
3677 state = -1; 3700 state = -1;
3678 3701
3679 /* basic handling */ 3702 /* basic handling */
3680 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3703 for (j = 0; j < ecb_array_length (argtopriv); j++)
3681 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3682 { 3705 {
3683 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3684 break; 3707 break;
3685 } 3708 }
… …
3711 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3712 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3713 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3714 * within VT52 mode 3737 * within VT52 mode
3715 */ 3738 */
3716 set_privmode (PrivMode_vt52, 1); 3739 priv_modes |= PrivMode_vt52;
3717 break; 3740 break;
3718 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3719 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3721 break; 3744 break;
… …
3736 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3738 break; 3761 break;
3739#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3740 case scrollBar_esc: 3763 case scrollBar_esc:
3741 if (scrollBar.map (state)) 3764 scrollBar.map (state);
3742 {
3743 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3744 scr_touch (true); 3766 scr_touch (true);
3745 }
3746 break; 3767 break;
3747#endif 3768#endif
3748 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3749 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3750 break; 3771 break;

Diff Legend

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