STREscape: don't trim prematurely

[st.git] / x.c

diff --git a/x.c b/x.c
index aa86b31..bc3ad5a 100644 (file)
--- a/x.c
+++ b/x.c
@@ -29,9 +29,11 @@ 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;
+       uint  release;

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


@@ -56,6 +58,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"


@@ -163,6 +166,7 @@ static void kpress(XEvent *);
 static void cmessage(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void cmessage(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);

+static int mouseaction(XEvent *, uint);

 static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);


@@ -312,6 +316,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)
 {


@@ -332,7 +342,7 @@ void
 mousesel(XEvent *e, int done)
 {
        int type, seltype = SEL_REGULAR;
 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)) {
 
        for (type = 1; type < LEN(selmasks); ++type) {
                if (match(selmasks[type], state)) {


@@ -408,25 +418,37 @@ mousereport(XEvent *e)
        ttywrite(buf, len, 0);
 }
 
        ttywrite(buf, len, 0);
 }
 

+int
+mouseaction(XEvent *e, uint release)
+{
+       MouseShortcut *ms;
+
+       for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
+               if (ms->release == release &&
+                   ms->button == e->xbutton.button &&
+                   (match(ms->mod, e->xbutton.state) ||  /* exact or forced */
+                    match(ms->mod, e->xbutton.state & ~forcemousemod))) {
+                       ms->func(&(ms->arg));
+                       return 1;
+               }
+       }
+
+       return 0;
+}
+

 void
 bpress(XEvent *e)
 {
        struct timespec now;
 void
 bpress(XEvent *e)
 {
        struct timespec now;

-       MouseShortcut *ms;

        int snap;
 
        int snap;
 

-       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {

                mousereport(e);
                return;
        }
 
                mousereport(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 (mouseaction(e, 0))
+               return;

 
        if (e->xbutton.button == Button1) {
                /*
 
        if (e->xbutton.button == Button1) {
                /*


@@ -642,21 +664,21 @@ xsetsel(char *str)
 void
 brelease(XEvent *e)
 {
 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;
        }
 
                mousereport(e);
                return;
        }
 

-       if (e->xbutton.button == Button2)
-               selpaste(NULL);
-       else if (e->xbutton.button == Button1)
+       if (mouseaction(e, 1))
+               return;
+       if (e->xbutton.button == Button1)

                mousesel(e, 1);
 }
 
 void
 bmotion(XEvent *e)
 {
                mousesel(e, 1);
 }
 
 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;
        }
                mousereport(e);
                return;
        }


@@ -1132,8 +1154,8 @@ xinit(int cols, int rows)
 
        win.mode = MODE_NUMLOCK;
        resettitle();
 
        win.mode = MODE_NUMLOCK;
        resettitle();

-       XMapWindow(xw.dpy, xw.win);

        xhints();
        xhints();

+       XMapWindow(xw.dpy, xw.win);

        XSync(xw.dpy, False);
 
        clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
        XSync(xw.dpy, False);
 
        clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);


@@ -1243,15 +1265,10 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
                        fontpattern = FcFontSetMatch(0, fcsets, 1,
                                        fcpattern, &fcres);
 
                        fontpattern = FcFontSetMatch(0, fcsets, 1,
                                        fcpattern, &fcres);
 

-                       /*
-                        * Allocate memory for the new cache entry.
-                        */
+                       /* Allocate memory for the new cache entry. */

                        if (frclen >= frccap) {
                                frccap += 16;
                        if (frclen >= frccap) {
                                frccap += 16;

-                               if (!frc)
-                                       frc = xmalloc(frccap * sizeof(Fontcache));
-                               else
-                                       frc = xrealloc(frc, frccap * sizeof(Fontcache));
+                               frc = xrealloc(frc, frccap * sizeof(Fontcache));

                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,