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.236 by root, Thu Jan 5 01:04:10 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
… …
967 } 968 }
968#endif 969#endif
969 970
970 if (want_refresh) 971 if (want_refresh)
971 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
972 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
973 scrollbar_show (1); 1012 scrollbar_show (1);
974#ifdef USE_XIM 1013#ifdef USE_XIM
975 IMSendSpot (); 1014 IMSendSpot ();
976#endif 1015#endif
… …
980} 1019}
981 1020
982void 1021void
983rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
984{ 1023{
985 SET_R (this); 1024 make_current ();
986 SET_LOCALE (locale);
987 1025
988 display->flush (); 1026 display->flush ();
989 1027
990 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
991 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
992} 1030}
993 1031
994void 1032void
995rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
996{ 1034{
997 SET_R (this); 1035 make_current ();
998 SET_LOCALE (locale);
999 1036
1000 refresh_limit = 1; 1037 refresh_limit = 1;
1001 refresh_count = 0; 1038 refresh_count = 0;
1002 flush (); 1039 flush ();
1003} 1040}
… …
1060{ 1097{
1061 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1062 || 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)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1101 {
1065 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1068 1104
1069 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1106 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1132} 1168}
1133 1169
1134void 1170void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1172{
1137 SET_R (this); 1173 make_current ();
1138 SET_LOCALE (locale);
1139 1174
1140 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1177 while (pty_fill ())
1143 if (cmd_parse ()) 1178 if (cmd_parse ())
… …
1163 1198
1164#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1165void 1200void
1166rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1167{ 1202{
1168 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1169 return; 1204 return;
1170 1205
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1207 XFlush (display->display);
1173 1208
… …
1175} 1210}
1176 1211
1177void 1212void
1178rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1179{ 1214{
1180 SET_R (this); 1215 make_current ();
1181 SET_LOCALE (locale);
1182 1216
1183 pointer_blank (); 1217 pointer_blank ();
1184} 1218}
1185#endif 1219#endif
1186 1220
… …
1265 1299
1266/*{{{ process an X event */ 1300/*{{{ process an X event */
1267void 1301void
1268rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1269{ 1303{
1304 make_current ();
1305
1270 dDisp; 1306 dDisp;
1271 1307
1272 SET_R (this); 1308 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1274 1312
1275#if defined(CURSOR_BLINK) 1313 // for XQueryPointer
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1316 unsigned int unused_mask;
1305 1317
1306 switch (ev.type) 1318 switch (ev.type)
… …
1313 1325
1314 break; 1326 break;
1315 1327
1316 case KeyRelease: 1328 case KeyRelease:
1317 { 1329 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1331 KeySym keysym;
1320 1332
1321 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 :/
1322#endif 1334#endif
1323 1335
1324#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1337 // ISO 14755 support
1326 if (iso14755buf) 1338 if (iso14755buf)
… …
1331# endif 1343# endif
1332# if ISO_14755 1344# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1334 // first: controls 1346 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1350 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1352 commit_iso14755 ();
1341 return; // case-break; 1353 goto skip_switch;
1342 } 1354 }
1343 1355
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1357 if (i[0] == keysym)
1346 { 1358 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1360 commit_iso14755 ();
1349 return; // case-break; 1361 goto skip_switch;
1350 } 1362 }
1351 1363
1352 scr_bell (); 1364 scr_bell ();
1353# endif 1365# endif
1354 iso14755buf = 0; 1366 iso14755buf = 0;
… …
1373 else 1385 else
1374 iso14755buf = 0; 1386 iso14755buf = 0;
1375 } 1387 }
1376#endif 1388#endif
1377 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
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1383#endif 1399#endif
1384 break; 1400 break;
1385 } 1401 }
1386 1402
… …
1516 1532
1517 case SelectionRequest: 1533 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1519 break; 1535 break;
1520 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
1521 case UnmapNotify: 1545 case UnmapNotify:
1522 mapped = 0; 1546 mapped = 0;
1523#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1525#endif 1549#endif
1526 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1551 break;
1534 1552
1535#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1536 case ReparentNotify: 1554 case ReparentNotify:
1537 rootwin_cb (ev); 1555 rootwin_cb (ev);
… …
1551 1569
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1555 1573
1556 scr_refresh (refresh_type); 1574 want_refresh = 1;
1557 } 1575 }
1558 else 1576 else
1559 { 1577 {
1560 XEvent unused_event; 1578 XEvent unused_event;
1561 1579
… …
1567 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1568 { 1586 {
1569 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1570 scrollbar_show (0); 1588 scrollbar_show (0);
1571 } 1589 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1590
1577#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1580#endif 1594#endif
… …
1584 case MotionNotify: 1598 case MotionNotify:
1585#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1600 if (hidden_pointer)
1587 pointer_unblank (); 1601 pointer_unblank ();
1588#endif 1602#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1604 break;
1598 1605
1599 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1600 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1612 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1614 ;
1605 1615
1606 XQueryPointer (disp, vt, 1616 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1698 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1700 scrollbar_size ());
1691 scr_refresh (refresh_type); 1701 want_refresh = 1;
1692 refresh_limit = 0; 1702 refresh_limit = 0;
1693 scrollbar_show (1); 1703 scrollbar_show (1);
1694 } 1704 }
1695 break; 1705 break;
1696 } 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
1697} 1736}
1698 1737
1699void 1738void
1700rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1701{ 1740{
1702 if (!focus) 1741 if (!focus)
1703 { 1742 {
1704 focus = 1; 1743 focus = 1;
1705 want_refresh = 1; 1744 want_refresh = 1;
1706 1745
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1747
1709#if USE_XIM 1748#if USE_XIM
1710 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1711 { 1750 {
1712 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
… …
1733 if (focus) 1772 if (focus)
1734 { 1773 {
1735 focus = 0; 1774 focus = 0;
1736 want_refresh = 1; 1775 want_refresh = 1;
1737 1776
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1778
1740#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1780 if (iso14755buf)
1742 { 1781 {
1743 iso14755buf = 0; 1782 iso14755buf = 0;
… …
1767 1806
1768#if TRANSPARENT 1807#if TRANSPARENT
1769void 1808void
1770rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1810{
1772 SET_R (this); 1811 make_current ();
1773 SET_LOCALE (locale);
1774 1812
1775 switch (ev.type) 1813 switch (ev.type)
1776 { 1814 {
1777 case PropertyNotify: 1815 case PropertyNotify:
1778 /* 1816 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1828 { 1866 {
1829 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1830 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1831 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1832 { 1871 {
1833 /* only report double clicks */ 1872 /* only report double clicks */
1834 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1835 mouse_report (ev); 1874 mouse_report (ev);
… …
1855 else 1894 else
1856 { 1895 {
1857 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1859 1898
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1900 switch (ev.button)
1862 { 1901 {
1863 case Button1: 1902 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1904 /* should be done in screen.C */
… …
1868#else 1907#else
1869 selection.rect = false; 1908 selection.rect = false;
1870#endif 1909#endif
1871 1910
1872 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1913 {
1875 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1877 else 1916 else
1878 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2082 }
2044 2083
2045 break; 2084 break;
2046 } 2085 }
2047 } 2086 }
2087
2048 return; 2088 return;
2049 } 2089 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2090}
2058 2091
2059void 2092void
2060rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2061{ 2094{
… …
2117 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2151 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2121 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2122 switch (ev.button) 2158 switch (ev.button)
2123 { 2159 {
2124 case Button1: 2160 case Button1:
2125 case Button3: 2161 case Button3:
2126 selection_make (ev.time); 2162 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2158 } 2194 }
2159 else 2195 else
2160 { 2196 {
2161# endif 2197# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2198 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2199 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2175 } 2201 }
2176#endif 2202# endif
2177 } 2203 }
2178 break; 2204 break;
2179#endif 2205#endif
2180 } 2206 }
2181 } 2207 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2208}
2187 2209
2188#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2189#if TINTING 2211#if TINTING
2190/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2670 2692
2671bool 2693bool
2672rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2673{ 2695{
2674 bool flag = false; 2696 bool flag = false;
2675 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2677 2699
2678 for (;;) 2700 for (;;)
2679 { 2701 {
2680 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2681 { 2703 {
2682 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2705 ch = next_char ();
2684 }
2685 2706
2686 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2687 break; 2708 break;
2709 }
2688 2710
2689 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)
2690 { 2712 {
2691 if (!seen_input) 2713 if (!seen_input)
2692 { 2714 {
… …
2701 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2703 } 2725 }
2704 2726
2705 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2729 bool refreshnow = false;
2708 int nlines = 0; 2730 int nlines = 0;
2709 unicode_t *str = buf; 2731 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2733
2712 for (;;) 2734 for (;;)
2713 { 2735 {
2714 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))
2715 break; 2737 break;
… …
2733 } 2755 }
2734 2756
2735 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2737 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2738 if (!PERL_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))))
2739 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2740 2763
2741 nlines = 0; 2764 nlines = 0;
2742 str = buf; 2765 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2744 } 2767 }
… …
2758 2781
2759 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2783 ch = next_char ();
2761 } 2784 }
2762 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 if (!PERL_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))))
2764 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2765 2789
2766 /* 2790 /*
2767 * 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
2768 * 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.
2769 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
… …
2775 refresh_limit++; 2799 refresh_limit++;
2776 else 2800 else
2777 { 2801 {
2778 flag = true; 2802 flag = true;
2779 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2780 flush_ev.stop (); 2804 want_refresh = 1;
2781 } 2805 }
2782 } 2806 }
2783 2807
2784 } 2808 }
2785 else 2809 else
… …
2800 } 2824 }
2801 2825
2802 return flag; 2826 return flag;
2803} 2827}
2804 2828
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2829// read the next character
2815unicode_t 2830wchar_t
2816rxvt_term::next_char () 2831rxvt_term::next_char ()
2817{ 2832{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2834 {
2820 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2846 break;
2832 } 2847 }
2833 2848
2834 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2835 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
2836 2851
2837 // assume wchar == unicode 2852 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2840 } 2855 }
2841 2856
2842 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;
2843} 2867}
2844 2868
2845/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2846/* 2870/*
2847 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2848 * to the command. 2872 * to the command.
2849 */ 2873 */
2850unicode_t 2874wchar_t
2851rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2852{ 2876{
2853 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2854 2878
2855 if (c == NOCHAR) 2879 if (c == NOCHAR)
2856 throw out_of_input; 2880 throw out_of_input;
2857 2881
2858 return c; 2882 return c;
2859} 2883}
2860 2884
2861unicode_t 2885uint32_t
2862rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2863{ 2887{
2864 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2865 2889
2866 if (c == NOCHAR) 2890 if (c == NOCHAR)
2867 throw out_of_input; 2891 throw out_of_input;
2868 2892
2869 return c; 2893 return c;
… …
3136 break; 3160 break;
3137 3161
3138 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3140 { 3164 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3167 }
3144 break; 3168 break;
3145 3169
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
… …
3811 { 3835 {
3812 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3837 break;
3814 3838
3815 *name++ = '\0'; 3839 *name++ = '\0';
3816 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3817 3841
3818 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3843 break;
3820 3844
3821 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3846 *buf++ = '\0';
3823 3847
3824 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3825 { 3849 {
3826 unsigned short r, g, b; 3850 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3828 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);
3829 } 3853 }
3830 else 3854 else
3831 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3832 } 3856 }
3833 break; 3857 break;
3834 case XTerm_Color00: 3858 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3860 break;
3837 case XTerm_Color01: 3861 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3863 break;
3840#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3867 break;
… …
3847 break; 3871 break;
3848 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3849 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);
3850 break; 3874 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3859 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);
3860 break; 3886 break;
3861 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3889 break;
3864#endif 3890#endif
… …
3869 if (am_transparent) 3895 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3871 break; 3897 break;
3872#endif 3898#endif
3873 3899
3874 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3875 if (*str != ';') 3901 if (*str != ';')
3876 { 3902 {
3877#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3906 scr_touch (true);
3907#endif
3882 } 3908 }
3909
3883 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3884 { 3911 {
3885 str++; 3912 str++;
3886#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
… …
3890 3917
3891 if (changed) 3918 if (changed)
3892 { 3919 {
3893#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3921 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3922 scr_touch (true);
3923#endif
3897 } 3924 }
3898 break; 3925 break;
3899 3926
3900 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3902 break; 3929 break;
3903 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3905 break; 3932 break;
3906 3933
3907 case XTerm_logfile: 3934 case XTerm_logfile:
3908 // TODO, when secure mode? 3935 // TODO, when secure mode?
3909 break; 3936 break;
3910 3937
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3938#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3919 { 3940 {
3920 int fd; 3941 int fd;
3921 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)
3922 { 3943 {
3923 scr_dump (fd); 3944 scr_dump (fd);
… …
3975 break; 3996 break;
3976#endif 3997#endif
3977 3998
3978#if ENABLE_PERL 3999#if ENABLE_PERL
3979 case URxvt_perl: 4000 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3981 ; // no responses yet 4002 ; // no responses yet
3982 break; 4003 break;
3983#endif 4004#endif
3984 } 4005 }
3985} 4006}
… …
4038 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4064 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4068#endif
… …
4097 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4116 switch (arg[i])
4099 { 4117 {
4100#if ENABLE_STYLES 4118#if ENABLE_STYLES
4101 case 1021: 4119 case 1021:
4102 if (mode) 4120 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4121
4107 scr_touch (true); 4122 scr_touch (true);
4108 break; 4123 break;
4109#endif 4124#endif
4110 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4150 break;
4136 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4137 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4153 break;
4142 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4144 break; 4156 break;
4145 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
… …
4151 /* 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 */
4152 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4167 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4164 case scrollBar_esc: 4169 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4166 { 4171 {
4167 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
… …
4186#if 0 4191#if 0
4187 case 1001: 4192 case 1001:
4188 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4189#endif 4194#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4197 break;
4196 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4197 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4200 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4204 scr_erase_screen (2);
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4415
4417void 4416void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 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
4420 if (v_buflen == 0) 4425 if (v_buflen == 0)
4421 { 4426 {
4422 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));
4423 4428
4424 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)

Diff Legend

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