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.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC vs.
Revision 1.501 by sf-exg, Fri Nov 25 09:00:40 2011 UTC

… …
257#endif 257#endif
258 258
259void 259void
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
781 } 776 }
782 777
783 if (newlen) 778 if (newlen)
784 len = strlen (kbuf); 779 len = strlen (kbuf);
785 780
781 if (len > 0)
782 {
786 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
787 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
788 */ 797 */
789#ifdef META8_OPTION 798#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
792#endif 801#endif
802 }
793 803
794 } 804 }
795 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
796 { 806 {
797 len = 1; 807 len = 1;
… …
830 if (view_start) 840 if (view_start)
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849 845
850 /* escape prefix */ 846 /* escape prefix */
851 if (meta 847 if (meta
852#ifdef META8_OPTION 848#ifdef META8_OPTION
853 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
938#endif 934#endif
939} 935}
940 936
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 937void
975rxvt_term::flush () 938rxvt_term::flush ()
976{ 939{
977 flush_ev.stop (); 940 flush_ev.stop ();
978 941
… …
1025 } 988 }
1026 989
1027 scr_refresh (); 990 scr_refresh ();
1028 scrollBar.show (1); 991 scrollBar.show (1);
1029#ifdef USE_XIM 992#ifdef USE_XIM
1030 IMSendSpot (); 993 im_send_spot ();
1031#endif 994#endif
1032 } 995 }
1033 996
1034 display->flush (); 997 display->flush ();
1035} 998}
… …
1080 1043
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1045void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1047{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1050 {
1088 want_refresh = 1; 1051 want_refresh = 1;
1089 refresh_check (); 1052 refresh_check ();
1090 } 1053 }
1091 else 1054 else
… …
1152 { 1115 {
1153 } 1116 }
1154} event_handler; 1117} event_handler;
1155#endif 1118#endif
1156 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1157bool 1153bool
1158rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1159{ 1155{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1161 1157
1162 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1159
1160 if (!avail)
1161 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1168 1167
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1169
1171 if (r > 0) 1170 if (r > 0)
1172 { 1171 {
1173 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1174 return true; 1173 return true;
… …
1442 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1442 focus_out ();
1444 break; 1443 break;
1445 1444
1446 case ConfigureNotify: 1445 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1448 { 1447 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1449 ;
1451 1450
1452#ifdef HAVE_BG_PIXMAP 1451#ifdef HAVE_BG_PIXMAP
… …
1475 } 1474 }
1476 else 1475 else
1477 { 1476 {
1478#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1479 if (moved) 1478 if (moved)
1480 {
1481 if (mapped)
1482 update_background (); 1479 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1486#endif 1480#endif
1487 } 1481 }
1488 1482
1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 } 1484 }
… …
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1559 ;
1566 1560
1567 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1568 { 1562 {
1569 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1570 scrollBar.show (0); 1564 scrollBar.show (0);
1571 } 1565 }
1572 } 1566 }
1573 break; 1567 break;
1574 1568
… …
1662#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1663 } 1657 }
1664#endif 1658#endif
1665 } 1659 }
1666 } 1660 }
1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1662 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1671 ; 1665 ;
1672 1666
1673 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1671 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollBar.size ()); 1673 scrollBar.size ());
1680 want_refresh = 1; 1674 want_refresh = 1;
1681 scrollBar.show (1); 1675 scrollBar.show (1);
1682 } 1676 }
1683 break; 1677 break;
… …
1718rxvt_term::set_urgency (bool enable) 1712rxvt_term::set_urgency (bool enable)
1719{ 1713{
1720 if (enable == urgency_hint) 1714 if (enable == urgency_hint)
1721 return; 1715 return;
1722 1716
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1718 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1720 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1728 } 1723 }
1729} 1724}
1730#endif 1725#endif
1731 1726
1732void 1727void
… …
1738 want_refresh = 1; 1733 want_refresh = 1;
1739 1734
1740#if USE_XIM 1735#if USE_XIM
1741 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1742 { 1737 {
1743 IMSetPosition (); 1738 im_set_position ();
1744 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1745 } 1740 }
1746#endif 1741#endif
1747#if CURSOR_BLINK 1742#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1979 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */ 1975 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */ 1977 direction = DN; /* down */
1983 1978
1984 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1985 /* 1980 /*
1986 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1987 * move up if mouse is above slider 1982 * move up if mouse is above slider
1988 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1989 * 1984 *
… …
2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029#endif 2024#endif
2030 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2031 { 2026 {
2032 if (direction == UP) 2027 if (direction == UP)
2033 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2034 else 2029 else
2035 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2036 } 2031 }
2037 } 2032 }
2038 else 2033 else
2039 switch (ev.button) 2034 switch (ev.button)
2040 { 2035 {
2041 case Button2: 2036 case Button2:
2042 switch (scrollBar.align) 2037 switch (scrollBar.align)
2043 { 2038 {
2044 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2045 csrO = 0; 2040 csrO = 0;
2046 break; 2041 break;
2047 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2048 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2049 break; 2044 break;
2050 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2051 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2052 break; 2047 break;
2053 } 2048 }
2054 2049
2055 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2056 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2057 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059 2054
2060 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2061 break; 2056 break;
2062 2057
2063 case Button1: 2058 case Button1:
2064 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2065 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2066 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2067 2062
2068 case Button3: 2063 case Button3:
2069 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2070 { 2065 {
2071 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2073 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2074# else 2069# else
2075 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2076# endif 2071# endif
2077 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2079 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2080# else 2075# else
2081 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2082# endif 2077# endif
2083 else 2078 else
2084 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2085 } 2080 }
2086 else 2081 else
2087 { 2082 {
2088 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2089 (nrow 2084 (nrow
2090 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2091 / scrollBar.size ())); 2086 / scrollBar.size ()));
2092 } 2087 }
2093 2088
2094 break; 2089 break;
2095 } 2090 }
… …
2106 2101
2107 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2108 if (!bypass_keystate) 2103 if (!bypass_keystate)
2109 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2110 2105
2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2112 { 2107 {
2113 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2114 scrollBar.show (0); 2109 scrollBar.show (0);
2115 } 2110 }
2116 2111
2117#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2118 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2221 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2223 2218
2224 for (;;) 2219 for (;;)
2225 { 2220 {
2226 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2227 { 2222 {
2228 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2224 ch = next_char ();
2230 2225
2231 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2232 break; 2227 break;
2233 } 2228 }
2234 2229
2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236 { 2231 {
2237 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2238 { 2233 {
2239 seen_input = 1; 2234 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2250 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2252
2258 for (;;) 2253 for (;;)
2259 { 2254 {
2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261 break; 2256 break;
2262 2257
2263 *str++ = ch; 2258 *str++ = ch;
2264 2259
2265 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2261 {
2267 if (ch == C0_LF) 2262 if (ch == C0_LF)
2268 nlines++; 2263 nlines++;
2269 2264
2270 refresh_count++; 2265 refresh_count++;
… …
2348rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2349{ 2344{
2350 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2351 { 2346 {
2352 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2354 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2355 2350
2356 wchar_t wc; 2351 wchar_t wc;
2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2358 2353
… …
2386 : NOCHAR; 2381 : NOCHAR;
2387} 2382}
2388 2383
2389static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2390 2385
2391/* rxvt_cmd_getc () - Return next input character */
2392/*
2393 * Return the next input character after first passing any keyboard input
2394 * to the command.
2395 */
2396wchar_t 2386wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2388{
2399 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2400 2390
… …
2493 pclose_printer (fd); 2483 pclose_printer (fd);
2494} 2484}
2495#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2496/*}}} */ 2486/*}}} */
2497 2487
2498/* *INDENT-OFF* */
2499enum { 2488enum {
2500 C1_40 = 0x40, 2489 C1_40 = 0x40,
2501 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2502 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2503 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2504 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2505}; 2494};
2506/* *INDENT-ON* */
2507 2495
2508/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2509void 2497void
2510rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2511{ 2499{
… …
2604 break; 2592 break;
2605 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607 break; 2595 break;
2608 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2609 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2610 break; 2598 break;
2611 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2612 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2613 /* unimplemented */ 2601 /* unimplemented */
2614 break; 2602 break;
… …
2633 return; 2621 return;
2634 } 2622 }
2635 2623
2636 switch (ch) 2624 switch (ch)
2637 { 2625 {
2638 /* case 1: do_tek_mode (); break; */
2639 case '#': 2626 case '#':
2640 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2641 scr_E (); 2628 scr_E ();
2642 break; 2629 break;
2643 case '(': 2630 case '(':
… …
2666#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2667 case '9': 2654 case '9':
2668 scr_forwardindex (); 2655 scr_forwardindex ();
2669 break; 2656 break;
2670#endif 2657#endif
2658 // DECPAM/DECPNM
2671 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2672 case '>': 2662 case '>':
2673 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2674 break; 2664 break;
2675 2665
2676 case C1_40: 2666 case C1_40:
2677 cmd_getc (); 2667 cmd_getc ();
2678 break; 2668 break;
… …
2682 2672
2683 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2684 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2685 { 2675 {
2686 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688 } 2678 }
2689 break; 2679 break;
2690 2680
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
… …
2704 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2705 scr_index (DN); 2695 scr_index (DN);
2706 break; 2696 break;
2707 2697
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2710 2700
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2713 2703
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2706 process_dcs_seq ();
2717 break; 2707 break;
… …
2750 } 2740 }
2751} 2741}
2752/*}}} */ 2742/*}}} */
2753 2743
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2745enum {
2757 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2773 };
2785/* *INDENT-ON* */
2786 2774
2787void 2775void
2788rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2789{ 2777{
2790 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2870 scr_soft_reset (); 2858 scr_soft_reset ();
2871 2859
2872 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874 2862
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877 } 2865 }
2878 break; 2866 break;
2879 } 2867 }
2880 2868
2881 return; 2869 return;
… …
2899 } 2887 }
2900 break; 2888 break;
2901#endif 2889#endif
2902 2890
2903 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2904 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2905 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2906 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2907 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2908 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2909 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2910 break; 2898 break;
2911 2899
2912 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2913 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3100 } 3088 }
3101} 3089}
3102/*}}} */ 3090/*}}} */
3103 3091
3104#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3105/* ARGSUSED */
3106void 3093void
3107rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108{ 3095{
3109 int x, y; 3096 int x, y;
3110 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3119 { 3106 {
3120 /* 3107 /*
3121 * commands 3108 * commands
3122 */ 3109 */
3123 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3125 break; 3112 break;
3126 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3115 break;
3129 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3118 break;
3132 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3121 break;
3135 case 5: /* raise window */ 3122 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3137 break; 3124 break;
3138 case 6: /* lower window */ 3125 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3140 break; 3127 break;
3141 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3142 scr_touch (true); 3129 scr_touch (true);
3143 break; 3130 break;
3144 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3155 3142
3156 /* 3143 /*
3157 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3158 */ 3145 */
3159 case 11: /* report window state */ 3146 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3149 break;
3163 case 13: /* report window position */ 3150 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3156 break;
3170 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3160 break;
3174 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3163 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3166 break;
3180 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3181 { 3168 {
3182 char *s; 3169 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3172 XFree (s);
3186 } 3173 }
3187 break; 3174 break;
3188 case 21: /* report window title */ 3175 case 21: /* report window title */
3189 { 3176 {
3190 char *s; 3177 char *s;
3191 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3180 XFree (s);
3194 } 3181 }
3195 break; 3182 break;
3196 } 3183 }
… …
3350 unsigned long bytes_after; 3337 unsigned long bytes_after;
3351 unsigned char *value = 0; 3338 unsigned char *value = 0;
3352 const char *str = ""; 3339 const char *str = "";
3353 3340
3354 if (prop 3341 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3346 && actual_type != None
3360 && actual_format == 8) 3347 && actual_format == 8)
… …
3372 { 3359 {
3373 *eq = 0; 3360 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3375 } 3362 }
3376 else 3363 else
3377 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3365 display->atom (str));
3379 } 3366 }
3380 break; 3367 break;
3381 3368
3382 case XTerm_Color: 3369 case XTerm_Color:
… …
3465 min (h_align, 32767), min (v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3466 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3454 }
3468 else 3455 else
3469 { 3456 {
3470 int changed = 0; 3457 bool changed = false;
3471 3458
3472 if (*str != ';') 3459 if (*str != ';')
3473 { 3460 {
3474 if (bg_set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3475 {
3476 changed++; 3462 changed = true;
3477 str = strchr (str, ';');
3478 if (str == NULL)
3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3483 } 3463 }
3484 else 3464 else
3485 { 3465 {
3486 str++; 3466 str++;
3487 if (bg_set_geometry (str, true)) 3467 if (bg_set_geometry (str, true))
3488 changed++; 3468 changed = true;
3489 } 3469 }
3490 3470
3491 if (changed) 3471 if (changed)
3492 { 3472 {
3493 if (bg_window_position_sensitive ()) 3473 if (bg_window_position_sensitive ())
… …
3609 if (mode == 'r') 3589 if (mode == 'r')
3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3611 else 3591 else
3612 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613 3593
3614 set_privmode (bit, state); 3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3615 } 3598 }
3616 3599
3617 return state; 3600 return state;
3618} 3601}
3619 3602
3620/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3621void 3604void
3622rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3623{ 3606{
3624 unsigned int i, j; 3607 unsigned int i, j;
3625 int state; 3608 int state;
3626 3609
3627 static const struct 3610 static const struct
3628 { 3611 {
3629 const int argval; 3612 const int argval;
3630 const unsigned long bit; 3613 const unsigned long bit;
3631 } argtopriv[] = { 3614 } argtopriv[] = {
3632 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3633 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3634 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3635 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3636 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3637 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3638 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3639 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3640 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3641 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3645 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3646#endif 3629#endif
3647 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3649 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3650 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3651 // 45 margin bell NYI 3634 // 45 margin bell NYI
3652 // 46 start logging 3635 // 46 start logging
3653 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3655#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3656 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3657#endif 3640#endif
3658 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3659 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
… …
3688 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3689 { 3672 {
3690 state = -1; 3673 state = -1;
3691 3674
3692 /* basic handling */ 3675 /* basic handling */
3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3694 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3695 { 3678 {
3696 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3697 break; 3680 break;
3698 } 3681 }
… …
3724 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3725 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3726 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3727 * within VT52 mode 3710 * within VT52 mode
3728 */ 3711 */
3729 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3730 break; 3713 break;
3731 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3732 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3734 break; 3717 break;
… …
3749 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3734 break;
3752#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3753 case scrollBar_esc: 3736 case scrollBar_esc:
3754 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3755 {
3756 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3757 scr_touch (true); 3739 scr_touch (true);
3758 }
3759 break; 3740 break;
3760#endif 3741#endif
3761 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3762 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3763 break; 3744 break;

Diff Legend

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