mouse shortcuts: allow same functions as kb shortcuts

[st.git] / x.c

diff --git a/x.c b/x.c
index 5828a3b..2a05a81 100644 (file)
--- a/x.c
+++ b/x.c
@@ -29,9 +29,10 @@ typedef struct {
 } Shortcut;
 
 typedef struct {
 } Shortcut;
 
 typedef struct {

-       uint b;
-       uint mask;
-       char *s;
+       uint mod;
+       uint button;
+       void (*func)(const Arg *);
+       const Arg arg;

 } MouseShortcut;
 
 typedef struct {
 } MouseShortcut;
 
 typedef struct {


@@ -56,6 +57,7 @@ static void selpaste(const Arg *);
 static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);

+static void ttysend(const Arg *);

 
 /* config.h for applying patches and the configuration. */
 #include "config.h"
 
 /* config.h for applying patches and the configuration. */
 #include "config.h"


@@ -312,6 +314,12 @@ zoomreset(const Arg *arg)
        }
 }
 
        }
 }
 

+void
+ttysend(const Arg *arg)
+{
+       ttywrite(arg->s, strlen(arg->s), 1);
+}
+

 int
 evcol(XEvent *e)
 {
 int
 evcol(XEvent *e)
 {


@@ -421,9 +429,9 @@ bpress(XEvent *e)
        }
 
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
        }
 
        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);
+               if (e->xbutton.button == ms->button
+                               && match(ms->mod, e->xbutton.state)) {
+                       ms->func(&(ms->arg));

                        return;
                }
        }
                        return;
                }
        }