KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pending_scroll_pixels_per_screen' of https://github.com/Luflosi/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-20 16:58:28 +05:30
commit 7d8edccb04
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kitty/mouse.c
View File

@ -609,16 +609,16 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
if (is_high_resolution) { if (is_high_resolution) {
yoffset *= OPT(touch_scroll_multiplier); yoffset *= OPT(touch_scroll_multiplier);
if (yoffset * global_state.callback_os_window->pending_scroll_pixels < 0) { if (yoffset * screen->pending_scroll_pixels < 0) {
global_state.callback_os_window->pending_scroll_pixels = 0; // change of direction screen->pending_scroll_pixels = 0; // change of direction
} }
double pixels = global_state.callback_os_window->pending_scroll_pixels + yoffset; double pixels = screen->pending_scroll_pixels + yoffset;
if (fabs(pixels) < global_state.callback_os_window->fonts_data->cell_height) { if (fabs(pixels) < global_state.callback_os_window->fonts_data->cell_height) {
global_state.callback_os_window->pending_scroll_pixels = pixels; screen->pending_scroll_pixels = pixels;
return; return;
} }
s = (int)round(pixels) / (int)global_state.callback_os_window->fonts_data->cell_height; s = (int)round(pixels) / (int)global_state.callback_os_window->fonts_data->cell_height;
global_state.callback_os_window->pending_scroll_pixels = pixels - s * (int) global_state.callback_os_window->fonts_data->cell_height; screen->pending_scroll_pixels = pixels - s * (int) global_state.callback_os_window->fonts_data->cell_height;
} else { } else {
if (screen->linebuf == screen->main_linebuf || !screen->modes.mouse_tracking_mode) { if (screen->linebuf == screen->main_linebuf || !screen->modes.mouse_tracking_mode) {
// Only use wheel_scroll_multiplier if we are scrolling kitty scrollback or in mouse // Only use wheel_scroll_multiplier if we are scrolling kitty scrollback or in mouse
@ -633,7 +633,7 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
// apparently on cocoa some mice generate really small yoffset values // apparently on cocoa some mice generate really small yoffset values
// when scrolling slowly https://github.com/kovidgoyal/kitty/issues/1238 // when scrolling slowly https://github.com/kovidgoyal/kitty/issues/1238
if (s == 0 && yoffset != 0) s = yoffset > 0 ? 1 : -1; if (s == 0 && yoffset != 0) s = yoffset > 0 ? 1 : -1;
global_state.callback_os_window->pending_scroll_pixels = 0; screen->pending_scroll_pixels = 0;
} }
if (s == 0) return; if (s == 0) return;
bool upwards = s > 0; bool upwards = s > 0;

1
kitty/screen.h
View File

@ -67,6 +67,7 @@ typedef struct {
unsigned int columns, lines, margin_top, margin_bottom, charset, scrolled_by, last_selection_scrolled_by; unsigned int columns, lines, margin_top, margin_bottom, charset, scrolled_by, last_selection_scrolled_by;
unsigned int last_rendered_cursor_x, last_rendered_cursor_y; unsigned int last_rendered_cursor_x, last_rendered_cursor_y;
double pending_scroll_pixels;
CellPixelSize cell_size; CellPixelSize cell_size;
OverlayLine overlay_line; OverlayLine overlay_line;
id_type window_id; id_type window_id;

1
kitty/state.h
View File

@ -151,7 +151,6 @@ typedef struct {
float background_opacity; float background_opacity;
FONTS_DATA_HANDLE fonts_data; FONTS_DATA_HANDLE fonts_data;
id_type temp_font_group_id; id_type temp_font_group_id;
double pending_scroll_pixels;
enum RENDER_STATE render_state; enum RENDER_STATE render_state;
monotonic_t last_render_frame_received_at; monotonic_t last_render_frame_received_at;
id_type last_focused_counter; id_type last_focused_counter;