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.224 by root, Sun Jan 1 06:18:20 2006 UTC vs.
Revision 1.256 by root, Wed Jan 11 05:14:26 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
54# include <sched.h> 56//# include <sched.h>
55#endif 57#endif
56 58
57#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 60# include "keyboard.h"
59#endif 61#endif
… …
266 mb[0] = ch[0]; 268 mb[0] = ch[0];
267 len = 1; 269 len = 1;
268 } 270 }
269 271
270 if (len > 0) 272 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
272 else 274 else
273 scr_bell (); 275 scr_bell ();
274 } 276 }
275 277
276 iso14755buf = 0; 278 iso14755buf = 0;
… …
304 KeySym keysym; 306 KeySym keysym;
305#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
306 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
307#endif 309#endif
308 int valid_keysym; 310 int valid_keysym;
309 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
310 312
311 /* 313 /*
312 * 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
313 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
314 * 316 *
… …
332 Status status_return; 334 Status status_return;
333 335
334#if 0 336#if 0
335#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
336 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
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
339 else 341 else
340#endif 342#endif
341#endif 343#endif
342 { 344 {
… …
379 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
380 } 382 }
381 else 383 else
382#endif 384#endif
383 { 385 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
386 } 388 }
387 389
388 if (valid_keysym) 390 if (valid_keysym)
389 { 391 {
… …
853 { 855 {
854#ifdef META8_OPTION 856#ifdef META8_OPTION
855 /* set 8-bit on */ 857 /* set 8-bit on */
856 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
857 { 859 {
858 unsigned char *ch; 860 char *ch;
859 861
860 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80; 863 *ch |= 0x80;
862 864
863 meta = 0; 865 meta = 0;
864 } 866 }
865#endif 867#endif
866 /* nil */ ; 868 /* nil */ ;
867 } 869 }
868 } 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;
869 874
870 if (len <= 0) 875 if (len <= 0)
871 return; /* not mapped */ 876 return; /* not mapped */
872 877
873 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
896#ifdef META8_OPTION 901#ifdef META8_OPTION
897 && meta_char == C0_ESC 902 && meta_char == C0_ESC
898#endif 903#endif
899 ) 904 )
900 { 905 {
901 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
902 tt_write (&ch, 1); 907 tt_write (&ch, 1);
903 } 908 }
904 909
905#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
906 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
918 923
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
922unsigned int 927unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 929{
925 unsigned int n, s; 930 unsigned int n, s;
926 931
927 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
965 } 970 }
966#endif 971#endif
967 972
968 if (want_refresh) 973 if (want_refresh)
969 { 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
970 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
971 scrollbar_show (1); 1014 scrollbar_show (1);
972#ifdef USE_XIM 1015#ifdef USE_XIM
973 IMSendSpot (); 1016 IMSendSpot ();
974#endif 1017#endif
… …
984 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
985 1028
986 display->flush (); 1029 display->flush ();
987 1030
988 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
990} 1033}
991 1034
992void 1035void
993rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
994{ 1037{
… …
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 } 1113 }
1071} 1114}
1072#endif 1115#endif
1073 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1074bool 1135bool
1075rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1076{ 1137{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1139
1079 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1080 { 1141 {
1081 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");
1082 n = 0; 1143 n = 0;
1083 } 1144 }
1084 1145
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
… …
1094 return true; 1155 return true;
1095 } 1156 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1158 {
1098#if HAVE_SCHED_YIELD 1159#if HAVE_SCHED_YIELD
1099 sched_yield (); 1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1100#endif 1162#endif
1101 } 1163 }
1102 else 1164 else
1103 { 1165 {
1104 pty_ev.stop (); 1166 pty_ev.stop ();
… …
1142 1204
1143#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1144void 1206void
1145rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1146{ 1208{
1147 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1148 return; 1210 return;
1149 1211
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1151 XFlush (display->display); 1213 XFlush (display->display);
1152 1214
… …
1249 dDisp; 1311 dDisp;
1250 1312
1251 SET_R (this); 1313 SET_R (this);
1252 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1253 1315
1254#if defined(CURSOR_BLINK)
1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1256 {
1257 if (hidden_cursor)
1258 {
1259 hidden_cursor = 0;
1260 want_refresh = 1;
1261 }
1262
1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1264 }
1265#endif
1266
1267#if defined(POINTER_BLANK)
1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1269 {
1270 if (ev.type == MotionNotify
1271 || ev.type == ButtonPress
1272 || ev.type == ButtonRelease)
1273 if (hidden_pointer)
1274 pointer_unblank ();
1275
1276 if (ev.type == KeyPress && hidden_pointer == 0)
1277 pointer_blank ();
1278 }
1279#endif
1280
1281 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1282 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1283 unsigned int unused_mask; 1318 unsigned int unused_mask;
1284 1319
1285 switch (ev.type) 1320 switch (ev.type)
… …
1292 1327
1293 break; 1328 break;
1294 1329
1295 case KeyRelease: 1330 case KeyRelease:
1296 { 1331 {
1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1298 KeySym ks; 1333 KeySym keysym;
1299 1334
1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1301#endif 1336#endif
1302 1337
1303#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1304 // ISO 14755 support 1339 // ISO 14755 support
1305 if (iso14755buf) 1340 if (iso14755buf)
… …
1310# endif 1345# endif
1311# if ISO_14755 1346# if ISO_14755
1312 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1313 // first: controls 1348 // first: controls
1314 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1315 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1317 { 1352 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1319 commit_iso14755 (); 1354 commit_iso14755 ();
1320 return; // case-break; 1355 goto skip_switch;
1321 } 1356 }
1322 1357
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks) 1359 if (i[0] == keysym)
1325 { 1360 {
1326 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 (); 1362 commit_iso14755 ();
1328 return; // case-break; 1363 goto skip_switch;
1329 } 1364 }
1330 1365
1331 scr_bell (); 1366 scr_bell ();
1332# endif 1367# endif
1333 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1352 else 1387 else
1353 iso14755buf = 0; 1388 iso14755buf = 0;
1354 } 1389 }
1355#endif 1390#endif
1356 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1361 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1362#endif 1401#endif
1363 break; 1402 break;
1364 } 1403 }
1365 1404
… …
1495 1534
1496 case SelectionRequest: 1535 case SelectionRequest:
1497 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1498 break; 1537 break;
1499 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1500 case UnmapNotify: 1547 case UnmapNotify:
1501 mapped = 0; 1548 mapped = 0;
1502#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1503 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1504#endif 1551#endif
1505 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 break; 1553 break;
1513 1554
1514#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1515 case ReparentNotify: 1556 case ReparentNotify:
1516 rootwin_cb (ev); 1557 rootwin_cb (ev);
… …
1530 1571
1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1534 1575
1535 scr_refresh (refresh_type); 1576 want_refresh = 1;
1536 } 1577 }
1537 else 1578 else
1538 { 1579 {
1539 XEvent unused_event; 1580 XEvent unused_event;
1540 1581
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1617 break;
1577 1618
1578 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1579 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1624 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1626 ;
1584 1627
1585 XQueryPointer (disp, vt, 1628 XQueryPointer (disp, vt,
… …
1665 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1710 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1712 scrollbar_size ());
1670 scr_refresh (refresh_type); 1713 want_refresh = 1;
1671 refresh_limit = 0; 1714 refresh_limit = 0;
1672 scrollbar_show (1); 1715 scrollbar_show (1);
1673 } 1716 }
1674 break; 1717 break;
1675 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1676} 1748}
1677 1749
1678void 1750void
1679rxvt_term::focus_in () 1751rxvt_term::focus_in ()
1680{ 1752{
1681 if (!focus) 1753 if (!focus)
1682 { 1754 {
1683 focus = 1; 1755 focus = 1;
1684 want_refresh = 1; 1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1685#if USE_XIM 1760#if USE_XIM
1686 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1687 { 1762 {
1688 IMSetStatusPosition (); 1763 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
… …
1709 if (focus) 1784 if (focus)
1710 { 1785 {
1711 focus = 0; 1786 focus = 0;
1712 want_refresh = 1; 1787 want_refresh = 1;
1713 1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1714#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1715 iso14755buf = 0; 1794 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1795# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1796 scr_overlay_off ();
1797# endif
1798 }
1719#endif 1799#endif
1720#if USE_XIM 1800#if USE_XIM
1721 if (Input_Context != NULL) 1801 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1723#endif 1803#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1768{ 1848{
1769 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1770 1850
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1772 if (!bypass_keystate) 1853 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1855
1775 /* 1856 /*
1776 * VT window processing of button press 1857 * VT window processing of button press
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1798 { 1879 {
1799 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1800 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1801 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1802 { 1884 {
1803 /* only report double clicks */ 1885 /* only report double clicks */
1804 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1805 mouse_report (ev); 1887 mouse_report (ev);
… …
1825 else 1907 else
1826 { 1908 {
1827 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1829 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1913 switch (ev.button)
1831 { 1914 {
1832 case Button1: 1915 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1920#else
1838 selection.rect = false; 1921 selection.rect = false;
1839#endif 1922#endif
1840 1923
1841 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1926 {
1844 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1846 else 1929 else
1847 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1848 } 1931 }
1849 else 1932 else
1850 { 1933 {
1851 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1935 MEvent.clicks++;
1853 else 1936 else
1854 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1855 1938
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1940 }
1858 1941
1859 MEvent.button = Button1; 1942 MEvent.button = Button1;
1860 break; 1943 break;
1861 1944
1862 case Button3: 1945 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1865 else 1948 else
1866 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1867 1950
1868 MEvent.button = Button3; 1951 MEvent.button = Button3;
1869 break; 1952 break;
1870 } 1953 }
1871 } 1954 }
1872 1955
1873 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1874 return; 1957 return;
1875 } 1958 }
1876 1959
… …
2012 } 2095 }
2013 2096
2014 break; 2097 break;
2015 } 2098 }
2016 } 2099 }
2100
2017 return; 2101 return;
2018 } 2102 }
2103
2019#if MENUBAR 2104#if MENUBAR
2020 /* 2105 /*
2021 * Menubar window processing of button press 2106 * Menubar window processing of button press
2022 */ 2107 */
2023 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2086 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2172 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2090 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2091 switch (ev.button) 2179 switch (ev.button)
2092 { 2180 {
2093 case Button1: 2181 case Button1:
2094 case Button3: 2182 case Button3:
2095 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2126 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2127 } 2215 }
2128 else 2216 else
2129 { 2217 {
2130# endif 2218# endif
2131# ifdef JUMP_MOUSE_WHEEL
2132 scr_page (v, i); 2219 scr_page (v, i);
2133 scr_refresh (SMOOTH_REFRESH);
2134 scrollbar_show (1); 2220 scrollbar_show (1);
2135# else
2136 while (i--)
2137 {
2138 scr_page (v, 1);
2139 scr_refresh (SMOOTH_REFRESH);
2140 scrollbar_show (1);
2141 }
2142# endif
2143# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2144 } 2222 }
2145#endif 2223# endif
2146 } 2224 }
2147 break; 2225 break;
2148#endif 2226#endif
2149 } 2227 }
2150 } 2228 }
… …
2639 2717
2640bool 2718bool
2641rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2642{ 2720{
2643 bool flag = false; 2721 bool flag = false;
2644 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2646 2724
2647 for (;;) 2725 for (;;)
2648 { 2726 {
2649 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2650 { 2728 {
2651 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2730 ch = next_char ();
2653 }
2654 2731
2655 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2656 break; 2733 break;
2734 }
2657 2735
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2737 {
2660 if (!seen_input) 2738 if (!seen_input)
2661 { 2739 {
… …
2670 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2672 } 2750 }
2673 2751
2674 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2754 bool refreshnow = false;
2677 int nlines = 0; 2755 int nlines = 0;
2678 unicode_t *str = buf; 2756 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2758
2681 for (;;) 2759 for (;;)
2682 { 2760 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2684 break; 2762 break;
… …
2694 2772
2695 if (!OPTION (Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2696 || (refresh_count >= refresh_limit * (nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2775 {
2698 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2699 ch = NOCHAR; 2778 ch = NOCHAR;
2700 break; 2779 break;
2701 } 2780 }
2702 2781
2703 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2704 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2705 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2706 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2707 nlines = 0; 2788 nlines = 0;
2708 str = buf; 2789 str = buf;
2709 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2710 } 2791 }
2711 2792
… …
2724 2805
2725 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2726 ch = next_char (); 2807 ch = next_char ();
2727 } 2808 }
2728 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2729 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2730 2812
2731 /* 2813 /*
2732 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2733 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2734 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
… …
2740 refresh_limit++; 2822 refresh_limit++;
2741 else 2823 else
2742 { 2824 {
2743 flag = true; 2825 flag = true;
2744 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2745 } 2828 }
2746 } 2829 }
2747 2830
2748 } 2831 }
2749 else 2832 else
… …
2764 } 2847 }
2765 2848
2766 return flag; 2849 return flag;
2767} 2850}
2768 2851
2769// read the next octet
2770unicode_t
2771rxvt_term::next_octet ()
2772{
2773 return cmdbuf_ptr < cmdbuf_endp
2774 ? *cmdbuf_ptr++
2775 : NOCHAR;
2776}
2777
2778// read the next character 2852// read the next character
2779unicode_t 2853wchar_t
2780rxvt_term::next_char () 2854rxvt_term::next_char ()
2781{ 2855{
2782 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2783 { 2857 {
2784 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2785 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2786 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2787 2861
2788 wchar_t wc; 2862 wchar_t wc;
2789 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2790 2864
2791 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2792 { 2866 {
2793 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2794 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2795 break; 2869 break;
2796 } 2870 }
2797 2871
2798 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2800 2874
2801 // assume wchar == unicode 2875 // assume wchar == unicode
2802 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2803 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2804 } 2878 }
2805 2879
2806 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2807} 2890}
2808 2891
2809/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2810/* 2893/*
2811 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2812 * to the command. 2895 * to the command.
2813 */ 2896 */
2814unicode_t 2897wchar_t
2815rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2816{ 2899{
2817 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2818 2901
2819 if (c == NOCHAR) 2902 if (c == NOCHAR)
2820 throw out_of_input; 2903 throw out_of_input;
2821 2904
2822 return c; 2905 return c;
2823} 2906}
2824 2907
2825unicode_t 2908uint32_t
2826rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2827{ 2910{
2828 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2829 2912
2830 if (c == NOCHAR) 2913 if (c == NOCHAR)
2831 throw out_of_input; 2914 throw out_of_input;
2832 2915
2833 return c; 2916 return c;
… …
2933 case C0_ESC: 3016 case C0_ESC:
2934 process_escape_seq (); 3017 process_escape_seq ();
2935 break; 3018 break;
2936 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2937 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2940 else 3022 else
2941 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2942 (unsigned int)strlen (VT100_ANS));
2943 break; 3024 break;
2944 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2945 scr_bell (); 3026 scr_bell ();
2946 break; 3027 break;
2947 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3102 break; 3183 break;
3103 3184
3104 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3105 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3106 { 3187 {
3107 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3108 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3109 } 3190 }
3110 break; 3191 break;
3111 3192
3112 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3113 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3135 process_dcs_seq (); 3216 process_dcs_seq ();
3136 break; 3217 break;
3137 3218
3138 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3139 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3140 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3141 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3142 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3143 3223
3144 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3145 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3146 process_csi_seq (); 3226 process_csi_seq ();
… …
3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3392 break; 3472 break;
3393 3473
3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3395 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3396 (unsigned int) (sizeof (VT100_ANS) - 1));
3397 break; 3476 break;
3398 3477
3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3400 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3401 break; 3480 break;
… …
3603/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3604/* 3683/*
3605 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3606 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3607 */ 3686 */
3608unsigned char * 3687char *
3609rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3610{ 3689{
3611 unicode_t ch; 3690 unicode_t ch;
3612 bool seen_esc = false; 3691 bool seen_esc = false;
3613 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3646 3725
3647 string[n++] = '\0'; 3726 string[n++] = '\0';
3648 3727
3649 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3650 3729
3651 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3652} 3731}
3653 3732
3654/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3655/* 3734/*
3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3657 */ 3736 */
3658void 3737void
3659rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3660{ 3739{
3661 unsigned char *s; 3740 char *s;
3662 unicode_t eh; 3741 unicode_t eh;
3663 3742
3664 /* 3743 /*
3665 * Not handled yet 3744 * Not handled yet
3666 */ 3745 */
… …
3685 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3686 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3687 3766
3688 if (ch == ';') 3767 if (ch == ';')
3689 { 3768 {
3690 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3691 3770
3692 if (s) 3771 if (s)
3693 { 3772 {
3694 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3695 free (s); 3774 free (s);
3696 } 3775 }
3697 } 3776 }
3698} 3777}
3699 3778
3700void 3779void
3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3702{ 3781{
3703 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3704 { 3783 {
3705 unsigned short r, g, b; 3784 unsigned short r, g, b;
3706 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3712 3791
3713/* 3792/*
3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3715 */ 3794 */
3716void 3795void
3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3718{ 3797{
3719 int changed = 0; 3798 int changed = 0;
3720 int color; 3799 int color;
3721 char *buf, *name; 3800 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3779 { 3858 {
3780 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3781 break; 3860 break;
3782 3861
3783 *name++ = '\0'; 3862 *name++ = '\0';
3784 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3785 3864
3786 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS))
3787 break; 3866 break;
3788 3867
3789 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3790 *buf++ = '\0'; 3869 *buf++ = '\0';
3791 3870
3792 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3793 { 3872 {
3794 unsigned short r, g, b; 3873 unsigned short r, g, b;
3795 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3796 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3797 } 3876 }
3798 else 3877 else
3799 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3800 } 3879 }
3801 break; 3880 break;
3802 case XTerm_Color00: 3881 case XTerm_Color00:
3803 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3804 break; 3883 break;
3805 case XTerm_Color01: 3884 case XTerm_Color01:
3806 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3807 break; 3886 break;
3808#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3809 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3810 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3811 break; 3890 break;
… …
3843 if (*str != ';') 3922 if (*str != ';')
3844 { 3923 {
3845#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3846 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3847 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3848#endif
3849 scr_touch (true); 3927 scr_touch (true);
3928#endif
3850 } 3929 }
3930
3851 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3852 { 3932 {
3853 str++; 3933 str++;
3854#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3855 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
… …
3858 3938
3859 if (changed) 3939 if (changed)
3860 { 3940 {
3861#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3862 resize_pixmap (); 3942 resize_pixmap ();
3863#endif
3864 scr_touch (true); 3943 scr_touch (true);
3944#endif
3865 } 3945 }
3866 break; 3946 break;
3867 3947
3868 case XTerm_restoreFG: 3948 case XTerm_restoreFG:
3869 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
… …
3929 } 4009 }
3930 break; 4010 break;
3931 4011
3932 case URxvt_view_up: 4012 case URxvt_view_up:
3933 case URxvt_view_down: 4013 case URxvt_view_down:
4014 {
3934 int lines = atoi (str); 4015 int lines = atoi (str);
3935 4016
3936 if (lines) 4017 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines); 4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else 4019 else
3939 {
3940 scr_erase_savelines (); 4020 scr_erase_savelines ();
3941 } 4021 }
3942 4022
4023 break;
4024#endif
4025
4026#if ENABLE_PERL
4027 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4029 ; // no responses yet
3943 break; 4030 break;
3944#endif 4031#endif
3945 } 4032 }
3946} 4033}
3947/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
4058 /* extra handling for values with state unkept */ 4145 /* extra handling for values with state unkept */
4059 switch (arg[i]) 4146 switch (arg[i])
4060 { 4147 {
4061#if ENABLE_STYLES 4148#if ENABLE_STYLES
4062 case 1021: 4149 case 1021:
4063 if (mode) 4150 set_option (Opt_intensityStyles, mode);
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067 4151
4068 want_refresh = 1; 4152 scr_touch (true);
4069 want_full_refresh = 1;
4070 break; 4153 break;
4071#endif 4154#endif
4072 case 1048: /* alternative cursor save */ 4155 case 1048: /* alternative cursor save */
4073 case 1049: 4156 case 1049:
4074 if (OPTION (Opt_secondaryScreen)) 4157 if (OPTION (Opt_secondaryScreen))
… …
4094 case 3: /* 80/132 */ 4177 case 3: /* 80/132 */
4095 if (priv_modes & PrivMode_132OK) 4178 if (priv_modes & PrivMode_132OK)
4096 set_widthheight (((state ? 132 : 80) * fwidth), height); 4179 set_widthheight (((state ? 132 : 80) * fwidth), height);
4097 break; 4180 break;
4098 case 4: /* smooth scrolling */ 4181 case 4: /* smooth scrolling */
4099 if (!state) 4182 set_option (Opt_jumpScroll, !state);
4100 SET_OPTION (Opt_jumpScroll);
4101 else
4102 CLR_OPTION (Opt_jumpScroll);
4103 break; 4183 break;
4104 case 5: /* reverse video */ 4184 case 5: /* reverse video */
4105 scr_rvideo_mode (state); 4185 scr_rvideo_mode (state);
4106 break; 4186 break;
4107 case 6: /* relative/absolute origins */ 4187 case 6: /* relative/absolute origins */
… …
4148#if 0 4228#if 0
4149 case 1001: 4229 case 1001:
4150 break; /* X11 mouse highlighting */ 4230 break; /* X11 mouse highlighting */
4151#endif 4231#endif
4152 case 1010: /* scroll to bottom on TTY output inhibit */ 4232 case 1010: /* scroll to bottom on TTY output inhibit */
4153 if (!state) 4233 set_option (Opt_scrollTtyOutput, !state);
4154 SET_OPTION (Opt_scrollTtyOutput);
4155 else
4156 CLR_OPTION (Opt_scrollTtyOutput);
4157 break; 4234 break;
4158 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4159 if (state) 4236 set_option (Opt_scrollTtyKeypress, state);
4160 SET_OPTION (Opt_scrollTtyKeypress);
4161 else
4162 CLR_OPTION (Opt_scrollTtyKeypress);
4163 break; 4237 break;
4164 case 1047: /* secondary screen w/ clearing last */ 4238 case 1047: /* secondary screen w/ clearing last */
4165 if (OPTION (Opt_secondaryScreen)) 4239 if (OPTION (Opt_secondaryScreen))
4166 if (current_screen != PRIMARY) 4240 if (current_screen != PRIMARY)
4167 scr_erase_screen (2); 4241 scr_erase_screen (2);
… …
4305 scr_color (Color_bg, Color_bg); 4379 scr_color (Color_bg, Color_bg);
4306 break; 4380 break;
4307 4381
4308 //case 50: // not variable spacing 4382 //case 50: // not variable spacing
4309 4383
4310#ifndef NO_BRIGHTCOLOR 4384#if ENABLE_FRILLS
4311 case 90: 4385 case 90:
4312 case 91: /* set bright fg color */ 4386 case 91: /* set bright fg color */
4313 case 92: 4387 case 92:
4314 case 93: 4388 case 93:
4315 case 94: 4389 case 94:
… …
4360 */ 4434 */
4361void 4435void
4362rxvt_term::tt_printf (const char *fmt,...) 4436rxvt_term::tt_printf (const char *fmt,...)
4363{ 4437{
4364 va_list arg_ptr; 4438 va_list arg_ptr;
4365 unsigned char buf[256]; 4439 char buf[256];
4366 4440
4367 va_start (arg_ptr, fmt); 4441 va_start (arg_ptr, fmt);
4368 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4442 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4369 va_end (arg_ptr); 4443 va_end (arg_ptr);
4370 tt_write (buf, strlen (buf)); 4444 tt_write (buf, strlen (buf));
… …
4375 * or generated by us in response to a query ESC sequence. 4449 * or generated by us in response to a query ESC sequence.
4376 */ 4450 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378 4452
4379void 4453void
4380rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
4381{ 4455{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
4458
4459 if (pty.pty < 0)
4460 return;
4461
4382 if (v_buflen == 0) 4462 if (v_buflen == 0)
4383 { 4463 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4385 4465
4386 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
… …
4388 4468
4389 data += written; 4469 data += written;
4390 len -= written; 4470 len -= written;
4391 } 4471 }
4392 4472
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4394 4474
4395 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len; 4476 v_buflen += len;
4397 4477
4398 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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