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.506 by sf-exg, Wed Apr 11 10:20:00 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
… …
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}
… …
1052 refresh_count = 0; 1015 refresh_count = 0;
1053 flush (); 1016 flush ();
1054} 1017}
1055 1018
1056#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
1057void 1035void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1037{
1060 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1039 want_refresh = 1;
… …
1080 1058
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1060void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1062{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1065 {
1088 want_refresh = 1; 1066 want_refresh = 1;
1089 refresh_check (); 1067 refresh_check ();
1090 } 1068 }
1091 else 1069 else
… …
1152 { 1130 {
1153 } 1131 }
1154} event_handler; 1132} event_handler;
1155#endif 1133#endif
1156 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1157bool 1168bool
1158rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1159{ 1170{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1161 1172
1162 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1174
1175 if (!avail)
1176 {
1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have 1177 // 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; 1178 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1168 1182
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1184
1171 if (r > 0) 1185 if (r > 0)
1172 { 1186 {
1173 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1174 return true; 1188 return true;
… …
1442 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1443 focus_out (); 1457 focus_out ();
1444 break; 1458 break;
1445 1459
1446 case ConfigureNotify: 1460 case ConfigureNotify:
1447 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1448 { 1462 {
1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1450 ; 1464 ;
1451 1465
1452#ifdef HAVE_BG_PIXMAP 1466#ifdef HAVE_BG_PIXMAP
… …
1475 } 1489 }
1476 else 1490 else
1477 { 1491 {
1478#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1479 if (moved) 1493 if (moved)
1480 {
1481 if (mapped)
1482 update_background (); 1494 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1486#endif 1495#endif
1487 } 1496 }
1488 1497
1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1490 } 1499 }
… …
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1574 ;
1566 1575
1567 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1568 { 1577 {
1569 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1570 scrollBar.show (0); 1579 scrollBar.show (0);
1571 } 1580 }
1572 } 1581 }
1573 break; 1582 break;
1574 1583
… …
1640 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1641 } 1650 }
1642 else 1651 else
1643 { 1652 {
1644 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1655 }
1647 1656
1648 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1659 + 1;
… …
1662#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1663 } 1672 }
1664#endif 1673#endif
1665 } 1674 }
1666 } 1675 }
1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1677 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1671 ; 1680 ;
1672 1681
1673 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1686 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1679 scrollBar.size ()); 1688 scrollBar.size ());
1680 want_refresh = 1; 1689 want_refresh = 1;
1681 scrollBar.show (1); 1690 scrollBar.show (1);
1682 } 1691 }
1683 break; 1692 break;
1684 } 1693 }
1685 1694
1686#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1688 {
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1696 }
1697#endif 1698#endif
1698 1699
1699#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 { 1702 {
… …
1718rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1719{ 1720{
1720 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1721 return; 1722 return;
1722 1723
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1724 { 1725 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1727 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1728 } 1730 }
1729} 1731}
1730#endif 1732#endif
1731 1733
1732void 1734void
… …
1738 want_refresh = 1; 1740 want_refresh = 1;
1739 1741
1740#if USE_XIM 1742#if USE_XIM
1741 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1742 { 1744 {
1743 IMSetPosition (); 1745 im_set_position ();
1744 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1745 } 1747 }
1746#endif 1748#endif
1747#if CURSOR_BLINK 1749#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1979 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */ 1982 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */ 1984 direction = DN; /* down */
1983 1985
1984 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1985 /* 1987 /*
1986 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1987 * move up if mouse is above slider 1989 * move up if mouse is above slider
1988 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1989 * 1991 *
… …
2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029#endif 2031#endif
2030 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2031 { 2033 {
2032 if (direction == UP) 2034 if (direction == UP)
2033 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2034 else 2036 else
2035 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2036 } 2038 }
2037 } 2039 }
2038 else 2040 else
2039 switch (ev.button) 2041 switch (ev.button)
2040 { 2042 {
2041 case Button2: 2043 case Button2:
2042 switch (scrollBar.align) 2044 switch (scrollBar.align)
2043 { 2045 {
2044 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2045 csrO = 0; 2047 csrO = 0;
2046 break; 2048 break;
2047 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2048 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2049 break; 2051 break;
2050 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2051 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2052 break; 2054 break;
2053 } 2055 }
2054 2056
2055 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2056 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2057 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059 2061
2060 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2061 break; 2063 break;
2062 2064
2063 case Button1: 2065 case Button1:
2064 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2065 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2066 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2067 2069
2068 case Button3: 2070 case Button3:
2069 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2070 { 2072 {
2071 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2073 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2074# else 2076# else
2075 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2076# endif 2078# endif
2077 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2079 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2080# else 2082# else
2081 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2082# endif 2084# endif
2083 else 2085 else
2084 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2085 } 2087 }
2086 else 2088 else
2087 { 2089 {
2088 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2089 (nrow 2091 (nrow
2090 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2091 / scrollBar.size ())); 2093 / scrollBar.size ()));
2092 } 2094 }
2093 2095
2094 break; 2096 break;
2095 } 2097 }
… …
2106 2108
2107 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2108 if (!bypass_keystate) 2110 if (!bypass_keystate)
2109 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2110 2112
2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2112 { 2114 {
2113 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2114 scrollBar.show (0); 2116 scrollBar.show (0);
2115 } 2117 }
2116 2118
2117#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2118 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2168 case Button3: 2170 case Button3:
2169 selection_make (ev.time); 2171 selection_make (ev.time);
2170 break; 2172 break;
2171 2173
2172 case Button2: 2174 case Button2:
2173 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?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175 break; 2177 break;
2176 2178
2177#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2178 case Button4: 2180 case Button4:
… …
2221 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2223 2225
2224 for (;;) 2226 for (;;)
2225 { 2227 {
2226 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2227 { 2229 {
2228 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2231 ch = next_char ();
2230 2232
2231 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2232 break; 2234 break;
2233 } 2235 }
2234 2236
2235 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))
2236 { 2238 {
2237 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2238 { 2240 {
2239 seen_input = 1; 2241 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2257 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2259
2258 for (;;) 2260 for (;;)
2259 { 2261 {
2260 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)))
2261 break; 2263 break;
2262 2264
2263 *str++ = ch; 2265 *str++ = ch;
2264 2266
2265 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2268 {
2267 if (ch == C0_LF) 2269 if (ch == C0_LF)
2268 nlines++; 2270 nlines++;
2269 2271
2270 refresh_count++; 2272 refresh_count++;
… …
2348rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2349{ 2351{
2350 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2351 { 2353 {
2352 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2354 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2355 2357
2356 wchar_t wc; 2358 wchar_t wc;
2357 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);
2358 2360
… …
2386 : NOCHAR; 2388 : NOCHAR;
2387} 2389}
2388 2390
2389static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2390 2392
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 2393wchar_t
2397rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2398{ 2395{
2399 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2400 2397
… …
2493 pclose_printer (fd); 2490 pclose_printer (fd);
2494} 2491}
2495#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2496/*}}} */ 2493/*}}} */
2497 2494
2498/* *INDENT-OFF* */
2499enum { 2495enum {
2500 C1_40 = 0x40, 2496 C1_40 = 0x40,
2501 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,
2502 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,
2503 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,
2504 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,
2505}; 2501};
2506/* *INDENT-ON* */
2507 2502
2508/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2509void 2504void
2510rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2511{ 2506{
… …
2604 break; 2599 break;
2605 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2607 break; 2602 break;
2608 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2609 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2610 break; 2605 break;
2611 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2612 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2613 /* unimplemented */ 2608 /* unimplemented */
2614 break; 2609 break;
… …
2633 return; 2628 return;
2634 } 2629 }
2635 2630
2636 switch (ch) 2631 switch (ch)
2637 { 2632 {
2638 /* case 1: do_tek_mode (); break; */
2639 case '#': 2633 case '#':
2640 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2641 scr_E (); 2635 scr_E ();
2642 break; 2636 break;
2643 case '(': 2637 case '(':
… …
2666#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2667 case '9': 2661 case '9':
2668 scr_forwardindex (); 2662 scr_forwardindex ();
2669 break; 2663 break;
2670#endif 2664#endif
2665 // DECPAM/DECPNM
2671 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2672 case '>': 2669 case '>':
2673 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2674 break; 2671 break;
2675 2672
2676 case C1_40: 2673 case C1_40:
2677 cmd_getc (); 2674 cmd_getc ();
2678 break; 2675 break;
… …
2682 2679
2683 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2684 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2685 { 2682 {
2686 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2688 } 2685 }
2689 break; 2686 break;
2690 2687
2691 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2692 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
… …
2704 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2705 scr_index (DN); 2702 scr_index (DN);
2706 break; 2703 break;
2707 2704
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2710 2707
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2713 2710
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2713 process_dcs_seq ();
2717 break; 2714 break;
… …
2750 } 2747 }
2751} 2748}
2752/*}}} */ 2749/*}}} */
2753 2750
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2752enum {
2757 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2758 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,
2759 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 ,
2760 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,
… …
2780 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, */
2781 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, */
2782 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, */
2783 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, {, |, }, ~, */
2784 }; 2780 };
2785/* *INDENT-ON* */
2786 2781
2787void 2782void
2788rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2789{ 2784{
2790 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2870 scr_soft_reset (); 2865 scr_soft_reset ();
2871 2866
2872 static const int pm_h[] = { 7, 25 }; 2867 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 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874 2869
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2877 } 2872 }
2878 break; 2873 break;
2879 } 2874 }
2880 2875
2881 return; 2876 return;
… …
2899 } 2894 }
2900 break; 2895 break;
2901#endif 2896#endif
2902 2897
2903 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2904 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2905 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2906 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2907 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2908 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2909 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2910 break; 2905 break;
2911 2906
2912 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2913 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3100 } 3095 }
3101} 3096}
3102/*}}} */ 3097/*}}} */
3103 3098
3104#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3105/* ARGSUSED */
3106void 3100void
3107rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3108{ 3102{
3109 int x, y; 3103 int x, y;
3110 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3119 { 3113 {
3120 /* 3114 /*
3121 * commands 3115 * commands
3122 */ 3116 */
3123 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3124 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3125 break; 3119 break;
3126 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3127 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3128 break; 3122 break;
3129 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3130 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3131 break; 3125 break;
3132 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3133 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3134 break; 3128 break;
3135 case 5: /* raise window */ 3129 case 5: /* raise window */
3136 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3137 break; 3131 break;
3138 case 6: /* lower window */ 3132 case 6: /* lower window */
3139 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3140 break; 3134 break;
3141 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3142 scr_touch (true); 3136 scr_touch (true);
3143 break; 3137 break;
3144 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3147 break; 3141 break;
3148 3142
3149 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3150 default: 3144 default:
3151 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3152 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3153 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3154 break; 3148 break;
3155 3149
3156 /* 3150 /*
3157 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3158 */ 3152 */
3159 case 11: /* report window state */ 3153 case 11: /* report window state */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3161 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3162 break; 3156 break;
3163 case 13: /* report window position */ 3157 case 13: /* report window position */
3164 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3165 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3166 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3167 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3168 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3169 break; 3163 break;
3170 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3173 break; 3167 break;
3174 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3175 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3176 break; 3170 break;
… …
3178 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3179 break; 3173 break;
3180 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3181 { 3175 {
3182 char *s; 3176 char *s;
3183 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3185 XFree (s); 3179 XFree (s);
3186 } 3180 }
3187 break; 3181 break;
3188 case 21: /* report window title */ 3182 case 21: /* report window title */
3189 { 3183 {
3190 char *s; 3184 char *s;
3191 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3193 XFree (s); 3187 XFree (s);
3194 } 3188 }
3195 break; 3189 break;
3196 } 3190 }
… …
3350 unsigned long bytes_after; 3344 unsigned long bytes_after;
3351 unsigned char *value = 0; 3345 unsigned char *value = 0;
3352 const char *str = ""; 3346 const char *str = "";
3353 3347
3354 if (prop 3348 if (prop
3355 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3356 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3357 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3358 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3359 && actual_type != None 3353 && actual_type != None
3360 && actual_format == 8) 3354 && actual_format == 8)
… …
3372 { 3366 {
3373 *eq = 0; 3367 *eq = 0;
3374 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3375 } 3369 }
3376 else 3370 else
3377 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3378 display->atom (str)); 3372 display->atom (str));
3379 } 3373 }
3380 break; 3374 break;
3381 3375
3382 case XTerm_Color: 3376 case XTerm_Color:
… …
3465 min (h_align, 32767), min (v_align, 32767)); 3459 min (h_align, 32767), min (v_align, 32767));
3466 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3461 }
3468 else 3462 else
3469 { 3463 {
3470 int changed = 0; 3464 bool changed = false;
3471 3465
3472 if (*str != ';') 3466 if (*str != ';')
3473 { 3467 {
3474 if (bg_set_file (str)) /* change pixmap */ 3468 if (bg_set_file (str)) /* change pixmap */
3475 {
3476 changed++; 3469 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 } 3470 }
3484 else 3471 else
3485 { 3472 {
3486 str++; 3473 str++;
3487 if (bg_set_geometry (str, true)) 3474 if (bg_set_geometry (str, true))
3488 changed++; 3475 changed = true;
3489 } 3476 }
3490 3477
3491 if (changed) 3478 if (changed)
3492 { 3479 {
3493 if (bg_window_position_sensitive ()) 3480 if (bg_window_position_sensitive ())
… …
3609 if (mode == 'r') 3596 if (mode == 'r')
3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3611 else 3598 else
3612 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3613 3600
3614 set_privmode (bit, state); 3601 if (state)
3602 priv_modes |= bit;
3603 else
3604 priv_modes &= ~bit;
3615 } 3605 }
3616 3606
3617 return state; 3607 return state;
3618} 3608}
3619 3609
3620/* we're not using priv _yet_ */ 3610/* we're not using priv _yet_ */
3621void 3611void
3622rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3612rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3623{ 3613{
3624 unsigned int i, j; 3614 unsigned int i, j;
3625 int state; 3615 int state;
3626 3616
3627 static const struct 3617 static const struct
3628 { 3618 {
3629 const int argval; 3619 const int argval;
3630 const unsigned long bit; 3620 const unsigned long bit;
3631 } argtopriv[] = { 3621 } argtopriv[] = {
3632 { 1, PrivMode_aplCUR }, // DECCKM 3622 { 1, PrivMode_aplCUR }, // DECCKM
3633 { 2, PrivMode_vt52 }, 3623 { 2, PrivMode_vt52 }, // DECANM
3634 { 3, PrivMode_132 }, // DECCOLM 3624 { 3, PrivMode_132 }, // DECCOLM
3635 { 4, PrivMode_smoothScroll }, // DECSCLM 3625 { 4, PrivMode_smoothScroll }, // DECSCLM
3636 { 5, PrivMode_rVideo }, // DECSCNM 3626 { 5, PrivMode_rVideo }, // DECSCNM
3637 { 6, PrivMode_relOrigin }, // DECOM 3627 { 6, PrivMode_relOrigin }, // DECOM
3638 { 7, PrivMode_Autowrap }, // DECAWM 3628 { 7, PrivMode_Autowrap }, // DECAWM
3639 // 8, auto-repeat keys // DECARM 3629 // 8, auto-repeat keys // DECARM
3640 { 9, PrivMode_MouseX10 }, 3630 { 9, PrivMode_MouseX10 },
3641 // 18 end FF to printer after print screen 3631 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region 3632 // 19 Print screen prints full screen/scroll region
3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3633 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3644#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
3645 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
3646#endif 3636#endif
3647 { 35, PrivMode_ShiftKeys }, // rxvt extension 3637 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK 3638 // 38, tektronix mode // DECTEK
3649 { 40, PrivMode_132OK }, 3639 { 40, PrivMode_132OK },
3650 // 41 xterm more fixes NYI 3640 // 41 xterm more fixes NYI
3651 // 45 margin bell NYI 3641 // 45 margin bell NYI
3652 // 46 start logging 3642 // 46 start logging
3653 { 47, PrivMode_Screen }, 3643 { 47, PrivMode_Screen },
3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3644 { 66, PrivMode_aplKP }, // DECNKM
3655#ifndef NO_BACKSPACE_KEY 3645#ifndef NO_BACKSPACE_KEY
3656 { 67, PrivMode_BackSpace }, // DECBKM 3646 { 67, PrivMode_BackSpace }, // DECBKM
3657#endif 3647#endif
3658 { 1000, PrivMode_MouseX11 }, 3648 { 1000, PrivMode_MouseX11 },
3659 { 1002, PrivMode_MouseBtnEvent }, 3649 { 1002, PrivMode_MouseBtnEvent },
… …
3688 for (i = 0; i < nargs; i++) 3678 for (i = 0; i < nargs; i++)
3689 { 3679 {
3690 state = -1; 3680 state = -1;
3691 3681
3692 /* basic handling */ 3682 /* basic handling */
3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3683 for (j = 0; j < ecb_array_length (argtopriv); j++)
3694 if (argtopriv[j].argval == arg[i]) 3684 if (argtopriv[j].argval == arg[i])
3695 { 3685 {
3696 state = privcases (mode, argtopriv[j].bit); 3686 state = privcases (mode, argtopriv[j].bit);
3697 break; 3687 break;
3698 } 3688 }
… …
3724 case 2: /* VT52 mode */ 3714 case 2: /* VT52 mode */
3725 /* oddball mode. should be set regardless of set/reset 3715 /* oddball mode. should be set regardless of set/reset
3726 * parameter. Return from VT52 mode with an ESC < from 3716 * parameter. Return from VT52 mode with an ESC < from
3727 * within VT52 mode 3717 * within VT52 mode
3728 */ 3718 */
3729 set_privmode (PrivMode_vt52, 1); 3719 priv_modes |= PrivMode_vt52;
3730 break; 3720 break;
3731 case 3: /* 80/132 */ 3721 case 3: /* 80/132 */
3732 if (priv_modes & PrivMode_132OK) 3722 if (priv_modes & PrivMode_132OK)
3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3723 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3734 break; 3724 break;
… …
3749 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3740 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3741 break;
3752#ifdef scrollBar_esc 3742#ifdef scrollBar_esc
3753 case scrollBar_esc: 3743 case scrollBar_esc:
3754 if (scrollBar.map (state)) 3744 scrollBar.map (state);
3755 {
3756 resize_all_windows (0, 0, 0); 3745 resize_all_windows (0, 0, 0);
3757 scr_touch (true); 3746 scr_touch (true);
3758 }
3759 break; 3747 break;
3760#endif 3748#endif
3761 case 25: /* visible/invisible cursor */ 3749 case 25: /* visible/invisible cursor */
3762 scr_cursor_visible (state); 3750 scr_cursor_visible (state);
3763 break; 3751 break;

Diff Legend

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