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.224 by root, Sun Jan 1 06:18:20 2006 UTC vs.
Revision 1.251 by root, Sun Jan 8 07:55:36 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"
52 53
53#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
54# include <sched.h> 56//# include <sched.h>
55#endif 57#endif
56 58
57#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 60# include "keyboard.h"
59#endif 61#endif
… …
266 mb[0] = ch[0]; 268 mb[0] = ch[0];
267 len = 1; 269 len = 1;
268 } 270 }
269 271
270 if (len > 0) 272 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
272 else 274 else
273 scr_bell (); 275 scr_bell ();
274 } 276 }
275 277
276 iso14755buf = 0; 278 iso14755buf = 0;
… …
304 KeySym keysym; 306 KeySym keysym;
305#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
306 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
307#endif 309#endif
308 int valid_keysym; 310 int valid_keysym;
309 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
310 312
311 /* 313 /*
312 * 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
313 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
314 * 316 *
… …
332 Status status_return; 334 Status status_return;
333 335
334#if 0 336#if 0
335#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
336 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
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
339 else 341 else
340#endif 342#endif
341#endif 343#endif
342 { 344 {
… …
379 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
380 } 382 }
381 else 383 else
382#endif 384#endif
383 { 385 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
386 } 388 }
387 389
388 if (valid_keysym) 390 if (valid_keysym)
389 { 391 {
… …
853 { 855 {
854#ifdef META8_OPTION 856#ifdef META8_OPTION
855 /* set 8-bit on */ 857 /* set 8-bit on */
856 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
857 { 859 {
858 unsigned char *ch; 860 char *ch;
859 861
860 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80; 863 *ch |= 0x80;
862 864
863 meta = 0; 865 meta = 0;
864 } 866 }
865#endif 867#endif
866 /* nil */ ; 868 /* nil */ ;
867 } 869 }
868 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
869 874
870 if (len <= 0) 875 if (len <= 0)
871 return; /* not mapped */ 876 return; /* not mapped */
872 877
873 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
896#ifdef META8_OPTION 901#ifdef META8_OPTION
897 && meta_char == C0_ESC 902 && meta_char == C0_ESC
898#endif 903#endif
899 ) 904 )
900 { 905 {
901 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
902 tt_write (&ch, 1); 907 tt_write (&ch, 1);
903 } 908 }
904 909
905#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
906 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
918 923
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
922unsigned int 927unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 929{
925 unsigned int n, s; 930 unsigned int n, s;
926 931
927 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
965 } 970 }
966#endif 971#endif
967 972
968 if (want_refresh) 973 if (want_refresh)
969 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (l->f & LINE_FILTERED)
993 row++;
994 else
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (++row);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (++row < end_row);
1013 }
1014
970 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
971 scrollbar_show (1); 1016 scrollbar_show (1);
972#ifdef USE_XIM 1017#ifdef USE_XIM
973 IMSendSpot (); 1018 IMSendSpot ();
974#endif 1019#endif
… …
984 SET_LOCALE (locale); 1029 SET_LOCALE (locale);
985 1030
986 display->flush (); 1031 display->flush ();
987 1032
988 if (want_refresh && !flush_ev.active) 1033 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01); 1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
990} 1035}
991 1036
992void 1037void
993rxvt_term::flush_cb (time_watcher &w) 1038rxvt_term::flush_cb (time_watcher &w)
994{ 1039{
… …
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 } 1115 }
1071} 1116}
1072#endif 1117#endif
1073 1118
1119#if HAVE_SCHED_YIELD
1120static struct event_handler
1121{
1122 check_watcher cw_yield;
1123
1124 void yield (check_watcher &w)
1125 {
1126 sched_yield ();
1127 w.stop ();
1128 }
1129
1130 event_handler ()
1131 : cw_yield (this, &event_handler::yield)
1132 {
1133 }
1134} event_handler;
1135#endif
1136
1074bool 1137bool
1075rxvt_term::pty_fill () 1138rxvt_term::pty_fill ()
1076{ 1139{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1141
1079 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1080 { 1143 {
1081 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1082 n = 0; 1145 n = 0;
1083 } 1146 }
1084 1147
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
… …
1094 return true; 1157 return true;
1095 } 1158 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1160 {
1098#if HAVE_SCHED_YIELD 1161#if HAVE_SCHED_YIELD
1099 sched_yield (); 1162 if (display->is_local)
1163 event_handler.cw_yield.start ();
1100#endif 1164#endif
1101 } 1165 }
1102 else 1166 else
1103 { 1167 {
1104 pty_ev.stop (); 1168 pty_ev.stop ();
… …
1142 1206
1143#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1144void 1208void
1145rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1146{ 1210{
1147 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1148 return; 1212 return;
1149 1213
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1151 XFlush (display->display); 1215 XFlush (display->display);
1152 1216
… …
1248{ 1312{
1249 dDisp; 1313 dDisp;
1250 1314
1251 SET_R (this); 1315 SET_R (this);
1252 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1253
1254#if defined(CURSOR_BLINK)
1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1256 {
1257 if (hidden_cursor)
1258 {
1259 hidden_cursor = 0;
1260 want_refresh = 1;
1261 }
1262
1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1264 }
1265#endif
1266
1267#if defined(POINTER_BLANK)
1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1269 {
1270 if (ev.type == MotionNotify
1271 || ev.type == ButtonPress
1272 || ev.type == ButtonRelease)
1273 if (hidden_pointer)
1274 pointer_unblank ();
1275
1276 if (ev.type == KeyPress && hidden_pointer == 0)
1277 pointer_blank ();
1278 }
1279#endif
1280 1317
1281 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1282 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1283 unsigned int unused_mask; 1320 unsigned int unused_mask;
1284 1321
… …
1315 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((ks >= 0x40 && ks <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (ks >= 0x61 && ks <= 0x7f)))
1317 { 1354 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1319 commit_iso14755 (); 1356 commit_iso14755 ();
1320 return; // case-break; 1357 goto skip_switch;
1321 } 1358 }
1322 1359
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks) 1361 if (i[0] == ks)
1325 { 1362 {
1326 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 (); 1364 commit_iso14755 ();
1328 return; // case-break; 1365 goto skip_switch;
1329 } 1366 }
1330 1367
1331 scr_bell (); 1368 scr_bell ();
1332# endif 1369# endif
1333 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1351# endif 1388# endif
1352 else 1389 else
1353 iso14755buf = 0; 1390 iso14755buf = 0;
1354 } 1391 }
1355#endif 1392#endif
1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1396 break;
1356 1397
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1495 1536
1496 case SelectionRequest: 1537 case SelectionRequest:
1497 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1498 break; 1539 break;
1499 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1500 case UnmapNotify: 1549 case UnmapNotify:
1501 mapped = 0; 1550 mapped = 0;
1502#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1503 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1504#endif 1553#endif
1505 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 break; 1555 break;
1513 1556
1514#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1515 case ReparentNotify: 1558 case ReparentNotify:
1516 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1619 break;
1577 1620
1578 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1579 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1626 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1628 ;
1584 1629
1585 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1671 refresh_limit = 0; 1716 refresh_limit = 0;
1672 scrollbar_show (1); 1717 scrollbar_show (1);
1673 } 1718 }
1674 break; 1719 break;
1675 } 1720 }
1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1676} 1750}
1677 1751
1678void 1752void
1679rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1680{ 1754{
1681 if (!focus) 1755 if (!focus)
1682 { 1756 {
1683 focus = 1; 1757 focus = 1;
1684 want_refresh = 1; 1758 want_refresh = 1;
1759
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1685#if USE_XIM 1762#if USE_XIM
1686 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1687 { 1764 {
1688 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1766 XSetICFocus (Input_Context);
… …
1709 if (focus) 1786 if (focus)
1710 { 1787 {
1711 focus = 0; 1788 focus = 0;
1712 want_refresh = 1; 1789 want_refresh = 1;
1713 1790
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1792
1714#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf)
1795 {
1715 iso14755buf = 0; 1796 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1797# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1798 scr_overlay_off ();
1799# endif
1800 }
1719#endif 1801#endif
1720#if USE_XIM 1802#if USE_XIM
1721 if (Input_Context != NULL) 1803 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1804 XUnsetICFocus (Input_Context);
1723#endif 1805#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1768{ 1850{
1769 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1770 1852
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1772 if (!bypass_keystate) 1855 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1857
1775 /* 1858 /*
1776 * VT window processing of button press 1859 * VT window processing of button press
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1798 { 1881 {
1799 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1800 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1801 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1802 { 1886 {
1803 /* only report double clicks */ 1887 /* only report double clicks */
1804 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1805 mouse_report (ev); 1889 mouse_report (ev);
… …
1825 else 1909 else
1826 { 1910 {
1827 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1829 1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1915 switch (ev.button)
1831 { 1916 {
1832 case Button1: 1917 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1922#else
1838 selection.rect = false; 1923 selection.rect = false;
1839#endif 1924#endif
1840 1925
1841 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1928 {
1844 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1846 else 1931 else
1847 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1848 } 1933 }
1849 else 1934 else
1850 { 1935 {
1851 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1937 MEvent.clicks++;
1853 else 1938 else
1854 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1855 1940
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1942 }
1858 1943
1859 MEvent.button = Button1; 1944 MEvent.button = Button1;
1860 break; 1945 break;
1861 1946
1862 case Button3: 1947 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1865 else 1950 else
1866 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1867 1952
1868 MEvent.button = Button3; 1953 MEvent.button = Button3;
1869 break; 1954 break;
1870 } 1955 }
1871 } 1956 }
1872 1957
1873 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1874 return; 1959 return;
1875 } 1960 }
1876 1961
… …
2012 } 2097 }
2013 2098
2014 break; 2099 break;
2015 } 2100 }
2016 } 2101 }
2102
2017 return; 2103 return;
2018 } 2104 }
2105
2019#if MENUBAR 2106#if MENUBAR
2020 /* 2107 /*
2021 * Menubar window processing of button press 2108 * Menubar window processing of button press
2022 */ 2109 */
2023 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2085 */ 2172 */
2086 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2174 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2090 2180
2091 switch (ev.button) 2181 switch (ev.button)
2092 { 2182 {
2093 case Button1: 2183 case Button1:
2094 case Button3: 2184 case Button3:
… …
2639 2729
2640bool 2730bool
2641rxvt_term::cmd_parse () 2731rxvt_term::cmd_parse ()
2642{ 2732{
2643 bool flag = false; 2733 bool flag = false;
2644 unicode_t ch = NOCHAR; 2734 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2735 char *seq_begin; // remember start of esc-sequence here
2646 2736
2647 for (;;) 2737 for (;;)
2648 { 2738 {
2649 if (ch == NOCHAR) 2739 if (ch == NOCHAR)
2650 { 2740 {
2651 seq_begin = cmdbuf_ptr; 2741 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2742 ch = next_char ();
2653 }
2654 2743
2655 if (ch == NOCHAR) // TODO: improve 2744 if (ch == NOCHAR)
2656 break; 2745 break;
2746 }
2657 2747
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2748 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2749 {
2660 if (!seen_input) 2750 if (!seen_input)
2661 { 2751 {
… …
2670 if (seen_resize && cmd_pid) 2760 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2761 kill (-cmd_pid, SIGWINCH);
2672 } 2762 }
2673 2763
2674 /* Read a text string from the input buffer */ 2764 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2765 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2766 bool refreshnow = false;
2677 int nlines = 0; 2767 int nlines = 0;
2678 unicode_t *str = buf; 2768 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2769 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2770
2681 for (;;) 2771 for (;;)
2682 { 2772 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2773 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2684 break; 2774 break;
… …
2694 2784
2695 if (!OPTION (Opt_jumpScroll) 2785 if (!OPTION (Opt_jumpScroll)
2696 || (refresh_count >= refresh_limit * (nrow - 1))) 2786 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2787 {
2698 refreshnow = true; 2788 refreshnow = true;
2789 refresh_count = 0;
2699 ch = NOCHAR; 2790 ch = NOCHAR;
2700 break; 2791 break;
2701 } 2792 }
2702 2793
2703 // scr_add_lines only works for nlines <= nrow - 1. 2794 // scr_add_lines only works for nlines <= nrow - 1.
2704 if (nlines >= nrow - 1) 2795 if (nlines >= nrow - 1)
2705 { 2796 {
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2706 scr_add_lines (buf, nlines, str - buf); 2798 scr_add_lines (buf, str - buf, nlines);
2799
2707 nlines = 0; 2800 nlines = 0;
2708 str = buf; 2801 str = buf;
2709 eol = str + min (ncol, UBUFSIZ); 2802 eol = str + min (ncol, UBUFSIZ);
2710 } 2803 }
2711 2804
… …
2724 2817
2725 seq_begin = cmdbuf_ptr; 2818 seq_begin = cmdbuf_ptr;
2726 ch = next_char (); 2819 ch = next_char ();
2727 } 2820 }
2728 2821
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2729 scr_add_lines (buf, nlines, str - buf); 2823 scr_add_lines (buf, str - buf, nlines);
2730 2824
2731 /* 2825 /*
2732 * If there have been a lot of new lines, then update the screen 2826 * If there have been a lot of new lines, then update the screen
2733 * What the heck I'll cheat and only refresh less than every page-full. 2827 * What the heck I'll cheat and only refresh less than every page-full.
2734 * the number of pages between refreshes is refresh_limit, which 2828 * the number of pages between refreshes is refresh_limit, which
… …
2740 refresh_limit++; 2834 refresh_limit++;
2741 else 2835 else
2742 { 2836 {
2743 flag = true; 2837 flag = true;
2744 scr_refresh (refresh_type); 2838 scr_refresh (refresh_type);
2839 flush_ev.stop ();
2745 } 2840 }
2746 } 2841 }
2747 2842
2748 } 2843 }
2749 else 2844 else
… …
2764 } 2859 }
2765 2860
2766 return flag; 2861 return flag;
2767} 2862}
2768 2863
2769// read the next octet
2770unicode_t
2771rxvt_term::next_octet ()
2772{
2773 return cmdbuf_ptr < cmdbuf_endp
2774 ? *cmdbuf_ptr++
2775 : NOCHAR;
2776}
2777
2778// read the next character 2864// read the next character
2779unicode_t 2865wchar_t
2780rxvt_term::next_char () 2866rxvt_term::next_char ()
2781{ 2867{
2782 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2783 { 2869 {
2784 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
2785 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2786 return *cmdbuf_ptr++; 2872 return *cmdbuf_ptr++;
2787 2873
2788 wchar_t wc; 2874 wchar_t wc;
2789 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2790 2876
2791 if (len == (size_t)-2) 2877 if (len == (size_t)-2)
2792 { 2878 {
2793 // the mbstate stores incomplete sequences. didn't know this :/ 2879 // the mbstate stores incomplete sequences. didn't know this :/
2794 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
2795 break; 2881 break;
2796 } 2882 }
2797 2883
2798 if (len == (size_t)-1) 2884 if (len == (size_t)-1)
2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2885 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2800 2886
2801 // assume wchar == unicode 2887 // assume wchar == unicode
2802 cmdbuf_ptr += len; 2888 cmdbuf_ptr += len;
2803 return wc & UNICODE_MASK; 2889 return wc & UNICODE_MASK;
2804 } 2890 }
2805 2891
2806 return NOCHAR; 2892 return NOCHAR;
2893}
2894
2895// read the next octet
2896uint32_t
2897rxvt_term::next_octet ()
2898{
2899 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR;
2807} 2902}
2808 2903
2809/* rxvt_cmd_getc () - Return next input character */ 2904/* rxvt_cmd_getc () - Return next input character */
2810/* 2905/*
2811 * Return the next input character after first passing any keyboard input 2906 * Return the next input character after first passing any keyboard input
2812 * to the command. 2907 * to the command.
2813 */ 2908 */
2814unicode_t 2909wchar_t
2815rxvt_term::cmd_getc () 2910rxvt_term::cmd_getc ()
2816{ 2911{
2817 unicode_t c = next_char (); 2912 wchar_t c = next_char ();
2818 2913
2819 if (c == NOCHAR) 2914 if (c == NOCHAR)
2820 throw out_of_input; 2915 throw out_of_input;
2821 2916
2822 return c; 2917 return c;
2823} 2918}
2824 2919
2825unicode_t 2920uint32_t
2826rxvt_term::cmd_get8 () 2921rxvt_term::cmd_get8 ()
2827{ 2922{
2828 unicode_t c = next_octet (); 2923 uint32_t c = next_octet ();
2829 2924
2830 if (c == NOCHAR) 2925 if (c == NOCHAR)
2831 throw out_of_input; 2926 throw out_of_input;
2832 2927
2833 return c; 2928 return c;
… …
2933 case C0_ESC: 3028 case C0_ESC:
2934 process_escape_seq (); 3029 process_escape_seq ();
2935 break; 3030 break;
2936 case C0_ENQ: /* terminal Status */ 3031 case C0_ENQ: /* terminal Status */
2937 if (rs[Rs_answerbackstring]) 3032 if (rs[Rs_answerbackstring])
2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3033 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2940 else 3034 else
2941 tt_write ((unsigned char *)VT100_ANS, 3035 tt_write (VT100_ANS, strlen (VT100_ANS));
2942 (unsigned int)strlen (VT100_ANS));
2943 break; 3036 break;
2944 case C0_BEL: /* bell */ 3037 case C0_BEL: /* bell */
2945 scr_bell (); 3038 scr_bell ();
2946 break; 3039 break;
2947 case C0_BS: /* backspace */ 3040 case C0_BS: /* backspace */
… …
3102 break; 3195 break;
3103 3196
3104 /* 8.3.87: NEXT LINE */ 3197 /* 8.3.87: NEXT LINE */
3105 case C1_NEL: /* ESC E */ 3198 case C1_NEL: /* ESC E */
3106 { 3199 {
3107 unicode_t nlcr[] = { C0_LF, C0_CR }; 3200 wchar_t nlcr[] = { C0_LF, C0_CR };
3108 scr_add_lines (nlcr, 1, 2); 3201 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3109 } 3202 }
3110 break; 3203 break;
3111 3204
3112 /* kidnapped escape sequence: Should be 8.3.48 */ 3205 /* kidnapped escape sequence: Should be 8.3.48 */
3113 case C1_ESA: /* ESC G */ 3206 case C1_ESA: /* ESC G */
… …
3135 process_dcs_seq (); 3228 process_dcs_seq ();
3136 break; 3229 break;
3137 3230
3138 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3231 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3139 case C1_SCI: /* ESC Z */ 3232 case C1_SCI: /* ESC Z */
3140 tt_write ((const unsigned char *)ESCZ_ANSWER, 3233 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3141 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3142 break; /* steal obsolete ESC [ c */ 3234 break; /* steal obsolete ESC [ c */
3143 3235
3144 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3236 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3145 case C1_CSI: /* ESC [ */ 3237 case C1_CSI: /* ESC [ */
3146 process_csi_seq (); 3238 process_csi_seq ();
… …
3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3482 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3483 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3392 break; 3484 break;
3393 3485
3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3486 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3395 tt_write ((const unsigned char *)VT100_ANS, 3487 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3396 (unsigned int) (sizeof (VT100_ANS) - 1));
3397 break; 3488 break;
3398 3489
3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3490 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3400 process_sgr_mode (nargs, arg); 3491 process_sgr_mode (nargs, arg);
3401 break; 3492 break;
… …
3603/*----------------------------------------------------------------------*/ 3694/*----------------------------------------------------------------------*/
3604/* 3695/*
3605 * get input up until STRING TERMINATOR (or BEL) 3696 * get input up until STRING TERMINATOR (or BEL)
3606 * ends_how is terminator used. returned input must be free()'d 3697 * ends_how is terminator used. returned input must be free()'d
3607 */ 3698 */
3608unsigned char * 3699char *
3609rxvt_term::get_to_st (unicode_t &ends_how) 3700rxvt_term::get_to_st (unicode_t &ends_how)
3610{ 3701{
3611 unicode_t ch; 3702 unicode_t ch;
3612 bool seen_esc = false; 3703 bool seen_esc = false;
3613 unsigned int n = 0; 3704 unsigned int n = 0;
… …
3646 3737
3647 string[n++] = '\0'; 3738 string[n++] = '\0';
3648 3739
3649 ends_how = (ch == 0x5c ? C0_ESC : ch); 3740 ends_how = (ch == 0x5c ? C0_ESC : ch);
3650 3741
3651 return (unsigned char *)rxvt_wcstombs (string); 3742 return rxvt_wcstombs (string);
3652} 3743}
3653 3744
3654/*----------------------------------------------------------------------*/ 3745/*----------------------------------------------------------------------*/
3655/* 3746/*
3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3747 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3657 */ 3748 */
3658void 3749void
3659rxvt_term::process_dcs_seq () 3750rxvt_term::process_dcs_seq ()
3660{ 3751{
3661 unsigned char *s; 3752 char *s;
3662 unicode_t eh; 3753 unicode_t eh;
3663 3754
3664 /* 3755 /*
3665 * Not handled yet 3756 * Not handled yet
3666 */ 3757 */
… …
3685 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3776 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3686 arg = arg * 10 + (ch - '0'); 3777 arg = arg * 10 + (ch - '0');
3687 3778
3688 if (ch == ';') 3779 if (ch == ';')
3689 { 3780 {
3690 unsigned char *s = get_to_st (eh); 3781 char *s = get_to_st (eh);
3691 3782
3692 if (s) 3783 if (s)
3693 { 3784 {
3694 process_xterm_seq (arg, (char *)s, eh); 3785 process_xterm_seq (arg, s, eh);
3695 free (s); 3786 free (s);
3696 } 3787 }
3697 } 3788 }
3698} 3789}
3699 3790
3700void 3791void
3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3792rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3702{ 3793{
3703 if (str[0] == '?' && !str[1]) 3794 if (str[0] == '?' && !str[1])
3704 { 3795 {
3705 unsigned short r, g, b; 3796 unsigned short r, g, b;
3706 pix_colors_focused[color].get (display, r, g, b); 3797 pix_colors_focused[color].get (display, r, g, b);
… …
3712 3803
3713/* 3804/*
3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3715 */ 3806 */
3716void 3807void
3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3808rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3718{ 3809{
3719 int changed = 0; 3810 int changed = 0;
3720 int color; 3811 int color;
3721 char *buf, *name; 3812 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3813 bool query = str[0] == '?' && !str[1];
… …
3929 } 4020 }
3930 break; 4021 break;
3931 4022
3932 case URxvt_view_up: 4023 case URxvt_view_up:
3933 case URxvt_view_down: 4024 case URxvt_view_down:
4025 {
3934 int lines = atoi (str); 4026 int lines = atoi (str);
3935 4027
3936 if (lines) 4028 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines); 4029 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else 4030 else
3939 {
3940 scr_erase_savelines (); 4031 scr_erase_savelines ();
3941 } 4032 }
3942 4033
4034 break;
4035#endif
4036
4037#if ENABLE_PERL
4038 case URxvt_perl:
4039 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4040 ; // no responses yet
3943 break; 4041 break;
3944#endif 4042#endif
3945 } 4043 }
3946} 4044}
3947/*----------------------------------------------------------------------*/ 4045/*----------------------------------------------------------------------*/
… …
4058 /* extra handling for values with state unkept */ 4156 /* extra handling for values with state unkept */
4059 switch (arg[i]) 4157 switch (arg[i])
4060 { 4158 {
4061#if ENABLE_STYLES 4159#if ENABLE_STYLES
4062 case 1021: 4160 case 1021:
4063 if (mode) 4161 set_option (Opt_intensityStyles, mode);
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067 4162
4068 want_refresh = 1; 4163 scr_touch (true);
4069 want_full_refresh = 1;
4070 break; 4164 break;
4071#endif 4165#endif
4072 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4073 case 1049: 4167 case 1049:
4074 if (OPTION (Opt_secondaryScreen)) 4168 if (OPTION (Opt_secondaryScreen))
… …
4094 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4095 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4096 set_widthheight (((state ? 132 : 80) * fwidth), height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4097 break; 4191 break;
4098 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4099 if (!state) 4193 set_option (Opt_jumpScroll, !state);
4100 SET_OPTION (Opt_jumpScroll);
4101 else
4102 CLR_OPTION (Opt_jumpScroll);
4103 break; 4194 break;
4104 case 5: /* reverse video */ 4195 case 5: /* reverse video */
4105 scr_rvideo_mode (state); 4196 scr_rvideo_mode (state);
4106 break; 4197 break;
4107 case 6: /* relative/absolute origins */ 4198 case 6: /* relative/absolute origins */
… …
4148#if 0 4239#if 0
4149 case 1001: 4240 case 1001:
4150 break; /* X11 mouse highlighting */ 4241 break; /* X11 mouse highlighting */
4151#endif 4242#endif
4152 case 1010: /* scroll to bottom on TTY output inhibit */ 4243 case 1010: /* scroll to bottom on TTY output inhibit */
4153 if (!state) 4244 set_option (Opt_scrollTtyOutput, !state);
4154 SET_OPTION (Opt_scrollTtyOutput);
4155 else
4156 CLR_OPTION (Opt_scrollTtyOutput);
4157 break; 4245 break;
4158 case 1011: /* scroll to bottom on key press */ 4246 case 1011: /* scroll to bottom on key press */
4159 if (state) 4247 set_option (Opt_scrollTtyKeypress, state);
4160 SET_OPTION (Opt_scrollTtyKeypress);
4161 else
4162 CLR_OPTION (Opt_scrollTtyKeypress);
4163 break; 4248 break;
4164 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4165 if (OPTION (Opt_secondaryScreen)) 4250 if (OPTION (Opt_secondaryScreen))
4166 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4167 scr_erase_screen (2); 4252 scr_erase_screen (2);
… …
4305 scr_color (Color_bg, Color_bg); 4390 scr_color (Color_bg, Color_bg);
4306 break; 4391 break;
4307 4392
4308 //case 50: // not variable spacing 4393 //case 50: // not variable spacing
4309 4394
4310#ifndef NO_BRIGHTCOLOR 4395#if ENABLE_FRILLS
4311 case 90: 4396 case 90:
4312 case 91: /* set bright fg color */ 4397 case 91: /* set bright fg color */
4313 case 92: 4398 case 92:
4314 case 93: 4399 case 93:
4315 case 94: 4400 case 94:
… …
4360 */ 4445 */
4361void 4446void
4362rxvt_term::tt_printf (const char *fmt,...) 4447rxvt_term::tt_printf (const char *fmt,...)
4363{ 4448{
4364 va_list arg_ptr; 4449 va_list arg_ptr;
4365 unsigned char buf[256]; 4450 char buf[256];
4366 4451
4367 va_start (arg_ptr, fmt); 4452 va_start (arg_ptr, fmt);
4368 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4453 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4369 va_end (arg_ptr); 4454 va_end (arg_ptr);
4370 tt_write (buf, strlen (buf)); 4455 tt_write (buf, strlen (buf));
… …
4375 * or generated by us in response to a query ESC sequence. 4460 * or generated by us in response to a query ESC sequence.
4376 */ 4461 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378 4463
4379void 4464void
4380rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4381{ 4466{
4467 if (pty.pty < 0)
4468 return;
4469
4382 if (v_buflen == 0) 4470 if (v_buflen == 0)
4383 { 4471 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4385 4473
4386 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4388 4476
4389 data += written; 4477 data += written;
4390 len -= written; 4478 len -= written;
4391 } 4479 }
4392 4480
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4394 4482
4395 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len; 4484 v_buflen += len;
4397 4485
4398 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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