mouse shortcuts: don't hardcode selpaste

[st.git] / st.c

diff --git a/st.c b/st.c
index d35f89d..ede7ae6 100644 (file)
--- a/st.c
+++ b/st.c
@@ -41,7 +41,7 @@
 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
 #define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))

-#define ISDELIM(u)             (utf8strchr(worddelimiters, u) != NULL)
+#define ISDELIM(u)             (u && wcschr(worddelimiters, u))

 
 enum term_mode {
        MODE_WRAP        = 1 << 0,
 
 enum term_mode {
        MODE_WRAP        = 1 << 0,


@@ -210,7 +210,6 @@ static void selsnap(int *, int *, int);
 static size_t utf8decode(const char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);
 static size_t utf8decode(const char *, Rune *, size_t);
 static Rune utf8decodebyte(char, size_t *);
 static char utf8encodebyte(Rune, size_t);

-static char *utf8strchr(char *, Rune);

 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);
 static size_t utf8validate(Rune *, size_t);
 
 static char *base64dec(const char *);


@@ -337,23 +336,6 @@ utf8encodebyte(Rune u, size_t i)
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 

-char *
-utf8strchr(char *s, Rune u)
-{
-       Rune r;
-       size_t i, j, len;
-
-       len = strlen(s);
-       for (i = 0, j = 0; i < len; i += j) {
-               if (!(j = utf8decode(&s[i], &r, len - i)))
-                       break;
-               if (r == u)
-                       return &(s[i]);
-       }
-
-       return NULL;
-}
-

 size_t
 utf8validate(Rune *u, size_t i)
 {
 size_t
 utf8validate(Rune *u, size_t i)
 {


@@ -476,7 +458,7 @@ selextend(int col, int row, int type, int done)
        selnormalize();
        sel.type = type;
 
        selnormalize();
        sel.type = type;
 

-       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type)
+       if (oldey != sel.oe.y || oldex != sel.oe.x || oldtype != sel.type || sel.mode == SEL_EMPTY)

                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 
        sel.mode = done ? SEL_IDLE : SEL_READY;


@@ -1847,7 +1829,7 @@ csireset(void)
 void
 strhandle(void)
 {
 void
 strhandle(void)
 {

-       char *p = NULL;
+       char *p = NULL, *dec;

        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);
        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);


@@ -1865,8 +1847,6 @@ strhandle(void)
                        return;
                case 52:
                        if (narg > 2) {
                        return;
                case 52:
                        if (narg > 2) {

-                               char *dec;
-

                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);


@@ -1884,7 +1864,10 @@ strhandle(void)
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {

-                               fprintf(stderr, "erresc: invalid color %s\n", p);
+                               if (par == 104 && narg <= 1)
+                                       return; /* color reset without parameter */
+                               fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
+                                       j, p ? p : "(null)");

                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders