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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 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.
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
… …
268 mb[0] = ch[0]; 268 mb[0] = ch[0];
269 len = 1; 269 len = 1;
270 } 270 }
271 271
272 if (len > 0) 272 if (len > 0)
273 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
274 else 274 else
275 scr_bell (); 275 scr_bell ();
276 } 276 }
277 277
278 iso14755buf = 0; 278 iso14755buf = 0;
… …
306 KeySym keysym; 306 KeySym keysym;
307#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
309#endif 309#endif
310 int valid_keysym; 310 int valid_keysym;
311 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
312 312
313 /* 313 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
316 * 316 *
… …
334 Status status_return; 334 Status status_return;
335 335
336#if 0 336#if 0
337#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
339 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
340 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
341 else 341 else
342#endif 342#endif
343#endif 343#endif
344 { 344 {
… …
381 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
382 } 382 }
383 else 383 else
384#endif 384#endif
385 { 385 {
386 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
387 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
388 } 388 }
389 389
390 if (valid_keysym) 390 if (valid_keysym)
391 { 391 {
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
855 { 855 {
856#ifdef META8_OPTION 856#ifdef META8_OPTION
857 /* set 8-bit on */ 857 /* set 8-bit on */
858 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
859 { 859 {
860 unsigned char *ch; 860 char *ch;
861 861
862 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
863 *ch |= 0x80; 863 *ch |= 0x80;
864 864
865 meta = 0; 865 meta = 0;
866 } 866 }
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
871 874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
898#ifdef META8_OPTION 901#ifdef META8_OPTION
899 && meta_char == C0_ESC 902 && meta_char == C0_ESC
900#endif 903#endif
901 ) 904 )
902 { 905 {
903 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
904 tt_write (&ch, 1); 907 tt_write (&ch, 1);
905 } 908 }
906 909
907#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
920 923
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
924unsigned int 927unsigned int
925rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 929{
927 unsigned int n, s; 930 unsigned int n, s;
928 931
929 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
967 } 970 }
968#endif 971#endif
969 972
970 if (want_refresh) 973 if (want_refresh)
971 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && 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
972 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
973 scrollbar_show (1); 1014 scrollbar_show (1);
974#ifdef USE_XIM 1015#ifdef USE_XIM
975 IMSendSpot (); 1016 IMSendSpot ();
976#endif 1017#endif
… …
980} 1021}
981 1022
982void 1023void
983rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
984{ 1025{
985 SET_R (this); 1026 make_current ();
986 SET_LOCALE (locale);
987 1027
988 display->flush (); 1028 display->flush ();
989 1029
990 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1032}
993 1033
994void 1034void
995rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
996{ 1036{
997 SET_R (this); 1037 make_current ();
998 SET_LOCALE (locale);
999 1038
1000 refresh_limit = 1; 1039 refresh_limit = 1;
1001 refresh_count = 0; 1040 refresh_count = 0;
1002 flush (); 1041 flush ();
1003} 1042}
… …
1060{ 1099{
1061 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1103 {
1065 if (view_start == nsaved || 1104 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1068 1106
1069 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1108 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1132} 1170}
1133 1171
1134void 1172void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1174{
1137 SET_R (this); 1175 make_current ();
1138 SET_LOCALE (locale);
1139 1176
1140 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1179 while (pty_fill ())
1143 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1163 1200
1164#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
1165void 1202void
1166rxvt_term::pointer_blank () 1203rxvt_term::pointer_blank ()
1167{ 1204{
1168 if (! OPTION (Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
1169 return; 1206 return;
1170 1207
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1209 XFlush (display->display);
1173 1210
… …
1175} 1212}
1176 1213
1177void 1214void
1178rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1179{ 1216{
1180 SET_R (this); 1217 make_current ();
1181 SET_LOCALE (locale);
1182 1218
1183 pointer_blank (); 1219 pointer_blank ();
1184} 1220}
1185#endif 1221#endif
1186 1222
… …
1265 1301
1266/*{{{ process an X event */ 1302/*{{{ process an X event */
1267void 1303void
1268rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1269{ 1305{
1306 make_current ();
1307
1270 dDisp; 1308 dDisp;
1271 1309
1272 SET_R (this); 1310 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1311 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return;
1274 1314
1275#if defined(CURSOR_BLINK) 1315 // for XQueryPointer
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1318 unsigned int unused_mask;
1305 1319
1306 switch (ev.type) 1320 switch (ev.type)
… …
1313 1327
1314 break; 1328 break;
1315 1329
1316 case KeyRelease: 1330 case KeyRelease:
1317 { 1331 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1333 KeySym keysym;
1320 1334
1321 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 :/
1322#endif 1336#endif
1323 1337
1324#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1339 // ISO 14755 support
1326 if (iso14755buf) 1340 if (iso14755buf)
… …
1331# endif 1345# endif
1332# if ISO_14755 1346# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1334 // first: controls 1348 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1352 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1354 commit_iso14755 ();
1341 return; // case-break; 1355 goto skip_switch;
1342 } 1356 }
1343 1357
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1359 if (i[0] == keysym)
1346 { 1360 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1362 commit_iso14755 ();
1349 return; // case-break; 1363 goto skip_switch;
1350 } 1364 }
1351 1365
1352 scr_bell (); 1366 scr_bell ();
1353# endif 1367# endif
1354 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1373 else 1387 else
1374 iso14755buf = 0; 1388 iso14755buf = 0;
1375 } 1389 }
1376#endif 1390#endif
1377 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
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1383#endif 1401#endif
1384 break; 1402 break;
1385 } 1403 }
1386 1404
… …
1516 1534
1517 case SelectionRequest: 1535 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1519 break; 1537 break;
1520 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
1521 case UnmapNotify: 1547 case UnmapNotify:
1522 mapped = 0; 1548 mapped = 0;
1523#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1525#endif 1551#endif
1526 break; 1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1553 break;
1534 1554
1535#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1536 case ReparentNotify: 1556 case ReparentNotify:
1537 rootwin_cb (ev); 1557 rootwin_cb (ev);
… …
1551 1571
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1555 1575
1556 scr_refresh (refresh_type); 1576 want_refresh = 1;
1557 } 1577 }
1558 else 1578 else
1559 { 1579 {
1560 XEvent unused_event; 1580 XEvent unused_event;
1561 1581
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1617 break;
1598 1618
1599 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1600 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1625 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1627 ;
1605 1628
1606 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1709 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1710 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1711 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1713 scrollbar_size ());
1691 scr_refresh (refresh_type); 1714 want_refresh = 1;
1692 refresh_limit = 0; 1715 refresh_limit = 0;
1693 scrollbar_show (1); 1716 scrollbar_show (1);
1694 } 1717 }
1695 break; 1718 break;
1696 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1697} 1749}
1698 1750
1699void 1751void
1700rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1701{ 1753{
1702 if (!focus) 1754 if (!focus)
1703 { 1755 {
1704 focus = 1; 1756 focus = 1;
1705 want_refresh = 1; 1757 want_refresh = 1;
1706 1758
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1760
1709#if USE_XIM 1761#if USE_XIM
1710 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1711 { 1763 {
1712 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
… …
1733 if (focus) 1785 if (focus)
1734 { 1786 {
1735 focus = 0; 1787 focus = 0;
1736 want_refresh = 1; 1788 want_refresh = 1;
1737 1789
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1791
1740#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1793 if (iso14755buf)
1742 { 1794 {
1743 iso14755buf = 0; 1795 iso14755buf = 0;
… …
1767 1819
1768#if TRANSPARENT 1820#if TRANSPARENT
1769void 1821void
1770rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1823{
1772 SET_R (this); 1824 make_current ();
1773 SET_LOCALE (locale);
1774 1825
1775 switch (ev.type) 1826 switch (ev.type)
1776 { 1827 {
1777 case PropertyNotify: 1828 case PropertyNotify:
1778 /* 1829 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1828 { 1879 {
1829 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1830 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1831 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1832 { 1884 {
1833 /* only report double clicks */ 1885 /* only report double clicks */
1834 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1835 mouse_report (ev); 1887 mouse_report (ev);
… …
1855 else 1907 else
1856 { 1908 {
1857 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1859 1911
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1913 switch (ev.button)
1862 { 1914 {
1863 case Button1: 1915 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1917 /* should be done in screen.C */
… …
1868#else 1920#else
1869 selection.rect = false; 1921 selection.rect = false;
1870#endif 1922#endif
1871 1923
1872 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1926 {
1875 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1877 else 1929 else
1878 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2095 }
2044 2096
2045 break; 2097 break;
2046 } 2098 }
2047 } 2099 }
2100
2048 return; 2101 return;
2049 } 2102 }
2103
2050#if MENUBAR 2104#if MENUBAR
2051 /* 2105 /*
2052 * Menubar window processing of button press 2106 * Menubar window processing of button press
2053 */ 2107 */
2054 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2172 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2121 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2122 switch (ev.button) 2179 switch (ev.button)
2123 { 2180 {
2124 case Button1: 2181 case Button1:
2125 case Button3: 2182 case Button3:
2126 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2158 } 2215 }
2159 else 2216 else
2160 { 2217 {
2161# endif 2218# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2219 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2220 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2221# ifdef MOUSE_SLIP_WHEELING
2175 } 2222 }
2176#endif 2223# endif
2177 } 2224 }
2178 break; 2225 break;
2179#endif 2226#endif
2180 } 2227 }
2181 } 2228 }
… …
2670 2717
2671bool 2718bool
2672rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2673{ 2720{
2674 bool flag = false; 2721 bool flag = false;
2675 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2676 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2677 2724
2678 for (;;) 2725 for (;;)
2679 { 2726 {
2680 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2681 { 2728 {
2682 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2730 ch = next_char ();
2684 }
2685 2731
2686 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2687 break; 2733 break;
2734 }
2688 2735
2689 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)
2690 { 2737 {
2691 if (!seen_input) 2738 if (!seen_input)
2692 { 2739 {
… …
2701 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2703 } 2750 }
2704 2751
2705 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2754 bool refreshnow = false;
2708 int nlines = 0; 2755 int nlines = 0;
2709 unicode_t *str = buf; 2756 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2758
2712 for (;;) 2759 for (;;)
2713 { 2760 {
2714 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))
2715 break; 2762 break;
… …
2733 } 2780 }
2734 2781
2735 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2737 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2739 nlines = 0; 2788 nlines = 0;
2740 str = buf; 2789 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2742 } 2791 }
2743 2792
… …
2756 2805
2757 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2807 ch = next_char ();
2759 } 2808 }
2760 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2762 2812
2763 /* 2813 /*
2764 * 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
2765 * 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.
2766 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
… …
2772 refresh_limit++; 2822 refresh_limit++;
2773 else 2823 else
2774 { 2824 {
2775 flag = true; 2825 flag = true;
2776 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2777 flush_ev.stop (); 2827 want_refresh = 1;
2778 } 2828 }
2779 } 2829 }
2780 2830
2781 } 2831 }
2782 else 2832 else
… …
2797 } 2847 }
2798 2848
2799 return flag; 2849 return flag;
2800} 2850}
2801 2851
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2852// read the next character
2812unicode_t 2853wchar_t
2813rxvt_term::next_char () 2854rxvt_term::next_char ()
2814{ 2855{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2857 {
2817 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2818 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2819 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2820 2861
2821 wchar_t wc; 2862 wchar_t wc;
2822 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);
2823 2864
2824 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2825 { 2866 {
2826 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2827 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2869 break;
2829 } 2870 }
2830 2871
2831 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2832 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
2833 2874
2834 // assume wchar == unicode 2875 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2837 } 2878 }
2838 2879
2839 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;
2840} 2890}
2841 2891
2842/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2843/* 2893/*
2844 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2845 * to the command. 2895 * to the command.
2846 */ 2896 */
2847unicode_t 2897wchar_t
2848rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2849{ 2899{
2850 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2851 2901
2852 if (c == NOCHAR) 2902 if (c == NOCHAR)
2853 throw out_of_input; 2903 throw out_of_input;
2854 2904
2855 return c; 2905 return c;
2856} 2906}
2857 2907
2858unicode_t 2908uint32_t
2859rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2860{ 2910{
2861 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2862 2912
2863 if (c == NOCHAR) 2913 if (c == NOCHAR)
2864 throw out_of_input; 2914 throw out_of_input;
2865 2915
2866 return c; 2916 return c;
… …
2966 case C0_ESC: 3016 case C0_ESC:
2967 process_escape_seq (); 3017 process_escape_seq ();
2968 break; 3018 break;
2969 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2970 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2971 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2972 (unsigned int)strlen (rs[Rs_answerbackstring]));
2973 else 3022 else
2974 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2975 (unsigned int)strlen (VT100_ANS));
2976 break; 3024 break;
2977 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2978 scr_bell (); 3026 scr_bell ();
2979 break; 3027 break;
2980 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3135 break; 3183 break;
3136 3184
3137 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3138 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3139 { 3187 {
3140 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3141 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3142 } 3190 }
3143 break; 3191 break;
3144 3192
3145 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3146 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3168 process_dcs_seq (); 3216 process_dcs_seq ();
3169 break; 3217 break;
3170 3218
3171 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3172 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3173 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3174 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3175 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3176 3223
3177 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3178 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3179 process_csi_seq (); 3226 process_csi_seq ();
… …
3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3425 break; 3472 break;
3426 3473
3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3428 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3430 break; 3476 break;
3431 3477
3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3433 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3434 break; 3480 break;
… …
3636/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3637/* 3683/*
3638 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3639 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3640 */ 3686 */
3641unsigned char * 3687char *
3642rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3643{ 3689{
3644 unicode_t ch; 3690 unicode_t ch;
3645 bool seen_esc = false; 3691 bool seen_esc = false;
3646 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3679 3725
3680 string[n++] = '\0'; 3726 string[n++] = '\0';
3681 3727
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3683 3729
3684 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3685} 3731}
3686 3732
3687/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3688/* 3734/*
3689 * 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)'
3690 */ 3736 */
3691void 3737void
3692rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3693{ 3739{
3694 unsigned char *s; 3740 char *s;
3695 unicode_t eh; 3741 unicode_t eh;
3696 3742
3697 /* 3743 /*
3698 * Not handled yet 3744 * Not handled yet
3699 */ 3745 */
… …
3718 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3719 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3720 3766
3721 if (ch == ';') 3767 if (ch == ';')
3722 { 3768 {
3723 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3724 3770
3725 if (s) 3771 if (s)
3726 { 3772 {
3727 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3728 free (s); 3774 free (s);
3729 } 3775 }
3730 } 3776 }
3731} 3777}
3732 3778
3733void 3779void
3734rxvt_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)
3735{ 3781{
3736 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3737 { 3783 {
3738 unsigned short r, g, b; 3784 unsigned short r, g, b;
3739 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3745 3791
3746/* 3792/*
3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3748 */ 3794 */
3749void 3795void
3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3751{ 3797{
3752 int changed = 0; 3798 int changed = 0;
3753 int color; 3799 int color;
3754 char *buf, *name; 3800 char *buf, *name;
3755 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3812 { 3858 {
3813 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3814 break; 3860 break;
3815 3861
3816 *name++ = '\0'; 3862 *name++ = '\0';
3817 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3818 3864
3819 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3820 break; 3866 break;
3821 3867
3822 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3823 *buf++ = '\0'; 3869 *buf++ = '\0';
3824 3870
3825 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3826 { 3872 {
3827 unsigned short r, g, b; 3873 unsigned short r, g, b;
3828 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3829 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);
3830 } 3876 }
3831 else 3877 else
3832 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3833 } 3879 }
3834 break; 3880 break;
3835 case XTerm_Color00: 3881 case XTerm_Color00:
3836 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3837 break; 3883 break;
3838 case XTerm_Color01: 3884 case XTerm_Color01:
3839 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3840 break; 3886 break;
3841#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3842 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3843 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3844 break; 3890 break;
… …
3848 break; 3894 break;
3849 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3850 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3851 break; 3897 break;
3852#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3853 case XTerm_Color_BD:
3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3855 break;
3856 case XTerm_Color_UL:
3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3858 break;
3859 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3861 break; 3909 break;
3862 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break; 3912 break;
3865#endif 3913#endif
… …
3870 if (am_transparent) 3918 if (am_transparent)
3871 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3872 break; 3920 break;
3873#endif 3921#endif
3874 3922
3875 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3876 if (*str != ';') 3924 if (*str != ';')
3877 { 3925 {
3878#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3879 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3880 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3881#endif
3882 scr_touch (true); 3929 scr_touch (true);
3930#endif
3883 } 3931 }
3932
3884 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3885 { 3934 {
3886 str++; 3935 str++;
3887#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3888 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3891 3940
3892 if (changed) 3941 if (changed)
3893 { 3942 {
3894#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3895 resize_pixmap (); 3944 resize_pixmap ();
3896#endif
3897 scr_touch (true); 3945 scr_touch (true);
3946#endif
3898 } 3947 }
3899 break; 3948 break;
3900 3949
3901 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3903 break; 3952 break;
3904 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3905 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3906 break; 3955 break;
3907 3956
3908 case XTerm_logfile: 3957 case XTerm_logfile:
3909 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3914 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break; 3965 break;
3917#endif 3966#endif
3918#if 0 3967#if 0
3919 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3920 { 3969 {
3921 int fd; 3970 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 { 3972 {
3924 scr_dump (fd); 3973 scr_dump (fd);
… …
3976 break; 4025 break;
3977#endif 4026#endif
3978 4027
3979#if ENABLE_PERL 4028#if ENABLE_PERL
3980 case URxvt_perl: 4029 case URxvt_perl:
3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3982 ; // no responses yet 4031 ; // no responses yet
3983 break; 4032 break;
3984#endif 4033#endif
3985 } 4034 }
3986} 4035}
… …
4098 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
4099 switch (arg[i]) 4148 switch (arg[i])
4100 { 4149 {
4101#if ENABLE_STYLES 4150#if ENABLE_STYLES
4102 case 1021: 4151 case 1021:
4103 if (mode) 4152 set_option (Opt_intensityStyles, mode);
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107 4153
4108 scr_touch (true); 4154 scr_touch (true);
4109 break; 4155 break;
4110#endif 4156#endif
4111 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
… …
4133 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
4134 if (priv_modes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
4135 set_widthheight (((state ? 132 : 80) * fwidth), height); 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
4136 break; 4182 break;
4137 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
4138 if (!state) 4184 set_option (Opt_jumpScroll, !state);
4139 SET_OPTION (Opt_jumpScroll);
4140 else
4141 CLR_OPTION (Opt_jumpScroll);
4142 break; 4185 break;
4143 case 5: /* reverse video */ 4186 case 5: /* reverse video */
4144 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
4145 break; 4188 break;
4146 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
… …
4187#if 0 4230#if 0
4188 case 1001: 4231 case 1001:
4189 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
4190#endif 4233#endif
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
4192 if (!state) 4235 set_option (Opt_scrollTtyOutput, !state);
4193 SET_OPTION (Opt_scrollTtyOutput);
4194 else
4195 CLR_OPTION (Opt_scrollTtyOutput);
4196 break; 4236 break;
4197 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
4198 if (state) 4238 set_option (Opt_scrollTtyKeypress, state);
4199 SET_OPTION (Opt_scrollTtyKeypress);
4200 else
4201 CLR_OPTION (Opt_scrollTtyKeypress);
4202 break; 4239 break;
4203 case 1047: /* secondary screen w/ clearing last */ 4240 case 1047: /* secondary screen w/ clearing last */
4204 if (OPTION (Opt_secondaryScreen)) 4241 if (OPTION (Opt_secondaryScreen))
4205 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
4206 scr_erase_screen (2); 4243 scr_erase_screen (2);
… …
4344 scr_color (Color_bg, Color_bg); 4381 scr_color (Color_bg, Color_bg);
4345 break; 4382 break;
4346 4383
4347 //case 50: // not variable spacing 4384 //case 50: // not variable spacing
4348 4385
4349#ifndef NO_BRIGHTCOLOR 4386#if ENABLE_FRILLS
4350 case 90: 4387 case 90:
4351 case 91: /* set bright fg color */ 4388 case 91: /* set bright fg color */
4352 case 92: 4389 case 92:
4353 case 93: 4390 case 93:
4354 case 94: 4391 case 94:
… …
4399 */ 4436 */
4400void 4437void
4401rxvt_term::tt_printf (const char *fmt,...) 4438rxvt_term::tt_printf (const char *fmt,...)
4402{ 4439{
4403 va_list arg_ptr; 4440 va_list arg_ptr;
4404 unsigned char buf[256]; 4441 char buf[256];
4405 4442
4406 va_start (arg_ptr, fmt); 4443 va_start (arg_ptr, fmt);
4407 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4408 va_end (arg_ptr); 4445 va_end (arg_ptr);
4409 tt_write (buf, strlen (buf)); 4446 tt_write (buf, strlen (buf));
… …
4414 * or generated by us in response to a query ESC sequence. 4451 * or generated by us in response to a query ESC sequence.
4415 */ 4452 */
4416const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4417 4454
4418void 4455void
4419rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4420{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4461 if (pty.pty < 0)
4462 return;
4463
4421 if (v_buflen == 0) 4464 if (v_buflen == 0)
4422 { 4465 {
4423 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4424 4467
4425 if ((unsigned int)written == len) 4468 if ((unsigned int)written == len)
… …
4427 4470
4428 data += written; 4471 data += written;
4429 len -= written; 4472 len -= written;
4430 } 4473 }
4431 4474
4432 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4476
4434 memcpy (v_buffer + v_buflen, data, len); 4477 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4478 v_buflen += len;
4436 4479
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4480 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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