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.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 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.
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 879 if (view_start)
916#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
918} 921}
919/*}}} */ 922/*}}} */
920 923
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 925unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 927{
927 unsigned int n, s; 928 unsigned int n, s;
928 929
969 970
970 if (want_refresh) 971 if (want_refresh)
971 { 972 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 974 {
974 int row = -view_start; 975 int row = view_start;
976 int end_row = row + nrow;
975 977
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 978 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 979 --row;
978 980
979 while (row < -view_start + nrow) 981 do
980 { 982 {
981 int start_row = row; 983 int start_row = row;
982 line_t *l; 984 line_t *l;
983 985
984 do 986 do
985 { 987 {
986 l = &ROW (row); 988 l = &ROW (row++);
987 989
988 if (!(l->f & LINE_FILTERED)) 990 if (!(l->f & LINE_FILTERED))
989 { 991 {
990 // line not filtered, mark it as filtered 992 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 993 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 994 while (l->is_longer ())
993 { 995 {
994 l = &ROW (++row); 996 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 997 l->f |= LINE_FILTERED;
996 } 998 }
997 999
998 // and filter it 1000 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000 1002
1001 break; 1003 break;
1002 } 1004 }
1003 } 1005 }
1004 while (l->is_longer ()); 1006 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 1007 }
1008 1008 while (row < end_row);
1009 } 1009 }
1010 1010
1011 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
1012 scrollbar_show (1); 1012 scrollbar_show (1);
1013#ifdef USE_XIM 1013#ifdef USE_XIM
1019} 1019}
1020 1020
1021void 1021void
1022rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
1023{ 1023{
1024 SET_R (this); 1024 make_current ();
1025 SET_LOCALE (locale);
1026 1025
1027 display->flush (); 1026 display->flush ();
1028 1027
1029 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1031} 1030}
1032 1031
1033void 1032void
1034rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
1035{ 1034{
1036 SET_R (this); 1035 make_current ();
1037 SET_LOCALE (locale);
1038 1036
1039 refresh_limit = 1; 1037 refresh_limit = 1;
1040 refresh_count = 0; 1038 refresh_count = 0;
1041 flush (); 1039 flush ();
1042} 1040}
1099{ 1097{
1100 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1101 {
1104 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1107 1104
1108 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1106 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1171} 1168}
1172 1169
1173void 1170void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1175{ 1172{
1176 SET_R (this); 1173 make_current ();
1177 SET_LOCALE (locale);
1178 1174
1179 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1180 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1177 while (pty_fill ())
1182 if (cmd_parse ()) 1178 if (cmd_parse ())
1202 1198
1203#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1204void 1200void
1205rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1206{ 1202{
1207 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1208 return; 1204 return;
1209 1205
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1211 XFlush (display->display); 1207 XFlush (display->display);
1212 1208
1214} 1210}
1215 1211
1216void 1212void
1217rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1218{ 1214{
1219 SET_R (this); 1215 make_current ();
1220 SET_LOCALE (locale);
1221 1216
1222 pointer_blank (); 1217 pointer_blank ();
1223} 1218}
1224#endif 1219#endif
1225 1220
1304 1299
1305/*{{{ process an X event */ 1300/*{{{ process an X event */
1306void 1301void
1307rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1308{ 1303{
1304 make_current ();
1305
1309 dDisp; 1306 dDisp;
1310 1307
1311 SET_R (this); 1308 if (ev.xany.window == vt
1312 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1313 1312
1314#if defined(CURSOR_BLINK) 1313 // for XQueryPointer
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1316 {
1317 if (hidden_cursor)
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340
1341 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1316 unsigned int unused_mask;
1344 1317
1345 switch (ev.type) 1318 switch (ev.type)
1352 1325
1353 break; 1326 break;
1354 1327
1355 case KeyRelease: 1328 case KeyRelease:
1356 { 1329 {
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1358 KeySym ks; 1331 KeySym keysym;
1359 1332
1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361#endif 1334#endif
1362 1335
1363#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support 1337 // ISO 14755 support
1365 if (iso14755buf) 1338 if (iso14755buf)
1370# endif 1343# endif
1371# if ISO_14755 1344# if ISO_14755
1372 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1373 // first: controls 1346 // first: controls
1374 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1377 { 1350 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1379 commit_iso14755 (); 1352 commit_iso14755 ();
1380 return; // case-break; 1353 goto skip_switch;
1381 } 1354 }
1382 1355
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks) 1357 if (i[0] == keysym)
1385 { 1358 {
1386 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 (); 1360 commit_iso14755 ();
1388 return; // case-break; 1361 goto skip_switch;
1389 } 1362 }
1390 1363
1391 scr_bell (); 1364 scr_bell ();
1392# endif 1365# endif
1393 iso14755buf = 0; 1366 iso14755buf = 0;
1412 else 1385 else
1413 iso14755buf = 0; 1386 iso14755buf = 0;
1414 } 1387 }
1415#endif 1388#endif
1416 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1421 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1422#endif 1399#endif
1423 break; 1400 break;
1424 } 1401 }
1425 1402
1555 1532
1556 case SelectionRequest: 1533 case SelectionRequest:
1557 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1558 break; 1535 break;
1559 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1560 case UnmapNotify: 1545 case UnmapNotify:
1561 mapped = 0; 1546 mapped = 0;
1562#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1564#endif 1549#endif
1565 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break; 1551 break;
1573 1552
1574#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1575 case ReparentNotify: 1554 case ReparentNotify:
1576 rootwin_cb (ev); 1555 rootwin_cb (ev);
1590 1569
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1594 1573
1595 scr_refresh (refresh_type); 1574 want_refresh = 1;
1596 } 1575 }
1597 else 1576 else
1598 { 1577 {
1599 XEvent unused_event; 1578 XEvent unused_event;
1600 1579
1606 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1607 { 1586 {
1608 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1609 scrollbar_show (0); 1588 scrollbar_show (0);
1610 } 1589 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615 1590
1616#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1619#endif 1594#endif
1623 case MotionNotify: 1598 case MotionNotify:
1624#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1600 if (hidden_pointer)
1626 pointer_unblank (); 1601 pointer_unblank ();
1627#endif 1602#endif
1628#if MENUBAR
1629 if (isMenuBarWindow (ev.xany.window))
1630 {
1631 menubar_control (ev.xbutton);
1632 break;
1633 }
1634#endif
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1604 break;
1637 1605
1638 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1639 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1612 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1643 ; 1614 ;
1644 1615
1645 XQueryPointer (disp, vt, 1616 XQueryPointer (disp, vt,
1725 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1698 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1700 scrollbar_size ());
1730 scr_refresh (refresh_type); 1701 want_refresh = 1;
1731 refresh_limit = 0; 1702 refresh_limit = 0;
1732 scrollbar_show (1); 1703 scrollbar_show (1);
1733 } 1704 }
1734 break; 1705 break;
1735 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1736} 1736}
1737 1737
1738void 1738void
1739rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1740{ 1740{
1806 1806
1807#if TRANSPARENT 1807#if TRANSPARENT
1808void 1808void
1809rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1810{
1811 SET_R (this); 1811 make_current ();
1812 SET_LOCALE (locale);
1813 1812
1814 switch (ev.type) 1813 switch (ev.type)
1815 { 1814 {
1816 case PropertyNotify: 1815 case PropertyNotify:
1817 /* 1816 /*
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1867 { 1866 {
1868 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1869 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1870 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1871 { 1871 {
1872 /* only report double clicks */ 1872 /* only report double clicks */
1873 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1874 mouse_report (ev); 1874 mouse_report (ev);
1894 else 1894 else
1895 { 1895 {
1896 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1898 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1900 switch (ev.button)
1901 { 1901 {
1902 case Button1: 1902 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1907#else 1907#else
1908 selection.rect = false; 1908 selection.rect = false;
1909#endif 1909#endif
1910 1910
1911 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1913 {
1914 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1916 else 1916 else
1917 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
2082 } 2082 }
2083 2083
2084 break; 2084 break;
2085 } 2085 }
2086 } 2086 }
2087
2087 return; 2088 return;
2088 } 2089 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2090}
2097 2091
2098void 2092void
2099rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2100{ 2094{
2156 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2157 && bypass_keystate 2151 && bypass_keystate
2158 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2159 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2160 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2161 switch (ev.button) 2158 switch (ev.button)
2162 { 2159 {
2163 case Button1: 2160 case Button1:
2164 case Button3: 2161 case Button3:
2165 selection_make (ev.time); 2162 selection_make (ev.time);
2196 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2197 } 2194 }
2198 else 2195 else
2199 { 2196 {
2200# endif 2197# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2198 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2199 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2214 } 2201 }
2215#endif 2202# endif
2216 } 2203 }
2217 break; 2204 break;
2218#endif 2205#endif
2219 } 2206 }
2220 } 2207 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2208}
2226 2209
2227#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2228#if TINTING 2211#if TINTING
2229/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
2709 2692
2710bool 2693bool
2711rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2712{ 2695{
2713 bool flag = false; 2696 bool flag = false;
2714 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2716 2699
2717 for (;;) 2700 for (;;)
2718 { 2701 {
2719 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2720 { 2703 {
2721 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2722 ch = next_char (); 2705 ch = next_char ();
2723 }
2724 2706
2725 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2726 break; 2708 break;
2709 }
2727 2710
2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2711 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2729 { 2712 {
2730 if (!seen_input) 2713 if (!seen_input)
2731 { 2714 {
2740 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2742 } 2725 }
2743 2726
2744 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2729 bool refreshnow = false;
2747 int nlines = 0; 2730 int nlines = 0;
2748 unicode_t *str = buf; 2731 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2733
2751 for (;;) 2734 for (;;)
2752 { 2735 {
2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754 break; 2737 break;
2772 } 2755 }
2773 2756
2774 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2776 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2779 2763
2780 nlines = 0; 2764 nlines = 0;
2781 str = buf; 2765 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2783 } 2767 }
2797 2781
2798 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2783 ch = next_char ();
2800 } 2784 }
2801 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2804 2789
2805 /* 2790 /*
2806 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2807 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
2808 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
2814 refresh_limit++; 2799 refresh_limit++;
2815 else 2800 else
2816 { 2801 {
2817 flag = true; 2802 flag = true;
2818 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2819 flush_ev.stop (); 2804 want_refresh = 1;
2820 } 2805 }
2821 } 2806 }
2822 2807
2823 } 2808 }
2824 else 2809 else
2839 } 2824 }
2840 2825
2841 return flag; 2826 return flag;
2842} 2827}
2843 2828
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2829// read the next character
2854unicode_t 2830wchar_t
2855rxvt_term::next_char () 2831rxvt_term::next_char ()
2856{ 2832{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2834 {
2859 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2869 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2846 break;
2871 } 2847 }
2872 2848
2873 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875 2851
2876 // assume wchar == unicode 2852 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2879 } 2855 }
2880 2856
2881 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2882} 2867}
2883 2868
2884/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2885/* 2870/*
2886 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2887 * to the command. 2872 * to the command.
2888 */ 2873 */
2889unicode_t 2874wchar_t
2890rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2891{ 2876{
2892 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2893 2878
2894 if (c == NOCHAR) 2879 if (c == NOCHAR)
2895 throw out_of_input; 2880 throw out_of_input;
2896 2881
2897 return c; 2882 return c;
2898} 2883}
2899 2884
2900unicode_t 2885uint32_t
2901rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2902{ 2887{
2903 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2904 2889
2905 if (c == NOCHAR) 2890 if (c == NOCHAR)
2906 throw out_of_input; 2891 throw out_of_input;
2907 2892
2908 return c; 2893 return c;
3175 break; 3160 break;
3176 3161
3177 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3179 { 3164 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3167 }
3183 break; 3168 break;
3184 3169
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
3850 { 3835 {
3851 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3837 break;
3853 3838
3854 *name++ = '\0'; 3839 *name++ = '\0';
3855 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3856 3841
3857 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3843 break;
3859 3844
3860 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3846 *buf++ = '\0';
3862 3847
3863 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3864 { 3849 {
3865 unsigned short r, g, b; 3850 unsigned short r, g, b;
3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868 } 3853 }
3869 else 3854 else
3870 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3871 } 3856 }
3872 break; 3857 break;
3873 case XTerm_Color00: 3858 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3875 break; 3860 break;
3876 case XTerm_Color01: 3861 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3878 break; 3863 break;
3879#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3882 break; 3867 break;
3886 break; 3871 break;
3887 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3889 break; 3874 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3891 case XTerm_Color_BD:
3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893 break;
3894 case XTerm_Color_UL:
3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896 break;
3897 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3899 break; 3886 break;
3900 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3902 break; 3889 break;
3903#endif 3890#endif
3908 if (am_transparent) 3895 if (am_transparent)
3909 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3910 break; 3897 break;
3911#endif 3898#endif
3912 3899
3913 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3914 if (*str != ';') 3901 if (*str != ';')
3915 { 3902 {
3916#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3917 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3918 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3919#endif
3920 scr_touch (true); 3906 scr_touch (true);
3907#endif
3921 } 3908 }
3909
3922 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3923 { 3911 {
3924 str++; 3912 str++;
3925#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3926 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3929 3917
3930 if (changed) 3918 if (changed)
3931 { 3919 {
3932#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3933 resize_pixmap (); 3921 resize_pixmap ();
3934#endif
3935 scr_touch (true); 3922 scr_touch (true);
3923#endif
3936 } 3924 }
3937 break; 3925 break;
3938 3926
3939 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3941 break; 3929 break;
3942 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3944 break; 3932 break;
3945 3933
3946 case XTerm_logfile: 3934 case XTerm_logfile:
3947 // TODO, when secure mode? 3935 // TODO, when secure mode?
3948 break; 3936 break;
3949 3937
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0 3938#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3958 { 3940 {
3959 int fd; 3941 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 { 3943 {
3962 scr_dump (fd); 3944 scr_dump (fd);
4014 break; 3996 break;
4015#endif 3997#endif
4016 3998
4017#if ENABLE_PERL 3999#if ENABLE_PERL
4018 case URxvt_perl: 4000 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4020 ; // no responses yet 4002 ; // no responses yet
4021 break; 4003 break;
4022#endif 4004#endif
4023 } 4005 }
4024} 4006}
4077 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 4064 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 4068#endif
4136 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4137 switch (arg[i]) 4116 switch (arg[i])
4138 { 4117 {
4139#if ENABLE_STYLES 4118#if ENABLE_STYLES
4140 case 1021: 4119 case 1021:
4141 if (mode) 4120 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 4121
4146 scr_touch (true); 4122 scr_touch (true);
4147 break; 4123 break;
4148#endif 4124#endif
4149 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4171 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 4150 break;
4175 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4176 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 4153 break;
4181 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4183 break; 4156 break;
4184 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
4190 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4191 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4194 break; 4167 break;
4195#ifdef menuBar_esc
4196 case menuBar_esc:
4197#ifdef MENUBAR
4198 map_menuBar (state);
4199#endif
4200 break;
4201#endif
4202#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4203 case scrollBar_esc: 4169 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4205 { 4171 {
4206 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
4225#if 0 4191#if 0
4226 case 1001: 4192 case 1001:
4227 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4228#endif 4194#endif
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 4197 break;
4235 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4236 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 4200 break;
4241 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 4204 scr_erase_screen (2);
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 4415
4456void 4416void
4457rxvt_term::tt_write (const char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 4418{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4421
4422 if (pty.pty < 0)
4423 return;
4424
4459 if (v_buflen == 0) 4425 if (v_buflen == 0)
4460 { 4426 {
4461 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4462 4428
4463 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines