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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 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 {
… …
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 }
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
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))
876 if (view_start) 879 if (view_start)
… …
916#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
918} 921}
919/*}}} */ 922/*}}} */
920 923
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 925unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 927{
927 unsigned int n, s; 928 unsigned int n, s;
928 929
… …
967 } 968 }
968#endif 969#endif
969 970
970 if (want_refresh) 971 if (want_refresh)
971 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
972 scr_refresh (refresh_type); 1011 scr_refresh ();
973 scrollbar_show (1); 1012 scrollbar_show (1);
974#ifdef USE_XIM 1013#ifdef USE_XIM
975 IMSendSpot (); 1014 IMSendSpot ();
976#endif 1015#endif
977 } 1016 }
… …
980} 1019}
981 1020
982void 1021void
983rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
984{ 1023{
985 SET_R (this); 1024 make_current ();
986 SET_LOCALE (locale);
987 1025
988 display->flush (); 1026 display->flush ();
989 1027
990 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1030}
993 1031
994void 1032void
995rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
996{ 1034{
997 SET_R (this); 1035 make_current ();
998 SET_LOCALE (locale);
999 1036
1000 refresh_limit = 1; 1037 refresh_limit = 1;
1001 refresh_count = 0; 1038 refresh_count = 0;
1002 flush (); 1039 flush ();
1003} 1040}
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1069{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1072 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1073 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1075 }
1040} 1076}
1041#endif 1077#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1082{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1084 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1086 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1088 }
1054} 1089}
1055#endif 1090#endif
… …
1060{ 1095{
1061 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1099 {
1065 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1068 1102
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1103 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1105 }
1073} 1106}
1074#endif 1107#endif
… …
1104 1137
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1108 1141
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1143
1111 if (r > 0) 1144 if (r > 0)
1112 { 1145 {
1113 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1114 return true; 1147 return true;
… …
1132} 1165}
1133 1166
1134void 1167void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1169{
1137 SET_R (this); 1170 make_current ();
1138 SET_LOCALE (locale);
1139 1171
1140 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1174 while (pty_fill ())
1143 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1163 1195
1164#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1165void 1197void
1166rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1167{ 1199{
1168 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1169 return; 1201 return;
1170 1202
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1204 XFlush (display->display);
1173 1205
… …
1175} 1207}
1176 1208
1177void 1209void
1178rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1179{ 1211{
1180 SET_R (this); 1212 make_current ();
1181 SET_LOCALE (locale);
1182 1213
1183 pointer_blank (); 1214 pointer_blank ();
1184} 1215}
1185#endif 1216#endif
1186 1217
… …
1265 1296
1266/*{{{ process an X event */ 1297/*{{{ process an X event */
1267void 1298void
1268rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1269{ 1300{
1301 make_current ();
1302
1270 dDisp; 1303 dDisp;
1271 1304
1272 SET_R (this); 1305 if (ev.xany.window == vt
1273 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1274 1309
1275#if defined(CURSOR_BLINK) 1310 // 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; 1311 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1313 unsigned int unused_mask;
1305 1314
1306 switch (ev.type) 1315 switch (ev.type)
… …
1313 1322
1314 break; 1323 break;
1315 1324
1316 case KeyRelease: 1325 case KeyRelease:
1317 { 1326 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1328 KeySym keysym;
1320 1329
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1331#endif
1323 1332
1324#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1334 // ISO 14755 support
1326 if (iso14755buf) 1335 if (iso14755buf)
… …
1331# endif 1340# endif
1332# if ISO_14755 1341# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1334 // first: controls 1343 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1347 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1349 commit_iso14755 ();
1341 return; // case-break; 1350 goto skip_switch;
1342 } 1351 }
1343 1352
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1354 if (i[0] == keysym)
1346 { 1355 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1357 commit_iso14755 ();
1349 return; // case-break; 1358 goto skip_switch;
1350 } 1359 }
1351 1360
1352 scr_bell (); 1361 scr_bell ();
1353# endif 1362# endif
1354 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1373 else 1382 else
1374 iso14755buf = 0; 1383 iso14755buf = 0;
1375 } 1384 }
1376#endif 1385#endif
1377 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1383#endif 1396#endif
1384 break; 1397 break;
1385 } 1398 }
1386 1399
… …
1489 { 1502 {
1490 seen_resize = 1; 1503 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1505 }
1493 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1495 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1496 check_our_parents (); 1511 check_our_parents ();
1497#endif 1512#endif
1498 } 1513 }
… …
1516 1531
1517 case SelectionRequest: 1532 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1519 break; 1534 break;
1520 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1521 case UnmapNotify: 1544 case UnmapNotify:
1522 mapped = 0; 1545 mapped = 0;
1523#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1525#endif 1548#endif
1526 break; 1549 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; 1550 break;
1534 1551
1535#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1536 case ReparentNotify: 1553 case ReparentNotify:
1537 rootwin_cb (ev); 1554 rootwin_cb (ev);
… …
1551 1568
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1555 1572
1556 scr_refresh (refresh_type); 1573 want_refresh = 1;
1557 } 1574 }
1558 else 1575 else
1559 { 1576 {
1560 XEvent unused_event; 1577 XEvent unused_event;
1561 1578
… …
1567 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1568 { 1585 {
1569 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1570 scrollbar_show (0); 1587 scrollbar_show (0);
1571 } 1588 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1589
1577#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1580#endif 1593#endif
… …
1584 case MotionNotify: 1597 case MotionNotify:
1585#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1599 if (hidden_pointer)
1587 pointer_unblank (); 1600 pointer_unblank ();
1588#endif 1601#endif
1589#if MENUBAR
1590 if (isMenuBarWindow (ev.xany.window))
1591 {
1592 menubar_control (ev.xbutton);
1593 break;
1594 }
1595#endif
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1603 break;
1598 1604
1599 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1600 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1611 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1613 ;
1605 1614
1606 XQueryPointer (disp, vt, 1615 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1697 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1699 scrollbar_size ());
1691 scr_refresh (refresh_type); 1700 want_refresh = 1;
1692 refresh_limit = 0; 1701 refresh_limit = 0;
1693 scrollbar_show (1); 1702 scrollbar_show (1);
1694 } 1703 }
1695 break; 1704 break;
1696 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1697} 1735}
1698 1736
1699void 1737void
1700rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1701{ 1739{
1702 if (!focus) 1740 if (!focus)
1703 { 1741 {
1704 focus = 1; 1742 focus = 1;
1705 want_refresh = 1; 1743 want_refresh = 1;
1706 1744
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1746
1709#if USE_XIM 1747#if USE_XIM
1710 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1711 { 1749 {
1712 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
… …
1733 if (focus) 1771 if (focus)
1734 { 1772 {
1735 focus = 0; 1773 focus = 0;
1736 want_refresh = 1; 1774 want_refresh = 1;
1737 1775
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1777
1740#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1779 if (iso14755buf)
1742 { 1780 {
1743 iso14755buf = 0; 1781 iso14755buf = 0;
… …
1767 1805
1768#if TRANSPARENT 1806#if TRANSPARENT
1769void 1807void
1770rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1809{
1772 SET_R (this); 1810 make_current ();
1773 SET_LOCALE (locale);
1774 1811
1775 switch (ev.type) 1812 switch (ev.type)
1776 { 1813 {
1777 case PropertyNotify: 1814 case PropertyNotify:
1778 /* 1815 /*
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1828 { 1865 {
1829 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1830 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1831 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1832 { 1870 {
1833 /* only report double clicks */ 1871 /* only report double clicks */
1834 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1835 mouse_report (ev); 1873 mouse_report (ev);
… …
1855 else 1893 else
1856 { 1894 {
1857 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1859 1897
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1899 switch (ev.button)
1862 { 1900 {
1863 case Button1: 1901 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1903 /* should be done in screen.C */
… …
1868#else 1906#else
1869 selection.rect = false; 1907 selection.rect = false;
1870#endif 1908#endif
1871 1909
1872 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1912 {
1875 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1877 else 1915 else
1878 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2081 }
2044 2082
2045 break; 2083 break;
2046 } 2084 }
2047 } 2085 }
2086
2048 return; 2087 return;
2049 } 2088 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2089}
2058 2090
2059void 2091void
2060rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2061{ 2093{
… …
2067 2099
2068 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2069 { 2101 {
2070 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2071 scrollbar_show (0); 2103 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2104 }
2076 2105
2077#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2117 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2147 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2121 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2122 switch (ev.button) 2154 switch (ev.button)
2123 { 2155 {
2124 case Button1: 2156 case Button1:
2125 case Button3: 2157 case Button3:
2126 selection_make (ev.time); 2158 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2158 } 2190 }
2159 else 2191 else
2160 { 2192 {
2161# endif 2193# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2194 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2195 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 2196# ifdef MOUSE_SLIP_WHEELING
2175 } 2197 }
2176#endif 2198# endif
2177 } 2199 }
2178 break; 2200 break;
2179#endif 2201#endif
2180 } 2202 }
2181 } 2203 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2204}
2187 2205
2188#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2189#if TINTING 2207#if TINTING
2190/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2670 2688
2671bool 2689bool
2672rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2673{ 2691{
2674 bool flag = false; 2692 bool flag = false;
2675 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2677 2695
2678 for (;;) 2696 for (;;)
2679 { 2697 {
2680 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2681 { 2699 {
2682 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2701 ch = next_char ();
2684 }
2685 2702
2686 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2687 break; 2704 break;
2705 }
2688 2706
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2708 {
2691 if (!seen_input) 2709 if (!seen_input)
2692 { 2710 {
… …
2701 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2703 } 2721 }
2704 2722
2705 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2725 bool refreshnow = false;
2708 int nlines = 0; 2726 int nlines = 0;
2709 unicode_t *str = buf; 2727 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2729
2712 for (;;) 2730 for (;;)
2713 { 2731 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2733 break;
… …
2733 } 2751 }
2734 2752
2735 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2737 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2739 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2740 2759
2741 nlines = 0; 2760 nlines = 0;
2742 str = buf; 2761 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
2744 } 2763 }
… …
2758 2777
2759 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2779 ch = next_char ();
2761 } 2780 }
2762 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2764 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2765 2785
2766 /* 2786 /*
2767 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
… …
2774 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2775 refresh_limit++; 2795 refresh_limit++;
2776 else 2796 else
2777 { 2797 {
2778 flag = true; 2798 flag = true;
2779 scr_refresh (refresh_type); 2799 scr_refresh ();
2780 flush_ev.stop (); 2800 want_refresh = 1;
2781 } 2801 }
2782 } 2802 }
2783 2803
2784 } 2804 }
2785 else 2805 else
… …
2800 } 2820 }
2801 2821
2802 return flag; 2822 return flag;
2803} 2823}
2804 2824
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2825// read the next character
2815unicode_t 2826wchar_t
2816rxvt_term::next_char () 2827rxvt_term::next_char ()
2817{ 2828{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2830 {
2820 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2842 break;
2832 } 2843 }
2833 2844
2834 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2847
2837 // assume wchar == unicode 2848 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2840 } 2851 }
2841 2852
2842 return NOCHAR; 2853 return NOCHAR;
2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet ()
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2843} 2863}
2844 2864
2845/* rxvt_cmd_getc () - Return next input character */ 2865/* rxvt_cmd_getc () - Return next input character */
2846/* 2866/*
2847 * Return the next input character after first passing any keyboard input 2867 * Return the next input character after first passing any keyboard input
2848 * to the command. 2868 * to the command.
2849 */ 2869 */
2850unicode_t 2870wchar_t
2851rxvt_term::cmd_getc () 2871rxvt_term::cmd_getc ()
2852{ 2872{
2853 unicode_t c = next_char (); 2873 wchar_t c = next_char ();
2854 2874
2855 if (c == NOCHAR) 2875 if (c == NOCHAR)
2856 throw out_of_input; 2876 throw out_of_input;
2857 2877
2858 return c; 2878 return c;
2859} 2879}
2860 2880
2861unicode_t 2881uint32_t
2862rxvt_term::cmd_get8 () 2882rxvt_term::cmd_get8 ()
2863{ 2883{
2864 unicode_t c = next_octet (); 2884 uint32_t c = next_octet ();
2865 2885
2866 if (c == NOCHAR) 2886 if (c == NOCHAR)
2867 throw out_of_input; 2887 throw out_of_input;
2868 2888
2869 return c; 2889 return c;
… …
3136 break; 3156 break;
3137 3157
3138 /* 8.3.87: NEXT LINE */ 3158 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3159 case C1_NEL: /* ESC E */
3140 { 3160 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3161 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3162 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3163 }
3144 break; 3164 break;
3145 3165
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3166 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3167 case C1_ESA: /* ESC G */
… …
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3767 */
3748void 3768void
3749rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3770{
3751 int changed = 0;
3752 int color; 3771 int color;
3753 char *buf, *name; 3772 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3774 int saveop = op;
3756 dDisp; 3775 dDisp;
… …
3811 { 3830 {
3812 if ((name = strchr (buf, ';')) == NULL) 3831 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3832 break;
3814 3833
3815 *name++ = '\0'; 3834 *name++ = '\0';
3816 color = atoi (buf); 3835 color = atoi (buf) + minCOLOR;
3817 3836
3818 if (color < 0 || color >= TOTAL_COLORS) 3837 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3838 break;
3820 3839
3821 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3841 *buf++ = '\0';
3823 3842
3824 if (name[0] == '?' && !name[1]) 3843 if (name[0] == '?' && !name[1])
3825 { 3844 {
3826 unsigned short r, g, b; 3845 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3846 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 } 3848 }
3830 else 3849 else
3831 set_window_color (color + minCOLOR, name); 3850 set_window_color (color, name);
3832 } 3851 }
3833 break; 3852 break;
3834 case XTerm_Color00: 3853 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3855 break;
3837 case XTerm_Color01: 3856 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3858 break;
3840#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3862 break;
… …
3847 break; 3866 break;
3848 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3850 break; 3869 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3860 break; 3881 break;
3861 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3884 break;
3864#endif 3885#endif
… …
3869 if (am_transparent) 3890 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3871 break; 3892 break;
3872#endif 3893#endif
3873 3894
3874 case XTerm_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3875 if (*str != ';') 3897 if (*str != ';')
3876 { 3898 {
3877#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3902 scr_touch (true);
3903#endif
3882 } 3904 }
3905
3906 int changed = 0;
3907
3883 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3884 { 3909 {
3885 str++; 3910 str++;
3886#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3888#endif 3913#endif
3889 } 3914 }
3890 3915
3891 if (changed) 3916 if (changed)
3892 { 3917 {
3893#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3919 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3920 scr_touch (true);
3921#endif
3897 } 3922 }
3923 }
3898 break; 3924 break;
3899 3925
3900 case XTerm_restoreFG: 3926 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3902 break; 3928 break;
3903 case XTerm_restoreBG: 3929 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3930 set_window_color (Color_bg, str);
3905 break; 3931 break;
3906 3932
3907 case XTerm_logfile: 3933 case XTerm_logfile:
3908 // TODO, when secure mode? 3934 // TODO, when secure mode?
3909 break; 3935 break;
3910 3936
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3937#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3938 case Rxvt_dumpscreen: /* no error notices */
3919 { 3939 {
3920 int fd; 3940 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3942 {
3923 scr_dump (fd); 3943 scr_dump (fd);
… …
3954 if (query) 3974 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3976 else
3957 { 3977 {
3958 set_locale (str); 3978 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3980 init_xlocale ();
3961 } 3981 }
3962 break; 3982 break;
3963 3983
3964 case URxvt_view_up: 3984 case URxvt_view_up:
… …
3975 break; 3995 break;
3976#endif 3996#endif
3977 3997
3978#if ENABLE_PERL 3998#if ENABLE_PERL
3979 case URxvt_perl: 3999 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3981 ; // no responses yet 4001 ; // no responses yet
3982 break; 4002 break;
3983#endif 4003#endif
3984 } 4004 }
3985} 4005}
… …
4038 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4063 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4067#endif
… …
4097 /* extra handling for values with state unkept */ 4114 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4115 switch (arg[i])
4099 { 4116 {
4100#if ENABLE_STYLES 4117#if ENABLE_STYLES
4101 case 1021: 4118 case 1021:
4102 if (mode) 4119 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4120
4107 scr_touch (true); 4121 scr_touch (true);
4108 break; 4122 break;
4109#endif 4123#endif
4110 case 1048: /* alternative cursor save */ 4124 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4146 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4147 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4148 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4149 break;
4136 case 4: /* smooth scrolling */ 4150 case 4: /* smooth scrolling */
4137 if (!state) 4151 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4152 break;
4142 case 5: /* reverse video */ 4153 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4154 scr_rvideo_mode (state);
4144 break; 4155 break;
4145 case 6: /* relative/absolute origins */ 4156 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4166 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4164 case scrollBar_esc: 4168 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4166 { 4170 {
4167 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
… …
4186#if 0 4190#if 0
4187 case 1001: 4191 case 1001:
4188 break; /* X11 mouse highlighting */ 4192 break; /* X11 mouse highlighting */
4189#endif 4193#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4194 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4195 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4196 break;
4196 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4197 if (state) 4198 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4199 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4200 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4201 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4203 scr_erase_screen (2);
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4413const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4414
4417void 4415void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4417{
4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4419 return;
4420
4421 if (pty->pty < 0)
4422 return;
4423
4420 if (v_buflen == 0) 4424 if (v_buflen == 0)
4421 { 4425 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 4427
4424 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4425 return; 4429 return;
4426 4430
4427 data += written; 4431 data += written;
… …
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4441}
4438 4442
4439void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4440{ 4444{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4446
4443 if (written > 0) 4447 if (written > 0)
4444 { 4448 {
4445 v_buflen -= written; 4449 v_buflen -= written;
4446 4450

Diff Legend

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