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.259 by root, Fri Jan 13 04:59:04 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 {
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
968 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
969 scrollbar_show (1); 1014 scrollbar_show (1);
970#ifdef USE_XIM 1015#ifdef USE_XIM
971 IMSendSpot (); 1016 IMSendSpot ();
972#endif 1017#endif
… …
982 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
983 1028
984 display->flush (); 1029 display->flush ();
985 1030
986 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1033}
989 1034
990void 1035void
991rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
992{ 1037{
… …
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1113 }
1069} 1114}
1070#endif 1115#endif
1071 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
1072bool 1135bool
1073rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1074{ 1137{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1139
1077 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1078 { 1141 {
1079 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");
1080 n = 0; 1143 n = 0;
1081 } 1144 }
1082 1145
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1086 1149
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1151
1089 if (n > 0) 1152 if (r > 0)
1090 { 1153 {
1091 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1092 return true; 1155 return true;
1093 } 1156 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1095 { 1165 {
1096 pty_ev.stop (); 1166 pty_ev.stop ();
1097 1167
1098 if (!OPTION (Opt_hold)) 1168 if (!OPTION (Opt_hold))
1099 destroy (); 1169 destroy ();
… …
1134 1204
1135#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1136void 1206void
1137rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1138{ 1208{
1139 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1140 return; 1210 return;
1141 1211
1142 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1143 XFlush (display->display); 1213 XFlush (display->display);
1144 1214
… …
1241 dDisp; 1311 dDisp;
1242 1312
1243 SET_R (this); 1313 SET_R (this);
1244 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1245 1315
1246#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1247 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1248 { 1318 return;
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 1319
1273 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1274 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1275 unsigned int unused_mask; 1322 unsigned int unused_mask;
1276 1323
… …
1284 1331
1285 break; 1332 break;
1286 1333
1287 case KeyRelease: 1334 case KeyRelease:
1288 { 1335 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1290 KeySym ks; 1337 KeySym keysym;
1291 1338
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif 1340#endif
1294 1341
1295#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support 1343 // ISO 14755 support
1297 if (iso14755buf) 1344 if (iso14755buf)
… …
1302# endif 1349# endif
1303# if ISO_14755 1350# if ISO_14755
1304 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1305 // first: controls 1352 // first: controls
1306 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1309 { 1356 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1311 commit_iso14755 (); 1358 commit_iso14755 ();
1312 return; // case-break; 1359 goto skip_switch;
1313 } 1360 }
1314 1361
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks) 1363 if (i[0] == keysym)
1317 { 1364 {
1318 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 (); 1366 commit_iso14755 ();
1320 return; // case-break; 1367 goto skip_switch;
1321 } 1368 }
1322 1369
1323 scr_bell (); 1370 scr_bell ();
1324# endif 1371# endif
1325 iso14755buf = 0; 1372 iso14755buf = 0;
… …
1344 else 1391 else
1345 iso14755buf = 0; 1392 iso14755buf = 0;
1346 } 1393 }
1347#endif 1394#endif
1348 1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1352 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1354#endif 1405#endif
1355 break; 1406 break;
1356 } 1407 }
1357 1408
… …
1487 1538
1488 case SelectionRequest: 1539 case SelectionRequest:
1489 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1490 break; 1541 break;
1491 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1492 case UnmapNotify: 1551 case UnmapNotify:
1493 mapped = 0; 1552 mapped = 0;
1494#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1495 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1496#endif 1555#endif
1497 break; 1556 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; 1557 break;
1505 1558
1506#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1507 case ReparentNotify: 1560 case ReparentNotify:
1508 rootwin_cb (ev); 1561 rootwin_cb (ev);
… …
1522 1575
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1526 1579
1527 scr_refresh (refresh_type); 1580 want_refresh = 1;
1528 } 1581 }
1529 else 1582 else
1530 { 1583 {
1531 XEvent unused_event; 1584 XEvent unused_event;
1532 1585
… …
1551#endif 1604#endif
1552 } 1605 }
1553 break; 1606 break;
1554 1607
1555 case MotionNotify: 1608 case MotionNotify:
1609 printf ("motion notify\n");//D
1556#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1611 if (hidden_pointer)
1558 pointer_unblank (); 1612 pointer_unblank ();
1559#endif 1613#endif
1560#if MENUBAR 1614#if MENUBAR
… …
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1622 break;
1569 1623
1570 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1571 { 1625 {
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1629 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1631 ;
1576 1632
1577 XQueryPointer (disp, vt, 1633 XQueryPointer (disp, vt,
… …
1657 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1715 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1661 scrollbar_size ()); 1717 scrollbar_size ());
1662 scr_refresh (refresh_type); 1718 want_refresh = 1;
1663 refresh_limit = 0; 1719 refresh_limit = 0;
1664 scrollbar_show (1); 1720 scrollbar_show (1);
1665 } 1721 }
1666 break; 1722 break;
1667 } 1723 }
1724
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729 {
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif
1739
1740#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 {
1743 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease)
1746 if (hidden_pointer)
1747 pointer_unblank ();
1748
1749 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank ();
1751 }
1752#endif
1668} 1753}
1669 1754
1670void 1755void
1671rxvt_term::focus_in () 1756rxvt_term::focus_in ()
1672{ 1757{
1673 if (!focus) 1758 if (!focus)
1674 { 1759 {
1675 focus = 1; 1760 focus = 1;
1676 want_refresh = 1; 1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1677#if USE_XIM 1765#if USE_XIM
1678 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1679 { 1767 {
1680 IMSetStatusPosition (); 1768 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1769 XSetICFocus (Input_Context);
… …
1701 if (focus) 1789 if (focus)
1702 { 1790 {
1703 focus = 0; 1791 focus = 0;
1704 want_refresh = 1; 1792 want_refresh = 1;
1705 1793
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1795
1706#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf)
1798 {
1707 iso14755buf = 0; 1799 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1800# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1801 scr_overlay_off ();
1802# endif
1803 }
1711#endif 1804#endif
1712#if USE_XIM 1805#if USE_XIM
1713 if (Input_Context != NULL) 1806 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1807 XUnsetICFocus (Input_Context);
1715#endif 1808#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
1760{ 1853{
1761 int reportmode = 0, clickintime; 1854 int reportmode = 0, clickintime;
1762 1855
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1856 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1857
1764 if (!bypass_keystate) 1858 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1859 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1860
1767 /* 1861 /*
1768 * VT window processing of button press 1862 * VT window processing of button press
… …
1788#ifdef MOUSE_REPORT_DOUBLECLICK 1882#ifdef MOUSE_REPORT_DOUBLECLICK
1789 if (ev.button == MEvent.button && clickintime) 1883 if (ev.button == MEvent.button && clickintime)
1790 { 1884 {
1791 /* same button, within alloted time */ 1885 /* same button, within alloted time */
1792 MEvent.clicks++; 1886 MEvent.clicks++;
1887
1793 if (MEvent.clicks > 1) 1888 if (MEvent.clicks > 1)
1794 { 1889 {
1795 /* only report double clicks */ 1890 /* only report double clicks */
1796 MEvent.clicks = 2; 1891 MEvent.clicks = 2;
1797 mouse_report (ev); 1892 mouse_report (ev);
… …
1817 else 1912 else
1818 { 1913 {
1819 if (ev.button != MEvent.button) 1914 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1915 MEvent.clicks = 0;
1821 1916
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1918 switch (ev.button)
1823 { 1919 {
1824 case Button1: 1920 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1925#else
1830 selection.rect = false; 1926 selection.rect = false;
1831#endif 1927#endif
1832 1928
1833 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1835 { 1931 {
1836 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1838 else 1934 else
1839 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1840 } 1936 }
1841 else 1937 else
1842 { 1938 {
1843 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1940 MEvent.clicks++;
1845 else 1941 else
1846 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1847 1943
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1945 }
1850 1946
1851 MEvent.button = Button1; 1947 MEvent.button = Button1;
1852 break; 1948 break;
1853 1949
1854 case Button3: 1950 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1857 else 1953 else
1858 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1859 1955
1860 MEvent.button = Button3; 1956 MEvent.button = Button3;
1861 break; 1957 break;
1862 } 1958 }
1863 } 1959 }
1864 1960
1865 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1866 return; 1962 return;
1867 } 1963 }
1868 1964
… …
2004 } 2100 }
2005 2101
2006 break; 2102 break;
2007 } 2103 }
2008 } 2104 }
2105
2009 return; 2106 return;
2010 } 2107 }
2108
2011#if MENUBAR 2109#if MENUBAR
2012 /* 2110 /*
2013 * Menubar window processing of button press 2111 * Menubar window processing of button press
2014 */ 2112 */
2015 if (isMenuBarWindow (ev.window)) 2113 if (isMenuBarWindow (ev.window))
… …
2078 if (priv_modes & PrivMode_mouse_report 2176 if (priv_modes & PrivMode_mouse_report
2079 && bypass_keystate 2177 && bypass_keystate
2080 && ev.button == Button1 && MEvent.clicks <= 1) 2178 && ev.button == Button1 && MEvent.clicks <= 1)
2081 selection_extend (ev.x, ev.y, 0); 2179 selection_extend (ev.x, ev.y, 0);
2082 2180
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2083 switch (ev.button) 2184 switch (ev.button)
2084 { 2185 {
2085 case Button1: 2186 case Button1:
2086 case Button3: 2187 case Button3:
2087 selection_make (ev.time); 2188 selection_make (ev.time);
… …
2118 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2119 } 2220 }
2120 else 2221 else
2121 { 2222 {
2122# endif 2223# endif
2123# ifdef JUMP_MOUSE_WHEEL
2124 scr_page (v, i); 2224 scr_page (v, i);
2125 scr_refresh (SMOOTH_REFRESH);
2126 scrollbar_show (1); 2225 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 2226# ifdef MOUSE_SLIP_WHEELING
2136 } 2227 }
2137#endif 2228# endif
2138 } 2229 }
2139 break; 2230 break;
2140#endif 2231#endif
2141 } 2232 }
2142 } 2233 }
… …
2631 2722
2632bool 2723bool
2633rxvt_term::cmd_parse () 2724rxvt_term::cmd_parse ()
2634{ 2725{
2635 bool flag = false; 2726 bool flag = false;
2636 unicode_t ch = NOCHAR; 2727 wchar_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2728 char *seq_begin; // remember start of esc-sequence here
2638 2729
2639 for (;;) 2730 for (;;)
2640 { 2731 {
2641 if (ch == NOCHAR) 2732 if (ch == NOCHAR)
2642 { 2733 {
2643 seq_begin = cmdbuf_ptr; 2734 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2735 ch = next_char ();
2645 }
2646 2736
2647 if (ch == NOCHAR) // TODO: improve 2737 if (ch == NOCHAR)
2648 break; 2738 break;
2739 }
2649 2740
2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2651 { 2742 {
2652 if (!seen_input) 2743 if (!seen_input)
2653 { 2744 {
… …
2662 if (seen_resize && cmd_pid) 2753 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH); 2754 kill (-cmd_pid, SIGWINCH);
2664 } 2755 }
2665 2756
2666 /* Read a text string from the input buffer */ 2757 /* Read a text string from the input buffer */
2667 unicode_t buf[UBUFSIZ]; 2758 wchar_t buf[UBUFSIZ];
2668 bool refreshnow = false; 2759 bool refreshnow = false;
2669 int nlines = 0; 2760 int nlines = 0;
2670 unicode_t *str = buf; 2761 wchar_t *str = buf;
2671 unicode_t *eol = str + min (ncol, UBUFSIZ); 2762 wchar_t *eol = str + min (ncol, UBUFSIZ);
2672 2763
2673 for (;;) 2764 for (;;)
2674 { 2765 {
2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2676 break; 2767 break;
… …
2686 2777
2687 if (!OPTION (Opt_jumpScroll) 2778 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2780 {
2690 refreshnow = true; 2781 refreshnow = true;
2782 refresh_count = 0;
2691 ch = NOCHAR; 2783 ch = NOCHAR;
2692 break; 2784 break;
2693 } 2785 }
2694 2786
2695 // scr_add_lines only works for nlines <= nrow - 1. 2787 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2788 if (nlines >= nrow - 1)
2697 { 2789 {
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2698 scr_add_lines (buf, nlines, str - buf); 2791 scr_add_lines (buf, str - buf, nlines);
2792
2699 nlines = 0; 2793 nlines = 0;
2700 str = buf; 2794 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2795 eol = str + min (ncol, UBUFSIZ);
2702 } 2796 }
2703 2797
… …
2716 2810
2717 seq_begin = cmdbuf_ptr; 2811 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2812 ch = next_char ();
2719 } 2813 }
2720 2814
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2721 scr_add_lines (buf, nlines, str - buf); 2816 scr_add_lines (buf, str - buf, nlines);
2722 2817
2723 /* 2818 /*
2724 * If there have been a lot of new lines, then update the screen 2819 * If there have been a lot of new lines, then update the screen
2725 * What the heck I'll cheat and only refresh less than every page-full. 2820 * What the heck I'll cheat and only refresh less than every page-full.
2726 * the number of pages between refreshes is refresh_limit, which 2821 * the number of pages between refreshes is refresh_limit, which
… …
2732 refresh_limit++; 2827 refresh_limit++;
2733 else 2828 else
2734 { 2829 {
2735 flag = true; 2830 flag = true;
2736 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2832 want_refresh = 1;
2737 } 2833 }
2738 } 2834 }
2739 2835
2740 } 2836 }
2741 else 2837 else
… …
2756 } 2852 }
2757 2853
2758 return flag; 2854 return flag;
2759} 2855}
2760 2856
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 2857// read the next character
2771unicode_t 2858wchar_t
2772rxvt_term::next_char () 2859rxvt_term::next_char ()
2773{ 2860{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2861 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2862 {
2776 // assume 7-bit to be ascii ALWAYS 2863 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2865 return *cmdbuf_ptr++;
2779 2866
2780 wchar_t wc; 2867 wchar_t wc;
2781 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2782 2869
2783 if (len == (size_t)-2) 2870 if (len == (size_t)-2)
2784 { 2871 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2872 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2873 cmdbuf_ptr = cmdbuf_endp;
2787 break; 2874 break;
2788 } 2875 }
2789 2876
2790 if (len == (size_t)-1) 2877 if (len == (size_t)-1)
2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2792 2879
2793 // assume wchar == unicode 2880 // assume wchar == unicode
2794 cmdbuf_ptr += len; 2881 cmdbuf_ptr += len;
2795 return wc & UNICODE_MASK; 2882 return wc & UNICODE_MASK;
2796 } 2883 }
2797 2884
2798 return NOCHAR; 2885 return NOCHAR;
2886}
2887
2888// read the next octet
2889uint32_t
2890rxvt_term::next_octet ()
2891{
2892 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR;
2799} 2895}
2800 2896
2801/* rxvt_cmd_getc () - Return next input character */ 2897/* rxvt_cmd_getc () - Return next input character */
2802/* 2898/*
2803 * Return the next input character after first passing any keyboard input 2899 * Return the next input character after first passing any keyboard input
2804 * to the command. 2900 * to the command.
2805 */ 2901 */
2806unicode_t 2902wchar_t
2807rxvt_term::cmd_getc () 2903rxvt_term::cmd_getc ()
2808{ 2904{
2809 unicode_t c = next_char (); 2905 wchar_t c = next_char ();
2810 2906
2811 if (c == NOCHAR) 2907 if (c == NOCHAR)
2812 throw out_of_input; 2908 throw out_of_input;
2813 2909
2814 return c; 2910 return c;
2815} 2911}
2816 2912
2817unicode_t 2913uint32_t
2818rxvt_term::cmd_get8 () 2914rxvt_term::cmd_get8 ()
2819{ 2915{
2820 unicode_t c = next_octet (); 2916 uint32_t c = next_octet ();
2821 2917
2822 if (c == NOCHAR) 2918 if (c == NOCHAR)
2823 throw out_of_input; 2919 throw out_of_input;
2824 2920
2825 return c; 2921 return c;
… …
2925 case C0_ESC: 3021 case C0_ESC:
2926 process_escape_seq (); 3022 process_escape_seq ();
2927 break; 3023 break;
2928 case C0_ENQ: /* terminal Status */ 3024 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 3025 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3026 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 3027 else
2933 tt_write ((unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 3029 break;
2936 case C0_BEL: /* bell */ 3030 case C0_BEL: /* bell */
2937 scr_bell (); 3031 scr_bell ();
2938 break; 3032 break;
2939 case C0_BS: /* backspace */ 3033 case C0_BS: /* backspace */
… …
3094 break; 3188 break;
3095 3189
3096 /* 8.3.87: NEXT LINE */ 3190 /* 8.3.87: NEXT LINE */
3097 case C1_NEL: /* ESC E */ 3191 case C1_NEL: /* ESC E */
3098 { 3192 {
3099 unicode_t nlcr[] = { C0_LF, C0_CR }; 3193 wchar_t nlcr[] = { C0_LF, C0_CR };
3100 scr_add_lines (nlcr, 1, 2); 3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3101 } 3195 }
3102 break; 3196 break;
3103 3197
3104 /* kidnapped escape sequence: Should be 8.3.48 */ 3198 /* kidnapped escape sequence: Should be 8.3.48 */
3105 case C1_ESA: /* ESC G */ 3199 case C1_ESA: /* ESC G */
… …
3127 process_dcs_seq (); 3221 process_dcs_seq ();
3128 break; 3222 break;
3129 3223
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3225 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3227 break; /* steal obsolete ESC [ c */
3135 3228
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3230 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3231 process_csi_seq ();
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3475 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3476 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3477 break;
3385 3478
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3479 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3480 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3481 break;
3390 3482
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3483 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3484 process_sgr_mode (nargs, arg);
3393 break; 3485 break;
… …
3595/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3596/* 3688/*
3597 * get input up until STRING TERMINATOR (or BEL) 3689 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3690 * ends_how is terminator used. returned input must be free()'d
3599 */ 3691 */
3600unsigned char * 3692char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3693rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3694{
3603 unicode_t ch; 3695 unicode_t ch;
3604 bool seen_esc = false; 3696 bool seen_esc = false;
3605 unsigned int n = 0; 3697 unsigned int n = 0;
… …
3638 3730
3639 string[n++] = '\0'; 3731 string[n++] = '\0';
3640 3732
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3733 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3734
3643 return (unsigned char *)rxvt_wcstombs (string); 3735 return rxvt_wcstombs (string);
3644} 3736}
3645 3737
3646/*----------------------------------------------------------------------*/ 3738/*----------------------------------------------------------------------*/
3647/* 3739/*
3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3649 */ 3741 */
3650void 3742void
3651rxvt_term::process_dcs_seq () 3743rxvt_term::process_dcs_seq ()
3652{ 3744{
3653 unsigned char *s; 3745 char *s;
3654 unicode_t eh; 3746 unicode_t eh;
3655 3747
3656 /* 3748 /*
3657 * Not handled yet 3749 * Not handled yet
3658 */ 3750 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3769 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3770 arg = arg * 10 + (ch - '0');
3679 3771
3680 if (ch == ';') 3772 if (ch == ';')
3681 { 3773 {
3682 unsigned char *s = get_to_st (eh); 3774 char *s = get_to_st (eh);
3683 3775
3684 if (s) 3776 if (s)
3685 { 3777 {
3686 process_xterm_seq (arg, (char *)s, eh); 3778 process_xterm_seq (arg, s, eh);
3687 free (s); 3779 free (s);
3688 } 3780 }
3689 } 3781 }
3690} 3782}
3691 3783
3692void 3784void
3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3694{ 3786{
3695 if (str[0] == '?' && !str[1]) 3787 if (str[0] == '?' && !str[1])
3696 { 3788 {
3697 unsigned short r, g, b; 3789 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3790 pix_colors_focused[color].get (display, r, g, b);
… …
3704 3796
3705/* 3797/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3799 */
3708void 3800void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3801rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3802{
3711 int changed = 0; 3803 int changed = 0;
3712 int color; 3804 int color;
3713 char *buf, *name; 3805 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3806 bool query = str[0] == '?' && !str[1];
… …
3771 { 3863 {
3772 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3773 break; 3865 break;
3774 3866
3775 *name++ = '\0'; 3867 *name++ = '\0';
3776 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3777 3869
3778 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3779 break; 3871 break;
3780 3872
3781 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3782 *buf++ = '\0'; 3874 *buf++ = '\0';
3783 3875
3784 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3785 { 3877 {
3786 unsigned short r, g, b; 3878 unsigned short r, g, b;
3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 pix_colors_focused[color].get (display, r, g, b);
3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3789 } 3881 }
3790 else 3882 else
3791 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3792 } 3884 }
3793 break; 3885 break;
3794 case XTerm_Color00: 3886 case XTerm_Color00:
3795 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3796 break; 3888 break;
3797 case XTerm_Color01: 3889 case XTerm_Color01:
3798 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3799 break; 3891 break;
3800#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3801 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3802 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3803 break; 3895 break;
… …
3807 break; 3899 break;
3808 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3809 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3810 break; 3902 break;
3811#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#ifndef NO_BOLD_UNDERLINE_REVERSE
3812 case XTerm_Color_BD:
3813 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3814 break;
3815 case XTerm_Color_UL:
3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3817 break;
3818 case XTerm_Color_RV: 3904 case XTerm_Color_RV:
3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3820 break; 3914 break;
3821 case URxvt_Color_IT: 3915 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break; 3917 break;
3824#endif 3918#endif
… …
3829 if (am_transparent) 3923 if (am_transparent)
3830 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3831 break; 3925 break;
3832#endif 3926#endif
3833 3927
3834 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3835 if (*str != ';') 3929 if (*str != ';')
3836 { 3930 {
3837#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3838 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3839 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3840#endif
3841 scr_touch (true); 3934 scr_touch (true);
3935#endif
3842 } 3936 }
3937
3843 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3844 { 3939 {
3845 str++; 3940 str++;
3846#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3847 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3850 3945
3851 if (changed) 3946 if (changed)
3852 { 3947 {
3853#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3854 resize_pixmap (); 3949 resize_pixmap ();
3855#endif
3856 scr_touch (true); 3950 scr_touch (true);
3951#endif
3857 } 3952 }
3858 break; 3953 break;
3859 3954
3860 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3861 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3862 break; 3957 break;
3863 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3864 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3865 break; 3960 break;
3866 3961
3867 case XTerm_logfile: 3962 case XTerm_logfile:
3868 // TODO, when secure mode? 3963 // TODO, when secure mode?
… …
3873 if (OPTION (Opt_insecure)) 3968 if (OPTION (Opt_insecure))
3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3875 break; 3970 break;
3876#endif 3971#endif
3877#if 0 3972#if 0
3878 case XTerm_dumpscreen: /* no error notices */ 3973 case Rxvt_dumpscreen: /* no error notices */
3879 { 3974 {
3880 int fd; 3975 int fd;
3881 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3882 { 3977 {
3883 scr_dump (fd); 3978 scr_dump (fd);
… …
3921 } 4016 }
3922 break; 4017 break;
3923 4018
3924 case URxvt_view_up: 4019 case URxvt_view_up:
3925 case URxvt_view_down: 4020 case URxvt_view_down:
4021 {
3926 int lines = atoi (str); 4022 int lines = atoi (str);
3927 4023
3928 if (lines) 4024 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 4025 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 4026 else
3931 {
3932 scr_erase_savelines (); 4027 scr_erase_savelines ();
3933 } 4028 }
3934 4029
4030 break;
4031#endif
4032
4033#if ENABLE_PERL
4034 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4036 ; // no responses yet
3935 break; 4037 break;
3936#endif 4038#endif
3937 } 4039 }
3938} 4040}
3939/*----------------------------------------------------------------------*/ 4041/*----------------------------------------------------------------------*/
… …
4048 } 4150 }
4049 4151
4050 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4153 switch (arg[i])
4052 { 4154 {
4155#if ENABLE_STYLES
4156 case 1021:
4157 set_option (Opt_intensityStyles, mode);
4158
4159 scr_touch (true);
4160 break;
4161#endif
4053 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
4054 case 1049: 4163 case 1049:
4055 if (OPTION (Opt_secondaryScreen)) 4164 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4165 if (mode == 0)
4057 scr_cursor (RESTORE); 4166 scr_cursor (RESTORE);
… …
4075 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4076 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4077 set_widthheight (((state ? 132 : 80) * fwidth), height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4078 break; 4187 break;
4079 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4080 if (!state) 4189 set_option (Opt_jumpScroll, !state);
4081 SET_OPTION (Opt_jumpScroll);
4082 else
4083 CLR_OPTION (Opt_jumpScroll);
4084 break; 4190 break;
4085 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4086 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4087 break; 4193 break;
4088 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4129#if 0 4235#if 0
4130 case 1001: 4236 case 1001:
4131 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4132#endif 4238#endif
4133 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4134 if (!state) 4240 set_option (Opt_scrollTtyOutput, !state);
4135 SET_OPTION (Opt_scrollTtyOutput);
4136 else
4137 CLR_OPTION (Opt_scrollTtyOutput);
4138 break; 4241 break;
4139 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4140 if (state) 4243 set_option (Opt_scrollTtyKeypress, state);
4141 SET_OPTION (Opt_scrollTtyKeypress);
4142 else
4143 CLR_OPTION (Opt_scrollTtyKeypress);
4144 break; 4244 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 */ 4245 case 1047: /* secondary screen w/ clearing last */
4153 if (OPTION (Opt_secondaryScreen)) 4246 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4248 scr_erase_screen (2);
4156 scr_change_screen (state); 4249 scr_change_screen (state);
… …
4293 scr_color (Color_bg, Color_bg); 4386 scr_color (Color_bg, Color_bg);
4294 break; 4387 break;
4295 4388
4296 //case 50: // not variable spacing 4389 //case 50: // not variable spacing
4297 4390
4298#ifndef NO_BRIGHTCOLOR 4391#if ENABLE_FRILLS
4299 case 90: 4392 case 90:
4300 case 91: /* set bright fg color */ 4393 case 91: /* set bright fg color */
4301 case 92: 4394 case 92:
4302 case 93: 4395 case 93:
4303 case 94: 4396 case 94:
… …
4315 case 106: 4408 case 106:
4316 case 107: 4409 case 107:
4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4410 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4318 break; 4411 break;
4319#endif 4412#endif
4320
4321 } 4413 }
4322 } 4414 }
4323} 4415}
4324/*}}} */ 4416/*}}} */
4325 4417
… …
4349 */ 4441 */
4350void 4442void
4351rxvt_term::tt_printf (const char *fmt,...) 4443rxvt_term::tt_printf (const char *fmt,...)
4352{ 4444{
4353 va_list arg_ptr; 4445 va_list arg_ptr;
4354 unsigned char buf[256]; 4446 char buf[256];
4355 4447
4356 va_start (arg_ptr, fmt); 4448 va_start (arg_ptr, fmt);
4357 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4449 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4358 va_end (arg_ptr); 4450 va_end (arg_ptr);
4359 tt_write (buf, strlen (buf)); 4451 tt_write (buf, strlen (buf));
… …
4364 * or generated by us in response to a query ESC sequence. 4456 * or generated by us in response to a query ESC sequence.
4365 */ 4457 */
4366const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4367 4459
4368void 4460void
4369rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4370{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4466 if (pty.pty < 0)
4467 return;
4468
4371 if (v_buflen == 0) 4469 if (v_buflen == 0)
4372 { 4470 {
4373 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4374 4472
4375 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4377 4475
4378 data += written; 4476 data += written;
4379 len -= written; 4477 len -= written;
4380 } 4478 }
4381 4479
4382 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4383 4481
4384 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4385 v_buflen += len; 4483 v_buflen += len;
4386 4484
4387 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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