st

My build of suckless's simple terminal
Log | Files | Refs | README | LICENSE

commit 3f51ba298c70c346ed1f8257c5e180a074d6ff9b
parent 222eac739d43c7a380b9a37db91bf61ed8dbc65a
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Wed,  8 Jul 2020 11:13:33 -0400

Merge branch 'dennisleexyz-mouse'

Diffstat:
Mconfig.h | 6++----
Mst.c | 5+++++
Mst.h | 1+
Mx.c | 12+++++++-----
4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config.h b/config.h @@ -228,10 +228,8 @@ static MouseShortcut mshortcuts[] = { MouseKey mkeys[] = { /* button mask function argument */ - { Button4, ShiftMask, kscrollup, {.i = 1} }, - { Button5, ShiftMask, kscrolldown, {.i = 1} }, - { Button4, MODKEY, kscrollup, {.i = 1} }, - { Button5, MODKEY, kscrolldown, {.i = 1} }, + { Button4, XK_NO_MOD, kscrollup, {.i = 1} }, + { Button5, XK_NO_MOD, kscrolldown, {.i = 1} }, { Button4, TERMMOD, zoom, {.f = +1} }, { Button5, TERMMOD, zoom, {.f = -1} }, }; diff --git a/st.c b/st.c @@ -1063,6 +1063,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 @@ -104,6 +104,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 @@ -442,11 +442,13 @@ bpress(XEvent *e) return; } - for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { - if (e->xbutton.button == ms->b - && match(ms->mask, e->xbutton.state)) { - ttywrite(ms->s, strlen(ms->s), 1); - return; + if (tisaltscr()) { + for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) { + if (e->xbutton.button == ms->b + && match(ms->mask, e->xbutton.state)) { + ttywrite(ms->s, strlen(ms->s), 1); + return; + } } }