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.261 by root, Fri Jan 13 15:42:50 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
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1622 break;
1598 1623
1599 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1600 { 1625 {
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1629 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1631 ;
1605 1632
1606 XQueryPointer (disp, vt, 1633 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1715 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1717 scrollbar_size ());
1691 scr_refresh (refresh_type); 1718 want_refresh = 1;
1692 refresh_limit = 0; 1719 refresh_limit = 0;
1693 scrollbar_show (1); 1720 scrollbar_show (1);
1694 } 1721 }
1695 break; 1722 break;
1696 } 1723 }
1724
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729 {
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif
1739
1740#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 {
1743 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease)
1746 if (hidden_pointer)
1747 pointer_unblank ();
1748
1749 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank ();
1751 }
1752#endif
1697} 1753}
1698 1754
1699void 1755void
1700rxvt_term::focus_in () 1756rxvt_term::focus_in ()
1701{ 1757{
1702 if (!focus) 1758 if (!focus)
1703 { 1759 {
1704 focus = 1; 1760 focus = 1;
1705 want_refresh = 1; 1761 want_refresh = 1;
1706 1762
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1764
1709#if USE_XIM 1765#if USE_XIM
1710 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1711 { 1767 {
1712 IMSetStatusPosition (); 1768 IMSetStatusPosition ();
… …
1733 if (focus) 1789 if (focus)
1734 { 1790 {
1735 focus = 0; 1791 focus = 0;
1736 want_refresh = 1; 1792 want_refresh = 1;
1737 1793
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1795
1740#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1797 if (iso14755buf)
1742 { 1798 {
1743 iso14755buf = 0; 1799 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1882#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1883 if (ev.button == MEvent.button && clickintime)
1828 { 1884 {
1829 /* same button, within alloted time */ 1885 /* same button, within alloted time */
1830 MEvent.clicks++; 1886 MEvent.clicks++;
1887
1831 if (MEvent.clicks > 1) 1888 if (MEvent.clicks > 1)
1832 { 1889 {
1833 /* only report double clicks */ 1890 /* only report double clicks */
1834 MEvent.clicks = 2; 1891 MEvent.clicks = 2;
1835 mouse_report (ev); 1892 mouse_report (ev);
… …
1855 else 1912 else
1856 { 1913 {
1857 if (ev.button != MEvent.button) 1914 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1915 MEvent.clicks = 0;
1859 1916
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1918 switch (ev.button)
1862 { 1919 {
1863 case Button1: 1920 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1922 /* should be done in screen.C */
… …
1868#else 1925#else
1869 selection.rect = false; 1926 selection.rect = false;
1870#endif 1927#endif
1871 1928
1872 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1931 {
1875 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1877 else 1934 else
1878 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2100 }
2044 2101
2045 break; 2102 break;
2046 } 2103 }
2047 } 2104 }
2105
2048 return; 2106 return;
2049 } 2107 }
2108
2050#if MENUBAR 2109#if MENUBAR
2051 /* 2110 /*
2052 * Menubar window processing of button press 2111 * Menubar window processing of button press
2053 */ 2112 */
2054 if (isMenuBarWindow (ev.window)) 2113 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2176 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2177 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2178 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2179 selection_extend (ev.x, ev.y, 0);
2121 2180
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2122 switch (ev.button) 2184 switch (ev.button)
2123 { 2185 {
2124 case Button1: 2186 case Button1:
2125 case Button3: 2187 case Button3:
2126 selection_make (ev.time); 2188 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2158 } 2220 }
2159 else 2221 else
2160 { 2222 {
2161# endif 2223# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2224 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2225 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 2226# ifdef MOUSE_SLIP_WHEELING
2175 } 2227 }
2176#endif 2228# endif
2177 } 2229 }
2178 break; 2230 break;
2179#endif 2231#endif
2180 } 2232 }
2181 } 2233 }
… …
2670 2722
2671bool 2723bool
2672rxvt_term::cmd_parse () 2724rxvt_term::cmd_parse ()
2673{ 2725{
2674 bool flag = false; 2726 bool flag = false;
2675 unicode_t ch = NOCHAR; 2727 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2728 char *seq_begin; // remember start of esc-sequence here
2677 2729
2678 for (;;) 2730 for (;;)
2679 { 2731 {
2680 if (ch == NOCHAR) 2732 if (ch == NOCHAR)
2681 { 2733 {
2682 seq_begin = cmdbuf_ptr; 2734 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2735 ch = next_char ();
2684 }
2685 2736
2686 if (ch == NOCHAR) // TODO: improve 2737 if (ch == NOCHAR)
2687 break; 2738 break;
2739 }
2688 2740
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2742 {
2691 if (!seen_input) 2743 if (!seen_input)
2692 { 2744 {
… …
2701 if (seen_resize && cmd_pid) 2753 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2754 kill (-cmd_pid, SIGWINCH);
2703 } 2755 }
2704 2756
2705 /* Read a text string from the input buffer */ 2757 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2758 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2759 bool refreshnow = false;
2708 int nlines = 0; 2760 int nlines = 0;
2709 unicode_t *str = buf; 2761 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2762 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2763
2712 for (;;) 2764 for (;;)
2713 { 2765 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2767 break;
… …
2733 } 2785 }
2734 2786
2735 // scr_add_lines only works for nlines <= nrow - 1. 2787 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2788 if (nlines >= nrow - 1)
2737 { 2789 {
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2791 scr_add_lines (buf, str - buf, nlines);
2792
2739 nlines = 0; 2793 nlines = 0;
2740 str = buf; 2794 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2795 eol = str + min (ncol, UBUFSIZ);
2742 } 2796 }
2743 2797
… …
2756 2810
2757 seq_begin = cmdbuf_ptr; 2811 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2812 ch = next_char ();
2759 } 2813 }
2760 2814
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2816 scr_add_lines (buf, str - buf, nlines);
2762 2817
2763 /* 2818 /*
2764 * If there have been a lot of new lines, then update the screen 2819 * 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. 2820 * 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 2821 * the number of pages between refreshes is refresh_limit, which
… …
2772 refresh_limit++; 2827 refresh_limit++;
2773 else 2828 else
2774 { 2829 {
2775 flag = true; 2830 flag = true;
2776 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2777 flush_ev.stop (); 2832 want_refresh = 1;
2778 } 2833 }
2779 } 2834 }
2780 2835
2781 } 2836 }
2782 else 2837 else
… …
2797 } 2852 }
2798 2853
2799 return flag; 2854 return flag;
2800} 2855}
2801 2856
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 2857// read the next character
2812unicode_t 2858wchar_t
2813rxvt_term::next_char () 2859rxvt_term::next_char ()
2814{ 2860{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2861 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2862 {
2817 // assume 7-bit to be ascii ALWAYS 2863 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2865 return *cmdbuf_ptr++;
2820 2866
2821 wchar_t wc; 2867 wchar_t wc;
2822 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2823 2869
2824 if (len == (size_t)-2) 2870 if (len == (size_t)-2)
2825 { 2871 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2872 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2873 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2874 break;
2829 } 2875 }
2830 2876
2831 if (len == (size_t)-1) 2877 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2879
2834 // assume wchar == unicode 2880 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2881 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2882 return wc & UNICODE_MASK;
2837 } 2883 }
2838 2884
2839 return NOCHAR; 2885 return NOCHAR;
2886}
2887
2888// read the next octet
2889uint32_t
2890rxvt_term::next_octet ()
2891{
2892 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR;
2840} 2895}
2841 2896
2842/* rxvt_cmd_getc () - Return next input character */ 2897/* rxvt_cmd_getc () - Return next input character */
2843/* 2898/*
2844 * Return the next input character after first passing any keyboard input 2899 * Return the next input character after first passing any keyboard input
2845 * to the command. 2900 * to the command.
2846 */ 2901 */
2847unicode_t 2902wchar_t
2848rxvt_term::cmd_getc () 2903rxvt_term::cmd_getc ()
2849{ 2904{
2850 unicode_t c = next_char (); 2905 wchar_t c = next_char ();
2851 2906
2852 if (c == NOCHAR) 2907 if (c == NOCHAR)
2853 throw out_of_input; 2908 throw out_of_input;
2854 2909
2855 return c; 2910 return c;
2856} 2911}
2857 2912
2858unicode_t 2913uint32_t
2859rxvt_term::cmd_get8 () 2914rxvt_term::cmd_get8 ()
2860{ 2915{
2861 unicode_t c = next_octet (); 2916 uint32_t c = next_octet ();
2862 2917
2863 if (c == NOCHAR) 2918 if (c == NOCHAR)
2864 throw out_of_input; 2919 throw out_of_input;
2865 2920
2866 return c; 2921 return c;
… …
2966 case C0_ESC: 3021 case C0_ESC:
2967 process_escape_seq (); 3022 process_escape_seq ();
2968 break; 3023 break;
2969 case C0_ENQ: /* terminal Status */ 3024 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 3025 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3026 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 3027 else
2974 tt_write ((unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 3029 break;
2977 case C0_BEL: /* bell */ 3030 case C0_BEL: /* bell */
2978 scr_bell (); 3031 scr_bell ();
2979 break; 3032 break;
2980 case C0_BS: /* backspace */ 3033 case C0_BS: /* backspace */
… …
3135 break; 3188 break;
3136 3189
3137 /* 8.3.87: NEXT LINE */ 3190 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3191 case C1_NEL: /* ESC E */
3139 { 3192 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3193 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3195 }
3143 break; 3196 break;
3144 3197
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3198 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3199 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3221 process_dcs_seq ();
3169 break; 3222 break;
3170 3223
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3225 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3227 break; /* steal obsolete ESC [ c */
3176 3228
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3230 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3231 process_csi_seq ();
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3475 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3476 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3477 break;
3426 3478
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3479 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3480 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3481 break;
3431 3482
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3483 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3484 process_sgr_mode (nargs, arg);
3434 break; 3485 break;
… …
3636/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3637/* 3688/*
3638 * get input up until STRING TERMINATOR (or BEL) 3689 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3690 * ends_how is terminator used. returned input must be free()'d
3640 */ 3691 */
3641unsigned char * 3692char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3693rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3694{
3644 unicode_t ch; 3695 unicode_t ch;
3645 bool seen_esc = false; 3696 bool seen_esc = false;
3646 unsigned int n = 0; 3697 unsigned int n = 0;
… …
3679 3730
3680 string[n++] = '\0'; 3731 string[n++] = '\0';
3681 3732
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3733 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3734
3684 return (unsigned char *)rxvt_wcstombs (string); 3735 return rxvt_wcstombs (string);
3685} 3736}
3686 3737
3687/*----------------------------------------------------------------------*/ 3738/*----------------------------------------------------------------------*/
3688/* 3739/*
3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3690 */ 3741 */
3691void 3742void
3692rxvt_term::process_dcs_seq () 3743rxvt_term::process_dcs_seq ()
3693{ 3744{
3694 unsigned char *s; 3745 char *s;
3695 unicode_t eh; 3746 unicode_t eh;
3696 3747
3697 /* 3748 /*
3698 * Not handled yet 3749 * Not handled yet
3699 */ 3750 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3769 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3770 arg = arg * 10 + (ch - '0');
3720 3771
3721 if (ch == ';') 3772 if (ch == ';')
3722 { 3773 {
3723 unsigned char *s = get_to_st (eh); 3774 char *s = get_to_st (eh);
3724 3775
3725 if (s) 3776 if (s)
3726 { 3777 {
3727 process_xterm_seq (arg, (char *)s, eh); 3778 process_xterm_seq (arg, s, eh);
3728 free (s); 3779 free (s);
3729 } 3780 }
3730 } 3781 }
3731} 3782}
3732 3783
3733void 3784void
3734rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3786{
3736 if (str[0] == '?' && !str[1]) 3787 if (str[0] == '?' && !str[1])
3737 { 3788 {
3738 unsigned short r, g, b; 3789 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3790 pix_colors_focused[color].get (display, r, g, b);
… …
3745 3796
3746/* 3797/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3799 */
3749void 3800void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3801rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3802{
3752 int changed = 0; 3803 int changed = 0;
3753 int color; 3804 int color;
3754 char *buf, *name; 3805 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3806 bool query = str[0] == '?' && !str[1];
… …
3812 { 3863 {
3813 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3865 break;
3815 3866
3816 *name++ = '\0'; 3867 *name++ = '\0';
3817 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3818 3869
3819 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3871 break;
3821 3872
3822 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3874 *buf++ = '\0';
3824 3875
3825 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3826 { 3877 {
3827 unsigned short r, g, b; 3878 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 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); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3830 } 3881 }
3831 else 3882 else
3832 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3833 } 3884 }
3834 break; 3885 break;
3835 case XTerm_Color00: 3886 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3837 break; 3888 break;
3838 case XTerm_Color01: 3889 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3840 break; 3891 break;
3841#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3844 break; 3895 break;
… …
3848 break; 3899 break;
3849 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3851 break; 3902 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#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: 3904 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3861 break; 3914 break;
3862 case URxvt_Color_IT: 3915 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break; 3917 break;
3865#endif 3918#endif
… …
3870 if (am_transparent) 3923 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3872 break; 3925 break;
3873#endif 3926#endif
3874 3927
3875 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3876 if (*str != ';') 3929 if (*str != ';')
3877 { 3930 {
3878#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3934 scr_touch (true);
3935#endif
3883 } 3936 }
3937
3884 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3885 { 3939 {
3886 str++; 3940 str++;
3887#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3891 3945
3892 if (changed) 3946 if (changed)
3893 { 3947 {
3894#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3949 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3950 scr_touch (true);
3951#endif
3898 } 3952 }
3899 break; 3953 break;
3900 3954
3901 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3903 break; 3957 break;
3904 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3906 break; 3960 break;
3907 3961
3908 case XTerm_logfile: 3962 case XTerm_logfile:
3909 // TODO, when secure mode? 3963 // TODO, when secure mode?
… …
3914 if (OPTION (Opt_insecure)) 3968 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break; 3970 break;
3917#endif 3971#endif
3918#if 0 3972#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3973 case Rxvt_dumpscreen: /* no error notices */
3920 { 3974 {
3921 int fd; 3975 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3977 {
3924 scr_dump (fd); 3978 scr_dump (fd);
… …
3976 break; 4030 break;
3977#endif 4031#endif
3978 4032
3979#if ENABLE_PERL 4033#if ENABLE_PERL
3980 case URxvt_perl: 4034 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 4036 ; // no responses yet
3983 break; 4037 break;
3984#endif 4038#endif
3985 } 4039 }
3986} 4040}
… …
4098 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4153 switch (arg[i])
4100 { 4154 {
4101#if ENABLE_STYLES 4155#if ENABLE_STYLES
4102 case 1021: 4156 case 1021:
4103 if (mode) 4157 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4158
4108 scr_touch (true); 4159 scr_touch (true);
4109 break; 4160 break;
4110#endif 4161#endif
4111 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4187 break;
4137 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4138 if (!state) 4189 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4190 break;
4143 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4145 break; 4193 break;
4146 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4187#if 0 4235#if 0
4188 case 1001: 4236 case 1001:
4189 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4190#endif 4238#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4240 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4241 break;
4197 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4198 if (state) 4243 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4244 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4245 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4246 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4248 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4386 scr_color (Color_bg, Color_bg);
4345 break; 4387 break;
4346 4388
4347 //case 50: // not variable spacing 4389 //case 50: // not variable spacing
4348 4390
4349#ifndef NO_BRIGHTCOLOR 4391#if ENABLE_FRILLS
4350 case 90: 4392 case 90:
4351 case 91: /* set bright fg color */ 4393 case 91: /* set bright fg color */
4352 case 92: 4394 case 92:
4353 case 93: 4395 case 93:
4354 case 94: 4396 case 94:
… …
4399 */ 4441 */
4400void 4442void
4401rxvt_term::tt_printf (const char *fmt,...) 4443rxvt_term::tt_printf (const char *fmt,...)
4402{ 4444{
4403 va_list arg_ptr; 4445 va_list arg_ptr;
4404 unsigned char buf[256]; 4446 char buf[256];
4405 4447
4406 va_start (arg_ptr, fmt); 4448 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4449 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4450 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4451 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4456 * or generated by us in response to a query ESC sequence.
4415 */ 4457 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4459
4418void 4460void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4466 if (pty.pty < 0)
4467 return;
4468
4421 if (v_buflen == 0) 4469 if (v_buflen == 0)
4422 { 4470 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4424 4472
4425 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4427 4475
4428 data += written; 4476 data += written;
4429 len -= written; 4477 len -= written;
4430 } 4478 }
4431 4479
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4481
4434 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4483 v_buflen += len;
4436 4484
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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