From c2131a689c5b83d2f5015f5afdce5ab3bc58e734 Mon Sep 17 00:00:00 2001 From: Mateja Date: Fri, 9 Apr 2021 22:46:44 +0200 Subject: Applied third `scrollback` patch. Allow scrollback using mouse wheel only when not in MODE_ALTSCREEN. --- config.def.h | 4 ++-- st.c | 5 +++++ st.h | 1 + x.c | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h index bdeeca4..3eaba27 100644 --- a/config.def.h +++ b/config.def.h @@ -189,8 +189,8 @@ static uint forcemousemod = ShiftMask; */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ - { ShiftMask, Button4, kscrollup, {.i = 1} }, - { ShiftMask, Button5, kscrolldown, {.i = 1} }, + { XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, /* !alt */ -1 }, + { XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, /* !alt */ -1 }, { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, diff --git a/st.c b/st.c index c5e3a4f..7f35b8a 100644 --- a/st.c +++ b/st.c @@ -1058,6 +1058,11 @@ tnew(int col, int row) treset(); } +int tisaltscr(void) +{ + return IS_SET(MODE_ALTSCREEN); +} + void tswapscreen(void) { diff --git a/st.h b/st.h index 5b9567a..d8bf1f0 100644 --- a/st.h +++ b/st.h @@ -91,6 +91,7 @@ void sendbreak(const Arg *); void toggleprinter(const Arg *); int tattrset(int); +int tisaltscr(void); void tnew(int, int); void tresize(int, int); void tsetdirtattr(int); diff --git a/x.c b/x.c index 906f6c1..fae2e5a 100644 --- a/x.c +++ b/x.c @@ -34,6 +34,7 @@ typedef struct { void (*func)(const Arg *); const Arg arg; uint release; + int altscrn; /* 0: don't care, -1: not alt screen, 1: alt screen */ } MouseShortcut; typedef struct { @@ -448,6 +449,7 @@ mouseaction(XEvent *e, uint release) for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { if (ms->release == release && ms->button == e->xbutton.button && + (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) && (match(ms->mod, state) || /* exact or forced */ match(ms->mod, state & ~forcemousemod))) { ms->func(&(ms->arg)); -- cgit v1.2.3