… | |
… | |
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 | } |
… | |
… | |
972 | |
972 | |
973 | if (want_refresh) |
973 | if (want_refresh) |
974 | { |
974 | { |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
976 | { |
976 | { |
977 | int row = -view_start; |
977 | int row = view_start; |
978 | int end_row = row + nrow; |
978 | int end_row = row + nrow; |
979 | |
979 | |
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | while (row > top_row && ROW (row - 1).is_longer ()) |
981 | --row; |
981 | --row; |
982 | |
982 | |
983 | do |
983 | do |
984 | { |
984 | { |
985 | int start_row = row; |
985 | int start_row = row; |
… | |
… | |
987 | |
987 | |
988 | do |
988 | do |
989 | { |
989 | { |
990 | l = &ROW (row++); |
990 | l = &ROW (row++); |
991 | |
991 | |
992 | if (l->f & LINE_FILTERED) |
992 | if (!(l->f & LINE_FILTERED)) |
993 | row++; |
|
|
994 | else |
|
|
995 | { |
993 | { |
996 | // line not filtered, mark it as filtered |
994 | // line not filtered, mark it as filtered |
997 | l->f |= LINE_FILTERED; |
995 | l->f |= LINE_FILTERED; |
998 | while (l->is_longer ()) |
996 | while (l->is_longer ()) |
999 | { |
997 | { |
1000 | l = &ROW (++row); |
998 | l = &ROW (row++); |
1001 | l->f |= LINE_FILTERED; |
999 | l->f |= LINE_FILTERED; |
1002 | } |
1000 | } |
1003 | |
1001 | |
1004 | // and filter it |
1002 | // and filter it |
1005 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
… | |
… | |
1007 | break; |
1005 | break; |
1008 | } |
1006 | } |
1009 | } |
1007 | } |
1010 | while (l->is_longer () && row < end_row); |
1008 | while (l->is_longer () && row < end_row); |
1011 | } |
1009 | } |
1012 | while (++row < end_row); |
1010 | while (row < end_row); |
1013 | } |
1011 | } |
1014 | |
1012 | |
1015 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
1016 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
1017 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
… | |
… | |
1023 | } |
1021 | } |
1024 | |
1022 | |
1025 | void |
1023 | void |
1026 | rxvt_term::check_cb (check_watcher &w) |
1024 | rxvt_term::check_cb (check_watcher &w) |
1027 | { |
1025 | { |
1028 | SET_R (this); |
1026 | make_current (); |
1029 | SET_LOCALE (locale); |
|
|
1030 | |
1027 | |
1031 | display->flush (); |
1028 | display->flush (); |
1032 | |
1029 | |
1033 | if (want_refresh && !flush_ev.active) |
1030 | if (want_refresh && !flush_ev.active) |
1034 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1031 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1035 | } |
1032 | } |
1036 | |
1033 | |
1037 | void |
1034 | void |
1038 | rxvt_term::flush_cb (time_watcher &w) |
1035 | rxvt_term::flush_cb (time_watcher &w) |
1039 | { |
1036 | { |
1040 | SET_R (this); |
1037 | make_current (); |
1041 | SET_LOCALE (locale); |
|
|
1042 | |
1038 | |
1043 | refresh_limit = 1; |
1039 | refresh_limit = 1; |
1044 | refresh_count = 0; |
1040 | refresh_count = 0; |
1045 | flush (); |
1041 | flush (); |
1046 | } |
1042 | } |
… | |
… | |
1103 | { |
1099 | { |
1104 | if (mouse_slip_wheel_speed == 0 |
1100 | if (mouse_slip_wheel_speed == 0 |
1105 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1101 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1106 | : scr_page (UP, mouse_slip_wheel_speed)) |
1102 | : scr_page (UP, mouse_slip_wheel_speed)) |
1107 | { |
1103 | { |
1108 | if (view_start == nsaved || |
1104 | if (view_start == top_row || view_start == 0) |
1109 | view_start == 0) |
|
|
1110 | mouse_slip_wheel_speed = 0; |
1105 | mouse_slip_wheel_speed = 0; |
1111 | |
1106 | |
1112 | refresh_type |= SMOOTH_REFRESH; |
1107 | refresh_type |= SMOOTH_REFRESH; |
1113 | want_refresh = 1; |
1108 | want_refresh = 1; |
1114 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1109 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
… | |
… | |
1175 | } |
1170 | } |
1176 | |
1171 | |
1177 | void |
1172 | void |
1178 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1173 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1179 | { |
1174 | { |
1180 | SET_R (this); |
1175 | make_current (); |
1181 | SET_LOCALE (locale); |
|
|
1182 | |
1176 | |
1183 | if (revents & EVENT_READ) |
1177 | if (revents & EVENT_READ) |
1184 | // loop, but don't allow a single term to monopolize us |
1178 | // loop, but don't allow a single term to monopolize us |
1185 | while (pty_fill ()) |
1179 | while (pty_fill ()) |
1186 | if (cmd_parse ()) |
1180 | if (cmd_parse ()) |
… | |
… | |
1218 | } |
1212 | } |
1219 | |
1213 | |
1220 | void |
1214 | void |
1221 | rxvt_term::pointer_cb (time_watcher &w) |
1215 | rxvt_term::pointer_cb (time_watcher &w) |
1222 | { |
1216 | { |
1223 | SET_R (this); |
1217 | make_current (); |
1224 | SET_LOCALE (locale); |
|
|
1225 | |
1218 | |
1226 | pointer_blank (); |
1219 | pointer_blank (); |
1227 | } |
1220 | } |
1228 | #endif |
1221 | #endif |
1229 | |
1222 | |
… | |
… | |
1308 | |
1301 | |
1309 | /*{{{ process an X event */ |
1302 | /*{{{ process an X event */ |
1310 | void |
1303 | void |
1311 | rxvt_term::x_cb (XEvent &ev) |
1304 | rxvt_term::x_cb (XEvent &ev) |
1312 | { |
1305 | { |
|
|
1306 | make_current (); |
|
|
1307 | |
1313 | dDisp; |
1308 | dDisp; |
1314 | |
1309 | |
1315 | SET_R (this); |
1310 | if (ev.xany.window == vt |
1316 | SET_LOCALE (locale); |
1311 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1312 | return; |
1317 | |
1313 | |
|
|
1314 | // for XQueryPointer |
1318 | Window unused_root, unused_child; |
1315 | Window unused_root, unused_child; |
1319 | int unused_root_x, unused_root_y; |
1316 | int unused_root_x, unused_root_y; |
1320 | unsigned int unused_mask; |
1317 | unsigned int unused_mask; |
1321 | |
1318 | |
1322 | switch (ev.type) |
1319 | switch (ev.type) |
… | |
… | |
1573 | |
1570 | |
1574 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1571 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1575 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1572 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1576 | ev.xexpose.width, ev.xexpose.height, False); |
1573 | ev.xexpose.width, ev.xexpose.height, False); |
1577 | |
1574 | |
1578 | scr_refresh (refresh_type); |
1575 | want_refresh = 1; |
1579 | } |
1576 | } |
1580 | else |
1577 | else |
1581 | { |
1578 | { |
1582 | XEvent unused_event; |
1579 | XEvent unused_event; |
1583 | |
1580 | |
… | |
… | |
1710 | &unused_root_x, &unused_root_y, |
1707 | &unused_root_x, &unused_root_y, |
1711 | &ev.xbutton.x, &ev.xbutton.y, |
1708 | &ev.xbutton.x, &ev.xbutton.y, |
1712 | &unused_mask); |
1709 | &unused_mask); |
1713 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1710 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1714 | scrollbar_size ()); |
1711 | scrollbar_size ()); |
1715 | scr_refresh (refresh_type); |
1712 | want_refresh = 1; |
1716 | refresh_limit = 0; |
1713 | refresh_limit = 0; |
1717 | scrollbar_show (1); |
1714 | scrollbar_show (1); |
1718 | } |
1715 | } |
1719 | break; |
1716 | break; |
1720 | } |
1717 | } |
… | |
… | |
1820 | |
1817 | |
1821 | #if TRANSPARENT |
1818 | #if TRANSPARENT |
1822 | void |
1819 | void |
1823 | rxvt_term::rootwin_cb (XEvent &ev) |
1820 | rxvt_term::rootwin_cb (XEvent &ev) |
1824 | { |
1821 | { |
1825 | SET_R (this); |
1822 | make_current (); |
1826 | SET_LOCALE (locale); |
|
|
1827 | |
1823 | |
1828 | switch (ev.type) |
1824 | switch (ev.type) |
1829 | { |
1825 | { |
1830 | case PropertyNotify: |
1826 | case PropertyNotify: |
1831 | /* |
1827 | /* |
… | |
… | |
1922 | #else |
1918 | #else |
1923 | selection.rect = false; |
1919 | selection.rect = false; |
1924 | #endif |
1920 | #endif |
1925 | |
1921 | |
1926 | /* allow shift+left click to extend selection */ |
1922 | /* allow shift+left click to extend selection */ |
1927 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1923 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1928 | { |
1924 | { |
1929 | if (MEvent.button == Button1 && clickintime) |
1925 | if (MEvent.button == Button1 && clickintime) |
1930 | selection_rotate (ev.x, ev.y); |
1926 | selection_rotate (ev.x, ev.y); |
1931 | else |
1927 | else |
1932 | selection_extend (ev.x, ev.y, 1); |
1928 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2216 | slip_wheel_ev.start (); |
2212 | slip_wheel_ev.start (); |
2217 | } |
2213 | } |
2218 | else |
2214 | else |
2219 | { |
2215 | { |
2220 | # endif |
2216 | # endif |
2221 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2222 | scr_page (v, i); |
2217 | scr_page (v, i); |
2223 | scr_refresh (SMOOTH_REFRESH); |
|
|
2224 | scrollbar_show (1); |
2218 | 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 |
2219 | # ifdef MOUSE_SLIP_WHEELING |
2234 | } |
2220 | } |
2235 | #endif |
2221 | # endif |
2236 | } |
2222 | } |
2237 | break; |
2223 | break; |
2238 | #endif |
2224 | #endif |
2239 | } |
2225 | } |
2240 | } |
2226 | } |
… | |
… | |
2834 | refresh_limit++; |
2820 | refresh_limit++; |
2835 | else |
2821 | else |
2836 | { |
2822 | { |
2837 | flag = true; |
2823 | flag = true; |
2838 | scr_refresh (refresh_type); |
2824 | scr_refresh (refresh_type); |
2839 | flush_ev.stop (); |
2825 | want_refresh = 1; |
2840 | } |
2826 | } |
2841 | } |
2827 | } |
2842 | |
2828 | |
2843 | } |
2829 | } |
2844 | else |
2830 | else |
… | |
… | |
3870 | { |
3856 | { |
3871 | if ((name = strchr (buf, ';')) == NULL) |
3857 | if ((name = strchr (buf, ';')) == NULL) |
3872 | break; |
3858 | break; |
3873 | |
3859 | |
3874 | *name++ = '\0'; |
3860 | *name++ = '\0'; |
3875 | color = atoi (buf); |
3861 | color = atoi (buf) + minCOLOR; |
3876 | |
3862 | |
3877 | if (color < 0 || color >= TOTAL_COLORS) |
3863 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3878 | break; |
3864 | break; |
3879 | |
3865 | |
3880 | if ((buf = strchr (name, ';')) != NULL) |
3866 | if ((buf = strchr (name, ';')) != NULL) |
3881 | *buf++ = '\0'; |
3867 | *buf++ = '\0'; |
3882 | |
3868 | |
3883 | if (name[0] == '?' && !name[1]) |
3869 | if (name[0] == '?' && !name[1]) |
3884 | { |
3870 | { |
3885 | unsigned short r, g, b; |
3871 | unsigned short r, g, b; |
3886 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3872 | 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); |
3873 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3888 | } |
3874 | } |
3889 | else |
3875 | else |
3890 | set_window_color (color + minCOLOR, name); |
3876 | set_window_color (color, name); |
3891 | } |
3877 | } |
3892 | break; |
3878 | break; |
3893 | case XTerm_Color00: |
3879 | case XTerm_Color00: |
3894 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3880 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3895 | break; |
3881 | break; |
3896 | case XTerm_Color01: |
3882 | case XTerm_Color01: |
3897 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3883 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3898 | break; |
3884 | break; |
3899 | #ifndef NO_CURSORCOLOR |
3885 | #ifndef NO_CURSORCOLOR |
3900 | case XTerm_Color_cursor: |
3886 | case XTerm_Color_cursor: |
3901 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3887 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3902 | break; |
3888 | break; |
… | |
… | |
3906 | break; |
3892 | break; |
3907 | case XTerm_Color_pointer_bg: |
3893 | case XTerm_Color_pointer_bg: |
3908 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3894 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3909 | break; |
3895 | break; |
3910 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3896 | #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: |
3897 | case XTerm_Color_RV: |
3918 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3898 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3899 | break; |
|
|
3900 | case Rxvt_Color_BD: |
|
|
3901 | case URxvt_Color_BD: |
|
|
3902 | process_color_seq (op, Color_BD, str, resp); |
|
|
3903 | break; |
|
|
3904 | case Rxvt_Color_UL: |
|
|
3905 | case URxvt_Color_UL: |
|
|
3906 | process_color_seq (op, Color_UL, str, resp); |
3919 | break; |
3907 | break; |
3920 | case URxvt_Color_IT: |
3908 | case URxvt_Color_IT: |
3921 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3909 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3922 | break; |
3910 | break; |
3923 | #endif |
3911 | #endif |
… | |
… | |
3928 | if (am_transparent) |
3916 | if (am_transparent) |
3929 | want_full_refresh = want_refresh = 1; |
3917 | want_full_refresh = want_refresh = 1; |
3930 | break; |
3918 | break; |
3931 | #endif |
3919 | #endif |
3932 | |
3920 | |
3933 | case XTerm_Pixmap: |
3921 | case Rxvt_Pixmap: |
3934 | if (*str != ';') |
3922 | if (*str != ';') |
3935 | { |
3923 | { |
3936 | #if XPM_BACKGROUND |
3924 | #if XPM_BACKGROUND |
3937 | scale_pixmap (""); /* reset to default scaling */ |
3925 | scale_pixmap (""); /* reset to default scaling */ |
3938 | set_bgPixmap (str); /* change pixmap */ |
3926 | set_bgPixmap (str); /* change pixmap */ |
3939 | #endif |
|
|
3940 | scr_touch (true); |
3927 | scr_touch (true); |
|
|
3928 | #endif |
3941 | } |
3929 | } |
|
|
3930 | |
3942 | while ((str = strchr (str, ';')) != NULL) |
3931 | while ((str = strchr (str, ';')) != NULL) |
3943 | { |
3932 | { |
3944 | str++; |
3933 | str++; |
3945 | #if XPM_BACKGROUND |
3934 | #if XPM_BACKGROUND |
3946 | changed += scale_pixmap (str); |
3935 | changed += scale_pixmap (str); |
… | |
… | |
3949 | |
3938 | |
3950 | if (changed) |
3939 | if (changed) |
3951 | { |
3940 | { |
3952 | #ifdef XPM_BACKGROUND |
3941 | #ifdef XPM_BACKGROUND |
3953 | resize_pixmap (); |
3942 | resize_pixmap (); |
3954 | #endif |
|
|
3955 | scr_touch (true); |
3943 | scr_touch (true); |
|
|
3944 | #endif |
3956 | } |
3945 | } |
3957 | break; |
3946 | break; |
3958 | |
3947 | |
3959 | case XTerm_restoreFG: |
3948 | case Rxvt_restoreFG: |
3960 | set_window_color (Color_fg, str); |
3949 | set_window_color (Color_fg, str); |
3961 | break; |
3950 | break; |
3962 | case XTerm_restoreBG: |
3951 | case Rxvt_restoreBG: |
3963 | set_window_color (Color_bg, str); |
3952 | set_window_color (Color_bg, str); |
3964 | break; |
3953 | break; |
3965 | |
3954 | |
3966 | case XTerm_logfile: |
3955 | case XTerm_logfile: |
3967 | // TODO, when secure mode? |
3956 | // TODO, when secure mode? |
… | |
… | |
3972 | if (OPTION (Opt_insecure)) |
3961 | if (OPTION (Opt_insecure)) |
3973 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3962 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3974 | break; |
3963 | break; |
3975 | #endif |
3964 | #endif |
3976 | #if 0 |
3965 | #if 0 |
3977 | case XTerm_dumpscreen: /* no error notices */ |
3966 | case Rxvt_dumpscreen: /* no error notices */ |
3978 | { |
3967 | { |
3979 | int fd; |
3968 | int fd; |
3980 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3969 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3981 | { |
3970 | { |
3982 | scr_dump (fd); |
3971 | scr_dump (fd); |