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.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
262 mb[0] = ch[0]; 268 mb[0] = ch[0];
263 len = 1; 269 len = 1;
264 } 270 }
265 271
266 if (len > 0) 272 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
268 else 274 else
269 scr_bell (); 275 scr_bell ();
270 } 276 }
271 277
272 iso14755buf = 0; 278 iso14755buf = 0;
… …
300 KeySym keysym; 306 KeySym keysym;
301#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
303#endif 309#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
… …
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
… …
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
… …
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
914 923
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
918unsigned int 927unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 929{
921 unsigned int n, s; 930 unsigned int n, s;
922 931
923 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 970 }
962#endif 971#endif
963 972
964 if (want_refresh) 973 if (want_refresh)
965 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
966 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
967 scrollbar_show (1); 1015 scrollbar_show (1);
968#ifdef USE_XIM 1016#ifdef USE_XIM
969 IMSendSpot (); 1017 IMSendSpot ();
970#endif 1018#endif
… …
980 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
981 1029
982 display->flush (); 1030 display->flush ();
983 1031
984 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1034}
987 1035
988void 1036void
989rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
990{ 1038{
… …
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1114 }
1067} 1115}
1068#endif 1116#endif
1069 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1070bool 1136bool
1071rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1072{ 1138{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1140
1075 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1076 { 1142 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1144 n = 0;
1079 } 1145 }
1080 1146
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1084 1150
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086 1152
1087 if (n > 0) 1153 if (r > 0)
1088 { 1154 {
1089 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1090 return true; 1156 return true;
1091 } 1157 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1093 { 1166 {
1094 pty_ev.stop (); 1167 pty_ev.stop ();
1095 1168
1096 if (!OPTION (Opt_hold)) 1169 if (!OPTION (Opt_hold))
1097 destroy (); 1170 destroy ();
… …
1132 1205
1133#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1134void 1207void
1135rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1136{ 1209{
1137 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1138 return; 1211 return;
1139 1212
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1214 XFlush (display->display);
1142 1215
… …
1238{ 1311{
1239 dDisp; 1312 dDisp;
1240 1313
1241 SET_R (this); 1314 SET_R (this);
1242 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1243
1244#if defined(CURSOR_BLINK)
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1246 {
1247 if (hidden_cursor)
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270 1316
1271 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1319 unsigned int unused_mask;
1274 1320
… …
1305 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1307 { 1353 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1309 commit_iso14755 (); 1355 commit_iso14755 ();
1310 return; // case-break; 1356 goto skip_switch;
1311 } 1357 }
1312 1358
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1360 if (i[0] == ks)
1315 { 1361 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1363 commit_iso14755 ();
1318 return; // case-break; 1364 goto skip_switch;
1319 } 1365 }
1320 1366
1321 scr_bell (); 1367 scr_bell ();
1322# endif 1368# endif
1323 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1341# endif 1387# endif
1342 else 1388 else
1343 iso14755buf = 0; 1389 iso14755buf = 0;
1344 } 1390 }
1345#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1346 1396
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1485 1535
1486 case SelectionRequest: 1536 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1488 break; 1538 break;
1489 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1490 case UnmapNotify: 1548 case UnmapNotify:
1491 mapped = 0; 1549 mapped = 0;
1492#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1494#endif 1552#endif
1495 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1554 break;
1503 1555
1504#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1505 case ReparentNotify: 1557 case ReparentNotify:
1506 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1618 break;
1567 1619
1568 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1569 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1625 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1627 ;
1574 1628
1575 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1661 refresh_limit = 0; 1715 refresh_limit = 0;
1662 scrollbar_show (1); 1716 scrollbar_show (1);
1663 } 1717 }
1664 break; 1718 break;
1665 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1666} 1749}
1667 1750
1668void 1751void
1669rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1670{ 1753{
1671 if (!focus) 1754 if (!focus)
1672 { 1755 {
1673 focus = 1; 1756 focus = 1;
1674 want_refresh = 1; 1757 want_refresh = 1;
1758
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1760
1675#if USE_XIM 1761#if USE_XIM
1676 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1677 { 1763 {
1678 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1765 XSetICFocus (Input_Context);
… …
1699 if (focus) 1785 if (focus)
1700 { 1786 {
1701 focus = 0; 1787 focus = 0;
1702 want_refresh = 1; 1788 want_refresh = 1;
1703 1789
1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1791
1704#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf)
1794 {
1705 iso14755buf = 0; 1795 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1796# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1797 scr_overlay_off ();
1798# endif
1799 }
1709#endif 1800#endif
1710#if USE_XIM 1801#if USE_XIM
1711 if (Input_Context != NULL) 1802 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1713#endif 1804#endif
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1848rxvt_term::button_press (XButtonEvent &ev)
1758{ 1849{
1759 int reportmode = 0, clickintime; 1850 int reportmode = 0, clickintime;
1760 1851
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1852 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1853
1762 if (!bypass_keystate) 1854 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1855 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1856
1765 /* 1857 /*
1766 * VT window processing of button press 1858 * VT window processing of button press
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1788 { 1880 {
1789 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1790 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1791 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1792 { 1885 {
1793 /* only report double clicks */ 1886 /* only report double clicks */
1794 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1795 mouse_report (ev); 1888 mouse_report (ev);
… …
1815 else 1908 else
1816 { 1909 {
1817 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1819 1912
1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1914 switch (ev.button)
1821 { 1915 {
1822 case Button1: 1916 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1921#else
1828 selection.rect = false; 1922 selection.rect = false;
1829#endif 1923#endif
1830 1924
1831 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1833 { 1927 {
1834 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1836 else 1930 else
1837 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1838 } 1932 }
1839 else 1933 else
1840 { 1934 {
1841 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1936 MEvent.clicks++;
1843 else 1937 else
1844 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1845 1939
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1941 }
1848 1942
1849 MEvent.button = Button1; 1943 MEvent.button = Button1;
1850 break; 1944 break;
1851 1945
1852 case Button3: 1946 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1855 else 1949 else
1856 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1857 1951
1858 MEvent.button = Button3; 1952 MEvent.button = Button3;
1859 break; 1953 break;
1860 } 1954 }
1861 } 1955 }
1862 1956
1863 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1864 return; 1958 return;
1865 } 1959 }
1866 1960
… …
2002 } 2096 }
2003 2097
2004 break; 2098 break;
2005 } 2099 }
2006 } 2100 }
2101
2007 return; 2102 return;
2008 } 2103 }
2104
2009#if MENUBAR 2105#if MENUBAR
2010 /* 2106 /*
2011 * Menubar window processing of button press 2107 * Menubar window processing of button press
2012 */ 2108 */
2013 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2075 */ 2171 */
2076 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2173 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2080 2179
2081 switch (ev.button) 2180 switch (ev.button)
2082 { 2181 {
2083 case Button1: 2182 case Button1:
2084 case Button3: 2183 case Button3:
… …
2629 2728
2630bool 2729bool
2631rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2632{ 2731{
2633 bool flag = false; 2732 bool flag = false;
2634 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2636 2735
2637 for (;;) 2736 for (;;)
2638 { 2737 {
2639 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2640 { 2739 {
2641 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2741 ch = next_char ();
2643 }
2644 2742
2645 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2646 break; 2744 break;
2745 }
2647 2746
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2748 {
2650 if (!seen_input) 2749 if (!seen_input)
2651 { 2750 {
… …
2660 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2662 } 2761 }
2663 2762
2664 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2765 bool refreshnow = false;
2667 int nlines = 0; 2766 int nlines = 0;
2668 unicode_t *str = buf; 2767 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2769
2671 for (;;) 2770 for (;;)
2672 { 2771 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2773 break;
… …
2684 2783
2685 if (!OPTION (Opt_jumpScroll) 2784 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2785 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2786 {
2688 refreshnow = true; 2787 refreshnow = true;
2788 refresh_count = 0;
2689 ch = NOCHAR; 2789 ch = NOCHAR;
2690 break; 2790 break;
2691 } 2791 }
2692 2792
2693 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2695 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2696 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2697 nlines = 0; 2799 nlines = 0;
2698 str = buf; 2800 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2700 } 2802 }
2701 2803
… …
2714 2816
2715 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2818 ch = next_char ();
2717 } 2819 }
2718 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2719 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2720 2823
2721 /* 2824 /*
2722 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2730 refresh_limit++; 2833 refresh_limit++;
2731 else 2834 else
2732 { 2835 {
2733 flag = true; 2836 flag = true;
2734 scr_refresh (refresh_type); 2837 scr_refresh (refresh_type);
2838 flush_ev.stop ();
2735 } 2839 }
2736 } 2840 }
2737 2841
2738 } 2842 }
2739 else 2843 else
… …
2754 } 2858 }
2755 2859
2756 return flag; 2860 return flag;
2757} 2861}
2758 2862
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2863// read the next character
2769unicode_t 2864wchar_t
2770rxvt_term::next_char () 2865rxvt_term::next_char ()
2771{ 2866{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2868 {
2774 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2777 2872
2778 wchar_t wc; 2873 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2875
2781 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2782 { 2877 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2880 break;
2786 } 2881 }
2787 2882
2788 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2885
2791 // assume wchar == unicode 2886 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2794 } 2889 }
2795 2890
2796 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2797} 2901}
2798 2902
2799/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2800/* 2904/*
2801 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2802 * to the command. 2906 * to the command.
2803 */ 2907 */
2804unicode_t 2908wchar_t
2805rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2806{ 2910{
2807 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2808 2912
2809 if (c == NOCHAR) 2913 if (c == NOCHAR)
2810 throw out_of_input; 2914 throw out_of_input;
2811 2915
2812 return c; 2916 return c;
2813} 2917}
2814 2918
2815unicode_t 2919uint32_t
2816rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2817{ 2921{
2818 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2819 2923
2820 if (c == NOCHAR) 2924 if (c == NOCHAR)
2821 throw out_of_input; 2925 throw out_of_input;
2822 2926
2823 return c; 2927 return c;
… …
2923 case C0_ESC: 3027 case C0_ESC:
2924 process_escape_seq (); 3028 process_escape_seq ();
2925 break; 3029 break;
2926 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 3033 else
2931 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 3035 break;
2934 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2935 scr_bell (); 3037 scr_bell ();
2936 break; 3038 break;
2937 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
3092 break; 3194 break;
3093 3195
3094 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3096 { 3198 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3201 }
3100 break; 3202 break;
3101 3203
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3227 process_dcs_seq ();
3126 break; 3228 break;
3127 3229
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
3133 3234
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3237 process_csi_seq ();
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3483 break;
3383 3484
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3487 break;
3388 3488
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3391 break; 3491 break;
… …
3593/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3594/* 3694/*
3595 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3597 */ 3697 */
3598unsigned char * 3698char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3700{
3601 unicode_t ch; 3701 unicode_t ch;
3602 bool seen_esc = false; 3702 bool seen_esc = false;
3603 unsigned int n = 0; 3703 unsigned int n = 0;
… …
3636 3736
3637 string[n++] = '\0'; 3737 string[n++] = '\0';
3638 3738
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3740
3641 return (unsigned char *)rxvt_wcstombs (string); 3741 return rxvt_wcstombs (string);
3642} 3742}
3643 3743
3644/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3645/* 3745/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3747 */
3648void 3748void
3649rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3650{ 3750{
3651 unsigned char *s; 3751 char *s;
3652 unicode_t eh; 3752 unicode_t eh;
3653 3753
3654 /* 3754 /*
3655 * Not handled yet 3755 * Not handled yet
3656 */ 3756 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3677 3777
3678 if (ch == ';') 3778 if (ch == ';')
3679 { 3779 {
3680 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3681 3781
3682 if (s) 3782 if (s)
3683 { 3783 {
3684 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3685 free (s); 3785 free (s);
3686 } 3786 }
3687 } 3787 }
3688} 3788}
3689 3789
3690void 3790void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3792{
3693 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3694 { 3794 {
3695 unsigned short r, g, b; 3795 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
… …
3702 3802
3703/* 3803/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3805 */
3706void 3806void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3808{
3709 int changed = 0; 3809 int changed = 0;
3710 int color; 3810 int color;
3711 char *buf, *name; 3811 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
… …
3919 } 4019 }
3920 break; 4020 break;
3921 4021
3922 case URxvt_view_up: 4022 case URxvt_view_up:
3923 case URxvt_view_down: 4023 case URxvt_view_down:
4024 {
3924 int lines = atoi (str); 4025 int lines = atoi (str);
3925 4026
3926 if (lines) 4027 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 4029 else
3929 {
3930 scr_erase_savelines (); 4030 scr_erase_savelines ();
3931 } 4031 }
3932 4032
4033 break;
4034#endif
4035
4036#if ENABLE_PERL
4037 case URxvt_perl:
4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4039 ; // no responses yet
3933 break; 4040 break;
3934#endif 4041#endif
3935 } 4042 }
3936} 4043}
3937/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
… …
4052 case 1021: 4159 case 1021:
4053 if (mode) 4160 if (mode)
4054 SET_OPTION (Opt_intensityStyles); 4161 SET_OPTION (Opt_intensityStyles);
4055 else 4162 else
4056 CLR_OPTION (Opt_intensityStyles); 4163 CLR_OPTION (Opt_intensityStyles);
4164
4165 scr_touch (true);
4166 break;
4057#endif 4167#endif
4058 case 1048: /* alternative cursor save */ 4168 case 1048: /* alternative cursor save */
4059 case 1049: 4169 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4170 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4171 if (mode == 0)
… …
4291 scr_color (Color_bg, Color_bg); 4401 scr_color (Color_bg, Color_bg);
4292 break; 4402 break;
4293 4403
4294 //case 50: // not variable spacing 4404 //case 50: // not variable spacing
4295 4405
4296#ifndef NO_BRIGHTCOLOR 4406#if ENABLE_FRILLS
4297 case 90: 4407 case 90:
4298 case 91: /* set bright fg color */ 4408 case 91: /* set bright fg color */
4299 case 92: 4409 case 92:
4300 case 93: 4410 case 93:
4301 case 94: 4411 case 94:
… …
4313 case 106: 4423 case 106:
4314 case 107: 4424 case 107:
4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316 break; 4426 break;
4317#endif 4427#endif
4318
4319 } 4428 }
4320 } 4429 }
4321} 4430}
4322/*}}} */ 4431/*}}} */
4323 4432
… …
4347 */ 4456 */
4348void 4457void
4349rxvt_term::tt_printf (const char *fmt,...) 4458rxvt_term::tt_printf (const char *fmt,...)
4350{ 4459{
4351 va_list arg_ptr; 4460 va_list arg_ptr;
4352 unsigned char buf[256]; 4461 char buf[256];
4353 4462
4354 va_start (arg_ptr, fmt); 4463 va_start (arg_ptr, fmt);
4355 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4464 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356 va_end (arg_ptr); 4465 va_end (arg_ptr);
4357 tt_write (buf, strlen (buf)); 4466 tt_write (buf, strlen (buf));
… …
4362 * or generated by us in response to a query ESC sequence. 4471 * or generated by us in response to a query ESC sequence.
4363 */ 4472 */
4364const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4473const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365 4474
4366void 4475void
4367rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4476rxvt_term::tt_write (const char *data, unsigned int len)
4368{ 4477{
4478 if (pty.pty < 0)
4479 return;
4480
4369 if (v_buflen == 0) 4481 if (v_buflen == 0)
4370 { 4482 {
4371 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4483 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4372 4484
4373 if ((unsigned int)written == len) 4485 if ((unsigned int)written == len)
… …
4375 4487
4376 data += written; 4488 data += written;
4377 len -= written; 4489 len -= written;
4378 } 4490 }
4379 4491
4380 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4492 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381 4493
4382 memcpy (v_buffer + v_buflen, data, len); 4494 memcpy (v_buffer + v_buflen, data, len);
4383 v_buflen += len; 4495 v_buflen += len;
4384 4496
4385 pty_ev.set (EVENT_READ | EVENT_WRITE); 4497 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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