… | |
… | |
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 | } |
… | |
… | |
919 | #endif /* DEBUG_CMD */ |
919 | #endif /* DEBUG_CMD */ |
920 | tt_write (kbuf, (unsigned int)len); |
920 | tt_write (kbuf, (unsigned int)len); |
921 | } |
921 | } |
922 | /*}}} */ |
922 | /*}}} */ |
923 | |
923 | |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
924 | #if defined (KEYSYM_RESOURCE) |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
926 | /* attempt to `write' count to the input buffer */ |
|
|
927 | unsigned int |
925 | unsigned int |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
926 | rxvt_term::cmd_write (const char *str, unsigned int count) |
929 | { |
927 | { |
930 | unsigned int n, s; |
928 | unsigned int n, s; |
931 | |
929 | |
… | |
… | |
972 | |
970 | |
973 | if (want_refresh) |
971 | if (want_refresh) |
974 | { |
972 | { |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
973 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
976 | { |
974 | { |
977 | int row = -view_start; |
975 | int row = view_start; |
978 | int end_row = row + nrow; |
976 | int end_row = row + nrow; |
979 | |
977 | |
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
978 | while (row > top_row && ROW (row - 1).is_longer ()) |
981 | --row; |
979 | --row; |
982 | |
980 | |
983 | do |
981 | do |
984 | { |
982 | { |
985 | int start_row = row; |
983 | int start_row = row; |
… | |
… | |
987 | |
985 | |
988 | do |
986 | do |
989 | { |
987 | { |
990 | l = &ROW (row++); |
988 | l = &ROW (row++); |
991 | |
989 | |
992 | if (l->f & LINE_FILTERED) |
990 | if (!(l->f & LINE_FILTERED)) |
993 | row++; |
|
|
994 | else |
|
|
995 | { |
991 | { |
996 | // line not filtered, mark it as filtered |
992 | // line not filtered, mark it as filtered |
997 | l->f |= LINE_FILTERED; |
993 | l->f |= LINE_FILTERED; |
998 | while (l->is_longer ()) |
994 | while (l->is_longer ()) |
999 | { |
995 | { |
1000 | l = &ROW (++row); |
996 | l = &ROW (row++); |
1001 | l->f |= LINE_FILTERED; |
997 | l->f |= LINE_FILTERED; |
1002 | } |
998 | } |
1003 | |
999 | |
1004 | // and filter it |
1000 | // and filter it |
1005 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1001 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
… | |
… | |
1007 | break; |
1003 | break; |
1008 | } |
1004 | } |
1009 | } |
1005 | } |
1010 | while (l->is_longer () && row < end_row); |
1006 | while (l->is_longer () && row < end_row); |
1011 | } |
1007 | } |
1012 | while (++row < end_row); |
1008 | while (row < end_row); |
1013 | } |
1009 | } |
1014 | |
1010 | |
1015 | scr_refresh (refresh_type); |
1011 | scr_refresh (); |
1016 | scrollbar_show (1); |
1012 | scrollbar_show (1); |
1017 | #ifdef USE_XIM |
1013 | #ifdef USE_XIM |
1018 | IMSendSpot (); |
1014 | IMSendSpot (); |
1019 | #endif |
1015 | #endif |
1020 | } |
1016 | } |
… | |
… | |
1023 | } |
1019 | } |
1024 | |
1020 | |
1025 | void |
1021 | void |
1026 | rxvt_term::check_cb (check_watcher &w) |
1022 | rxvt_term::check_cb (check_watcher &w) |
1027 | { |
1023 | { |
1028 | SET_R (this); |
1024 | make_current (); |
1029 | SET_LOCALE (locale); |
|
|
1030 | |
1025 | |
1031 | display->flush (); |
1026 | display->flush (); |
1032 | |
1027 | |
1033 | if (want_refresh && !flush_ev.active) |
1028 | if (want_refresh && !flush_ev.active) |
1034 | 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 |
1035 | } |
1030 | } |
1036 | |
1031 | |
1037 | void |
1032 | void |
1038 | rxvt_term::flush_cb (time_watcher &w) |
1033 | rxvt_term::flush_cb (time_watcher &w) |
1039 | { |
1034 | { |
1040 | SET_R (this); |
1035 | make_current (); |
1041 | SET_LOCALE (locale); |
|
|
1042 | |
1036 | |
1043 | refresh_limit = 1; |
1037 | refresh_limit = 1; |
1044 | refresh_count = 0; |
1038 | refresh_count = 0; |
1045 | flush (); |
1039 | flush (); |
1046 | } |
1040 | } |
… | |
… | |
1074 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1068 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1075 | { |
1069 | { |
1076 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1070 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1077 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1071 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1078 | { |
1072 | { |
1079 | refresh_type |= SMOOTH_REFRESH; |
|
|
1080 | want_refresh = 1; |
1073 | want_refresh = 1; |
1081 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1074 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1082 | } |
1075 | } |
1083 | } |
1076 | } |
1084 | #endif |
1077 | #endif |
… | |
… | |
1088 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1081 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1089 | { |
1082 | { |
1090 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1083 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1091 | { |
1084 | { |
1092 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1085 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1093 | refresh_type |= SMOOTH_REFRESH; |
|
|
1094 | want_refresh = 1; |
1086 | want_refresh = 1; |
1095 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1087 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1096 | } |
1088 | } |
1097 | } |
1089 | } |
1098 | #endif |
1090 | #endif |
… | |
… | |
1103 | { |
1095 | { |
1104 | if (mouse_slip_wheel_speed == 0 |
1096 | if (mouse_slip_wheel_speed == 0 |
1105 | || 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) |
1106 | : scr_page (UP, mouse_slip_wheel_speed)) |
1098 | : scr_page (UP, mouse_slip_wheel_speed)) |
1107 | { |
1099 | { |
1108 | if (view_start == nsaved || |
1100 | if (view_start == top_row || view_start == 0) |
1109 | view_start == 0) |
|
|
1110 | mouse_slip_wheel_speed = 0; |
1101 | mouse_slip_wheel_speed = 0; |
1111 | |
1102 | |
1112 | refresh_type |= SMOOTH_REFRESH; |
|
|
1113 | want_refresh = 1; |
1103 | want_refresh = 1; |
1114 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1104 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1115 | } |
1105 | } |
1116 | } |
1106 | } |
1117 | #endif |
1107 | #endif |
… | |
… | |
1147 | |
1137 | |
1148 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1149 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1150 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1151 | |
1141 | |
1152 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1153 | |
1143 | |
1154 | if (r > 0) |
1144 | if (r > 0) |
1155 | { |
1145 | { |
1156 | cmdbuf_endp += r; |
1146 | cmdbuf_endp += r; |
1157 | return true; |
1147 | return true; |
… | |
… | |
1175 | } |
1165 | } |
1176 | |
1166 | |
1177 | void |
1167 | void |
1178 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1168 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1179 | { |
1169 | { |
1180 | SET_R (this); |
1170 | make_current (); |
1181 | SET_LOCALE (locale); |
|
|
1182 | |
1171 | |
1183 | if (revents & EVENT_READ) |
1172 | if (revents & EVENT_READ) |
1184 | // loop, but don't allow a single term to monopolize us |
1173 | // loop, but don't allow a single term to monopolize us |
1185 | while (pty_fill ()) |
1174 | while (pty_fill ()) |
1186 | if (cmd_parse ()) |
1175 | if (cmd_parse ()) |
… | |
… | |
1218 | } |
1207 | } |
1219 | |
1208 | |
1220 | void |
1209 | void |
1221 | rxvt_term::pointer_cb (time_watcher &w) |
1210 | rxvt_term::pointer_cb (time_watcher &w) |
1222 | { |
1211 | { |
1223 | SET_R (this); |
1212 | make_current (); |
1224 | SET_LOCALE (locale); |
|
|
1225 | |
1213 | |
1226 | pointer_blank (); |
1214 | pointer_blank (); |
1227 | } |
1215 | } |
1228 | #endif |
1216 | #endif |
1229 | |
1217 | |
… | |
… | |
1308 | |
1296 | |
1309 | /*{{{ process an X event */ |
1297 | /*{{{ process an X event */ |
1310 | void |
1298 | void |
1311 | rxvt_term::x_cb (XEvent &ev) |
1299 | rxvt_term::x_cb (XEvent &ev) |
1312 | { |
1300 | { |
|
|
1301 | make_current (); |
|
|
1302 | |
1313 | dDisp; |
1303 | dDisp; |
1314 | |
1304 | |
1315 | SET_R (this); |
1305 | if (ev.xany.window == vt |
1316 | SET_LOCALE (locale); |
1306 | && SHOULD_INVOKE (HOOK_X_EVENT) |
|
|
1307 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1308 | return; |
1317 | |
1309 | |
|
|
1310 | // for XQueryPointer |
1318 | Window unused_root, unused_child; |
1311 | Window unused_root, unused_child; |
1319 | int unused_root_x, unused_root_y; |
1312 | int unused_root_x, unused_root_y; |
1320 | unsigned int unused_mask; |
1313 | unsigned int unused_mask; |
1321 | |
1314 | |
1322 | switch (ev.type) |
1315 | switch (ev.type) |
… | |
… | |
1509 | { |
1502 | { |
1510 | seen_resize = 1; |
1503 | seen_resize = 1; |
1511 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1512 | } |
1505 | } |
1513 | |
1506 | |
|
|
1507 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1508 | |
1514 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1509 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1515 | if (OPTION (Opt_transparent)) |
1510 | if (OPTION (Opt_transparent)) |
1516 | check_our_parents (); |
1511 | check_our_parents (); |
1517 | #endif |
1512 | #endif |
1518 | } |
1513 | } |
… | |
… | |
1573 | |
1568 | |
1574 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1569 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1575 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1570 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1576 | ev.xexpose.width, ev.xexpose.height, False); |
1571 | ev.xexpose.width, ev.xexpose.height, False); |
1577 | |
1572 | |
1578 | scr_refresh (refresh_type); |
1573 | want_refresh = 1; |
1579 | } |
1574 | } |
1580 | else |
1575 | else |
1581 | { |
1576 | { |
1582 | XEvent unused_event; |
1577 | XEvent unused_event; |
1583 | |
1578 | |
… | |
… | |
1589 | if (isScrollbarWindow (ev.xany.window)) |
1584 | if (isScrollbarWindow (ev.xany.window)) |
1590 | { |
1585 | { |
1591 | scrollBar.setIdle (); |
1586 | scrollBar.setIdle (); |
1592 | scrollbar_show (0); |
1587 | scrollbar_show (0); |
1593 | } |
1588 | } |
1594 | #ifdef MENUBAR |
|
|
1595 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1596 | menubar_expose (); |
|
|
1597 | #endif |
|
|
1598 | |
1589 | |
1599 | #ifdef TRANSPARENT |
1590 | #ifdef TRANSPARENT |
1600 | if (am_transparent && ev.xany.window == parent[0]) |
1591 | if (am_transparent && ev.xany.window == parent[0]) |
1601 | XClearWindow (disp, ev.xany.window); |
1592 | XClearWindow (disp, ev.xany.window); |
1602 | #endif |
1593 | #endif |
… | |
… | |
1606 | case MotionNotify: |
1597 | case MotionNotify: |
1607 | #ifdef POINTER_BLANK |
1598 | #ifdef POINTER_BLANK |
1608 | if (hidden_pointer) |
1599 | if (hidden_pointer) |
1609 | pointer_unblank (); |
1600 | pointer_unblank (); |
1610 | #endif |
1601 | #endif |
1611 | #if MENUBAR |
|
|
1612 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1613 | { |
|
|
1614 | menubar_control (ev.xbutton); |
|
|
1615 | break; |
|
|
1616 | } |
|
|
1617 | #endif |
|
|
1618 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1602 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1619 | break; |
1603 | break; |
1620 | |
1604 | |
1621 | if (ev.xany.window == vt) |
1605 | if (ev.xany.window == vt) |
1622 | { |
1606 | { |
|
|
1607 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1623 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1608 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1624 | ; // nop |
1609 | ; // nop |
1625 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1610 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1626 | { |
1611 | { |
1627 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1612 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1628 | ; |
1613 | ; |
… | |
… | |
1710 | &unused_root_x, &unused_root_y, |
1695 | &unused_root_x, &unused_root_y, |
1711 | &ev.xbutton.x, &ev.xbutton.y, |
1696 | &ev.xbutton.x, &ev.xbutton.y, |
1712 | &unused_mask); |
1697 | &unused_mask); |
1713 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1698 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1714 | scrollbar_size ()); |
1699 | scrollbar_size ()); |
1715 | scr_refresh (refresh_type); |
1700 | want_refresh = 1; |
1716 | refresh_limit = 0; |
1701 | refresh_limit = 0; |
1717 | scrollbar_show (1); |
1702 | scrollbar_show (1); |
1718 | } |
1703 | } |
1719 | break; |
1704 | break; |
1720 | } |
1705 | } |
… | |
… | |
1820 | |
1805 | |
1821 | #if TRANSPARENT |
1806 | #if TRANSPARENT |
1822 | void |
1807 | void |
1823 | rxvt_term::rootwin_cb (XEvent &ev) |
1808 | rxvt_term::rootwin_cb (XEvent &ev) |
1824 | { |
1809 | { |
1825 | SET_R (this); |
1810 | make_current (); |
1826 | SET_LOCALE (locale); |
|
|
1827 | |
1811 | |
1828 | switch (ev.type) |
1812 | switch (ev.type) |
1829 | { |
1813 | { |
1830 | case PropertyNotify: |
1814 | case PropertyNotify: |
1831 | /* |
1815 | /* |
… | |
… | |
1922 | #else |
1906 | #else |
1923 | selection.rect = false; |
1907 | selection.rect = false; |
1924 | #endif |
1908 | #endif |
1925 | |
1909 | |
1926 | /* allow shift+left click to extend selection */ |
1910 | /* allow shift+left click to extend selection */ |
1927 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1911 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1928 | { |
1912 | { |
1929 | if (MEvent.button == Button1 && clickintime) |
1913 | if (MEvent.button == Button1 && clickintime) |
1930 | selection_rotate (ev.x, ev.y); |
1914 | selection_rotate (ev.x, ev.y); |
1931 | else |
1915 | else |
1932 | selection_extend (ev.x, ev.y, 1); |
1916 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2100 | } |
2084 | } |
2101 | } |
2085 | } |
2102 | |
2086 | |
2103 | return; |
2087 | return; |
2104 | } |
2088 | } |
2105 | |
|
|
2106 | #if MENUBAR |
|
|
2107 | /* |
|
|
2108 | * Menubar window processing of button press |
|
|
2109 | */ |
|
|
2110 | if (isMenuBarWindow (ev.window)) |
|
|
2111 | menubar_control (ev); |
|
|
2112 | #endif |
|
|
2113 | } |
2089 | } |
2114 | |
2090 | |
2115 | void |
2091 | void |
2116 | rxvt_term::button_release (XButtonEvent &ev) |
2092 | rxvt_term::button_release (XButtonEvent &ev) |
2117 | { |
2093 | { |
… | |
… | |
2123 | |
2099 | |
2124 | if (scrollbar_isUpDn ()) |
2100 | if (scrollbar_isUpDn ()) |
2125 | { |
2101 | { |
2126 | scrollBar.setIdle (); |
2102 | scrollBar.setIdle (); |
2127 | scrollbar_show (0); |
2103 | scrollbar_show (0); |
2128 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2129 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2130 | #endif |
|
|
2131 | } |
2104 | } |
2132 | |
2105 | |
2133 | #ifdef SELECTION_SCROLLING |
2106 | #ifdef SELECTION_SCROLLING |
2134 | if (sel_scroll_ev.active) |
2107 | if (sel_scroll_ev.active) |
2135 | sel_scroll_ev.stop(); |
2108 | sel_scroll_ev.stop(); |
… | |
… | |
2216 | slip_wheel_ev.start (); |
2189 | slip_wheel_ev.start (); |
2217 | } |
2190 | } |
2218 | else |
2191 | else |
2219 | { |
2192 | { |
2220 | # endif |
2193 | # endif |
2221 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2222 | scr_page (v, i); |
2194 | scr_page (v, i); |
2223 | scr_refresh (SMOOTH_REFRESH); |
|
|
2224 | scrollbar_show (1); |
2195 | scrollbar_show (1); |
2225 | # else |
|
|
2226 | while (i--) |
|
|
2227 | { |
|
|
2228 | scr_page (v, 1); |
|
|
2229 | scr_refresh (SMOOTH_REFRESH); |
|
|
2230 | scrollbar_show (1); |
|
|
2231 | } |
|
|
2232 | # endif |
|
|
2233 | # ifdef MOUSE_SLIP_WHEELING |
2196 | # ifdef MOUSE_SLIP_WHEELING |
2234 | } |
2197 | } |
2235 | #endif |
2198 | # endif |
2236 | } |
2199 | } |
2237 | break; |
2200 | break; |
2238 | #endif |
2201 | #endif |
2239 | } |
2202 | } |
2240 | } |
2203 | } |
2241 | #ifdef MENUBAR |
|
|
2242 | else if (isMenuBarWindow (ev.window)) |
|
|
2243 | menubar_control (ev); |
|
|
2244 | #endif |
|
|
2245 | } |
2204 | } |
2246 | |
2205 | |
2247 | #ifdef TRANSPARENT |
2206 | #ifdef TRANSPARENT |
2248 | #if TINTING |
2207 | #if TINTING |
2249 | /* taken from aterm-0.4.2 */ |
2208 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2792 | } |
2751 | } |
2793 | |
2752 | |
2794 | // scr_add_lines only works for nlines <= nrow - 1. |
2753 | // scr_add_lines only works for nlines <= nrow - 1. |
2795 | if (nlines >= nrow - 1) |
2754 | if (nlines >= nrow - 1) |
2796 | { |
2755 | { |
|
|
2756 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2797 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2757 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2798 | scr_add_lines (buf, str - buf, nlines); |
2758 | scr_add_lines (buf, str - buf, nlines); |
2799 | |
2759 | |
2800 | nlines = 0; |
2760 | nlines = 0; |
2801 | str = buf; |
2761 | str = buf; |
2802 | eol = str + min (ncol, UBUFSIZ); |
2762 | eol = str + min (ncol, UBUFSIZ); |
… | |
… | |
2817 | |
2777 | |
2818 | seq_begin = cmdbuf_ptr; |
2778 | seq_begin = cmdbuf_ptr; |
2819 | ch = next_char (); |
2779 | ch = next_char (); |
2820 | } |
2780 | } |
2821 | |
2781 | |
|
|
2782 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2822 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2783 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2823 | scr_add_lines (buf, str - buf, nlines); |
2784 | scr_add_lines (buf, str - buf, nlines); |
2824 | |
2785 | |
2825 | /* |
2786 | /* |
2826 | * 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 |
2827 | * 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. |
… | |
… | |
2833 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2794 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2834 | refresh_limit++; |
2795 | refresh_limit++; |
2835 | else |
2796 | else |
2836 | { |
2797 | { |
2837 | flag = true; |
2798 | flag = true; |
2838 | scr_refresh (refresh_type); |
2799 | scr_refresh (); |
2839 | flush_ev.stop (); |
2800 | want_refresh = 1; |
2840 | } |
2801 | } |
2841 | } |
2802 | } |
2842 | |
2803 | |
2843 | } |
2804 | } |
2844 | else |
2805 | else |
… | |
… | |
3805 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3766 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3806 | */ |
3767 | */ |
3807 | void |
3768 | void |
3808 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3769 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3809 | { |
3770 | { |
3810 | int changed = 0; |
|
|
3811 | int color; |
3771 | int color; |
3812 | char *buf, *name; |
3772 | char *buf, *name; |
3813 | bool query = str[0] == '?' && !str[1]; |
3773 | bool query = str[0] == '?' && !str[1]; |
3814 | int saveop = op; |
3774 | int saveop = op; |
3815 | dDisp; |
3775 | dDisp; |
… | |
… | |
3870 | { |
3830 | { |
3871 | if ((name = strchr (buf, ';')) == NULL) |
3831 | if ((name = strchr (buf, ';')) == NULL) |
3872 | break; |
3832 | break; |
3873 | |
3833 | |
3874 | *name++ = '\0'; |
3834 | *name++ = '\0'; |
3875 | color = atoi (buf); |
3835 | color = atoi (buf) + minCOLOR; |
3876 | |
3836 | |
3877 | if (color < 0 || color >= TOTAL_COLORS) |
3837 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3878 | break; |
3838 | break; |
3879 | |
3839 | |
3880 | if ((buf = strchr (name, ';')) != NULL) |
3840 | if ((buf = strchr (name, ';')) != NULL) |
3881 | *buf++ = '\0'; |
3841 | *buf++ = '\0'; |
3882 | |
3842 | |
3883 | if (name[0] == '?' && !name[1]) |
3843 | if (name[0] == '?' && !name[1]) |
3884 | { |
3844 | { |
3885 | unsigned short r, g, b; |
3845 | unsigned short r, g, b; |
3886 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3846 | pix_colors_focused[color].get (display, r, g, b); |
3887 | 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); |
3888 | } |
3848 | } |
3889 | else |
3849 | else |
3890 | set_window_color (color + minCOLOR, name); |
3850 | set_window_color (color, name); |
3891 | } |
3851 | } |
3892 | break; |
3852 | break; |
3893 | case XTerm_Color00: |
3853 | case XTerm_Color00: |
3894 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3854 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3895 | break; |
3855 | break; |
3896 | case XTerm_Color01: |
3856 | case XTerm_Color01: |
3897 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3857 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3898 | break; |
3858 | break; |
3899 | #ifndef NO_CURSORCOLOR |
3859 | #ifndef NO_CURSORCOLOR |
3900 | case XTerm_Color_cursor: |
3860 | case XTerm_Color_cursor: |
3901 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3861 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3902 | break; |
3862 | break; |
… | |
… | |
3906 | break; |
3866 | break; |
3907 | case XTerm_Color_pointer_bg: |
3867 | case XTerm_Color_pointer_bg: |
3908 | 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); |
3909 | break; |
3869 | break; |
3910 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3870 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3911 | case XTerm_Color_BD: |
|
|
3912 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3913 | break; |
|
|
3914 | case XTerm_Color_UL: |
|
|
3915 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3916 | break; |
|
|
3917 | case XTerm_Color_RV: |
3871 | case XTerm_Color_RV: |
3918 | 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); |
3919 | break; |
3881 | break; |
3920 | case URxvt_Color_IT: |
3882 | case URxvt_Color_IT: |
3921 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3883 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3922 | break; |
3884 | break; |
3923 | #endif |
3885 | #endif |
… | |
… | |
3928 | if (am_transparent) |
3890 | if (am_transparent) |
3929 | want_full_refresh = want_refresh = 1; |
3891 | want_full_refresh = want_refresh = 1; |
3930 | break; |
3892 | break; |
3931 | #endif |
3893 | #endif |
3932 | |
3894 | |
3933 | case XTerm_Pixmap: |
3895 | case Rxvt_Pixmap: |
|
|
3896 | { |
3934 | if (*str != ';') |
3897 | if (*str != ';') |
3935 | { |
3898 | { |
3936 | #if XPM_BACKGROUND |
3899 | #if XPM_BACKGROUND |
3937 | scale_pixmap (""); /* reset to default scaling */ |
3900 | scale_pixmap (""); /* reset to default scaling */ |
3938 | set_bgPixmap (str); /* change pixmap */ |
3901 | set_bgPixmap (str); /* change pixmap */ |
3939 | #endif |
|
|
3940 | scr_touch (true); |
3902 | scr_touch (true); |
|
|
3903 | #endif |
3941 | } |
3904 | } |
|
|
3905 | |
|
|
3906 | int changed = 0; |
|
|
3907 | |
3942 | while ((str = strchr (str, ';')) != NULL) |
3908 | while ((str = strchr (str, ';')) != NULL) |
3943 | { |
3909 | { |
3944 | str++; |
3910 | str++; |
3945 | #if XPM_BACKGROUND |
3911 | #if XPM_BACKGROUND |
3946 | changed += scale_pixmap (str); |
3912 | changed += scale_pixmap (str); |
3947 | #endif |
3913 | #endif |
3948 | } |
3914 | } |
3949 | |
3915 | |
3950 | if (changed) |
3916 | if (changed) |
3951 | { |
3917 | { |
3952 | #ifdef XPM_BACKGROUND |
3918 | #ifdef XPM_BACKGROUND |
3953 | resize_pixmap (); |
3919 | resize_pixmap (); |
3954 | #endif |
|
|
3955 | scr_touch (true); |
3920 | scr_touch (true); |
|
|
3921 | #endif |
3956 | } |
3922 | } |
|
|
3923 | } |
3957 | break; |
3924 | break; |
3958 | |
3925 | |
3959 | case XTerm_restoreFG: |
3926 | case Rxvt_restoreFG: |
3960 | set_window_color (Color_fg, str); |
3927 | set_window_color (Color_fg, str); |
3961 | break; |
3928 | break; |
3962 | case XTerm_restoreBG: |
3929 | case Rxvt_restoreBG: |
3963 | set_window_color (Color_bg, str); |
3930 | set_window_color (Color_bg, str); |
3964 | break; |
3931 | break; |
3965 | |
3932 | |
3966 | case XTerm_logfile: |
3933 | case XTerm_logfile: |
3967 | // TODO, when secure mode? |
3934 | // TODO, when secure mode? |
3968 | break; |
3935 | break; |
3969 | |
3936 | |
3970 | #ifdef MENUBAR |
|
|
3971 | case URxvt_Menu: |
|
|
3972 | if (OPTION (Opt_insecure)) |
|
|
3973 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3974 | break; |
|
|
3975 | #endif |
|
|
3976 | #if 0 |
3937 | #if 0 |
3977 | case XTerm_dumpscreen: /* no error notices */ |
3938 | case Rxvt_dumpscreen: /* no error notices */ |
3978 | { |
3939 | { |
3979 | int fd; |
3940 | int fd; |
3980 | 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) |
3981 | { |
3942 | { |
3982 | scr_dump (fd); |
3943 | scr_dump (fd); |
… | |
… | |
4013 | if (query) |
3974 | if (query) |
4014 | 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); |
4015 | else |
3976 | else |
4016 | { |
3977 | { |
4017 | set_locale (str); |
3978 | set_locale (str); |
4018 | pty.set_utf8_mode (enc_utf8); |
3979 | pty->set_utf8_mode (enc_utf8); |
4019 | init_xlocale (); |
3980 | init_xlocale (); |
4020 | } |
3981 | } |
4021 | break; |
3982 | break; |
4022 | |
3983 | |
4023 | case URxvt_view_up: |
3984 | case URxvt_view_up: |
… | |
… | |
4097 | { 5, PrivMode_rVideo }, |
4058 | { 5, PrivMode_rVideo }, |
4098 | { 6, PrivMode_relOrigin }, |
4059 | { 6, PrivMode_relOrigin }, |
4099 | { 7, PrivMode_Autowrap }, |
4060 | { 7, PrivMode_Autowrap }, |
4100 | // 8, bi-directional support mode |
4061 | // 8, bi-directional support mode |
4101 | { 9, PrivMode_MouseX10 }, |
4062 | { 9, PrivMode_MouseX10 }, |
4102 | #ifdef menuBar_esc |
|
|
4103 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4104 | #endif |
|
|
4105 | // 18, 19 printing-related |
4063 | // 18, 19 printing-related |
4106 | { 25, PrivMode_VisibleCursor }, |
4064 | { 25, PrivMode_VisibleCursor }, |
4107 | #ifdef scrollBar_esc |
4065 | #ifdef scrollBar_esc |
4108 | { scrollBar_esc, PrivMode_scrollBar }, |
4066 | { scrollBar_esc, PrivMode_scrollBar }, |
4109 | #endif |
4067 | #endif |
… | |
… | |
4204 | /* 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 */ |
4205 | case 9: /* X10 mouse reporting */ |
4163 | case 9: /* X10 mouse reporting */ |
4206 | if (state) /* orthogonal */ |
4164 | if (state) /* orthogonal */ |
4207 | priv_modes &= ~PrivMode_MouseX11; |
4165 | priv_modes &= ~PrivMode_MouseX11; |
4208 | break; |
4166 | break; |
4209 | #ifdef menuBar_esc |
|
|
4210 | case menuBar_esc: |
|
|
4211 | #ifdef MENUBAR |
|
|
4212 | map_menuBar (state); |
|
|
4213 | #endif |
|
|
4214 | break; |
|
|
4215 | #endif |
|
|
4216 | #ifdef scrollBar_esc |
4167 | #ifdef scrollBar_esc |
4217 | case scrollBar_esc: |
4168 | case scrollBar_esc: |
4218 | if (scrollbar_mapping (state)) |
4169 | if (scrollbar_mapping (state)) |
4219 | { |
4170 | { |
4220 | resize_all_windows (0, 0, 0); |
4171 | resize_all_windows (0, 0, 0); |
… | |
… | |
4465 | rxvt_term::tt_write (const char *data, unsigned int len) |
4416 | rxvt_term::tt_write (const char *data, unsigned int len) |
4466 | { |
4417 | { |
4467 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4418 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4468 | return; |
4419 | return; |
4469 | |
4420 | |
4470 | if (pty.pty < 0) |
4421 | if (pty->pty < 0) |
4471 | return; |
4422 | return; |
4472 | |
4423 | |
4473 | if (v_buflen == 0) |
4424 | if (v_buflen == 0) |
4474 | { |
4425 | { |
4475 | 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)); |
4476 | |
4427 | |
4477 | if ((unsigned int)written == len) |
4428 | if ((unsigned int)written == len) |
4478 | return; |
4429 | return; |
4479 | |
4430 | |
4480 | data += written; |
4431 | data += written; |
… | |
… | |
4489 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4440 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4490 | } |
4441 | } |
4491 | |
4442 | |
4492 | void rxvt_term::pty_write () |
4443 | void rxvt_term::pty_write () |
4493 | { |
4444 | { |
4494 | 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)); |
4495 | |
4446 | |
4496 | if (written > 0) |
4447 | if (written > 0) |
4497 | { |
4448 | { |
4498 | v_buflen -= written; |
4449 | v_buflen -= written; |
4499 | |
4450 | |