… | |
… | |
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 | } |
… | |
… | |
464 | { |
464 | { |
465 | switch (keysym) |
465 | switch (keysym) |
466 | { |
466 | { |
467 | /* normal XTerm key bindings */ |
467 | /* normal XTerm key bindings */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
469 | selection_request (ev.time, 0, 0); |
469 | selection_request (ev.time); |
470 | return; |
470 | return; |
471 | #if TODO |
471 | #if TODO |
472 | /* rxvt extras */ |
472 | /* rxvt extras */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
474 | change_font (FONT_UP); |
474 | change_font (FONT_UP); |
… | |
… | |
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; |
… | |
… | |
1008 | while (l->is_longer () && row < end_row); |
1006 | while (l->is_longer () && row < end_row); |
1009 | } |
1007 | } |
1010 | while (row < end_row); |
1008 | while (row < end_row); |
1011 | } |
1009 | } |
1012 | |
1010 | |
1013 | scr_refresh (refresh_type); |
1011 | scr_refresh (); |
1014 | scrollbar_show (1); |
1012 | scrollbar_show (1); |
1015 | #ifdef USE_XIM |
1013 | #ifdef USE_XIM |
1016 | IMSendSpot (); |
1014 | IMSendSpot (); |
1017 | #endif |
1015 | #endif |
1018 | } |
1016 | } |
… | |
… | |
1021 | } |
1019 | } |
1022 | |
1020 | |
1023 | void |
1021 | void |
1024 | rxvt_term::check_cb (check_watcher &w) |
1022 | rxvt_term::check_cb (check_watcher &w) |
1025 | { |
1023 | { |
1026 | SET_R (this); |
1024 | make_current (); |
1027 | SET_LOCALE (locale); |
|
|
1028 | |
1025 | |
1029 | display->flush (); |
1026 | display->flush (); |
1030 | |
1027 | |
1031 | if (want_refresh && !flush_ev.active) |
1028 | if (want_refresh && !flush_ev.active) |
1032 | 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 |
1033 | } |
1030 | } |
1034 | |
1031 | |
1035 | void |
1032 | void |
1036 | rxvt_term::flush_cb (time_watcher &w) |
1033 | rxvt_term::flush_cb (time_watcher &w) |
1037 | { |
1034 | { |
1038 | SET_R (this); |
1035 | make_current (); |
1039 | SET_LOCALE (locale); |
|
|
1040 | |
1036 | |
1041 | refresh_limit = 1; |
1037 | refresh_limit = 1; |
1042 | refresh_count = 0; |
1038 | refresh_count = 0; |
1043 | flush (); |
1039 | flush (); |
1044 | } |
1040 | } |
… | |
… | |
1072 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1068 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1073 | { |
1069 | { |
1074 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1070 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1075 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1071 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1076 | { |
1072 | { |
1077 | refresh_type |= SMOOTH_REFRESH; |
|
|
1078 | want_refresh = 1; |
1073 | want_refresh = 1; |
1079 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1074 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1080 | } |
1075 | } |
1081 | } |
1076 | } |
1082 | #endif |
1077 | #endif |
… | |
… | |
1086 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1081 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1087 | { |
1082 | { |
1088 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1083 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1089 | { |
1084 | { |
1090 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1085 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1091 | refresh_type |= SMOOTH_REFRESH; |
|
|
1092 | want_refresh = 1; |
1086 | want_refresh = 1; |
1093 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1087 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1094 | } |
1088 | } |
1095 | } |
1089 | } |
1096 | #endif |
1090 | #endif |
… | |
… | |
1101 | { |
1095 | { |
1102 | if (mouse_slip_wheel_speed == 0 |
1096 | if (mouse_slip_wheel_speed == 0 |
1103 | || 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) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1098 | : scr_page (UP, mouse_slip_wheel_speed)) |
1105 | { |
1099 | { |
1106 | if (view_start == nsaved || |
1100 | if (view_start == top_row || view_start == 0) |
1107 | view_start == 0) |
|
|
1108 | mouse_slip_wheel_speed = 0; |
1101 | mouse_slip_wheel_speed = 0; |
1109 | |
1102 | |
1110 | refresh_type |= SMOOTH_REFRESH; |
|
|
1111 | want_refresh = 1; |
1103 | want_refresh = 1; |
1112 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1104 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1113 | } |
1105 | } |
1114 | } |
1106 | } |
1115 | #endif |
1107 | #endif |
… | |
… | |
1145 | |
1137 | |
1146 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1147 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1148 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1149 | |
1141 | |
1150 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1151 | |
1143 | |
1152 | if (r > 0) |
1144 | if (r > 0) |
1153 | { |
1145 | { |
1154 | cmdbuf_endp += r; |
1146 | cmdbuf_endp += r; |
1155 | return true; |
1147 | return true; |
… | |
… | |
1173 | } |
1165 | } |
1174 | |
1166 | |
1175 | void |
1167 | void |
1176 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1168 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1177 | { |
1169 | { |
1178 | SET_R (this); |
1170 | make_current (); |
1179 | SET_LOCALE (locale); |
|
|
1180 | |
1171 | |
1181 | if (revents & EVENT_READ) |
1172 | if (revents & EVENT_READ) |
1182 | // loop, but don't allow a single term to monopolize us |
1173 | // loop, but don't allow a single term to monopolize us |
1183 | while (pty_fill ()) |
1174 | while (pty_fill ()) |
1184 | if (cmd_parse ()) |
1175 | if (cmd_parse ()) |
… | |
… | |
1216 | } |
1207 | } |
1217 | |
1208 | |
1218 | void |
1209 | void |
1219 | rxvt_term::pointer_cb (time_watcher &w) |
1210 | rxvt_term::pointer_cb (time_watcher &w) |
1220 | { |
1211 | { |
1221 | SET_R (this); |
1212 | make_current (); |
1222 | SET_LOCALE (locale); |
|
|
1223 | |
1213 | |
1224 | pointer_blank (); |
1214 | pointer_blank (); |
1225 | } |
1215 | } |
1226 | #endif |
1216 | #endif |
1227 | |
1217 | |
… | |
… | |
1306 | |
1296 | |
1307 | /*{{{ process an X event */ |
1297 | /*{{{ process an X event */ |
1308 | void |
1298 | void |
1309 | rxvt_term::x_cb (XEvent &ev) |
1299 | rxvt_term::x_cb (XEvent &ev) |
1310 | { |
1300 | { |
|
|
1301 | make_current (); |
|
|
1302 | |
1311 | dDisp; |
1303 | dDisp; |
1312 | |
1304 | |
1313 | SET_R (this); |
1305 | if (ev.xany.window == vt |
1314 | SET_LOCALE (locale); |
1306 | && SHOULD_INVOKE (HOOK_X_EVENT) |
|
|
1307 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1308 | return; |
1315 | |
1309 | |
|
|
1310 | // for XQueryPointer |
1316 | Window unused_root, unused_child; |
1311 | Window unused_root, unused_child; |
1317 | int unused_root_x, unused_root_y; |
1312 | int unused_root_x, unused_root_y; |
1318 | unsigned int unused_mask; |
1313 | unsigned int unused_mask; |
1319 | |
1314 | |
1320 | switch (ev.type) |
1315 | switch (ev.type) |
… | |
… | |
1507 | { |
1502 | { |
1508 | seen_resize = 1; |
1503 | seen_resize = 1; |
1509 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1510 | } |
1505 | } |
1511 | |
1506 | |
|
|
1507 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1508 | |
1512 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1509 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1513 | if (OPTION (Opt_transparent)) |
1510 | if (OPTION (Opt_transparent)) |
1514 | check_our_parents (); |
1511 | check_our_parents (); |
1515 | #endif |
1512 | #endif |
1516 | } |
1513 | } |
… | |
… | |
1587 | if (isScrollbarWindow (ev.xany.window)) |
1584 | if (isScrollbarWindow (ev.xany.window)) |
1588 | { |
1585 | { |
1589 | scrollBar.setIdle (); |
1586 | scrollBar.setIdle (); |
1590 | scrollbar_show (0); |
1587 | scrollbar_show (0); |
1591 | } |
1588 | } |
1592 | #ifdef MENUBAR |
|
|
1593 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1594 | menubar_expose (); |
|
|
1595 | #endif |
|
|
1596 | |
1589 | |
1597 | #ifdef TRANSPARENT |
1590 | #ifdef TRANSPARENT |
1598 | if (am_transparent && ev.xany.window == parent[0]) |
1591 | if (am_transparent && ev.xany.window == parent[0]) |
1599 | XClearWindow (disp, ev.xany.window); |
1592 | XClearWindow (disp, ev.xany.window); |
1600 | #endif |
1593 | #endif |
… | |
… | |
1604 | case MotionNotify: |
1597 | case MotionNotify: |
1605 | #ifdef POINTER_BLANK |
1598 | #ifdef POINTER_BLANK |
1606 | if (hidden_pointer) |
1599 | if (hidden_pointer) |
1607 | pointer_unblank (); |
1600 | pointer_unblank (); |
1608 | #endif |
1601 | #endif |
1609 | #if MENUBAR |
|
|
1610 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1611 | { |
|
|
1612 | menubar_control (ev.xbutton); |
|
|
1613 | break; |
|
|
1614 | } |
|
|
1615 | #endif |
|
|
1616 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1602 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1617 | break; |
1603 | break; |
1618 | |
1604 | |
1619 | if (ev.xany.window == vt) |
1605 | if (ev.xany.window == vt) |
1620 | { |
1606 | { |
|
|
1607 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1621 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1608 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1622 | ; // nop |
1609 | ; // nop |
1623 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1610 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1624 | { |
1611 | { |
1625 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1612 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1626 | ; |
1613 | ; |
… | |
… | |
1818 | |
1805 | |
1819 | #if TRANSPARENT |
1806 | #if TRANSPARENT |
1820 | void |
1807 | void |
1821 | rxvt_term::rootwin_cb (XEvent &ev) |
1808 | rxvt_term::rootwin_cb (XEvent &ev) |
1822 | { |
1809 | { |
1823 | SET_R (this); |
1810 | make_current (); |
1824 | SET_LOCALE (locale); |
|
|
1825 | |
1811 | |
1826 | switch (ev.type) |
1812 | switch (ev.type) |
1827 | { |
1813 | { |
1828 | case PropertyNotify: |
1814 | case PropertyNotify: |
1829 | /* |
1815 | /* |
… | |
… | |
1920 | #else |
1906 | #else |
1921 | selection.rect = false; |
1907 | selection.rect = false; |
1922 | #endif |
1908 | #endif |
1923 | |
1909 | |
1924 | /* allow shift+left click to extend selection */ |
1910 | /* allow shift+left click to extend selection */ |
1925 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1911 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1926 | { |
1912 | { |
1927 | if (MEvent.button == Button1 && clickintime) |
1913 | if (MEvent.button == Button1 && clickintime) |
1928 | selection_rotate (ev.x, ev.y); |
1914 | selection_rotate (ev.x, ev.y); |
1929 | else |
1915 | else |
1930 | selection_extend (ev.x, ev.y, 1); |
1916 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2098 | } |
2084 | } |
2099 | } |
2085 | } |
2100 | |
2086 | |
2101 | return; |
2087 | return; |
2102 | } |
2088 | } |
2103 | |
|
|
2104 | #if MENUBAR |
|
|
2105 | /* |
|
|
2106 | * Menubar window processing of button press |
|
|
2107 | */ |
|
|
2108 | if (isMenuBarWindow (ev.window)) |
|
|
2109 | menubar_control (ev); |
|
|
2110 | #endif |
|
|
2111 | } |
2089 | } |
2112 | |
2090 | |
2113 | void |
2091 | void |
2114 | rxvt_term::button_release (XButtonEvent &ev) |
2092 | rxvt_term::button_release (XButtonEvent &ev) |
2115 | { |
2093 | { |
… | |
… | |
2121 | |
2099 | |
2122 | if (scrollbar_isUpDn ()) |
2100 | if (scrollbar_isUpDn ()) |
2123 | { |
2101 | { |
2124 | scrollBar.setIdle (); |
2102 | scrollBar.setIdle (); |
2125 | scrollbar_show (0); |
2103 | scrollbar_show (0); |
2126 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2127 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2128 | #endif |
|
|
2129 | } |
2104 | } |
2130 | |
2105 | |
2131 | #ifdef SELECTION_SCROLLING |
2106 | #ifdef SELECTION_SCROLLING |
2132 | if (sel_scroll_ev.active) |
2107 | if (sel_scroll_ev.active) |
2133 | sel_scroll_ev.stop(); |
2108 | sel_scroll_ev.stop(); |
… | |
… | |
2180 | { |
2155 | { |
2181 | case Button1: |
2156 | case Button1: |
2182 | case Button3: |
2157 | case Button3: |
2183 | selection_make (ev.time); |
2158 | selection_make (ev.time); |
2184 | break; |
2159 | break; |
|
|
2160 | |
2185 | case Button2: |
2161 | case Button2: |
|
|
2162 | if (IN_RANGE_EXC (ev.x, 0, width) |
|
|
2163 | && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2186 | selection_request (ev.time, ev.x, ev.y); |
2164 | selection_request (ev.time); |
|
|
2165 | |
2187 | break; |
2166 | break; |
|
|
2167 | |
2188 | #ifdef MOUSE_WHEEL |
2168 | #ifdef MOUSE_WHEEL |
2189 | case Button4: |
2169 | case Button4: |
2190 | case Button5: |
2170 | case Button5: |
2191 | { |
2171 | { |
2192 | int i; |
2172 | int i; |
… | |
… | |
2224 | } |
2204 | } |
2225 | break; |
2205 | break; |
2226 | #endif |
2206 | #endif |
2227 | } |
2207 | } |
2228 | } |
2208 | } |
2229 | #ifdef MENUBAR |
|
|
2230 | else if (isMenuBarWindow (ev.window)) |
|
|
2231 | menubar_control (ev); |
|
|
2232 | #endif |
|
|
2233 | } |
2209 | } |
2234 | |
2210 | |
2235 | #ifdef TRANSPARENT |
2211 | #ifdef TRANSPARENT |
2236 | #if TINTING |
2212 | #if TINTING |
2237 | /* taken from aterm-0.4.2 */ |
2213 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2780 | } |
2756 | } |
2781 | |
2757 | |
2782 | // scr_add_lines only works for nlines <= nrow - 1. |
2758 | // scr_add_lines only works for nlines <= nrow - 1. |
2783 | if (nlines >= nrow - 1) |
2759 | if (nlines >= nrow - 1) |
2784 | { |
2760 | { |
|
|
2761 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2785 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2762 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2786 | scr_add_lines (buf, str - buf, nlines); |
2763 | scr_add_lines (buf, str - buf, nlines); |
2787 | |
2764 | |
2788 | nlines = 0; |
2765 | nlines = 0; |
2789 | str = buf; |
2766 | str = buf; |
2790 | eol = str + min (ncol, UBUFSIZ); |
2767 | eol = str + min (ncol, UBUFSIZ); |
… | |
… | |
2805 | |
2782 | |
2806 | seq_begin = cmdbuf_ptr; |
2783 | seq_begin = cmdbuf_ptr; |
2807 | ch = next_char (); |
2784 | ch = next_char (); |
2808 | } |
2785 | } |
2809 | |
2786 | |
|
|
2787 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2810 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2788 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2811 | scr_add_lines (buf, str - buf, nlines); |
2789 | scr_add_lines (buf, str - buf, nlines); |
2812 | |
2790 | |
2813 | /* |
2791 | /* |
2814 | * If there have been a lot of new lines, then update the screen |
2792 | * If there have been a lot of new lines, then update the screen |
2815 | * What the heck I'll cheat and only refresh less than every page-full. |
2793 | * What the heck I'll cheat and only refresh less than every page-full. |
… | |
… | |
2821 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2799 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2822 | refresh_limit++; |
2800 | refresh_limit++; |
2823 | else |
2801 | else |
2824 | { |
2802 | { |
2825 | flag = true; |
2803 | flag = true; |
2826 | scr_refresh (refresh_type); |
2804 | scr_refresh (); |
2827 | want_refresh = 1; |
2805 | want_refresh = 1; |
2828 | } |
2806 | } |
2829 | } |
2807 | } |
2830 | |
2808 | |
2831 | } |
2809 | } |
… | |
… | |
3793 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3771 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3794 | */ |
3772 | */ |
3795 | void |
3773 | void |
3796 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3774 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3797 | { |
3775 | { |
3798 | int changed = 0; |
|
|
3799 | int color; |
3776 | int color; |
3800 | char *buf, *name; |
3777 | char *buf, *name; |
3801 | bool query = str[0] == '?' && !str[1]; |
3778 | bool query = str[0] == '?' && !str[1]; |
3802 | int saveop = op; |
3779 | int saveop = op; |
3803 | dDisp; |
3780 | dDisp; |
… | |
… | |
3919 | want_full_refresh = want_refresh = 1; |
3896 | want_full_refresh = want_refresh = 1; |
3920 | break; |
3897 | break; |
3921 | #endif |
3898 | #endif |
3922 | |
3899 | |
3923 | case Rxvt_Pixmap: |
3900 | case Rxvt_Pixmap: |
|
|
3901 | { |
3924 | if (*str != ';') |
3902 | if (*str != ';') |
3925 | { |
3903 | { |
3926 | #if XPM_BACKGROUND |
3904 | #if XPM_BACKGROUND |
3927 | scale_pixmap (""); /* reset to default scaling */ |
3905 | scale_pixmap (""); /* reset to default scaling */ |
3928 | set_bgPixmap (str); /* change pixmap */ |
3906 | set_bgPixmap (str); /* change pixmap */ |
3929 | scr_touch (true); |
3907 | scr_touch (true); |
3930 | #endif |
3908 | #endif |
3931 | } |
3909 | } |
3932 | |
3910 | |
|
|
3911 | int changed = 0; |
|
|
3912 | |
3933 | while ((str = strchr (str, ';')) != NULL) |
3913 | while ((str = strchr (str, ';')) != NULL) |
3934 | { |
3914 | { |
3935 | str++; |
3915 | str++; |
3936 | #if XPM_BACKGROUND |
3916 | #if XPM_BACKGROUND |
3937 | changed += scale_pixmap (str); |
3917 | changed += scale_pixmap (str); |
3938 | #endif |
3918 | #endif |
3939 | } |
3919 | } |
3940 | |
3920 | |
3941 | if (changed) |
3921 | if (changed) |
3942 | { |
3922 | { |
3943 | #ifdef XPM_BACKGROUND |
3923 | #ifdef XPM_BACKGROUND |
3944 | resize_pixmap (); |
3924 | resize_pixmap (); |
3945 | scr_touch (true); |
3925 | scr_touch (true); |
3946 | #endif |
3926 | #endif |
3947 | } |
3927 | } |
|
|
3928 | } |
3948 | break; |
3929 | break; |
3949 | |
3930 | |
3950 | case Rxvt_restoreFG: |
3931 | case Rxvt_restoreFG: |
3951 | set_window_color (Color_fg, str); |
3932 | set_window_color (Color_fg, str); |
3952 | break; |
3933 | break; |
… | |
… | |
3956 | |
3937 | |
3957 | case XTerm_logfile: |
3938 | case XTerm_logfile: |
3958 | // TODO, when secure mode? |
3939 | // TODO, when secure mode? |
3959 | break; |
3940 | break; |
3960 | |
3941 | |
3961 | #ifdef MENUBAR |
|
|
3962 | case URxvt_Menu: |
|
|
3963 | if (OPTION (Opt_insecure)) |
|
|
3964 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3965 | break; |
|
|
3966 | #endif |
|
|
3967 | #if 0 |
3942 | #if 0 |
3968 | case Rxvt_dumpscreen: /* no error notices */ |
3943 | case Rxvt_dumpscreen: /* no error notices */ |
3969 | { |
3944 | { |
3970 | int fd; |
3945 | int fd; |
3971 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3946 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
… | |
… | |
4004 | if (query) |
3979 | if (query) |
4005 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3980 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
4006 | else |
3981 | else |
4007 | { |
3982 | { |
4008 | set_locale (str); |
3983 | set_locale (str); |
4009 | pty.set_utf8_mode (enc_utf8); |
3984 | pty->set_utf8_mode (enc_utf8); |
4010 | init_xlocale (); |
3985 | init_xlocale (); |
4011 | } |
3986 | } |
4012 | break; |
3987 | break; |
4013 | |
3988 | |
4014 | case URxvt_view_up: |
3989 | case URxvt_view_up: |
… | |
… | |
4088 | { 5, PrivMode_rVideo }, |
4063 | { 5, PrivMode_rVideo }, |
4089 | { 6, PrivMode_relOrigin }, |
4064 | { 6, PrivMode_relOrigin }, |
4090 | { 7, PrivMode_Autowrap }, |
4065 | { 7, PrivMode_Autowrap }, |
4091 | // 8, bi-directional support mode |
4066 | // 8, bi-directional support mode |
4092 | { 9, PrivMode_MouseX10 }, |
4067 | { 9, PrivMode_MouseX10 }, |
4093 | #ifdef menuBar_esc |
|
|
4094 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4095 | #endif |
|
|
4096 | // 18, 19 printing-related |
4068 | // 18, 19 printing-related |
4097 | { 25, PrivMode_VisibleCursor }, |
4069 | { 25, PrivMode_VisibleCursor }, |
4098 | #ifdef scrollBar_esc |
4070 | #ifdef scrollBar_esc |
4099 | { scrollBar_esc, PrivMode_scrollBar }, |
4071 | { scrollBar_esc, PrivMode_scrollBar }, |
4100 | #endif |
4072 | #endif |
… | |
… | |
4195 | /* case 8: - auto repeat, can't do on a per window basis */ |
4167 | /* case 8: - auto repeat, can't do on a per window basis */ |
4196 | case 9: /* X10 mouse reporting */ |
4168 | case 9: /* X10 mouse reporting */ |
4197 | if (state) /* orthogonal */ |
4169 | if (state) /* orthogonal */ |
4198 | priv_modes &= ~PrivMode_MouseX11; |
4170 | priv_modes &= ~PrivMode_MouseX11; |
4199 | break; |
4171 | break; |
4200 | #ifdef menuBar_esc |
|
|
4201 | case menuBar_esc: |
|
|
4202 | #ifdef MENUBAR |
|
|
4203 | map_menuBar (state); |
|
|
4204 | #endif |
|
|
4205 | break; |
|
|
4206 | #endif |
|
|
4207 | #ifdef scrollBar_esc |
4172 | #ifdef scrollBar_esc |
4208 | case scrollBar_esc: |
4173 | case scrollBar_esc: |
4209 | if (scrollbar_mapping (state)) |
4174 | if (scrollbar_mapping (state)) |
4210 | { |
4175 | { |
4211 | resize_all_windows (0, 0, 0); |
4176 | resize_all_windows (0, 0, 0); |
… | |
… | |
4456 | rxvt_term::tt_write (const char *data, unsigned int len) |
4421 | rxvt_term::tt_write (const char *data, unsigned int len) |
4457 | { |
4422 | { |
4458 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4423 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4459 | return; |
4424 | return; |
4460 | |
4425 | |
4461 | if (pty.pty < 0) |
4426 | if (pty->pty < 0) |
4462 | return; |
4427 | return; |
4463 | |
4428 | |
4464 | if (v_buflen == 0) |
4429 | if (v_buflen == 0) |
4465 | { |
4430 | { |
4466 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4431 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4467 | |
4432 | |
4468 | if ((unsigned int)written == len) |
4433 | if ((unsigned int)written == len) |
4469 | return; |
4434 | return; |
4470 | |
4435 | |
4471 | data += written; |
4436 | data += written; |
… | |
… | |
4480 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4445 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4481 | } |
4446 | } |
4482 | |
4447 | |
4483 | void rxvt_term::pty_write () |
4448 | void rxvt_term::pty_write () |
4484 | { |
4449 | { |
4485 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4450 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4486 | |
4451 | |
4487 | if (written > 0) |
4452 | if (written > 0) |
4488 | { |
4453 | { |
4489 | v_buflen -= written; |
4454 | v_buflen -= written; |
4490 | |
4455 | |