| … | |
… | |
| 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 |
| … | |
… | |
| 1573 | |
1571 | |
| 1574 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1572 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
| 1575 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1573 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
| 1576 | ev.xexpose.width, ev.xexpose.height, False); |
1574 | ev.xexpose.width, ev.xexpose.height, False); |
| 1577 | |
1575 | |
| 1578 | scr_refresh (refresh_type); |
1576 | want_refresh = 1; |
| 1579 | } |
1577 | } |
| 1580 | else |
1578 | else |
| 1581 | { |
1579 | { |
| 1582 | XEvent unused_event; |
1580 | XEvent unused_event; |
| 1583 | |
1581 | |
| … | |
… | |
| 1710 | &unused_root_x, &unused_root_y, |
1708 | &unused_root_x, &unused_root_y, |
| 1711 | &ev.xbutton.x, &ev.xbutton.y, |
1709 | &ev.xbutton.x, &ev.xbutton.y, |
| 1712 | &unused_mask); |
1710 | &unused_mask); |
| 1713 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1711 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
| 1714 | scrollbar_size ()); |
1712 | scrollbar_size ()); |
| 1715 | scr_refresh (refresh_type); |
1713 | want_refresh = 1; |
| 1716 | refresh_limit = 0; |
1714 | refresh_limit = 0; |
| 1717 | scrollbar_show (1); |
1715 | scrollbar_show (1); |
| 1718 | } |
1716 | } |
| 1719 | break; |
1717 | break; |
| 1720 | } |
1718 | } |
| … | |
… | |
| 2216 | slip_wheel_ev.start (); |
2214 | slip_wheel_ev.start (); |
| 2217 | } |
2215 | } |
| 2218 | else |
2216 | else |
| 2219 | { |
2217 | { |
| 2220 | # endif |
2218 | # endif |
| 2221 | # ifdef JUMP_MOUSE_WHEEL |
|
|
| 2222 | scr_page (v, i); |
2219 | scr_page (v, i); |
| 2223 | scr_refresh (SMOOTH_REFRESH); |
|
|
| 2224 | scrollbar_show (1); |
2220 | 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 |
2221 | # ifdef MOUSE_SLIP_WHEELING |
| 2234 | } |
2222 | } |
| 2235 | #endif |
2223 | # endif |
| 2236 | } |
2224 | } |
| 2237 | break; |
2225 | break; |
| 2238 | #endif |
2226 | #endif |
| 2239 | } |
2227 | } |
| 2240 | } |
2228 | } |
| … | |
… | |
| 2834 | refresh_limit++; |
2822 | refresh_limit++; |
| 2835 | else |
2823 | else |
| 2836 | { |
2824 | { |
| 2837 | flag = true; |
2825 | flag = true; |
| 2838 | scr_refresh (refresh_type); |
2826 | scr_refresh (refresh_type); |
| 2839 | flush_ev.stop (); |
2827 | want_refresh = 1; |
| 2840 | } |
2828 | } |
| 2841 | } |
2829 | } |
| 2842 | |
2830 | |
| 2843 | } |
2831 | } |
| 2844 | else |
2832 | else |
