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.222 by root, Sat Dec 31 19:35:56 2005 UTC vs.
Revision 1.250 by root, Sun Jan 8 06:35:23 2006 UTC

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

Diff Legend

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