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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13:56 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
267 mb[0] = ch[0]; 268 mb[0] = ch[0];
268 len = 1; 269 len = 1;
269 } 270 }
270 271
271 if (len > 0) 272 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
273 else 274 else
274 scr_bell (); 275 scr_bell ();
275 } 276 }
276 277
277 iso14755buf = 0; 278 iso14755buf = 0;
… …
305 KeySym keysym; 306 KeySym keysym;
306#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
308#endif 309#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * 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
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 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
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
923unsigned int 927unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 929{
926 unsigned int n, s; 930 unsigned int n, s;
927 931
928 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 970 }
967#endif 971#endif
968 972
969 if (want_refresh) 973 if (want_refresh)
970 { 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
971 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
972 scrollbar_show (1); 1016 scrollbar_show (1);
973#ifdef USE_XIM 1017#ifdef USE_XIM
974 IMSendSpot (); 1018 IMSendSpot ();
975#endif 1019#endif
… …
1095{ 1139{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1141
1098 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1099 { 1143 {
1100 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");
1101 n = 0; 1145 n = 0;
1102 } 1146 }
1103 1147
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
… …
1162 1206
1163#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1164void 1208void
1165rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1166{ 1210{
1167 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1168 return; 1212 return;
1169 1213
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1215 XFlush (display->display);
1172 1216
… …
1269 dDisp; 1313 dDisp;
1270 1314
1271 SET_R (this); 1315 SET_R (this);
1272 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1273 1317
1274#if defined(CURSOR_BLINK)
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1276 {
1277 if (hidden_cursor)
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1320 unsigned int unused_mask;
1304 1321
1305 switch (ev.type) 1322 switch (ev.type)
… …
1312 1329
1313 break; 1330 break;
1314 1331
1315 case KeyRelease: 1332 case KeyRelease:
1316 { 1333 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1335 KeySym keysym;
1319 1336
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1338#endif
1322 1339
1323#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1341 // ISO 14755 support
1325 if (iso14755buf) 1342 if (iso14755buf)
… …
1330# endif 1347# endif
1331# if ISO_14755 1348# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1333 // first: controls 1350 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1354 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1356 commit_iso14755 ();
1340 return; // case-break; 1357 goto skip_switch;
1341 } 1358 }
1342 1359
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1361 if (i[0] == keysym)
1345 { 1362 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1364 commit_iso14755 ();
1348 return; // case-break; 1365 goto skip_switch;
1349 } 1366 }
1350 1367
1351 scr_bell (); 1368 scr_bell ();
1352# endif 1369# endif
1353 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1372 else 1389 else
1373 iso14755buf = 0; 1390 iso14755buf = 0;
1374 } 1391 }
1375#endif 1392#endif
1376 1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1382#endif 1403#endif
1383 break; 1404 break;
1384 } 1405 }
1385 1406
… …
1515 1536
1516 case SelectionRequest: 1537 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1518 break; 1539 break;
1519 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
1520 case UnmapNotify: 1549 case UnmapNotify:
1521 mapped = 0; 1550 mapped = 0;
1522#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1524#endif 1553#endif
1525 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1555 break;
1533 1556
1534#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1535 case ReparentNotify: 1558 case ReparentNotify:
1536 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1550 1573
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, False);
1554 1577
1555 scr_refresh (refresh_type); 1578 want_refresh = 1;
1556 } 1579 }
1557 else 1580 else
1558 { 1581 {
1559 XEvent unused_event; 1582 XEvent unused_event;
1560 1583
… …
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1619 break;
1597 1620
1598 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1599 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1626 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1628 ;
1604 1629
1605 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1685 &unused_root_x, &unused_root_y, 1710 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1711 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1712 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1714 scrollbar_size ());
1690 scr_refresh (refresh_type); 1715 want_refresh = 1;
1691 refresh_limit = 0; 1716 refresh_limit = 0;
1692 scrollbar_show (1); 1717 scrollbar_show (1);
1693 } 1718 }
1694 break; 1719 break;
1695 } 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
1696} 1750}
1697 1751
1698void 1752void
1699rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1700{ 1754{
1701 if (!focus) 1755 if (!focus)
1702 { 1756 {
1703 focus = 1; 1757 focus = 1;
1704 want_refresh = 1; 1758 want_refresh = 1;
1705 1759
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1761
1708#if USE_XIM 1762#if USE_XIM
1709 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1710 { 1764 {
1711 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
… …
1732 if (focus) 1786 if (focus)
1733 { 1787 {
1734 focus = 0; 1788 focus = 0;
1735 want_refresh = 1; 1789 want_refresh = 1;
1736 1790
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1792
1739#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1794 if (iso14755buf)
1741 { 1795 {
1742 iso14755buf = 0; 1796 iso14755buf = 0;
… …
1795rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1796{ 1850{
1797 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1798 1852
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1800 if (!bypass_keystate) 1855 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1857
1803 /* 1858 /*
1804 * VT window processing of button press 1859 * VT window processing of button press
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1826 { 1881 {
1827 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1828 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1829 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1830 { 1886 {
1831 /* only report double clicks */ 1887 /* only report double clicks */
1832 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1833 mouse_report (ev); 1889 mouse_report (ev);
… …
1853 else 1909 else
1854 { 1910 {
1855 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1856 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1857 1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 switch (ev.button) 1915 switch (ev.button)
1859 { 1916 {
1860 case Button1: 1917 case Button1:
1861 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1863#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1865#else 1922#else
1866 selection.rect = false; 1923 selection.rect = false;
1867#endif 1924#endif
1868 1925
1869 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1871 { 1928 {
1872 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1874 else 1931 else
1875 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1876 } 1933 }
1877 else 1934 else
1878 { 1935 {
1879 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1880 MEvent.clicks++; 1937 MEvent.clicks++;
1881 else 1938 else
1882 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1883 1940
1884 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1885 } 1942 }
1886 1943
1887 MEvent.button = Button1; 1944 MEvent.button = Button1;
1888 break; 1945 break;
1889 1946
1890 case Button3: 1947 case Button3:
1891 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1892 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1893 else 1950 else
1894 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1895 1952
1896 MEvent.button = Button3; 1953 MEvent.button = Button3;
1897 break; 1954 break;
1898 } 1955 }
1899 } 1956 }
1900 1957
1901 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1902 return; 1959 return;
1903 } 1960 }
1904 1961
… …
2040 } 2097 }
2041 2098
2042 break; 2099 break;
2043 } 2100 }
2044 } 2101 }
2102
2045 return; 2103 return;
2046 } 2104 }
2105
2047#if MENUBAR 2106#if MENUBAR
2048 /* 2107 /*
2049 * Menubar window processing of button press 2108 * Menubar window processing of button press
2050 */ 2109 */
2051 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2114 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2115 && bypass_keystate 2174 && bypass_keystate
2116 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2117 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2118 2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2119 switch (ev.button) 2181 switch (ev.button)
2120 { 2182 {
2121 case Button1: 2183 case Button1:
2122 case Button3: 2184 case Button3:
2123 selection_make (ev.time); 2185 selection_make (ev.time);
… …
2154 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2155 } 2217 }
2156 else 2218 else
2157 { 2219 {
2158# endif 2220# endif
2159# ifdef JUMP_MOUSE_WHEEL
2160 scr_page (v, i); 2221 scr_page (v, i);
2161 scr_refresh (SMOOTH_REFRESH);
2162 scrollbar_show (1); 2222 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2172 } 2224 }
2173#endif 2225# endif
2174 } 2226 }
2175 break; 2227 break;
2176#endif 2228#endif
2177 } 2229 }
2178 } 2230 }
… …
2667 2719
2668bool 2720bool
2669rxvt_term::cmd_parse () 2721rxvt_term::cmd_parse ()
2670{ 2722{
2671 bool flag = false; 2723 bool flag = false;
2672 unicode_t ch = NOCHAR; 2724 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2725 char *seq_begin; // remember start of esc-sequence here
2674 2726
2675 for (;;) 2727 for (;;)
2676 { 2728 {
2677 if (ch == NOCHAR) 2729 if (ch == NOCHAR)
2678 { 2730 {
2679 seq_begin = cmdbuf_ptr; 2731 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2732 ch = next_char ();
2681 }
2682 2733
2683 if (ch == NOCHAR) // TODO: improve 2734 if (ch == NOCHAR)
2684 break; 2735 break;
2736 }
2685 2737
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2738 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 { 2739 {
2688 if (!seen_input) 2740 if (!seen_input)
2689 { 2741 {
… …
2698 if (seen_resize && cmd_pid) 2750 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2751 kill (-cmd_pid, SIGWINCH);
2700 } 2752 }
2701 2753
2702 /* Read a text string from the input buffer */ 2754 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2755 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2756 bool refreshnow = false;
2705 int nlines = 0; 2757 int nlines = 0;
2706 unicode_t *str = buf; 2758 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2759 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2760
2709 for (;;) 2761 for (;;)
2710 { 2762 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2763 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break; 2764 break;
… …
2730 } 2782 }
2731 2783
2732 // scr_add_lines only works for nlines <= nrow - 1. 2784 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2785 if (nlines >= nrow - 1)
2734 { 2786 {
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2735 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2789
2736 nlines = 0; 2790 nlines = 0;
2737 str = buf; 2791 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2792 eol = str + min (ncol, UBUFSIZ);
2739 } 2793 }
2740 2794
… …
2753 2807
2754 seq_begin = cmdbuf_ptr; 2808 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2809 ch = next_char ();
2756 } 2810 }
2757 2811
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2758 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2759 2814
2760 /* 2815 /*
2761 * If there have been a lot of new lines, then update the screen 2816 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full. 2817 * What the heck I'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which 2818 * the number of pages between refreshes is refresh_limit, which
… …
2769 refresh_limit++; 2824 refresh_limit++;
2770 else 2825 else
2771 { 2826 {
2772 flag = true; 2827 flag = true;
2773 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2774 flush_ev.stop (); 2829 want_refresh = 1;
2775 } 2830 }
2776 } 2831 }
2777 2832
2778 } 2833 }
2779 else 2834 else
… …
2794 } 2849 }
2795 2850
2796 return flag; 2851 return flag;
2797} 2852}
2798 2853
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2854// read the next character
2809unicode_t 2855wchar_t
2810rxvt_term::next_char () 2856rxvt_term::next_char ()
2811{ 2857{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2859 {
2814 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2817 2863
2818 wchar_t wc; 2864 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2866
2821 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2822 { 2868 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2871 break;
2826 } 2872 }
2827 2873
2828 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830 2876
2831 // assume wchar == unicode 2877 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2879 return wc & UNICODE_MASK;
2834 } 2880 }
2835 2881
2836 return NOCHAR; 2882 return NOCHAR;
2883}
2884
2885// read the next octet
2886uint32_t
2887rxvt_term::next_octet ()
2888{
2889 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR;
2837} 2892}
2838 2893
2839/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2840/* 2895/*
2841 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2842 * to the command. 2897 * to the command.
2843 */ 2898 */
2844unicode_t 2899wchar_t
2845rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2846{ 2901{
2847 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2848 2903
2849 if (c == NOCHAR) 2904 if (c == NOCHAR)
2850 throw out_of_input; 2905 throw out_of_input;
2851 2906
2852 return c; 2907 return c;
2853} 2908}
2854 2909
2855unicode_t 2910uint32_t
2856rxvt_term::cmd_get8 () 2911rxvt_term::cmd_get8 ()
2857{ 2912{
2858 unicode_t c = next_octet (); 2913 uint32_t c = next_octet ();
2859 2914
2860 if (c == NOCHAR) 2915 if (c == NOCHAR)
2861 throw out_of_input; 2916 throw out_of_input;
2862 2917
2863 return c; 2918 return c;
… …
2963 case C0_ESC: 3018 case C0_ESC:
2964 process_escape_seq (); 3019 process_escape_seq ();
2965 break; 3020 break;
2966 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 3024 else
2971 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 3026 break;
2974 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2975 scr_bell (); 3028 scr_bell ();
2976 break; 3029 break;
2977 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
3132 break; 3185 break;
3133 3186
3134 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
3136 { 3189 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 3192 }
3140 break; 3193 break;
3141 3194
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 3218 process_dcs_seq ();
3166 break; 3219 break;
3167 3220
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
3173 3225
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 3228 process_csi_seq ();
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 3474 break;
3423 3475
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 3478 break;
3428 3479
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
3431 break; 3482 break;
… …
3633/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3634/* 3685/*
3635 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3687 * ends_how is terminator used. returned input must be free()'d
3637 */ 3688 */
3638unsigned char * 3689char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3691{
3641 unicode_t ch; 3692 unicode_t ch;
3642 bool seen_esc = false; 3693 bool seen_esc = false;
3643 unsigned int n = 0; 3694 unsigned int n = 0;
… …
3676 3727
3677 string[n++] = '\0'; 3728 string[n++] = '\0';
3678 3729
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3731
3681 return (unsigned char *)rxvt_wcstombs (string); 3732 return rxvt_wcstombs (string);
3682} 3733}
3683 3734
3684/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3685/* 3736/*
3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3687 */ 3738 */
3688void 3739void
3689rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3690{ 3741{
3691 unsigned char *s; 3742 char *s;
3692 unicode_t eh; 3743 unicode_t eh;
3693 3744
3694 /* 3745 /*
3695 * Not handled yet 3746 * Not handled yet
3696 */ 3747 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3717 3768
3718 if (ch == ';') 3769 if (ch == ';')
3719 { 3770 {
3720 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3721 3772
3722 if (s) 3773 if (s)
3723 { 3774 {
3724 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3725 free (s); 3776 free (s);
3726 } 3777 }
3727 } 3778 }
3728} 3779}
3729 3780
3730void 3781void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3732{ 3783{
3733 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3734 { 3785 {
3735 unsigned short r, g, b; 3786 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
… …
3742 3793
3743/* 3794/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3796 */
3746void 3797void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3799{
3749 int changed = 0; 3800 int changed = 0;
3750 int color; 3801 int color;
3751 char *buf, *name; 3802 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
… …
3959 } 4010 }
3960 break; 4011 break;
3961 4012
3962 case URxvt_view_up: 4013 case URxvt_view_up:
3963 case URxvt_view_down: 4014 case URxvt_view_down:
4015 {
3964 int lines = atoi (str); 4016 int lines = atoi (str);
3965 4017
3966 if (lines) 4018 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 4019 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 4020 else
3969 {
3970 scr_erase_savelines (); 4021 scr_erase_savelines ();
3971 } 4022 }
3972 4023
4024 break;
4025#endif
4026
4027#if ENABLE_PERL
4028 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4030 ; // no responses yet
3973 break; 4031 break;
3974#endif 4032#endif
3975 } 4033 }
3976} 4034}
3977/*----------------------------------------------------------------------*/ 4035/*----------------------------------------------------------------------*/
… …
4088 /* extra handling for values with state unkept */ 4146 /* extra handling for values with state unkept */
4089 switch (arg[i]) 4147 switch (arg[i])
4090 { 4148 {
4091#if ENABLE_STYLES 4149#if ENABLE_STYLES
4092 case 1021: 4150 case 1021:
4093 if (mode) 4151 set_option (Opt_intensityStyles, mode);
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097 4152
4098 scr_touch (true); 4153 scr_touch (true);
4099 break; 4154 break;
4100#endif 4155#endif
4101 case 1048: /* alternative cursor save */ 4156 case 1048: /* alternative cursor save */
… …
4123 case 3: /* 80/132 */ 4178 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 4179 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 4180 set_widthheight (((state ? 132 : 80) * fwidth), height);
4126 break; 4181 break;
4127 case 4: /* smooth scrolling */ 4182 case 4: /* smooth scrolling */
4128 if (!state) 4183 set_option (Opt_jumpScroll, !state);
4129 SET_OPTION (Opt_jumpScroll);
4130 else
4131 CLR_OPTION (Opt_jumpScroll);
4132 break; 4184 break;
4133 case 5: /* reverse video */ 4185 case 5: /* reverse video */
4134 scr_rvideo_mode (state); 4186 scr_rvideo_mode (state);
4135 break; 4187 break;
4136 case 6: /* relative/absolute origins */ 4188 case 6: /* relative/absolute origins */
… …
4177#if 0 4229#if 0
4178 case 1001: 4230 case 1001:
4179 break; /* X11 mouse highlighting */ 4231 break; /* X11 mouse highlighting */
4180#endif 4232#endif
4181 case 1010: /* scroll to bottom on TTY output inhibit */ 4233 case 1010: /* scroll to bottom on TTY output inhibit */
4182 if (!state) 4234 set_option (Opt_scrollTtyOutput, !state);
4183 SET_OPTION (Opt_scrollTtyOutput);
4184 else
4185 CLR_OPTION (Opt_scrollTtyOutput);
4186 break; 4235 break;
4187 case 1011: /* scroll to bottom on key press */ 4236 case 1011: /* scroll to bottom on key press */
4188 if (state) 4237 set_option (Opt_scrollTtyKeypress, state);
4189 SET_OPTION (Opt_scrollTtyKeypress);
4190 else
4191 CLR_OPTION (Opt_scrollTtyKeypress);
4192 break; 4238 break;
4193 case 1047: /* secondary screen w/ clearing last */ 4239 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 4240 if (OPTION (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 4241 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 4242 scr_erase_screen (2);
… …
4334 scr_color (Color_bg, Color_bg); 4380 scr_color (Color_bg, Color_bg);
4335 break; 4381 break;
4336 4382
4337 //case 50: // not variable spacing 4383 //case 50: // not variable spacing
4338 4384
4339#ifndef NO_BRIGHTCOLOR 4385#if ENABLE_FRILLS
4340 case 90: 4386 case 90:
4341 case 91: /* set bright fg color */ 4387 case 91: /* set bright fg color */
4342 case 92: 4388 case 92:
4343 case 93: 4389 case 93:
4344 case 94: 4390 case 94:
… …
4389 */ 4435 */
4390void 4436void
4391rxvt_term::tt_printf (const char *fmt,...) 4437rxvt_term::tt_printf (const char *fmt,...)
4392{ 4438{
4393 va_list arg_ptr; 4439 va_list arg_ptr;
4394 unsigned char buf[256]; 4440 char buf[256];
4395 4441
4396 va_start (arg_ptr, fmt); 4442 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4443 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 4444 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 4445 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 4450 * or generated by us in response to a query ESC sequence.
4405 */ 4451 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 4453
4408void 4454void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4455rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 4456{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return;
4459
4460 if (pty.pty < 0)
4461 return;
4462
4411 if (v_buflen == 0) 4463 if (v_buflen == 0)
4412 { 4464 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4414 4466
4415 if ((unsigned int)written == len) 4467 if ((unsigned int)written == len)
… …
4417 4469
4418 data += written; 4470 data += written;
4419 len -= written; 4471 len -= written;
4420 } 4472 }
4421 4473
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 4475
4424 memcpy (v_buffer + v_buflen, data, len); 4476 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 4477 v_buflen += len;
4426 4478
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4479 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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