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.227 by root, Mon Jan 2 15:35:43 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
267 mb[0] = ch[0]; 268 mb[0] = ch[0];
268 len = 1; 269 len = 1;
269 } 270 }
270 271
271 if (len > 0) 272 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
273 else 274 else
274 scr_bell (); 275 scr_bell ();
275 } 276 }
276 277
277 iso14755buf = 0; 278 iso14755buf = 0;
… …
305 KeySym keysym; 306 KeySym keysym;
306#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
308#endif 309#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
923unsigned int 927unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 929{
926 unsigned int n, s; 930 unsigned int n, s;
927 931
928 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 970 }
967#endif 971#endif
968 972
969 if (want_refresh) 973 if (want_refresh)
970 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
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
971 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
972 scrollbar_show (1); 1014 scrollbar_show (1);
973#ifdef USE_XIM 1015#ifdef USE_XIM
974 IMSendSpot (); 1016 IMSendSpot ();
975#endif 1017#endif
… …
1095{ 1137{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1139
1098 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1099 { 1141 {
1100 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");
1101 n = 0; 1143 n = 0;
1102 } 1144 }
1103 1145
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
… …
1113 return true; 1155 return true;
1114 } 1156 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1158 {
1117#if HAVE_SCHED_YIELD 1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1118 event_handler.cw_yield.start (); 1161 event_handler.cw_yield.start ();
1119#endif 1162#endif
1120 } 1163 }
1121 else 1164 else
1122 { 1165 {
1123 pty_ev.stop (); 1166 pty_ev.stop ();
… …
1161 1204
1162#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1163void 1206void
1164rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1165{ 1208{
1166 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1167 return; 1210 return;
1168 1211
1169 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1170 XFlush (display->display); 1213 XFlush (display->display);
1171 1214
… …
1268 dDisp; 1311 dDisp;
1269 1312
1270 SET_R (this); 1313 SET_R (this);
1271 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1272 1315
1273#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1275 { 1318 return;
1276 if (hidden_cursor)
1277 {
1278 hidden_cursor = 0;
1279 want_refresh = 1;
1280 }
1281 1319
1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1283 }
1284#endif
1285
1286#if defined(POINTER_BLANK)
1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1288 {
1289 if (ev.type == MotionNotify
1290 || ev.type == ButtonPress
1291 || ev.type == ButtonRelease)
1292 if (hidden_pointer)
1293 pointer_unblank ();
1294
1295 if (ev.type == KeyPress && hidden_pointer == 0)
1296 pointer_blank ();
1297 }
1298#endif
1299
1300 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1301 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1302 unsigned int unused_mask; 1323 unsigned int unused_mask;
1303 1324
1304 switch (ev.type) 1325 switch (ev.type)
… …
1311 1332
1312 break; 1333 break;
1313 1334
1314 case KeyRelease: 1335 case KeyRelease:
1315 { 1336 {
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1317 KeySym ks; 1338 KeySym keysym;
1318 1339
1319 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 :/
1320#endif 1341#endif
1321 1342
1322#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support 1344 // ISO 14755 support
1324 if (iso14755buf) 1345 if (iso14755buf)
… …
1329# endif 1350# endif
1330# if ISO_14755 1351# if ISO_14755
1331 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1332 // first: controls 1353 // first: controls
1333 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1336 { 1357 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1338 commit_iso14755 (); 1359 commit_iso14755 ();
1339 return; // case-break; 1360 goto skip_switch;
1340 } 1361 }
1341 1362
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks) 1364 if (i[0] == keysym)
1344 { 1365 {
1345 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 (); 1367 commit_iso14755 ();
1347 return; // case-break; 1368 goto skip_switch;
1348 } 1369 }
1349 1370
1350 scr_bell (); 1371 scr_bell ();
1351# endif 1372# endif
1352 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1371 else 1392 else
1372 iso14755buf = 0; 1393 iso14755buf = 0;
1373 } 1394 }
1374#endif 1395#endif
1375 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
1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1377 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1380 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1381#endif 1406#endif
1382 break; 1407 break;
1383 } 1408 }
1384 1409
… …
1514 1539
1515 case SelectionRequest: 1540 case SelectionRequest:
1516 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1517 break; 1542 break;
1518 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
1519 case UnmapNotify: 1552 case UnmapNotify:
1520 mapped = 0; 1553 mapped = 0;
1521#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1522 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1523#endif 1556#endif
1524 break; 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 break; 1558 break;
1532 1559
1533#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1534 case ReparentNotify: 1561 case ReparentNotify:
1535 rootwin_cb (ev); 1562 rootwin_cb (ev);
… …
1549 1576
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1553 1580
1554 scr_refresh (refresh_type); 1581 want_refresh = 1;
1555 } 1582 }
1556 else 1583 else
1557 { 1584 {
1558 XEvent unused_event; 1585 XEvent unused_event;
1559 1586
… …
1578#endif 1605#endif
1579 } 1606 }
1580 break; 1607 break;
1581 1608
1582 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1583#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1584 if (hidden_pointer) 1612 if (hidden_pointer)
1585 pointer_unblank (); 1613 pointer_unblank ();
1586#endif 1614#endif
1587#if MENUBAR 1615#if MENUBAR
… …
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1623 break;
1596 1624
1597 if (ev.xany.window == vt) 1625 if (ev.xany.window == vt)
1598 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1599 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1600 { 1630 {
1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1602 ; 1632 ;
1603 1633
1604 XQueryPointer (disp, vt, 1634 XQueryPointer (disp, vt,
… …
1684 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1685 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1686 &unused_mask); 1716 &unused_mask);
1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1688 scrollbar_size ()); 1718 scrollbar_size ());
1689 scr_refresh (refresh_type); 1719 want_refresh = 1;
1690 refresh_limit = 0; 1720 refresh_limit = 0;
1691 scrollbar_show (1); 1721 scrollbar_show (1);
1692 } 1722 }
1693 break; 1723 break;
1694 } 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
1695} 1754}
1696 1755
1697void 1756void
1698rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1699{ 1758{
1700 if (!focus) 1759 if (!focus)
1701 { 1760 {
1702 focus = 1; 1761 focus = 1;
1703 want_refresh = 1; 1762 want_refresh = 1;
1704 1763
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706 1765
1707#if USE_XIM 1766#if USE_XIM
1708 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1709 { 1768 {
1710 IMSetStatusPosition (); 1769 IMSetStatusPosition ();
… …
1731 if (focus) 1790 if (focus)
1732 { 1791 {
1733 focus = 0; 1792 focus = 0;
1734 want_refresh = 1; 1793 want_refresh = 1;
1735 1794
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737 1796
1738#if ENABLE_FRILLS || ISO_14755 1797#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1798 if (iso14755buf)
1740 { 1799 {
1741 iso14755buf = 0; 1800 iso14755buf = 0;
… …
1794rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1795{ 1854{
1796 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1797 1856
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1799 if (!bypass_keystate) 1859 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1861
1802 /* 1862 /*
1803 * VT window processing of button press 1863 * VT window processing of button press
… …
1823#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1824 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1825 { 1885 {
1826 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1827 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1828 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1829 { 1890 {
1830 /* only report double clicks */ 1891 /* only report double clicks */
1831 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1832 mouse_report (ev); 1893 mouse_report (ev);
… …
1852 else 1913 else
1853 { 1914 {
1854 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1855 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1856 1917
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1857 switch (ev.button) 1919 switch (ev.button)
1858 { 1920 {
1859 case Button1: 1921 case Button1:
1860 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */ 1923 /* should be done in screen.C */
1862#if ENABLE_FRILLS 1924#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask); 1925 selection.rect = !!(ev.state & ModMetaMask);
1864#else 1926#else
1865 selection.rect = false; 1927 selection.rect = false;
1866#endif 1928#endif
1867 1929
1868 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1870 { 1932 {
1871 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1873 else 1935 else
1874 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1875 } 1937 }
1876 else 1938 else
1877 { 1939 {
1878 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1879 MEvent.clicks++; 1941 MEvent.clicks++;
1880 else 1942 else
1881 MEvent.clicks = 1; 1943 MEvent.clicks = 1;
1882 1944
1883 selection_click (MEvent.clicks, ev.x, ev.y); 1945 selection_click (MEvent.clicks, ev.x, ev.y);
1884 } 1946 }
1885 1947
1886 MEvent.button = Button1; 1948 MEvent.button = Button1;
1887 break; 1949 break;
1888 1950
1889 case Button3: 1951 case Button3:
1890 if (MEvent.button == Button3 && clickintime) 1952 if (MEvent.button == Button3 && clickintime)
1891 selection_rotate (ev.x, ev.y); 1953 selection_rotate (ev.x, ev.y);
1892 else 1954 else
1893 selection_extend (ev.x, ev.y, 1); 1955 selection_extend (ev.x, ev.y, 1);
1894 1956
1895 MEvent.button = Button3; 1957 MEvent.button = Button3;
1896 break; 1958 break;
1897 } 1959 }
1898 } 1960 }
1899 1961
1900 MEvent.time = ev.time; 1962 MEvent.time = ev.time;
1901 return; 1963 return;
1902 } 1964 }
1903 1965
… …
2039 } 2101 }
2040 2102
2041 break; 2103 break;
2042 } 2104 }
2043 } 2105 }
2106
2044 return; 2107 return;
2045 } 2108 }
2109
2046#if MENUBAR 2110#if MENUBAR
2047 /* 2111 /*
2048 * Menubar window processing of button press 2112 * Menubar window processing of button press
2049 */ 2113 */
2050 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
2113 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2114 && bypass_keystate 2178 && bypass_keystate
2115 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2116 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2117 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2118 switch (ev.button) 2185 switch (ev.button)
2119 { 2186 {
2120 case Button1: 2187 case Button1:
2121 case Button3: 2188 case Button3:
2122 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2153 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2154 } 2221 }
2155 else 2222 else
2156 { 2223 {
2157# endif 2224# endif
2158# ifdef JUMP_MOUSE_WHEEL
2159 scr_page (v, i); 2225 scr_page (v, i);
2160 scr_refresh (SMOOTH_REFRESH);
2161 scrollbar_show (1); 2226 scrollbar_show (1);
2162# else
2163 while (i--)
2164 {
2165 scr_page (v, 1);
2166 scr_refresh (SMOOTH_REFRESH);
2167 scrollbar_show (1);
2168 }
2169# endif
2170# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2171 } 2228 }
2172#endif 2229# endif
2173 } 2230 }
2174 break; 2231 break;
2175#endif 2232#endif
2176 } 2233 }
2177 } 2234 }
… …
2666 2723
2667bool 2724bool
2668rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2669{ 2726{
2670 bool flag = false; 2727 bool flag = false;
2671 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2673 2730
2674 for (;;) 2731 for (;;)
2675 { 2732 {
2676 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2677 { 2734 {
2678 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2736 ch = next_char ();
2680 }
2681 2737
2682 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2683 break; 2739 break;
2740 }
2684 2741
2685 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)
2686 { 2743 {
2687 if (!seen_input) 2744 if (!seen_input)
2688 { 2745 {
… …
2697 if (seen_resize && cmd_pid) 2754 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2699 } 2756 }
2700 2757
2701 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2702 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2703 bool refreshnow = false; 2760 bool refreshnow = false;
2704 int nlines = 0; 2761 int nlines = 0;
2705 unicode_t *str = buf; 2762 wchar_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ); 2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2707 2764
2708 for (;;) 2765 for (;;)
2709 { 2766 {
2710 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))
2711 break; 2768 break;
… …
2729 } 2786 }
2730 2787
2731 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2733 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2734 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2793
2735 nlines = 0; 2794 nlines = 0;
2736 str = buf; 2795 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2738 } 2797 }
2739 2798
… …
2752 2811
2753 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2813 ch = next_char ();
2755 } 2814 }
2756 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2757 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2758 2818
2759 /* 2819 /*
2760 * 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
2761 * 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.
2762 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2768 refresh_limit++; 2828 refresh_limit++;
2769 else 2829 else
2770 { 2830 {
2771 flag = true; 2831 flag = true;
2772 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2773 flush_ev.stop (); 2833 want_refresh = 1;
2774 } 2834 }
2775 } 2835 }
2776 2836
2777 } 2837 }
2778 else 2838 else
… …
2793 } 2853 }
2794 2854
2795 return flag; 2855 return flag;
2796} 2856}
2797 2857
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805}
2806
2807// read the next character 2858// read the next character
2808unicode_t 2859wchar_t
2809rxvt_term::next_char () 2860rxvt_term::next_char ()
2810{ 2861{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2863 {
2813 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++; 2866 return *cmdbuf_ptr++;
2816 2867
2817 wchar_t wc; 2868 wchar_t wc;
2818 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);
2819 2870
2820 if (len == (size_t)-2) 2871 if (len == (size_t)-2)
2821 { 2872 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2873 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2824 break; 2875 break;
2825 } 2876 }
2826 2877
2827 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2828 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
2829 2880
2830 // assume wchar == unicode 2881 // assume wchar == unicode
2831 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2833 } 2884 }
2834 2885
2835 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;
2836} 2896}
2837 2897
2838/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2839/* 2899/*
2840 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2841 * to the command. 2901 * to the command.
2842 */ 2902 */
2843unicode_t 2903wchar_t
2844rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2845{ 2905{
2846 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2847 2907
2848 if (c == NOCHAR) 2908 if (c == NOCHAR)
2849 throw out_of_input; 2909 throw out_of_input;
2850 2910
2851 return c; 2911 return c;
2852} 2912}
2853 2913
2854unicode_t 2914uint32_t
2855rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2856{ 2916{
2857 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2858 2918
2859 if (c == NOCHAR) 2919 if (c == NOCHAR)
2860 throw out_of_input; 2920 throw out_of_input;
2861 2921
2862 return c; 2922 return c;
… …
2962 case C0_ESC: 3022 case C0_ESC:
2963 process_escape_seq (); 3023 process_escape_seq ();
2964 break; 3024 break;
2965 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 3028 else
2970 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 3030 break;
2973 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2974 scr_bell (); 3032 scr_bell ();
2975 break; 3033 break;
2976 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3131 break; 3189 break;
3132 3190
3133 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3134 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3135 { 3193 {
3136 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3137 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3138 } 3196 }
3139 break; 3197 break;
3140 3198
3141 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3142 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3164 process_dcs_seq (); 3222 process_dcs_seq ();
3165 break; 3223 break;
3166 3224
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3172 3229
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3174 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 3232 process_csi_seq ();
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 3478 break;
3422 3479
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 3482 break;
3427 3483
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3430 break; 3486 break;
… …
3632/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3633/* 3689/*
3634 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3636 */ 3692 */
3637unsigned char * 3693char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3695{
3640 unicode_t ch; 3696 unicode_t ch;
3641 bool seen_esc = false; 3697 bool seen_esc = false;
3642 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3675 3731
3676 string[n++] = '\0'; 3732 string[n++] = '\0';
3677 3733
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3735
3680 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3681} 3737}
3682 3738
3683/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3684/* 3740/*
3685 * 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)'
3686 */ 3742 */
3687void 3743void
3688rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3689{ 3745{
3690 unsigned char *s; 3746 char *s;
3691 unicode_t eh; 3747 unicode_t eh;
3692 3748
3693 /* 3749 /*
3694 * Not handled yet 3750 * Not handled yet
3695 */ 3751 */
… …
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3716 3772
3717 if (ch == ';') 3773 if (ch == ';')
3718 { 3774 {
3719 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3720 3776
3721 if (s) 3777 if (s)
3722 { 3778 {
3723 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3724 free (s); 3780 free (s);
3725 } 3781 }
3726 } 3782 }
3727} 3783}
3728 3784
3729void 3785void
3730rxvt_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)
3731{ 3787{
3732 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3733 { 3789 {
3734 unsigned short r, g, b; 3790 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3741 3797
3742/* 3798/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3800 */
3745void 3801void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3803{
3748 int changed = 0; 3804 int changed = 0;
3749 int color; 3805 int color;
3750 char *buf, *name; 3806 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3808 { 3864 {
3809 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3866 break;
3811 3867
3812 *name++ = '\0'; 3868 *name++ = '\0';
3813 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3814 3870
3815 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3872 break;
3817 3873
3818 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3875 *buf++ = '\0';
3820 3876
3821 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3822 { 3878 {
3823 unsigned short r, g, b; 3879 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3825 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);
3826 } 3882 }
3827 else 3883 else
3828 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3829 } 3885 }
3830 break; 3886 break;
3831 case XTerm_Color00: 3887 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break; 3889 break;
3834 case XTerm_Color01: 3890 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3836 break; 3892 break;
3837#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3840 break; 3896 break;
… …
3844 break; 3900 break;
3845 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3846 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);
3847 break; 3903 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3856 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);
3857 break; 3915 break;
3858 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break; 3918 break;
3861#endif 3919#endif
… …
3866 if (am_transparent) 3924 if (am_transparent)
3867 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3868 break; 3926 break;
3869#endif 3927#endif
3870 3928
3871 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3872 if (*str != ';') 3930 if (*str != ';')
3873 { 3931 {
3874#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true); 3935 scr_touch (true);
3936#endif
3879 } 3937 }
3938
3880 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3881 { 3940 {
3882 str++; 3941 str++;
3883#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3884 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3887 3946
3888 if (changed) 3947 if (changed)
3889 { 3948 {
3890#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3891 resize_pixmap (); 3950 resize_pixmap ();
3892#endif
3893 scr_touch (true); 3951 scr_touch (true);
3952#endif
3894 } 3953 }
3895 break; 3954 break;
3896 3955
3897 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3899 break; 3958 break;
3900 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3902 break; 3961 break;
3903 3962
3904 case XTerm_logfile: 3963 case XTerm_logfile:
3905 // TODO, when secure mode? 3964 // TODO, when secure mode?
… …
3910 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break; 3971 break;
3913#endif 3972#endif
3914#if 0 3973#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3916 { 3975 {
3917 int fd; 3976 int fd;
3918 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)
3919 { 3978 {
3920 scr_dump (fd); 3979 scr_dump (fd);
… …
3958 } 4017 }
3959 break; 4018 break;
3960 4019
3961 case URxvt_view_up: 4020 case URxvt_view_up:
3962 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3963 int lines = atoi (str); 4023 int lines = atoi (str);
3964 4024
3965 if (lines) 4025 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 4027 else
3968 {
3969 scr_erase_savelines (); 4028 scr_erase_savelines ();
3970 } 4029 }
3971 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3972 break; 4038 break;
3973#endif 4039#endif
3974 } 4040 }
3975} 4041}
3976/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4087 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4088 switch (arg[i]) 4154 switch (arg[i])
4089 { 4155 {
4090#if ENABLE_STYLES 4156#if ENABLE_STYLES
4091 case 1021: 4157 case 1021:
4092 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096 4159
4097 scr_touch (true); 4160 scr_touch (true);
4098 break; 4161 break;
4099#endif 4162#endif
4100 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
… …
4122 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4123 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4124 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4125 break; 4188 break;
4126 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4127 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4128 SET_OPTION (Opt_jumpScroll);
4129 else
4130 CLR_OPTION (Opt_jumpScroll);
4131 break; 4191 break;
4132 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4133 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4134 break; 4194 break;
4135 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4176#if 0 4236#if 0
4177 case 1001: 4237 case 1001:
4178 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4179#endif 4239#endif
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4181 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4182 SET_OPTION (Opt_scrollTtyOutput);
4183 else
4184 CLR_OPTION (Opt_scrollTtyOutput);
4185 break; 4242 break;
4186 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4187 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4188 SET_OPTION (Opt_scrollTtyKeypress);
4189 else
4190 CLR_OPTION (Opt_scrollTtyKeypress);
4191 break; 4245 break;
4192 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4193 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 4249 scr_erase_screen (2);
… …
4333 scr_color (Color_bg, Color_bg); 4387 scr_color (Color_bg, Color_bg);
4334 break; 4388 break;
4335 4389
4336 //case 50: // not variable spacing 4390 //case 50: // not variable spacing
4337 4391
4338#ifndef NO_BRIGHTCOLOR 4392#if ENABLE_FRILLS
4339 case 90: 4393 case 90:
4340 case 91: /* set bright fg color */ 4394 case 91: /* set bright fg color */
4341 case 92: 4395 case 92:
4342 case 93: 4396 case 93:
4343 case 94: 4397 case 94:
… …
4388 */ 4442 */
4389void 4443void
4390rxvt_term::tt_printf (const char *fmt,...) 4444rxvt_term::tt_printf (const char *fmt,...)
4391{ 4445{
4392 va_list arg_ptr; 4446 va_list arg_ptr;
4393 unsigned char buf[256]; 4447 char buf[256];
4394 4448
4395 va_start (arg_ptr, fmt); 4449 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4450 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 4451 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 4452 tt_write (buf, strlen (buf));
… …
4403 * or generated by us in response to a query ESC sequence. 4457 * or generated by us in response to a query ESC sequence.
4404 */ 4458 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 4460
4407void 4461void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 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
4410 if (v_buflen == 0) 4470 if (v_buflen == 0)
4411 { 4471 {
4412 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));
4413 4473
4414 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4416 4476
4417 data += written; 4477 data += written;
4418 len -= written; 4478 len -= written;
4419 } 4479 }
4420 4480
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4482
4423 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4484 v_buflen += len;
4425 4485
4426 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