… | |
… | |
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; |
… | |
… | |
1101 | { |
1101 | { |
1102 | if (mouse_slip_wheel_speed == 0 |
1102 | if (mouse_slip_wheel_speed == 0 |
1103 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1103 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1105 | { |
1105 | { |
1106 | if (view_start == nsaved || |
1106 | if (view_start == top_row || view_start == 0) |
1107 | view_start == 0) |
|
|
1108 | mouse_slip_wheel_speed = 0; |
1107 | mouse_slip_wheel_speed = 0; |
1109 | |
1108 | |
1110 | refresh_type |= SMOOTH_REFRESH; |
1109 | refresh_type |= SMOOTH_REFRESH; |
1111 | want_refresh = 1; |
1110 | want_refresh = 1; |
1112 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1111 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
… | |
… | |
1311 | dDisp; |
1310 | dDisp; |
1312 | |
1311 | |
1313 | SET_R (this); |
1312 | SET_R (this); |
1314 | SET_LOCALE (locale); |
1313 | SET_LOCALE (locale); |
1315 | |
1314 | |
|
|
1315 | if (ev.xany.window == vt |
|
|
1316 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1317 | return; |
|
|
1318 | |
|
|
1319 | // for XQueryPointer |
1316 | Window unused_root, unused_child; |
1320 | Window unused_root, unused_child; |
1317 | int unused_root_x, unused_root_y; |
1321 | int unused_root_x, unused_root_y; |
1318 | unsigned int unused_mask; |
1322 | unsigned int unused_mask; |
1319 | |
1323 | |
1320 | switch (ev.type) |
1324 | switch (ev.type) |
… | |
… | |
1920 | #else |
1924 | #else |
1921 | selection.rect = false; |
1925 | selection.rect = false; |
1922 | #endif |
1926 | #endif |
1923 | |
1927 | |
1924 | /* allow shift+left click to extend selection */ |
1928 | /* allow shift+left click to extend selection */ |
1925 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1929 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1926 | { |
1930 | { |
1927 | if (MEvent.button == Button1 && clickintime) |
1931 | if (MEvent.button == Button1 && clickintime) |
1928 | selection_rotate (ev.x, ev.y); |
1932 | selection_rotate (ev.x, ev.y); |
1929 | else |
1933 | else |
1930 | selection_extend (ev.x, ev.y, 1); |
1934 | selection_extend (ev.x, ev.y, 1); |