… | |
… | |
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 | |
… | |
… | |
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 | } |
… | |
… | |
1070 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1068 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1071 | { |
1069 | { |
1072 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1070 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1073 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1071 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1074 | { |
1072 | { |
1075 | refresh_type |= SMOOTH_REFRESH; |
|
|
1076 | want_refresh = 1; |
1073 | want_refresh = 1; |
1077 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1074 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1078 | } |
1075 | } |
1079 | } |
1076 | } |
1080 | #endif |
1077 | #endif |
… | |
… | |
1084 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1081 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1085 | { |
1082 | { |
1086 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1083 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1087 | { |
1084 | { |
1088 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1085 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1089 | refresh_type |= SMOOTH_REFRESH; |
|
|
1090 | want_refresh = 1; |
1086 | want_refresh = 1; |
1091 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1087 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1092 | } |
1088 | } |
1093 | } |
1089 | } |
1094 | #endif |
1090 | #endif |
… | |
… | |
1102 | : scr_page (UP, mouse_slip_wheel_speed)) |
1098 | : scr_page (UP, mouse_slip_wheel_speed)) |
1103 | { |
1099 | { |
1104 | if (view_start == top_row || view_start == 0) |
1100 | if (view_start == top_row || view_start == 0) |
1105 | mouse_slip_wheel_speed = 0; |
1101 | mouse_slip_wheel_speed = 0; |
1106 | |
1102 | |
1107 | refresh_type |= SMOOTH_REFRESH; |
|
|
1108 | want_refresh = 1; |
1103 | want_refresh = 1; |
1109 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1104 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1110 | } |
1105 | } |
1111 | } |
1106 | } |
1112 | #endif |
1107 | #endif |
… | |
… | |
1142 | |
1137 | |
1143 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1144 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1145 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1146 | |
1141 | |
1147 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1148 | |
1143 | |
1149 | if (r > 0) |
1144 | if (r > 0) |
1150 | { |
1145 | { |
1151 | cmdbuf_endp += r; |
1146 | cmdbuf_endp += r; |
1152 | return true; |
1147 | return true; |
… | |
… | |
1587 | if (isScrollbarWindow (ev.xany.window)) |
1582 | if (isScrollbarWindow (ev.xany.window)) |
1588 | { |
1583 | { |
1589 | scrollBar.setIdle (); |
1584 | scrollBar.setIdle (); |
1590 | scrollbar_show (0); |
1585 | scrollbar_show (0); |
1591 | } |
1586 | } |
1592 | #ifdef MENUBAR |
|
|
1593 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1594 | menubar_expose (); |
|
|
1595 | #endif |
|
|
1596 | |
1587 | |
1597 | #ifdef TRANSPARENT |
1588 | #ifdef TRANSPARENT |
1598 | if (am_transparent && ev.xany.window == parent[0]) |
1589 | if (am_transparent && ev.xany.window == parent[0]) |
1599 | XClearWindow (disp, ev.xany.window); |
1590 | XClearWindow (disp, ev.xany.window); |
1600 | #endif |
1591 | #endif |
… | |
… | |
1603 | |
1594 | |
1604 | case MotionNotify: |
1595 | case MotionNotify: |
1605 | #ifdef POINTER_BLANK |
1596 | #ifdef POINTER_BLANK |
1606 | if (hidden_pointer) |
1597 | if (hidden_pointer) |
1607 | pointer_unblank (); |
1598 | pointer_unblank (); |
1608 | #endif |
|
|
1609 | #if MENUBAR |
|
|
1610 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1611 | { |
|
|
1612 | menubar_control (ev.xbutton); |
|
|
1613 | break; |
|
|
1614 | } |
|
|
1615 | #endif |
1599 | #endif |
1616 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1600 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1617 | break; |
1601 | break; |
1618 | |
1602 | |
1619 | if (ev.xany.window == vt) |
1603 | if (ev.xany.window == vt) |
… | |
… | |
2098 | } |
2082 | } |
2099 | } |
2083 | } |
2100 | |
2084 | |
2101 | return; |
2085 | return; |
2102 | } |
2086 | } |
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 | } |
2087 | } |
2112 | |
2088 | |
2113 | void |
2089 | void |
2114 | rxvt_term::button_release (XButtonEvent &ev) |
2090 | rxvt_term::button_release (XButtonEvent &ev) |
2115 | { |
2091 | { |
… | |
… | |
2121 | |
2097 | |
2122 | if (scrollbar_isUpDn ()) |
2098 | if (scrollbar_isUpDn ()) |
2123 | { |
2099 | { |
2124 | scrollBar.setIdle (); |
2100 | scrollBar.setIdle (); |
2125 | scrollbar_show (0); |
2101 | scrollbar_show (0); |
2126 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2127 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2128 | #endif |
|
|
2129 | } |
2102 | } |
2130 | |
2103 | |
2131 | #ifdef SELECTION_SCROLLING |
2104 | #ifdef SELECTION_SCROLLING |
2132 | if (sel_scroll_ev.active) |
2105 | if (sel_scroll_ev.active) |
2133 | sel_scroll_ev.stop(); |
2106 | sel_scroll_ev.stop(); |
… | |
… | |
2224 | } |
2197 | } |
2225 | break; |
2198 | break; |
2226 | #endif |
2199 | #endif |
2227 | } |
2200 | } |
2228 | } |
2201 | } |
2229 | #ifdef MENUBAR |
|
|
2230 | else if (isMenuBarWindow (ev.window)) |
|
|
2231 | menubar_control (ev); |
|
|
2232 | #endif |
|
|
2233 | } |
2202 | } |
2234 | |
2203 | |
2235 | #ifdef TRANSPARENT |
2204 | #ifdef TRANSPARENT |
2236 | #if TINTING |
2205 | #if TINTING |
2237 | /* taken from aterm-0.4.2 */ |
2206 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2780 | } |
2749 | } |
2781 | |
2750 | |
2782 | // scr_add_lines only works for nlines <= nrow - 1. |
2751 | // scr_add_lines only works for nlines <= nrow - 1. |
2783 | if (nlines >= nrow - 1) |
2752 | if (nlines >= nrow - 1) |
2784 | { |
2753 | { |
|
|
2754 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2785 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2755 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2786 | scr_add_lines (buf, str - buf, nlines); |
2756 | scr_add_lines (buf, str - buf, nlines); |
2787 | |
2757 | |
2788 | nlines = 0; |
2758 | nlines = 0; |
2789 | str = buf; |
2759 | str = buf; |
2790 | eol = str + min (ncol, UBUFSIZ); |
2760 | eol = str + min (ncol, UBUFSIZ); |
… | |
… | |
2805 | |
2775 | |
2806 | seq_begin = cmdbuf_ptr; |
2776 | seq_begin = cmdbuf_ptr; |
2807 | ch = next_char (); |
2777 | ch = next_char (); |
2808 | } |
2778 | } |
2809 | |
2779 | |
|
|
2780 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2810 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2781 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2811 | scr_add_lines (buf, str - buf, nlines); |
2782 | scr_add_lines (buf, str - buf, nlines); |
2812 | |
2783 | |
2813 | /* |
2784 | /* |
2814 | * If there have been a lot of new lines, then update the screen |
2785 | * 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. |
2786 | * What the heck I'll cheat and only refresh less than every page-full. |
… | |
… | |
2821 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2792 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2822 | refresh_limit++; |
2793 | refresh_limit++; |
2823 | else |
2794 | else |
2824 | { |
2795 | { |
2825 | flag = true; |
2796 | flag = true; |
2826 | scr_refresh (refresh_type); |
2797 | scr_refresh (); |
2827 | want_refresh = 1; |
2798 | want_refresh = 1; |
2828 | } |
2799 | } |
2829 | } |
2800 | } |
2830 | |
2801 | |
2831 | } |
2802 | } |
… | |
… | |
3956 | |
3927 | |
3957 | case XTerm_logfile: |
3928 | case XTerm_logfile: |
3958 | // TODO, when secure mode? |
3929 | // TODO, when secure mode? |
3959 | break; |
3930 | break; |
3960 | |
3931 | |
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 |
3932 | #if 0 |
3968 | case Rxvt_dumpscreen: /* no error notices */ |
3933 | case Rxvt_dumpscreen: /* no error notices */ |
3969 | { |
3934 | { |
3970 | int fd; |
3935 | int fd; |
3971 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3936 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
… | |
… | |
4004 | if (query) |
3969 | if (query) |
4005 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3970 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
4006 | else |
3971 | else |
4007 | { |
3972 | { |
4008 | set_locale (str); |
3973 | set_locale (str); |
4009 | pty.set_utf8_mode (enc_utf8); |
3974 | pty->set_utf8_mode (enc_utf8); |
4010 | init_xlocale (); |
3975 | init_xlocale (); |
4011 | } |
3976 | } |
4012 | break; |
3977 | break; |
4013 | |
3978 | |
4014 | case URxvt_view_up: |
3979 | case URxvt_view_up: |
… | |
… | |
4088 | { 5, PrivMode_rVideo }, |
4053 | { 5, PrivMode_rVideo }, |
4089 | { 6, PrivMode_relOrigin }, |
4054 | { 6, PrivMode_relOrigin }, |
4090 | { 7, PrivMode_Autowrap }, |
4055 | { 7, PrivMode_Autowrap }, |
4091 | // 8, bi-directional support mode |
4056 | // 8, bi-directional support mode |
4092 | { 9, PrivMode_MouseX10 }, |
4057 | { 9, PrivMode_MouseX10 }, |
4093 | #ifdef menuBar_esc |
|
|
4094 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4095 | #endif |
|
|
4096 | // 18, 19 printing-related |
4058 | // 18, 19 printing-related |
4097 | { 25, PrivMode_VisibleCursor }, |
4059 | { 25, PrivMode_VisibleCursor }, |
4098 | #ifdef scrollBar_esc |
4060 | #ifdef scrollBar_esc |
4099 | { scrollBar_esc, PrivMode_scrollBar }, |
4061 | { scrollBar_esc, PrivMode_scrollBar }, |
4100 | #endif |
4062 | #endif |
… | |
… | |
4195 | /* case 8: - auto repeat, can't do on a per window basis */ |
4157 | /* case 8: - auto repeat, can't do on a per window basis */ |
4196 | case 9: /* X10 mouse reporting */ |
4158 | case 9: /* X10 mouse reporting */ |
4197 | if (state) /* orthogonal */ |
4159 | if (state) /* orthogonal */ |
4198 | priv_modes &= ~PrivMode_MouseX11; |
4160 | priv_modes &= ~PrivMode_MouseX11; |
4199 | break; |
4161 | 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 |
4162 | #ifdef scrollBar_esc |
4208 | case scrollBar_esc: |
4163 | case scrollBar_esc: |
4209 | if (scrollbar_mapping (state)) |
4164 | if (scrollbar_mapping (state)) |
4210 | { |
4165 | { |
4211 | resize_all_windows (0, 0, 0); |
4166 | resize_all_windows (0, 0, 0); |
… | |
… | |
4456 | rxvt_term::tt_write (const char *data, unsigned int len) |
4411 | rxvt_term::tt_write (const char *data, unsigned int len) |
4457 | { |
4412 | { |
4458 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4413 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4459 | return; |
4414 | return; |
4460 | |
4415 | |
4461 | if (pty.pty < 0) |
4416 | if (pty->pty < 0) |
4462 | return; |
4417 | return; |
4463 | |
4418 | |
4464 | if (v_buflen == 0) |
4419 | if (v_buflen == 0) |
4465 | { |
4420 | { |
4466 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4421 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4467 | |
4422 | |
4468 | if ((unsigned int)written == len) |
4423 | if ((unsigned int)written == len) |
4469 | return; |
4424 | return; |
4470 | |
4425 | |
4471 | data += written; |
4426 | data += written; |
… | |
… | |
4480 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4435 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4481 | } |
4436 | } |
4482 | |
4437 | |
4483 | void rxvt_term::pty_write () |
4438 | void rxvt_term::pty_write () |
4484 | { |
4439 | { |
4485 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4440 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4486 | |
4441 | |
4487 | if (written > 0) |
4442 | if (written > 0) |
4488 | { |
4443 | { |
4489 | v_buflen -= written; |
4444 | v_buflen -= written; |
4490 | |
4445 | |