From e71fa5d2027d31756c2279c73ec158123ce094ed Mon Sep 17 00:00:00 2001 From: Ivan Tham Date: Sat, 31 Oct 2015 12:06:38 +0800 Subject: [PATCH] Change mshortcuts to mkeys to make it clear --- config.def.h | 20 ++++++++++---------- st.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config.def.h b/config.def.h index 860ce3d..c6ebf6c 100644 --- a/config.def.h +++ b/config.def.h @@ -130,16 +130,6 @@ static unsigned int mousebg = 0; static unsigned int defaultitalic = 11; static unsigned int defaultunderline = 7; -/* - * Internal mouse shortcuts. - * Beware that overloading Button1 will disable the selection. - */ -static Mousekey mshortcuts[] = { - /* button mask string */ - { Button4, XK_ANY_MOD, "\031" }, - { Button5, XK_ANY_MOD, "\005" }, -}; - /* Internal keyboard shortcuts. */ #define MODKEY Mod1Mask @@ -160,6 +150,16 @@ static Shortcut shortcuts[] = { }; /* + * Internal mouse keys. + * Beware that overloading Button1 will disable the selection. + */ +static Mousekey mkeys[] = { + /* button mask string */ + { Button4, XK_ANY_MOD, "\031" }, + { Button5, XK_ANY_MOD, "\005" }, +}; + +/* * Special keys (change & recompile st.info accordingly) * * Mask value: diff --git a/st.c b/st.c index b2a4fff..fc0c22d 100644 --- a/st.c +++ b/st.c @@ -951,7 +951,7 @@ bpress(XEvent *e) return; } - for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { + for (mk = mkeys; mk < mkeys + LEN(mkeys); mk++) { if (e->xbutton.button == mk->b && match(mk->mask, e->xbutton.state)) { ttysend(mk->s, strlen(mk->s)); -- 2.6.2