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.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.
… …
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 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
972 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
973 scrollbar_show (1); 1016 scrollbar_show (1);
974#ifdef USE_XIM 1017#ifdef USE_XIM
975 IMSendSpot (); 1018 IMSendSpot ();
976#endif 1019#endif
… …
1096{ 1139{
1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1098 1141
1099 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1100 { 1143 {
1101 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");
1102 n = 0; 1145 n = 0;
1103 } 1146 }
1104 1147
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
… …
1163 1206
1164#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1165void 1208void
1166rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1167{ 1210{
1168 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1169 return; 1212 return;
1170 1213
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1215 XFlush (display->display);
1173 1216
… …
1270 dDisp; 1313 dDisp;
1271 1314
1272 SET_R (this); 1315 SET_R (this);
1273 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1274 1317
1275#if defined(CURSOR_BLINK)
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
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; 1318 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1320 unsigned int unused_mask;
1305 1321
1306 switch (ev.type) 1322 switch (ev.type)
… …
1313 1329
1314 break; 1330 break;
1315 1331
1316 case KeyRelease: 1332 case KeyRelease:
1317 { 1333 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1335 KeySym keysym;
1320 1336
1321 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 :/
1322#endif 1338#endif
1323 1339
1324#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1341 // ISO 14755 support
1326 if (iso14755buf) 1342 if (iso14755buf)
… …
1331# endif 1347# endif
1332# if ISO_14755 1348# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1334 // first: controls 1350 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1354 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1356 commit_iso14755 ();
1341 return; // case-break; 1357 goto skip_switch;
1342 } 1358 }
1343 1359
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1361 if (i[0] == keysym)
1346 { 1362 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1364 commit_iso14755 ();
1349 return; // case-break; 1365 goto skip_switch;
1350 } 1366 }
1351 1367
1352 scr_bell (); 1368 scr_bell ();
1353# endif 1369# endif
1354 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1373 else 1389 else
1374 iso14755buf = 0; 1390 iso14755buf = 0;
1375 } 1391 }
1376#endif 1392#endif
1377 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
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1383#endif 1403#endif
1384 break; 1404 break;
1385 } 1405 }
1386 1406
… …
1516 1536
1517 case SelectionRequest: 1537 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1519 break; 1539 break;
1520 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
1521 case UnmapNotify: 1549 case UnmapNotify:
1522 mapped = 0; 1550 mapped = 0;
1523#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1525#endif 1553#endif
1526 break; 1554 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; 1555 break;
1534 1556
1535#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1536 case ReparentNotify: 1558 case ReparentNotify:
1537 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1551 1573
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, False);
1555 1577
1556 scr_refresh (refresh_type); 1578 want_refresh = 1;
1557 } 1579 }
1558 else 1580 else
1559 { 1581 {
1560 XEvent unused_event; 1582 XEvent unused_event;
1561 1583
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1619 break;
1598 1620
1599 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1600 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1626 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1628 ;
1605 1629
1606 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1710 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1711 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1712 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1714 scrollbar_size ());
1691 scr_refresh (refresh_type); 1715 want_refresh = 1;
1692 refresh_limit = 0; 1716 refresh_limit = 0;
1693 scrollbar_show (1); 1717 scrollbar_show (1);
1694 } 1718 }
1695 break; 1719 break;
1696 } 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
1697} 1750}
1698 1751
1699void 1752void
1700rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1701{ 1754{
1702 if (!focus) 1755 if (!focus)
1703 { 1756 {
1704 focus = 1; 1757 focus = 1;
1705 want_refresh = 1; 1758 want_refresh = 1;
1706 1759
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1761
1709#if USE_XIM 1762#if USE_XIM
1710 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1711 { 1764 {
1712 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
… …
1733 if (focus) 1786 if (focus)
1734 { 1787 {
1735 focus = 0; 1788 focus = 0;
1736 want_refresh = 1; 1789 want_refresh = 1;
1737 1790
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1792
1740#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1794 if (iso14755buf)
1742 { 1795 {
1743 iso14755buf = 0; 1796 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1828 { 1881 {
1829 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1830 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1831 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1832 { 1886 {
1833 /* only report double clicks */ 1887 /* only report double clicks */
1834 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1835 mouse_report (ev); 1889 mouse_report (ev);
… …
1855 else 1909 else
1856 { 1910 {
1857 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1859 1913
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1915 switch (ev.button)
1862 { 1916 {
1863 case Button1: 1917 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1919 /* should be done in screen.C */
… …
2043 } 2097 }
2044 2098
2045 break; 2099 break;
2046 } 2100 }
2047 } 2101 }
2102
2048 return; 2103 return;
2049 } 2104 }
2105
2050#if MENUBAR 2106#if MENUBAR
2051 /* 2107 /*
2052 * Menubar window processing of button press 2108 * Menubar window processing of button press
2053 */ 2109 */
2054 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2174 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2121 2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2122 switch (ev.button) 2181 switch (ev.button)
2123 { 2182 {
2124 case Button1: 2183 case Button1:
2125 case Button3: 2184 case Button3:
2126 selection_make (ev.time); 2185 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2158 } 2217 }
2159 else 2218 else
2160 { 2219 {
2161# endif 2220# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2221 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2222 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 2223# ifdef MOUSE_SLIP_WHEELING
2175 } 2224 }
2176#endif 2225# endif
2177 } 2226 }
2178 break; 2227 break;
2179#endif 2228#endif
2180 } 2229 }
2181 } 2230 }
… …
2670 2719
2671bool 2720bool
2672rxvt_term::cmd_parse () 2721rxvt_term::cmd_parse ()
2673{ 2722{
2674 bool flag = false; 2723 bool flag = false;
2675 unicode_t ch = NOCHAR; 2724 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2725 char *seq_begin; // remember start of esc-sequence here
2677 2726
2678 for (;;) 2727 for (;;)
2679 { 2728 {
2680 if (ch == NOCHAR) 2729 if (ch == NOCHAR)
2681 { 2730 {
2682 seq_begin = cmdbuf_ptr; 2731 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2732 ch = next_char ();
2684 }
2685 2733
2686 if (ch == NOCHAR) // TODO: improve 2734 if (ch == NOCHAR)
2687 break; 2735 break;
2736 }
2688 2737
2689 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)
2690 { 2739 {
2691 if (!seen_input) 2740 if (!seen_input)
2692 { 2741 {
… …
2701 if (seen_resize && cmd_pid) 2750 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2751 kill (-cmd_pid, SIGWINCH);
2703 } 2752 }
2704 2753
2705 /* Read a text string from the input buffer */ 2754 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2755 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2756 bool refreshnow = false;
2708 int nlines = 0; 2757 int nlines = 0;
2709 unicode_t *str = buf; 2758 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2759 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2760
2712 for (;;) 2761 for (;;)
2713 { 2762 {
2714 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))
2715 break; 2764 break;
… …
2733 } 2782 }
2734 2783
2735 // scr_add_lines only works for nlines <= nrow - 1. 2784 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2785 if (nlines >= nrow - 1)
2737 { 2786 {
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2789
2739 nlines = 0; 2790 nlines = 0;
2740 str = buf; 2791 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2792 eol = str + min (ncol, UBUFSIZ);
2742 } 2793 }
2743 2794
… …
2756 2807
2757 seq_begin = cmdbuf_ptr; 2808 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2809 ch = next_char ();
2759 } 2810 }
2760 2811
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2762 2814
2763 /* 2815 /*
2764 * 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
2765 * 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.
2766 * the number of pages between refreshes is refresh_limit, which 2818 * the number of pages between refreshes is refresh_limit, which
… …
2772 refresh_limit++; 2824 refresh_limit++;
2773 else 2825 else
2774 { 2826 {
2775 flag = true; 2827 flag = true;
2776 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2777 flush_ev.stop (); 2829 want_refresh = 1;
2778 } 2830 }
2779 } 2831 }
2780 2832
2781 } 2833 }
2782 else 2834 else
… …
2797 } 2849 }
2798 2850
2799 return flag; 2851 return flag;
2800} 2852}
2801 2853
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 2854// read the next character
2812unicode_t 2855wchar_t
2813rxvt_term::next_char () 2856rxvt_term::next_char ()
2814{ 2857{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2859 {
2817 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2820 2863
2821 wchar_t wc; 2864 wchar_t wc;
2822 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);
2823 2866
2824 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2825 { 2868 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2871 break;
2829 } 2872 }
2830 2873
2831 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2832 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
2833 2876
2834 // assume wchar == unicode 2877 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2879 return wc & UNICODE_MASK;
2837 } 2880 }
2838 2881
2839 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;
2840} 2892}
2841 2893
2842/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2843/* 2895/*
2844 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2845 * to the command. 2897 * to the command.
2846 */ 2898 */
2847unicode_t 2899wchar_t
2848rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2849{ 2901{
2850 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2851 2903
2852 if (c == NOCHAR) 2904 if (c == NOCHAR)
2853 throw out_of_input; 2905 throw out_of_input;
2854 2906
2855 return c; 2907 return c;
2856} 2908}
2857 2909
2858unicode_t 2910uint32_t
2859rxvt_term::cmd_get8 () 2911rxvt_term::cmd_get8 ()
2860{ 2912{
2861 unicode_t c = next_octet (); 2913 uint32_t c = next_octet ();
2862 2914
2863 if (c == NOCHAR) 2915 if (c == NOCHAR)
2864 throw out_of_input; 2916 throw out_of_input;
2865 2917
2866 return c; 2918 return c;
… …
2966 case C0_ESC: 3018 case C0_ESC:
2967 process_escape_seq (); 3019 process_escape_seq ();
2968 break; 3020 break;
2969 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 3024 else
2974 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 3026 break;
2977 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2978 scr_bell (); 3028 scr_bell ();
2979 break; 3029 break;
2980 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
3135 break; 3185 break;
3136 3186
3137 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
3139 { 3189 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3192 }
3143 break; 3193 break;
3144 3194
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3218 process_dcs_seq ();
3169 break; 3219 break;
3170 3220
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
3176 3225
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3228 process_csi_seq ();
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3474 break;
3426 3475
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3478 break;
3431 3479
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
3434 break; 3482 break;
… …
3636/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3637/* 3685/*
3638 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3687 * ends_how is terminator used. returned input must be free()'d
3640 */ 3688 */
3641unsigned char * 3689char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3691{
3644 unicode_t ch; 3692 unicode_t ch;
3645 bool seen_esc = false; 3693 bool seen_esc = false;
3646 unsigned int n = 0; 3694 unsigned int n = 0;
… …
3679 3727
3680 string[n++] = '\0'; 3728 string[n++] = '\0';
3681 3729
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3731
3684 return (unsigned char *)rxvt_wcstombs (string); 3732 return rxvt_wcstombs (string);
3685} 3733}
3686 3734
3687/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3688/* 3736/*
3689 * 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)'
3690 */ 3738 */
3691void 3739void
3692rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3693{ 3741{
3694 unsigned char *s; 3742 char *s;
3695 unicode_t eh; 3743 unicode_t eh;
3696 3744
3697 /* 3745 /*
3698 * Not handled yet 3746 * Not handled yet
3699 */ 3747 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3720 3768
3721 if (ch == ';') 3769 if (ch == ';')
3722 { 3770 {
3723 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3724 3772
3725 if (s) 3773 if (s)
3726 { 3774 {
3727 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3728 free (s); 3776 free (s);
3729 } 3777 }
3730 } 3778 }
3731} 3779}
3732 3780
3733void 3781void
3734rxvt_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)
3735{ 3783{
3736 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3737 { 3785 {
3738 unsigned short r, g, b; 3786 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
… …
3745 3793
3746/* 3794/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3796 */
3749void 3797void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3799{
3752 int changed = 0; 3800 int changed = 0;
3753 int color; 3801 int color;
3754 char *buf, *name; 3802 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
… …
3976 break; 4024 break;
3977#endif 4025#endif
3978 4026
3979#if ENABLE_PERL 4027#if ENABLE_PERL
3980 case URxvt_perl: 4028 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 4030 ; // no responses yet
3983 break; 4031 break;
3984#endif 4032#endif
3985 } 4033 }
3986} 4034}
… …
4098 /* extra handling for values with state unkept */ 4146 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4147 switch (arg[i])
4100 { 4148 {
4101#if ENABLE_STYLES 4149#if ENABLE_STYLES
4102 case 1021: 4150 case 1021:
4103 if (mode) 4151 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4152
4108 scr_touch (true); 4153 scr_touch (true);
4109 break; 4154 break;
4110#endif 4155#endif
4111 case 1048: /* alternative cursor save */ 4156 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4178 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4179 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4180 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4181 break;
4137 case 4: /* smooth scrolling */ 4182 case 4: /* smooth scrolling */
4138 if (!state) 4183 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4184 break;
4143 case 5: /* reverse video */ 4185 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4186 scr_rvideo_mode (state);
4145 break; 4187 break;
4146 case 6: /* relative/absolute origins */ 4188 case 6: /* relative/absolute origins */
… …
4187#if 0 4229#if 0
4188 case 1001: 4230 case 1001:
4189 break; /* X11 mouse highlighting */ 4231 break; /* X11 mouse highlighting */
4190#endif 4232#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4233 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4234 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4235 break;
4197 case 1011: /* scroll to bottom on key press */ 4236 case 1011: /* scroll to bottom on key press */
4198 if (state) 4237 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4238 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4239 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4240 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4241 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4242 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4380 scr_color (Color_bg, Color_bg);
4345 break; 4381 break;
4346 4382
4347 //case 50: // not variable spacing 4383 //case 50: // not variable spacing
4348 4384
4349#ifndef NO_BRIGHTCOLOR 4385#if ENABLE_FRILLS
4350 case 90: 4386 case 90:
4351 case 91: /* set bright fg color */ 4387 case 91: /* set bright fg color */
4352 case 92: 4388 case 92:
4353 case 93: 4389 case 93:
4354 case 94: 4390 case 94:
… …
4399 */ 4435 */
4400void 4436void
4401rxvt_term::tt_printf (const char *fmt,...) 4437rxvt_term::tt_printf (const char *fmt,...)
4402{ 4438{
4403 va_list arg_ptr; 4439 va_list arg_ptr;
4404 unsigned char buf[256]; 4440 char buf[256];
4405 4441
4406 va_start (arg_ptr, fmt); 4442 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4443 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4444 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4445 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4450 * or generated by us in response to a query ESC sequence.
4415 */ 4451 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4453
4418void 4454void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4455rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 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
4421 if (v_buflen == 0) 4463 if (v_buflen == 0)
4422 { 4464 {
4423 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));
4424 4466
4425 if ((unsigned int)written == len) 4467 if ((unsigned int)written == len)
… …
4427 4469
4428 data += written; 4470 data += written;
4429 len -= written; 4471 len -= written;
4430 } 4472 }
4431 4473
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4475
4434 memcpy (v_buffer + v_buflen, data, len); 4476 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4477 v_buflen += len;
4436 4478
4437 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