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

Fix #1272

Browse Source
This commit is contained in:
Kovid Goyal 2018-12-28 07:52:29 +05:30
parent f45acc055e
commit a038f62a5b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kitty/mouse.c
View File

@ -558,6 +558,7 @@ void
scroll_event(double UNUSED xoffset, double yoffset, int flags) { scroll_event(double UNUSED xoffset, double yoffset, int flags) {
bool in_tab_bar; bool in_tab_bar;
static id_type window_for_momentum_scroll = 0; static id_type window_for_momentum_scroll = 0;
static bool main_screen_for_momentum_scroll = false;
unsigned int window_idx = 0; unsigned int window_idx = 0;
Window *w = window_for_event(&window_idx, &in_tab_bar); Window *w = window_for_event(&window_idx, &in_tab_bar);
if (!w && !in_tab_bar) { if (!w && !in_tab_bar) {
@ -568,18 +569,22 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
if (t) w = t->windows + t->active_window; if (t) w = t->windows + t->active_window;
} }
if (!w) return; if (!w) return;
Screen *screen = w->render_data.screen;
enum MomentumData { NoMomentumData, MomentumPhaseBegan, MomentumPhaseStationary, MomentumPhaseActive, MomentumPhaseEnded, MomentumPhaseCancelled, MomentumPhaseMayBegin }; enum MomentumData { NoMomentumData, MomentumPhaseBegan, MomentumPhaseStationary, MomentumPhaseActive, MomentumPhaseEnded, MomentumPhaseCancelled, MomentumPhaseMayBegin };
enum MomentumData momentum_data = (flags >> 1) & 7; enum MomentumData momentum_data = (flags >> 1) & 7;
switch(momentum_data) { switch(momentum_data) {
case MomentumPhaseBegan: case MomentumPhaseBegan:
window_for_momentum_scroll = w->id; break; window_for_momentum_scroll = w->id;
main_screen_for_momentum_scroll = screen->linebuf == screen->main_linebuf;
break;
case MomentumPhaseActive: case MomentumPhaseActive:
if (window_for_momentum_scroll != w->id) return; if (window_for_momentum_scroll != w->id || main_screen_for_momentum_scroll != (screen->linebuf == screen->main_linebuf)) return;
break; break;
case MomentumPhaseEnded: case MomentumPhaseEnded:
window_for_momentum_scroll = 0; break; window_for_momentum_scroll = 0;
break;
default: default:
break; break;
} }
@ -587,7 +592,6 @@ scroll_event(double UNUSED xoffset, double yoffset, int flags) {
int s; int s;
bool is_high_resolution = flags & 1; bool is_high_resolution = flags & 1;
Screen *screen = w->render_data.screen;
if (is_high_resolution) { if (is_high_resolution) {
yoffset *= OPT(touch_scroll_multiplier); yoffset *= OPT(touch_scroll_multiplier);