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.462 by root, Wed Nov 24 04:07:39 2010 UTC vs.
Revision 1.494 by sf-exg, Mon Aug 22 17:23:56 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
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 }
… …
889 commit_iso14755 (); 884 commit_iso14755 ();
890 885
891 return; 886 return;
892 } 887 }
893 888
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 890 if (i[0] == keysym)
896 { 891 {
897 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 893 commit_iso14755 ();
899 894
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
938#endif 933#endif
939} 934}
940 935
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 936void
975rxvt_term::flush () 937rxvt_term::flush ()
976{ 938{
977 flush_ev.stop (); 939 flush_ev.stop ();
978 940
979#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 944 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 945 scr_touch (false);
985 } 946 }
986#endif 947#endif
987 948
988 if (want_refresh) 949 if (want_refresh)
… …
1026 } 987 }
1027 988
1028 scr_refresh (); 989 scr_refresh ();
1029 scrollBar.show (1); 990 scrollBar.show (1);
1030#ifdef USE_XIM 991#ifdef USE_XIM
1031 IMSendSpot (); 992 im_send_spot ();
1032#endif 993#endif
1033 } 994 }
1034 995
1035 display->flush (); 996 display->flush ();
1036} 997}
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1446 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1441 focus_out ();
1448 break; 1442 break;
1449 1443
1450 case ConfigureNotify: 1444 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1452 { 1446 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1448 ;
1455 1449
1456#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1457 bool moved = false; 1451 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1452 if (bg_window_position_sensitive ())
1459 { 1453 {
1460 int x, y; 1454 int x, y;
1461 if (ev.xconfigure.send_event) 1455 if (ev.xconfigure.send_event)
1462 { 1456 {
1463 x = ev.xconfigure.x; 1457 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1458 y = ev.xconfigure.y;
1465 } 1459 }
1466 else 1460 else
1467 get_window_origin (x, y); 1461 get_window_origin (x, y);
1468 1462
1469 if (bgPixmap.set_position (x, y) 1463 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1464 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1465 moved = true;
1472 } 1466 }
1473#endif 1467#endif
1474 1468
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1479 } 1473 }
1480 else 1474 else
1481 { 1475 {
1482#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1483 if (moved) 1477 if (moved)
1484 {
1485 if (mapped)
1486 update_background (); 1478 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif 1479#endif
1491 } 1480 }
1492 1481
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1483 }
1495 break; 1484 break;
1496 1485
1497 case PropertyNotify: 1486 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1488 break;
1504 1489
1505 case SelectionClear: 1490 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break;
1508
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break; 1492 break;
1513 1493
1514 case SelectionRequest: 1494 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1516 break; 1496 break;
… …
1527 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1531 */ 1511 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1534#endif 1514#endif
1535 mapped = 1; 1515 mapped = 1;
1536#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1553 { 1533 {
1554 do 1534 do
1555 { 1535 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1538 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1540
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1542
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1544 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1547 }
1568 1548
1569 want_refresh = 1; 1549 want_refresh = 1;
1570 } 1550 }
1571 else 1551 else
… …
1686 XQueryPointer (dpy, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1687 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1688 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1689 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1690 &unused_mask); 1670 &unused_mask);
1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692 scrollBar.size ()); 1672 scrollBar.size ());
1693 want_refresh = 1; 1673 want_refresh = 1;
1694 scrollBar.show (1); 1674 scrollBar.show (1);
1695 } 1675 }
1696 break; 1676 break;
… …
1731rxvt_term::set_urgency (bool enable) 1711rxvt_term::set_urgency (bool enable)
1732{ 1712{
1733 if (enable == urgency_hint) 1713 if (enable == urgency_hint)
1734 return; 1714 return;
1735 1715
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1717 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1719 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1720 urgency_hint = enable;
1741 } 1721 }
1742} 1722}
1743#endif 1723#endif
1744 1724
… …
1751 want_refresh = 1; 1731 want_refresh = 1;
1752 1732
1753#if USE_XIM 1733#if USE_XIM
1754 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1755 { 1735 {
1756 IMSetPosition (); 1736 im_set_position ();
1757 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1758 } 1738 }
1759#endif 1739#endif
1760#if CURSOR_BLINK 1740#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1852 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1853 */ 1833 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1836 {
1857 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1858 update_background (); 1838 update_background ();
1859 } 1839 }
1860 1840
1861 break; 1841 break;
1862 } 1842 }
… …
2064 csrO = scrollBar.bot - scrollBar.top; 2044 csrO = scrollBar.bot - scrollBar.top;
2065 break; 2045 break;
2066 } 2046 }
2067 2047
2068 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2069 || scrollbar_above_slider (ev.y) 2049 || scrollBar.above_slider (ev.y)
2070 || scrollbar_below_slider (ev.y)) 2050 || scrollBar.below_slider (ev.y))
2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072 2052
2073 scrollBar.state = STATE_MOTION; 2053 scrollBar.state = STATE_MOTION;
2074 break; 2054 break;
2075 2055
2076 case Button1: 2056 case Button1:
… …
2079 /* FALLTHROUGH */ 2059 /* FALLTHROUGH */
2080 2060
2081 case Button3: 2061 case Button3:
2082 if (scrollBar.style != R_SB_XTERM) 2062 if (scrollBar.style != R_SB_XTERM)
2083 { 2063 {
2084 if (scrollbar_above_slider (ev.y)) 2064 if (scrollBar.above_slider (ev.y))
2085# ifdef RXVT_SCROLL_FULL 2065# ifdef RXVT_SCROLL_FULL
2086 scr_page (UP, nrow - 1); 2066 scr_page (UP, nrow - 1);
2087# else 2067# else
2088 scr_page (UP, nrow / 4); 2068 scr_page (UP, nrow / 4);
2089# endif 2069# endif
2090 else if (scrollbar_below_slider (ev.y)) 2070 else if (scrollBar.below_slider (ev.y))
2091# ifdef RXVT_SCROLL_FULL 2071# ifdef RXVT_SCROLL_FULL
2092 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2093# else 2073# else
2094 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2095# endif 2075# endif
… …
2098 } 2078 }
2099 else 2079 else
2100 { 2080 {
2101 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2102 (nrow 2082 (nrow
2103 * scrollbar_position (ev.y) 2083 * scrollBar.position (ev.y)
2104 / scrollBar.size ())); 2084 / scrollBar.size ()));
2105 } 2085 }
2106 2086
2107 break; 2087 break;
2108 } 2088 }
… …
2234 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2236 2216
2237 for (;;) 2217 for (;;)
2238 { 2218 {
2239 if (expect_false (ch == NOCHAR)) 2219 if (ecb_unlikely (ch == NOCHAR))
2240 { 2220 {
2241 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2222 ch = next_char ();
2243 2223
2244 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2245 break; 2225 break;
2246 } 2226 }
2247 2227
2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2249 { 2229 {
2250 if (expect_false (!seen_input)) 2230 if (ecb_unlikely (!seen_input))
2251 { 2231 {
2252 seen_input = 1; 2232 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2248 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2250
2271 for (;;) 2251 for (;;)
2272 { 2252 {
2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2274 break; 2254 break;
2275 2255
2276 *str++ = ch; 2256 *str++ = ch;
2277 2257
2278 if (expect_false (ch == C0_LF || str >= eol)) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2259 {
2280 if (ch == C0_LF) 2260 if (ch == C0_LF)
2281 nlines++; 2261 nlines++;
2282 2262
2283 refresh_count++; 2263 refresh_count++;
… …
2361rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2362{ 2342{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2344 {
2365 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2367 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2368 2348
2369 wchar_t wc; 2349 wchar_t wc;
2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2371 2351
… …
2399 : NOCHAR; 2379 : NOCHAR;
2400} 2380}
2401 2381
2402static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2403 2383
2404/* rxvt_cmd_getc () - Return next input character */
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t 2384wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2386{
2412 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2413 2388
… …
2506 pclose_printer (fd); 2481 pclose_printer (fd);
2507} 2482}
2508#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2509/*}}} */ 2484/*}}} */
2510 2485
2511/* *INDENT-OFF* */
2512enum { 2486enum {
2513 C1_40 = 0x40, 2487 C1_40 = 0x40,
2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2518}; 2492};
2519/* *INDENT-ON* */
2520 2493
2521/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2522void 2495void
2523rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2497{
… …
2646 return; 2619 return;
2647 } 2620 }
2648 2621
2649 switch (ch) 2622 switch (ch)
2650 { 2623 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2624 case '#':
2653 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2654 scr_E (); 2626 scr_E ();
2655 break; 2627 break;
2656 case '(': 2628 case '(':
… …
2679#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2680 case '9': 2652 case '9':
2681 scr_forwardindex (); 2653 scr_forwardindex ();
2682 break; 2654 break;
2683#endif 2655#endif
2656 // DECPAM/DECPNM
2684 case '=': 2657 case '=':
2685 case '>': 2658 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2687 break; 2660 break;
2688 2661
… …
2695 2668
2696 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2698 { 2671 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2674 }
2702 break; 2675 break;
2703 2676
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2706 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2707 break; 2682 break;
2708 2683
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2716 scr_index (DN); 2691 scr_index (DN);
2717 break; 2692 break;
2718 2693
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2721 2696
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2724 2699
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2702 process_dcs_seq ();
2728 break; 2703 break;
… …
2761 } 2736 }
2762} 2737}
2763/*}}} */ 2738/*}}} */
2764 2739
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2741enum {
2768 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2769 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2770 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2771 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2751};
2778 2752
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2758
2785const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2786 { 2760 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2791 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2792 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2793 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2794 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2795 }; 2769 };
2796/* *INDENT-ON* */
2797 2770
2798void 2771void
2799rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2800{ 2773{
2801 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2881 scr_soft_reset (); 2854 scr_soft_reset ();
2882 2855
2883 static const int pm_h[] = { 7, 25 }; 2856 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2858
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2861 }
2889 break; 2862 break;
2890 } 2863 }
2891 2864
2892 return; 2865 return;
… …
3111 } 3084 }
3112} 3085}
3113/*}}} */ 3086/*}}} */
3114 3087
3115#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3089void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3091{
3120 int x, y; 3092 int x, y;
3121 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3130 { 3102 {
3131 /* 3103 /*
3132 * commands 3104 * commands
3133 */ 3105 */
3134 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3136 break; 3108 break;
3137 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3111 break;
3140 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3114 break;
3143 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3117 break;
3146 case 5: /* raise window */ 3118 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3148 break; 3120 break;
3149 case 6: /* lower window */ 3121 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3151 break; 3123 break;
3152 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3153 scr_touch (true); 3125 scr_touch (true);
3154 break; 3126 break;
3155 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3166 3138
3167 /* 3139 /*
3168 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3169 */ 3141 */
3170 case 11: /* report window state */ 3142 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3145 break;
3174 case 13: /* report window position */ 3146 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3152 break;
3181 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3156 break;
3185 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3159 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3162 break;
3191 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3192 { 3164 {
3193 char *s; 3165 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3196 XFree (s); 3168 XFree (s);
3197 } 3169 }
3198 break; 3170 break;
3199 case 21: /* report window title */ 3171 case 21: /* report window title */
3200 { 3172 {
3201 char *s; 3173 char *s;
3202 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3204 XFree (s); 3176 XFree (s);
3205 } 3177 }
3206 break; 3178 break;
3207 } 3179 }
… …
3361 unsigned long bytes_after; 3333 unsigned long bytes_after;
3362 unsigned char *value = 0; 3334 unsigned char *value = 0;
3363 const char *str = ""; 3335 const char *str = "";
3364 3336
3365 if (prop 3337 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3342 && actual_type != None
3371 && actual_format == 8) 3343 && actual_format == 8)
… …
3383 { 3355 {
3384 *eq = 0; 3356 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3386 } 3358 }
3387 else 3359 else
3388 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3361 display->atom (str));
3390 } 3362 }
3391 break; 3363 break;
3392 3364
3393 case XTerm_Color: 3365 case XTerm_Color:
… …
3454 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3455 { 3427 {
3456 bool changed = false; 3428 bool changed = false;
3457 3429
3458 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3432
3463 if (changed) 3433 if (changed)
3464 update_background (); 3434 update_background ();
3465 } 3435 }
3466 3436
… …
3472 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3473 { 3443 {
3474 char str[256]; 3444 char str[256];
3475 3445
3476 sprintf (str, "[%dx%d+%d+%d]", 3446 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3450 }
3481 else 3451 else
3482 { 3452 {
3483 int changed = 0; 3453 bool changed = false;
3484 3454
3485 if (*str != ';') 3455 if (*str != ';')
3486 { 3456 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3488 {
3489 changed++; 3458 changed = true;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3496 } 3459 }
3497 else 3460 else
3498 { 3461 {
3499 str++; 3462 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3463 if (bg_set_geometry (str, true))
3501 changed++; 3464 changed = true;
3502 } 3465 }
3503 3466
3504 if (changed) 3467 if (changed)
3505 { 3468 {
3506 if (bgPixmap.window_position_sensitive ()) 3469 if (bg_window_position_sensitive ())
3507 { 3470 {
3508 int x, y; 3471 int x, y;
3509 get_window_origin (x, y); 3472 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3473 bg_set_position (x, y);
3511 } 3474 }
3512 update_background (); 3475 update_background ();
3513 } 3476 }
3514 } 3477 }
3515 break; 3478 break;
… …
3630 return state; 3593 return state;
3631} 3594}
3632 3595
3633/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3634void 3597void
3635rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3636{ 3599{
3637 unsigned int i, j; 3600 unsigned int i, j;
3638 int state; 3601 int state;
3639 3602
3640 static const struct 3603 static const struct
3641 { 3604 {
3642 const int argval; 3605 const int argval;
3643 const unsigned long bit; 3606 const unsigned long bit;
3644 } argtopriv[] = { 3607 } argtopriv[] = {
3645 { 1, PrivMode_aplCUR }, // DECCKM 3608 { 1, PrivMode_aplCUR }, // DECCKM
3646 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3647 { 3, PrivMode_132 }, // DECCOLM 3610 { 3, PrivMode_132 }, // DECCOLM
3648 { 4, PrivMode_smoothScroll }, // DECSCLM 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3649 { 5, PrivMode_rVideo }, // DECSCNM 3612 { 5, PrivMode_rVideo }, // DECSCNM
3650 { 6, PrivMode_relOrigin }, // DECOM 3613 { 6, PrivMode_relOrigin }, // DECOM
3651 { 7, PrivMode_Autowrap }, // DECAWM 3614 { 7, PrivMode_Autowrap }, // DECAWM
3652 // 8, auto-repeat keys // DECARM 3615 // 8, auto-repeat keys // DECARM
3653 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3654 // 18 end FF to printer after print screen 3617 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region 3618 // 19 Print screen prints full screen/scroll region
3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3658 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3659#endif 3622#endif
3660 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK 3624 // 38, tektronix mode // DECTEK
3662 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3663 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3664 // 45 margin bell NYI 3627 // 45 margin bell NYI
3665 // 46 start logging 3628 // 46 start logging
3666 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3630 { 66, PrivMode_aplKP }, // DECNKM
3668#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3669 { 67, PrivMode_BackSpace }, // DECBKM 3632 { 67, PrivMode_BackSpace }, // DECBKM
3670#endif 3633#endif
3671 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3672 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
… …
3701 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3702 { 3665 {
3703 state = -1; 3666 state = -1;
3704 3667
3705 /* basic handling */ 3668 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3708 { 3671 {
3709 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3710 break; 3673 break;
3711 } 3674 }
… …
3984 } 3947 }
3985 } 3948 }
3986} 3949}
3987/*}}} */ 3950/*}}} */
3988 3951
3989/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3990void
3991rxvt_term::process_graphics ()
3992{
3993 unicode_t ch, cmd = cmd_getc ();
3994
3995 if (cmd == 'Q')
3996 {
3997 /* query graphics */
3998 tt_printf ("\033G0\012"); /* no graphics */
3999 return;
4000 }
4001 /* swallow other graphics sequences until terminating ':' */
4002 do
4003 ch = cmd_getc ();
4004 while (ch != ':');
4005}
4006/*}}} */
4007
4008/* ------------------------------------------------------------------------- */ 3952/* ------------------------------------------------------------------------- */
4009 3953
4010/* 3954/*
4011 * Send printf () formatted output to the command. 3955 * Send printf () formatted output to the command.
4012 * Only use for small amounts of data. 3956 * Only use for small amounts of data.
… …
4025 3969
4026/* ---------------------------------------------------------------------- */ 3970/* ---------------------------------------------------------------------- */
4027/* Write data to the pty as typed by the user, pasted with the mouse, 3971/* Write data to the pty as typed by the user, pasted with the mouse,
4028 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
4029 */ 3973 */
4030const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4031 3975
4032void 3976void
4033rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
4034{ 3978{
4035 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4040 3984
4041 if (v_buflen == 0) 3985 if (v_buflen == 0)
4042 { 3986 {
4043 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4044 3988
3989 max_it (written, 0);
3990
4045 if ((unsigned int)written == len) 3991 if (written == len)
4046 return; 3992 return;
4047 3993
4048 data += written; 3994 data += written;
4049 len -= written; 3995 len -= written;
4050 } 3996 }
4051 3997
4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3998 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4053 3999
4054 memcpy (v_buffer + v_buflen, data, len); 4000 memcpy (v_buffer + v_buflen, data, len);
4055 v_buflen += len; 4001 v_buflen += len;
4056 4002
4057 pty_ev.set (ev::READ | ev::WRITE); 4003 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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