diff --git a/config.def.h b/config.def.h index 2f1b24c..fc6b662 100644 --- a/config.def.h +++ b/config.def.h @@ -191,6 +191,8 @@ static uint forcemousemod = ShiftMask; */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ + { 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/config.h b/config.h index e8d6e84..2935e16 100644 --- a/config.h +++ b/config.h @@ -188,6 +188,8 @@ static uint forcemousemod = ShiftMask; */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ + { 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/patches/todo/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff b/patches/in-progress/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff similarity index 100% rename from patches/todo/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff rename to patches/in-progress/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff diff --git a/st.c b/st.c index 1e7ce77..c580c48 100644 --- a/st.c +++ b/st.c @@ -1069,6 +1069,11 @@ tattrset(int attr) return 0; } +int tisaltscr(void) +{ + return IS_SET(MODE_ALTSCREEN); +} + void tsetdirt(int top, int bot) { diff --git a/st.h b/st.h index c1cfc7d..4db5fc5 100644 --- a/st.h +++ b/st.h @@ -102,6 +102,7 @@ void sendbreak(const Arg *); void toggleprinter(const Arg *); int tattrset(int); +int tisaltscr(void); void tnew(int, int); int tisaltscreen(void); void tresize(int, int); diff --git a/x.c b/x.c index 5fec927..07e482c 100644 --- a/x.c +++ b/x.c @@ -35,6 +35,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 { @@ -470,6 +471,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));