old-st

commit 87ee7adf5481522c0f81301e45fcc437daa3f959
parent e590e816656b5d1d4f0c1ff804bf26aaabab3626
Author: Cem Keylan <cem@ckyln.com>
Date:   Tue, 12 Nov 2019 06:18:40 +0300

mouse shortcuts: allow override for all shortcuts

Diffstat:
M
config.h
 | 
14
+++++++-------
M
x.c
 | 
12
++++++------

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/config.h b/config.h
@@ -188,6 +188,13 @@ ResourcePref resources[] = {
 };
 
 /*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+
+/*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
@@ -271,13 +278,6 @@ static KeySym mappedkeys[] = { -1 };
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
 /*
- * Override mouse-select while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forceselmod = ShiftMask;
-
-/*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.
  */
diff --git a/x.c b/x.c
@@ -356,7 +356,7 @@ void
 mousesel(XEvent *e, int done)
 {
 	int type, seltype = SEL_REGULAR;
-	uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
+	uint state = e->xbutton.state & ~(Button1Mask | forcemousemod);
 
 	for (type = 1; type < LEN(selmasks); ++type) {
 		if (match(selmasks[type], state)) {
@@ -439,14 +439,14 @@ bpress(XEvent *e)
 	MouseShortcut *ms;
 	int snap;
 
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
 	}
 
 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
-               if (e->xbutton.button == ms->button 
-                               && match(ms->mod, e->xbutton.state)) { 
+		if (e->xbutton.button == ms->button &&
+    			match(ms->mod, e->xbutton.state & ~forcemousemod)) {
                        ms->func(&(ms->arg)); 
 			return;
 		}
@@ -666,7 +666,7 @@ xsetsel(char *str)
 void
 brelease(XEvent *e)
 {
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
 	}
@@ -680,7 +680,7 @@ brelease(XEvent *e)
 void
 bmotion(XEvent *e)
 {
-	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
 	}