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.232 by root, Wed Jan 4 01:10:08 2006 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 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.
… …
268 mb[0] = ch[0]; 268 mb[0] = ch[0];
269 len = 1; 269 len = 1;
270 } 270 }
271 271
272 if (len > 0) 272 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
274 else 274 else
275 scr_bell (); 275 scr_bell ();
276 } 276 }
277 277
278 iso14755buf = 0; 278 iso14755buf = 0;
… …
306 KeySym keysym; 306 KeySym keysym;
307#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
309#endif 309#endif
310 int valid_keysym; 310 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
312 312
313 /* 313 /*
314 * 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
315 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
316 * 316 *
… …
334 Status status_return; 334 Status status_return;
335 335
336#if 0 336#if 0
337#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
338 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
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
341 else 341 else
342#endif 342#endif
343#endif 343#endif
344 { 344 {
… …
381 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
382 } 382 }
383 else 383 else
384#endif 384#endif
385 { 385 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
388 } 388 }
389 389
390 if (valid_keysym) 390 if (valid_keysym)
391 { 391 {
… …
855 { 855 {
856#ifdef META8_OPTION 856#ifdef META8_OPTION
857 /* set 8-bit on */ 857 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
859 { 859 {
860 unsigned char *ch; 860 char *ch;
861 861
862 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 863 *ch |= 0x80;
864 864
865 meta = 0; 865 meta = 0;
866 } 866 }
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 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;
871 874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
898#ifdef META8_OPTION 901#ifdef META8_OPTION
899 && meta_char == C0_ESC 902 && meta_char == C0_ESC
900#endif 903#endif
901 ) 904 )
902 { 905 {
903 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
904 tt_write (&ch, 1); 907 tt_write (&ch, 1);
905 } 908 }
906 909
907#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
920 923
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
924unsigned int 927unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 929{
927 unsigned int n, s; 930 unsigned int n, s;
928 931
929 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
967 } 970 }
968#endif 971#endif
969 972
970 if (want_refresh) 973 if (want_refresh)
971 { 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
972 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
973 scrollbar_show (1); 1014 scrollbar_show (1);
974#ifdef USE_XIM 1015#ifdef USE_XIM
975 IMSendSpot (); 1016 IMSendSpot ();
976#endif 1017#endif
… …
1096{ 1137{
1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1098 1139
1099 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1100 { 1141 {
1101 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");
1102 n = 0; 1143 n = 0;
1103 } 1144 }
1104 1145
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
… …
1163 1204
1164#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1165void 1206void
1166rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1167{ 1208{
1168 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1169 return; 1210 return;
1170 1211
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1213 XFlush (display->display);
1173 1214
… …
1270 dDisp; 1311 dDisp;
1271 1312
1272 SET_R (this); 1313 SET_R (this);
1273 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1274 1315
1275#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 { 1318 return;
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1319
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1323 unsigned int unused_mask;
1305 1324
1306 switch (ev.type) 1325 switch (ev.type)
… …
1313 1332
1314 break; 1333 break;
1315 1334
1316 case KeyRelease: 1335 case KeyRelease:
1317 { 1336 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1338 KeySym keysym;
1320 1339
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1341#endif
1323 1342
1324#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1344 // ISO 14755 support
1326 if (iso14755buf) 1345 if (iso14755buf)
… …
1331# endif 1350# endif
1332# if ISO_14755 1351# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1334 // first: controls 1353 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1357 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1359 commit_iso14755 ();
1341 return; // case-break; 1360 goto skip_switch;
1342 } 1361 }
1343 1362
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1364 if (i[0] == keysym)
1346 { 1365 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1367 commit_iso14755 ();
1349 return; // case-break; 1368 goto skip_switch;
1350 } 1369 }
1351 1370
1352 scr_bell (); 1371 scr_bell ();
1353# endif 1372# endif
1354 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1373 else 1392 else
1374 iso14755buf = 0; 1393 iso14755buf = 0;
1375 } 1394 }
1376#endif 1395#endif
1377 1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1383#endif 1406#endif
1384 break; 1407 break;
1385 } 1408 }
1386 1409
… …
1516 1539
1517 case SelectionRequest: 1540 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1519 break; 1542 break;
1520 1543
1544 case MapNotify:
1545 mapped = 1;
1546#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1548#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break;
1551
1521 case UnmapNotify: 1552 case UnmapNotify:
1522 mapped = 0; 1553 mapped = 0;
1523#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1525#endif 1556#endif
1526 break; 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1558 break;
1534 1559
1535#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1536 case ReparentNotify: 1561 case ReparentNotify:
1537 rootwin_cb (ev); 1562 rootwin_cb (ev);
… …
1551 1576
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1555 1580
1556 scr_refresh (refresh_type); 1581 want_refresh = 1;
1557 } 1582 }
1558 else 1583 else
1559 { 1584 {
1560 XEvent unused_event; 1585 XEvent unused_event;
1561 1586
… …
1580#endif 1605#endif
1581 } 1606 }
1582 break; 1607 break;
1583 1608
1584 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1585#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1612 if (hidden_pointer)
1587 pointer_unblank (); 1613 pointer_unblank ();
1588#endif 1614#endif
1589#if MENUBAR 1615#if MENUBAR
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1623 break;
1598 1624
1599 if (ev.xany.window == vt) 1625 if (ev.xany.window == vt)
1600 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1630 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1632 ;
1605 1633
1606 XQueryPointer (disp, vt, 1634 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1716 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1718 scrollbar_size ());
1691 scr_refresh (refresh_type); 1719 want_refresh = 1;
1692 refresh_limit = 0; 1720 refresh_limit = 0;
1693 scrollbar_show (1); 1721 scrollbar_show (1);
1694 } 1722 }
1695 break; 1723 break;
1696 } 1724 }
1725
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 {
1731 if (hidden_cursor)
1732 {
1733 hidden_cursor = 0;
1734 want_refresh = 1;
1735 }
1736
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1738 }
1739#endif
1740
1741#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 {
1744 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease)
1747 if (hidden_pointer)
1748 pointer_unblank ();
1749
1750 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank ();
1752 }
1753#endif
1697} 1754}
1698 1755
1699void 1756void
1700rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1701{ 1758{
1702 if (!focus) 1759 if (!focus)
1703 { 1760 {
1704 focus = 1; 1761 focus = 1;
1705 want_refresh = 1; 1762 want_refresh = 1;
1706 1763
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1765
1709#if USE_XIM 1766#if USE_XIM
1710 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1711 { 1768 {
1712 IMSetStatusPosition (); 1769 IMSetStatusPosition ();
… …
1733 if (focus) 1790 if (focus)
1734 { 1791 {
1735 focus = 0; 1792 focus = 0;
1736 want_refresh = 1; 1793 want_refresh = 1;
1737 1794
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1796
1740#if ENABLE_FRILLS || ISO_14755 1797#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1798 if (iso14755buf)
1742 { 1799 {
1743 iso14755buf = 0; 1800 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1828 { 1885 {
1829 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1830 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1831 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1832 { 1890 {
1833 /* only report double clicks */ 1891 /* only report double clicks */
1834 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1835 mouse_report (ev); 1893 mouse_report (ev);
… …
1855 else 1913 else
1856 { 1914 {
1857 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1859 1917
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1919 switch (ev.button)
1862 { 1920 {
1863 case Button1: 1921 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1923 /* should be done in screen.C */
… …
1868#else 1926#else
1869 selection.rect = false; 1927 selection.rect = false;
1870#endif 1928#endif
1871 1929
1872 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1932 {
1875 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1877 else 1935 else
1878 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2101 }
2044 2102
2045 break; 2103 break;
2046 } 2104 }
2047 } 2105 }
2106
2048 return; 2107 return;
2049 } 2108 }
2109
2050#if MENUBAR 2110#if MENUBAR
2051 /* 2111 /*
2052 * Menubar window processing of button press 2112 * Menubar window processing of button press
2053 */ 2113 */
2054 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2178 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2121 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2122 switch (ev.button) 2185 switch (ev.button)
2123 { 2186 {
2124 case Button1: 2187 case Button1:
2125 case Button3: 2188 case Button3:
2126 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2158 } 2221 }
2159 else 2222 else
2160 { 2223 {
2161# endif 2224# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2225 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2226 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2175 } 2228 }
2176#endif 2229# endif
2177 } 2230 }
2178 break; 2231 break;
2179#endif 2232#endif
2180 } 2233 }
2181 } 2234 }
… …
2670 2723
2671bool 2724bool
2672rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2673{ 2726{
2674 bool flag = false; 2727 bool flag = false;
2675 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2677 2730
2678 for (;;) 2731 for (;;)
2679 { 2732 {
2680 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2681 { 2734 {
2682 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2736 ch = next_char ();
2684 }
2685 2737
2686 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2687 break; 2739 break;
2740 }
2688 2741
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2742 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2743 {
2691 if (!seen_input) 2744 if (!seen_input)
2692 { 2745 {
… …
2701 if (seen_resize && cmd_pid) 2754 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2703 } 2756 }
2704 2757
2705 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2760 bool refreshnow = false;
2708 int nlines = 0; 2761 int nlines = 0;
2709 unicode_t *str = buf; 2762 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2764
2712 for (;;) 2765 for (;;)
2713 { 2766 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2768 break;
… …
2733 } 2786 }
2734 2787
2735 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2737 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2793
2739 nlines = 0; 2794 nlines = 0;
2740 str = buf; 2795 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2742 } 2797 }
2743 2798
… …
2756 2811
2757 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2813 ch = next_char ();
2759 } 2814 }
2760 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2762 2818
2763 /* 2819 /*
2764 * If there have been a lot of new lines, then update the screen 2820 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2821 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2772 refresh_limit++; 2828 refresh_limit++;
2773 else 2829 else
2774 { 2830 {
2775 flag = true; 2831 flag = true;
2776 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2777 flush_ev.stop (); 2833 want_refresh = 1;
2778 } 2834 }
2779 } 2835 }
2780 2836
2781 } 2837 }
2782 else 2838 else
… …
2797 } 2853 }
2798 2854
2799 return flag; 2855 return flag;
2800} 2856}
2801 2857
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2858// read the next character
2812unicode_t 2859wchar_t
2813rxvt_term::next_char () 2860rxvt_term::next_char ()
2814{ 2861{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2863 {
2817 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2866 return *cmdbuf_ptr++;
2820 2867
2821 wchar_t wc; 2868 wchar_t wc;
2822 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2869 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823 2870
2824 if (len == (size_t)-2) 2871 if (len == (size_t)-2)
2825 { 2872 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2873 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2875 break;
2829 } 2876 }
2830 2877
2831 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2879 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2880
2834 // assume wchar == unicode 2881 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2837 } 2884 }
2838 2885
2839 return NOCHAR; 2886 return NOCHAR;
2887}
2888
2889// read the next octet
2890uint32_t
2891rxvt_term::next_octet ()
2892{
2893 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR;
2840} 2896}
2841 2897
2842/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2843/* 2899/*
2844 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2845 * to the command. 2901 * to the command.
2846 */ 2902 */
2847unicode_t 2903wchar_t
2848rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2849{ 2905{
2850 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2851 2907
2852 if (c == NOCHAR) 2908 if (c == NOCHAR)
2853 throw out_of_input; 2909 throw out_of_input;
2854 2910
2855 return c; 2911 return c;
2856} 2912}
2857 2913
2858unicode_t 2914uint32_t
2859rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2860{ 2916{
2861 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2862 2918
2863 if (c == NOCHAR) 2919 if (c == NOCHAR)
2864 throw out_of_input; 2920 throw out_of_input;
2865 2921
2866 return c; 2922 return c;
… …
2966 case C0_ESC: 3022 case C0_ESC:
2967 process_escape_seq (); 3023 process_escape_seq ();
2968 break; 3024 break;
2969 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 3028 else
2974 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 3030 break;
2977 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2978 scr_bell (); 3032 scr_bell ();
2979 break; 3033 break;
2980 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3135 break; 3189 break;
3136 3190
3137 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3139 { 3193 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3196 }
3143 break; 3197 break;
3144 3198
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3222 process_dcs_seq ();
3169 break; 3223 break;
3170 3224
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3176 3229
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3232 process_csi_seq ();
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3478 break;
3426 3479
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3482 break;
3431 3483
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3434 break; 3486 break;
… …
3636/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3637/* 3689/*
3638 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3640 */ 3692 */
3641unsigned char * 3693char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3695{
3644 unicode_t ch; 3696 unicode_t ch;
3645 bool seen_esc = false; 3697 bool seen_esc = false;
3646 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3679 3731
3680 string[n++] = '\0'; 3732 string[n++] = '\0';
3681 3733
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3735
3684 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3685} 3737}
3686 3738
3687/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3688/* 3740/*
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3741 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3742 */
3691void 3743void
3692rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3693{ 3745{
3694 unsigned char *s; 3746 char *s;
3695 unicode_t eh; 3747 unicode_t eh;
3696 3748
3697 /* 3749 /*
3698 * Not handled yet 3750 * Not handled yet
3699 */ 3751 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3720 3772
3721 if (ch == ';') 3773 if (ch == ';')
3722 { 3774 {
3723 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3724 3776
3725 if (s) 3777 if (s)
3726 { 3778 {
3727 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3728 free (s); 3780 free (s);
3729 } 3781 }
3730 } 3782 }
3731} 3783}
3732 3784
3733void 3785void
3734rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3787{
3736 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3737 { 3789 {
3738 unsigned short r, g, b; 3790 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3745 3797
3746/* 3798/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3800 */
3749void 3801void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3803{
3752 int changed = 0; 3804 int changed = 0;
3753 int color; 3805 int color;
3754 char *buf, *name; 3806 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3812 { 3864 {
3813 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3866 break;
3815 3867
3816 *name++ = '\0'; 3868 *name++ = '\0';
3817 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3818 3870
3819 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3872 break;
3821 3873
3822 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3875 *buf++ = '\0';
3824 3876
3825 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3826 { 3878 {
3827 unsigned short r, g, b; 3879 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3829 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 } 3882 }
3831 else 3883 else
3832 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3833 } 3885 }
3834 break; 3886 break;
3835 case XTerm_Color00: 3887 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3837 break; 3889 break;
3838 case XTerm_Color01: 3890 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3840 break; 3892 break;
3841#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3844 break; 3896 break;
… …
3848 break; 3900 break;
3849 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3851 break; 3903 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3907 break;
3908 case Rxvt_Color_BD:
3909 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp);
3911 break;
3912 case Rxvt_Color_UL:
3913 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp);
3861 break; 3915 break;
3862 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break; 3918 break;
3865#endif 3919#endif
… …
3870 if (am_transparent) 3924 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3872 break; 3926 break;
3873#endif 3927#endif
3874 3928
3875 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3876 if (*str != ';') 3930 if (*str != ';')
3877 { 3931 {
3878#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3935 scr_touch (true);
3936#endif
3883 } 3937 }
3938
3884 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3885 { 3940 {
3886 str++; 3941 str++;
3887#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3891 3946
3892 if (changed) 3947 if (changed)
3893 { 3948 {
3894#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3950 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3951 scr_touch (true);
3952#endif
3898 } 3953 }
3899 break; 3954 break;
3900 3955
3901 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3903 break; 3958 break;
3904 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3906 break; 3961 break;
3907 3962
3908 case XTerm_logfile: 3963 case XTerm_logfile:
3909 // TODO, when secure mode? 3964 // TODO, when secure mode?
… …
3914 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break; 3971 break;
3917#endif 3972#endif
3918#if 0 3973#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3920 { 3975 {
3921 int fd; 3976 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3978 {
3924 scr_dump (fd); 3979 scr_dump (fd);
… …
3976 break; 4031 break;
3977#endif 4032#endif
3978 4033
3979#if ENABLE_PERL 4034#if ENABLE_PERL
3980 case URxvt_perl: 4035 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 4037 ; // no responses yet
3983 break; 4038 break;
3984#endif 4039#endif
3985 } 4040 }
3986} 4041}
… …
4098 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4154 switch (arg[i])
4100 { 4155 {
4101#if ENABLE_STYLES 4156#if ENABLE_STYLES
4102 case 1021: 4157 case 1021:
4103 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4159
4108 scr_touch (true); 4160 scr_touch (true);
4109 break; 4161 break;
4110#endif 4162#endif
4111 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4188 break;
4137 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4138 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4191 break;
4143 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4145 break; 4194 break;
4146 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4187#if 0 4236#if 0
4188 case 1001: 4237 case 1001:
4189 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4190#endif 4239#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4242 break;
4197 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4198 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4245 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4249 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4387 scr_color (Color_bg, Color_bg);
4345 break; 4388 break;
4346 4389
4347 //case 50: // not variable spacing 4390 //case 50: // not variable spacing
4348 4391
4349#ifndef NO_BRIGHTCOLOR 4392#if ENABLE_FRILLS
4350 case 90: 4393 case 90:
4351 case 91: /* set bright fg color */ 4394 case 91: /* set bright fg color */
4352 case 92: 4395 case 92:
4353 case 93: 4396 case 93:
4354 case 94: 4397 case 94:
… …
4399 */ 4442 */
4400void 4443void
4401rxvt_term::tt_printf (const char *fmt,...) 4444rxvt_term::tt_printf (const char *fmt,...)
4402{ 4445{
4403 va_list arg_ptr; 4446 va_list arg_ptr;
4404 unsigned char buf[256]; 4447 char buf[256];
4405 4448
4406 va_start (arg_ptr, fmt); 4449 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4450 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4451 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4452 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4457 * or generated by us in response to a query ESC sequence.
4415 */ 4458 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4460
4418void 4461void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 4463{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return;
4466
4467 if (pty.pty < 0)
4468 return;
4469
4421 if (v_buflen == 0) 4470 if (v_buflen == 0)
4422 { 4471 {
4423 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));
4424 4473
4425 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4427 4476
4428 data += written; 4477 data += written;
4429 len -= written; 4478 len -= written;
4430 } 4479 }
4431 4480
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4482
4434 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4484 v_buflen += len;
4436 4485
4437 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