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.219 by root, Sat Dec 31 17:16:17 2005 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.
… …
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"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162void 167void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 169{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
… …
238 242
239# if ENABLE_COMBINING 243# if ENABLE_COMBINING
240 if (alloc) 244 if (alloc)
241 delete [] alloc; 245 delete [] alloc;
242# endif 246# endif
243#endif
244} 247}
248#endif
245 249
246void 250void
247rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
248{ 252{
249 wchar_t ch[2]; 253 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 268 mb[0] = ch[0];
265 len = 1; 269 len = 1;
266 } 270 }
267 271
268 if (len > 0) 272 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
270 else 274 else
271 scr_bell (); 275 scr_bell ();
272 } 276 }
273 277
274 iso14755buf = 0; 278 iso14755buf = 0;
… …
302 KeySym keysym; 306 KeySym keysym;
303#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
305#endif 309#endif
306 int valid_keysym; 310 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
308 312
309 /* 313 /*
310 * 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
311 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
312 * 316 *
… …
330 Status status_return; 334 Status status_return;
331 335
332#if 0 336#if 0
333#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
334 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
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
337 else 341 else
338#endif 342#endif
339#endif 343#endif
340 { 344 {
… …
377 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
378 } 382 }
379 else 383 else
380#endif 384#endif
381 { 385 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
384 } 388 }
385 389
386 if (valid_keysym) 390 if (valid_keysym)
387 { 391 {
… …
851 { 855 {
852#ifdef META8_OPTION 856#ifdef META8_OPTION
853 /* set 8-bit on */ 857 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
855 { 859 {
856 unsigned char *ch; 860 char *ch;
857 861
858 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 863 *ch |= 0x80;
860 864
861 meta = 0; 865 meta = 0;
862 } 866 }
863#endif 867#endif
864 /* nil */ ; 868 /* nil */ ;
865 } 869 }
866 } 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;
867 874
868 if (len <= 0) 875 if (len <= 0)
869 return; /* not mapped */ 876 return; /* not mapped */
870 877
871 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
894#ifdef META8_OPTION 901#ifdef META8_OPTION
895 && meta_char == C0_ESC 902 && meta_char == C0_ESC
896#endif 903#endif
897 ) 904 )
898 { 905 {
899 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
900 tt_write (&ch, 1); 907 tt_write (&ch, 1);
901 } 908 }
902 909
903#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
916 923
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
920unsigned int 927unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 929{
923 unsigned int n, s; 930 unsigned int n, s;
924 931
925 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 970 }
964#endif 971#endif
965 972
966 if (want_refresh) 973 if (want_refresh)
967 { 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
968 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
969 scrollbar_show (1); 1016 scrollbar_show (1);
970#ifdef USE_XIM 1017#ifdef USE_XIM
971 IMSendSpot (); 1018 IMSendSpot ();
972#endif 1019#endif
… …
982 SET_LOCALE (locale); 1029 SET_LOCALE (locale);
983 1030
984 display->flush (); 1031 display->flush ();
985 1032
986 if (want_refresh && !flush_ev.active) 1033 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1035}
989 1036
990void 1037void
991rxvt_term::flush_cb (time_watcher &w) 1038rxvt_term::flush_cb (time_watcher &w)
992{ 1039{
… …
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1115 }
1069} 1116}
1070#endif 1117#endif
1071 1118
1119#if HAVE_SCHED_YIELD
1120static struct event_handler
1121{
1122 check_watcher cw_yield;
1123
1124 void yield (check_watcher &w)
1125 {
1126 sched_yield ();
1127 w.stop ();
1128 }
1129
1130 event_handler ()
1131 : cw_yield (this, &event_handler::yield)
1132 {
1133 }
1134} event_handler;
1135#endif
1136
1072bool 1137bool
1073rxvt_term::pty_fill () 1138rxvt_term::pty_fill ()
1074{ 1139{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1141
1077 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1078 { 1143 {
1079 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");
1080 n = 0; 1145 n = 0;
1081 } 1146 }
1082 1147
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1150 cmdbuf_endp = cmdbuf_ptr + n;
1086 1151
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1153
1089 if (n > 0) 1154 if (r > 0)
1090 { 1155 {
1091 cmdbuf_endp += n; 1156 cmdbuf_endp += r;
1092 return true; 1157 return true;
1093 } 1158 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 {
1161#if HAVE_SCHED_YIELD
1162 if (display->is_local)
1163 event_handler.cw_yield.start ();
1164#endif
1165 }
1166 else
1095 { 1167 {
1096 pty_ev.stop (); 1168 pty_ev.stop ();
1097 1169
1098 if (!OPTION (Opt_hold)) 1170 if (!OPTION (Opt_hold))
1099 destroy (); 1171 destroy ();
… …
1134 1206
1135#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1136void 1208void
1137rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1138{ 1210{
1139 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1140 return; 1212 return;
1141 1213
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1143 XFlush (display->display); 1215 XFlush (display->display);
1144 1216
… …
1241 dDisp; 1313 dDisp;
1242 1314
1243 SET_R (this); 1315 SET_R (this);
1244 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1245 1317
1246#if defined(CURSOR_BLINK)
1247 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1248 {
1249 if (hidden_cursor)
1250 {
1251 hidden_cursor = 0;
1252 want_refresh = 1;
1253 }
1254
1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1256 }
1257#endif
1258
1259#if defined(POINTER_BLANK)
1260 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1261 {
1262 if (ev.type == MotionNotify
1263 || ev.type == ButtonPress
1264 || ev.type == ButtonRelease)
1265 if (hidden_pointer)
1266 pointer_unblank ();
1267
1268 if (ev.type == KeyPress && hidden_pointer == 0)
1269 pointer_blank ();
1270 }
1271#endif
1272
1273 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1320 unsigned int unused_mask;
1276 1321
1277 switch (ev.type) 1322 switch (ev.type)
… …
1284 1329
1285 break; 1330 break;
1286 1331
1287 case KeyRelease: 1332 case KeyRelease:
1288 { 1333 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1290 KeySym ks; 1335 KeySym keysym;
1291 1336
1292 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 :/
1293#endif 1338#endif
1294 1339
1295#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support 1341 // ISO 14755 support
1297 if (iso14755buf) 1342 if (iso14755buf)
… …
1302# endif 1347# endif
1303# if ISO_14755 1348# if ISO_14755
1304 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1305 // first: controls 1350 // first: controls
1306 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1309 { 1354 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1311 commit_iso14755 (); 1356 commit_iso14755 ();
1312 return; // case-break; 1357 goto skip_switch;
1313 } 1358 }
1314 1359
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1361 if (i[0] == keysym)
1317 { 1362 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1364 commit_iso14755 ();
1320 return; // case-break; 1365 goto skip_switch;
1321 } 1366 }
1322 1367
1323 scr_bell (); 1368 scr_bell ();
1324# endif 1369# endif
1325 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1344 else 1389 else
1345 iso14755buf = 0; 1390 iso14755buf = 0;
1346 } 1391 }
1347#endif 1392#endif
1348 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
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1354#endif 1403#endif
1355 break; 1404 break;
1356 } 1405 }
1357 1406
… …
1487 1536
1488 case SelectionRequest: 1537 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1490 break; 1539 break;
1491 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
1492 case UnmapNotify: 1549 case UnmapNotify:
1493 mapped = 0; 1550 mapped = 0;
1494#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1496#endif 1553#endif
1497 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498
1499 case MapNotify:
1500 mapped = 1;
1501#ifdef TEXT_BLINK
1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1503#endif
1504 break; 1555 break;
1505 1556
1506#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1507 case ReparentNotify: 1558 case ReparentNotify:
1508 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1522 1573
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, False);
1526 1577
1527 scr_refresh (refresh_type); 1578 want_refresh = 1;
1528 } 1579 }
1529 else 1580 else
1530 { 1581 {
1531 XEvent unused_event; 1582 XEvent unused_event;
1532 1583
… …
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1619 break;
1569 1620
1570 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1571 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1626 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1628 ;
1576 1629
1577 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1657 &unused_root_x, &unused_root_y, 1710 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1711 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1712 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1714 scrollbar_size ());
1662 scr_refresh (refresh_type); 1715 want_refresh = 1;
1663 refresh_limit = 0; 1716 refresh_limit = 0;
1664 scrollbar_show (1); 1717 scrollbar_show (1);
1665 } 1718 }
1666 break; 1719 break;
1667 } 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
1668} 1750}
1669 1751
1670void 1752void
1671rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1672{ 1754{
1673 if (!focus) 1755 if (!focus)
1674 { 1756 {
1675 focus = 1; 1757 focus = 1;
1676 want_refresh = 1; 1758 want_refresh = 1;
1759
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1677#if USE_XIM 1762#if USE_XIM
1678 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1679 { 1764 {
1680 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1766 XSetICFocus (Input_Context);
… …
1701 if (focus) 1786 if (focus)
1702 { 1787 {
1703 focus = 0; 1788 focus = 0;
1704 want_refresh = 1; 1789 want_refresh = 1;
1705 1790
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1792
1706#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf)
1795 {
1707 iso14755buf = 0; 1796 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1797# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1798 scr_overlay_off ();
1799# endif
1800 }
1711#endif 1801#endif
1712#if USE_XIM 1802#if USE_XIM
1713 if (Input_Context != NULL) 1803 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1804 XUnsetICFocus (Input_Context);
1715#endif 1805#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1760{ 1850{
1761 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1762 1852
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1764 if (!bypass_keystate) 1855 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1857
1767 /* 1858 /*
1768 * VT window processing of button press 1859 * VT window processing of button press
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1790 { 1881 {
1791 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1792 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1793 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1794 { 1886 {
1795 /* only report double clicks */ 1887 /* only report double clicks */
1796 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1797 mouse_report (ev); 1889 mouse_report (ev);
… …
1817 else 1909 else
1818 { 1910 {
1819 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1821 1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1915 switch (ev.button)
1823 { 1916 {
1824 case Button1: 1917 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1922#else
1830 selection.rect = false; 1923 selection.rect = false;
1831#endif 1924#endif
1832 1925
1833 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1835 { 1928 {
1836 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1838 else 1931 else
1839 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1840 } 1933 }
1841 else 1934 else
1842 { 1935 {
1843 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1937 MEvent.clicks++;
1845 else 1938 else
1846 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1847 1940
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1942 }
1850 1943
1851 MEvent.button = Button1; 1944 MEvent.button = Button1;
1852 break; 1945 break;
1853 1946
1854 case Button3: 1947 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1857 else 1950 else
1858 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1859 1952
1860 MEvent.button = Button3; 1953 MEvent.button = Button3;
1861 break; 1954 break;
1862 } 1955 }
1863 } 1956 }
1864 1957
1865 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1866 return; 1959 return;
1867 } 1960 }
1868 1961
… …
2004 } 2097 }
2005 2098
2006 break; 2099 break;
2007 } 2100 }
2008 } 2101 }
2102
2009 return; 2103 return;
2010 } 2104 }
2105
2011#if MENUBAR 2106#if MENUBAR
2012 /* 2107 /*
2013 * Menubar window processing of button press 2108 * Menubar window processing of button press
2014 */ 2109 */
2015 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2078 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2079 && bypass_keystate 2174 && bypass_keystate
2080 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2081 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2082 2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2083 switch (ev.button) 2181 switch (ev.button)
2084 { 2182 {
2085 case Button1: 2183 case Button1:
2086 case Button3: 2184 case Button3:
2087 selection_make (ev.time); 2185 selection_make (ev.time);
… …
2118 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2119 } 2217 }
2120 else 2218 else
2121 { 2219 {
2122# endif 2220# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2221 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2222 scrollbar_show (1);
2127# else
2128 while (i--)
2129 {
2130 scr_page (v, 1);
2131 scr_refresh (SMOOTH_REFRESH);
2132 scrollbar_show (1);
2133 }
2134# endif
2135# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2136 } 2224 }
2137#endif 2225# endif
2138 } 2226 }
2139 break; 2227 break;
2140#endif 2228#endif
2141 } 2229 }
2142 } 2230 }
… …
2631 2719
2632bool 2720bool
2633rxvt_term::cmd_parse () 2721rxvt_term::cmd_parse ()
2634{ 2722{
2635 bool flag = false; 2723 bool flag = false;
2636 unicode_t ch = NOCHAR; 2724 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2725 char *seq_begin; // remember start of esc-sequence here
2638 2726
2639 for (;;) 2727 for (;;)
2640 { 2728 {
2641 if (ch == NOCHAR) 2729 if (ch == NOCHAR)
2642 { 2730 {
2643 seq_begin = cmdbuf_ptr; 2731 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2732 ch = next_char ();
2645 }
2646 2733
2647 if (ch == NOCHAR) // TODO: improve 2734 if (ch == NOCHAR)
2648 break; 2735 break;
2736 }
2649 2737
2650 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)
2651 { 2739 {
2652 if (!seen_input) 2740 if (!seen_input)
2653 { 2741 {
… …
2662 if (seen_resize && cmd_pid) 2750 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2751 kill (-cmd_pid, SIGWINCH);
2664 } 2752 }
2665 2753
2666 /* Read a text string from the input buffer */ 2754 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2755 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2756 bool refreshnow = false;
2669 int nlines = 0; 2757 int nlines = 0;
2670 unicode_t *str = buf; 2758 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2759 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2760
2673 for (;;) 2761 for (;;)
2674 { 2762 {
2675 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))
2676 break; 2764 break;
… …
2686 2774
2687 if (!OPTION (Opt_jumpScroll) 2775 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2776 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2777 {
2690 refreshnow = true; 2778 refreshnow = true;
2779 refresh_count = 0;
2691 ch = NOCHAR; 2780 ch = NOCHAR;
2692 break; 2781 break;
2693 } 2782 }
2694 2783
2695 // scr_add_lines only works for nlines <= nrow - 1. 2784 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2785 if (nlines >= nrow - 1)
2697 { 2786 {
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2698 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2789
2699 nlines = 0; 2790 nlines = 0;
2700 str = buf; 2791 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2792 eol = str + min (ncol, UBUFSIZ);
2702 } 2793 }
2703 2794
… …
2716 2807
2717 seq_begin = cmdbuf_ptr; 2808 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2809 ch = next_char ();
2719 } 2810 }
2720 2811
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2721 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2722 2814
2723 /* 2815 /*
2724 * 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
2725 * 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.
2726 * the number of pages between refreshes is refresh_limit, which 2818 * the number of pages between refreshes is refresh_limit, which
… …
2732 refresh_limit++; 2824 refresh_limit++;
2733 else 2825 else
2734 { 2826 {
2735 flag = true; 2827 flag = true;
2736 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2829 want_refresh = 1;
2737 } 2830 }
2738 } 2831 }
2739 2832
2740 } 2833 }
2741 else 2834 else
… …
2756 } 2849 }
2757 2850
2758 return flag; 2851 return flag;
2759} 2852}
2760 2853
2761// read the next octet
2762unicode_t
2763rxvt_term::next_octet ()
2764{
2765 return cmdbuf_ptr < cmdbuf_endp
2766 ? *cmdbuf_ptr++
2767 : NOCHAR;
2768}
2769
2770// read the next character 2854// read the next character
2771unicode_t 2855wchar_t
2772rxvt_term::next_char () 2856rxvt_term::next_char ()
2773{ 2857{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2859 {
2776 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2779 2863
2780 wchar_t wc; 2864 wchar_t wc;
2781 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);
2782 2866
2783 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2784 { 2868 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2871 break;
2788 } 2872 }
2789 2873
2790 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2791 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
2792 2876
2793 // assume wchar == unicode 2877 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2879 return wc & UNICODE_MASK;
2796 } 2880 }
2797 2881
2798 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;
2799} 2892}
2800 2893
2801/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2802/* 2895/*
2803 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2804 * to the command. 2897 * to the command.
2805 */ 2898 */
2806unicode_t 2899wchar_t
2807rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2808{ 2901{
2809 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2810 2903
2811 if (c == NOCHAR) 2904 if (c == NOCHAR)
2812 throw out_of_input; 2905 throw out_of_input;
2813 2906
2814 return c; 2907 return c;
2815} 2908}
2816 2909
2817unicode_t 2910uint32_t
2818rxvt_term::cmd_get8 () 2911rxvt_term::cmd_get8 ()
2819{ 2912{
2820 unicode_t c = next_octet (); 2913 uint32_t c = next_octet ();
2821 2914
2822 if (c == NOCHAR) 2915 if (c == NOCHAR)
2823 throw out_of_input; 2916 throw out_of_input;
2824 2917
2825 return c; 2918 return c;
… …
2925 case C0_ESC: 3018 case C0_ESC:
2926 process_escape_seq (); 3019 process_escape_seq ();
2927 break; 3020 break;
2928 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 3024 else
2933 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 3026 break;
2936 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2937 scr_bell (); 3028 scr_bell ();
2938 break; 3029 break;
2939 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
3094 break; 3185 break;
3095 3186
3096 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
3098 { 3189 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3192 }
3102 break; 3193 break;
3103 3194
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3218 process_dcs_seq ();
3128 break; 3219 break;
3129 3220
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
3135 3225
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3228 process_csi_seq ();
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3474 break;
3385 3475
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3478 break;
3390 3479
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
3393 break; 3482 break;
… …
3595/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3596/* 3685/*
3597 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3687 * ends_how is terminator used. returned input must be free()'d
3599 */ 3688 */
3600unsigned char * 3689char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3691{
3603 unicode_t ch; 3692 unicode_t ch;
3604 bool seen_esc = false; 3693 bool seen_esc = false;
3605 unsigned int n = 0; 3694 unsigned int n = 0;
… …
3638 3727
3639 string[n++] = '\0'; 3728 string[n++] = '\0';
3640 3729
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3731
3643 return (unsigned char *)rxvt_wcstombs (string); 3732 return rxvt_wcstombs (string);
3644} 3733}
3645 3734
3646/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3647/* 3736/*
3648 * 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)'
3649 */ 3738 */
3650void 3739void
3651rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3652{ 3741{
3653 unsigned char *s; 3742 char *s;
3654 unicode_t eh; 3743 unicode_t eh;
3655 3744
3656 /* 3745 /*
3657 * Not handled yet 3746 * Not handled yet
3658 */ 3747 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3679 3768
3680 if (ch == ';') 3769 if (ch == ';')
3681 { 3770 {
3682 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3683 3772
3684 if (s) 3773 if (s)
3685 { 3774 {
3686 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3687 free (s); 3776 free (s);
3688 } 3777 }
3689 } 3778 }
3690} 3779}
3691 3780
3692void 3781void
3693rxvt_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)
3694{ 3783{
3695 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3696 { 3785 {
3697 unsigned short r, g, b; 3786 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
… …
3704 3793
3705/* 3794/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3796 */
3708void 3797void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3799{
3711 int changed = 0; 3800 int changed = 0;
3712 int color; 3801 int color;
3713 char *buf, *name; 3802 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
… …
3921 } 4010 }
3922 break; 4011 break;
3923 4012
3924 case URxvt_view_up: 4013 case URxvt_view_up:
3925 case URxvt_view_down: 4014 case URxvt_view_down:
4015 {
3926 int lines = atoi (str); 4016 int lines = atoi (str);
3927 4017
3928 if (lines) 4018 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 4019 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 4020 else
3931 {
3932 scr_erase_savelines (); 4021 scr_erase_savelines ();
3933 } 4022 }
3934 4023
4024 break;
4025#endif
4026
4027#if ENABLE_PERL
4028 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4030 ; // no responses yet
3935 break; 4031 break;
3936#endif 4032#endif
3937 } 4033 }
3938} 4034}
3939/*----------------------------------------------------------------------*/ 4035/*----------------------------------------------------------------------*/
… …
4048 } 4144 }
4049 4145
4050 /* extra handling for values with state unkept */ 4146 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4147 switch (arg[i])
4052 { 4148 {
4149#if ENABLE_STYLES
4150 case 1021:
4151 set_option (Opt_intensityStyles, mode);
4152
4153 scr_touch (true);
4154 break;
4155#endif
4053 case 1048: /* alternative cursor save */ 4156 case 1048: /* alternative cursor save */
4054 case 1049: 4157 case 1049:
4055 if (OPTION (Opt_secondaryScreen)) 4158 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4159 if (mode == 0)
4057 scr_cursor (RESTORE); 4160 scr_cursor (RESTORE);
… …
4075 case 3: /* 80/132 */ 4178 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4179 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4180 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4181 break;
4079 case 4: /* smooth scrolling */ 4182 case 4: /* smooth scrolling */
4080 if (!state) 4183 set_option (Opt_jumpScroll, !state);
4081 SET_OPTION (Opt_jumpScroll);
4082 else
4083 CLR_OPTION (Opt_jumpScroll);
4084 break; 4184 break;
4085 case 5: /* reverse video */ 4185 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4186 scr_rvideo_mode (state);
4087 break; 4187 break;
4088 case 6: /* relative/absolute origins */ 4188 case 6: /* relative/absolute origins */
… …
4129#if 0 4229#if 0
4130 case 1001: 4230 case 1001:
4131 break; /* X11 mouse highlighting */ 4231 break; /* X11 mouse highlighting */
4132#endif 4232#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4233 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (!state) 4234 set_option (Opt_scrollTtyOutput, !state);
4135 SET_OPTION (Opt_scrollTtyOutput);
4136 else
4137 CLR_OPTION (Opt_scrollTtyOutput);
4138 break; 4235 break;
4139 case 1011: /* scroll to bottom on key press */ 4236 case 1011: /* scroll to bottom on key press */
4140 if (state) 4237 set_option (Opt_scrollTtyKeypress, state);
4141 SET_OPTION (Opt_scrollTtyKeypress);
4142 else
4143 CLR_OPTION (Opt_scrollTtyKeypress);
4144 break; 4238 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
4152 case 1047: /* secondary screen w/ clearing last */ 4239 case 1047: /* secondary screen w/ clearing last */
4153 if (OPTION (Opt_secondaryScreen)) 4240 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4241 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4242 scr_erase_screen (2);
4156 scr_change_screen (state); 4243 scr_change_screen (state);
… …
4293 scr_color (Color_bg, Color_bg); 4380 scr_color (Color_bg, Color_bg);
4294 break; 4381 break;
4295 4382
4296 //case 50: // not variable spacing 4383 //case 50: // not variable spacing
4297 4384
4298#ifndef NO_BRIGHTCOLOR 4385#if ENABLE_FRILLS
4299 case 90: 4386 case 90:
4300 case 91: /* set bright fg color */ 4387 case 91: /* set bright fg color */
4301 case 92: 4388 case 92:
4302 case 93: 4389 case 93:
4303 case 94: 4390 case 94:
… …
4315 case 106: 4402 case 106:
4316 case 107: 4403 case 107:
4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4318 break; 4405 break;
4319#endif 4406#endif
4320
4321 } 4407 }
4322 } 4408 }
4323} 4409}
4324/*}}} */ 4410/*}}} */
4325 4411
… …
4349 */ 4435 */
4350void 4436void
4351rxvt_term::tt_printf (const char *fmt,...) 4437rxvt_term::tt_printf (const char *fmt,...)
4352{ 4438{
4353 va_list arg_ptr; 4439 va_list arg_ptr;
4354 unsigned char buf[256]; 4440 char buf[256];
4355 4441
4356 va_start (arg_ptr, fmt); 4442 va_start (arg_ptr, fmt);
4357 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4443 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4358 va_end (arg_ptr); 4444 va_end (arg_ptr);
4359 tt_write (buf, strlen (buf)); 4445 tt_write (buf, strlen (buf));
… …
4364 * or generated by us in response to a query ESC sequence. 4450 * or generated by us in response to a query ESC sequence.
4365 */ 4451 */
4366const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4367 4453
4368void 4454void
4369rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4455rxvt_term::tt_write (const char *data, unsigned int len)
4370{ 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
4371 if (v_buflen == 0) 4463 if (v_buflen == 0)
4372 { 4464 {
4373 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));
4374 4466
4375 if ((unsigned int)written == len) 4467 if ((unsigned int)written == len)
… …
4377 4469
4378 data += written; 4470 data += written;
4379 len -= written; 4471 len -= written;
4380 } 4472 }
4381 4473
4382 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4383 4475
4384 memcpy (v_buffer + v_buflen, data, len); 4476 memcpy (v_buffer + v_buflen, data, len);
4385 v_buflen += len; 4477 v_buflen += len;
4386 4478
4387 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