Move CRLF input processing into ttywrite

[st.git] / x.c

diff --git a/x.c b/x.c
index ddae6b6..76fb910 100644 (file)
--- a/x.c
+++ b/x.c
@@ -38,10 +38,9 @@ typedef struct {
        KeySym k;
        uint mask;
        char *s;
        KeySym k;
        uint mask;
        char *s;

-       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       /* three-valued logic variables: 0 indifferent, 1 on, -1 off */

        signed char appkey;    /* application keypad */
        signed char appcursor; /* application cursor */
        signed char appkey;    /* application keypad */
        signed char appcursor; /* application cursor */

-       signed char crlf;      /* crlf mode          */

 } Key;
 
 /* X modifiers */
 } Key;
 
 /* X modifiers */


@@ -157,7 +156,7 @@ static void selnotify(XEvent *);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void setsel(char *, Time);
 static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void setsel(char *, Time);

-static void mousesel(XEvent *);
+static void mousesel(XEvent *, int);

 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
 static int match(uint, uint);
 static void mousereport(XEvent *);
 static char *kmap(KeySym, uint);
 static int match(uint, uint);


@@ -313,7 +312,7 @@ y2row(int y)
 }
 
 void
 }
 
 void

-mousesel(XEvent *e)
+mousesel(XEvent *e, int done)

 {
        int type, seltype = SEL_REGULAR;
        uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
 {
        int type, seltype = SEL_REGULAR;
        uint state = e->xbutton.state & ~(Button1Mask | forceselmod);


@@ -324,8 +323,9 @@ mousesel(XEvent *e)
                        break;
                }
        }
                        break;
                }
        }

-
-       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype);
+       selextend(x2col(e->xbutton.x), y2row(e->xbutton.y), seltype, done);
+       if (done)
+               setsel(getsel(), e->xbutton.time);

 }
 
 void
 }
 
 void


@@ -389,7 +389,7 @@ mousereport(XEvent *e)
                return;
        }
 
                return;
        }
 

-       ttywrite(buf, len);
+       ttywrite(buf, len, 0);

 }
 
 void
 }
 
 void


@@ -407,7 +407,7 @@ bpress(XEvent *e)
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                if (e->xbutton.button == ms->b
                                && match(ms->mask, e->xbutton.state)) {
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                if (e->xbutton.button == ms->b
                                && match(ms->mask, e->xbutton.state)) {

-                       ttysend(ms->s, strlen(ms->s));
+                       ttywrite(ms->s, strlen(ms->s), 1);

                        return;
                }
        }
                        return;
                }
        }


@@ -519,10 +519,10 @@ selnotify(XEvent *e)
                }
 
                if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
                }
 
                if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)

-                       ttywrite("\033[200~", 6);
-               ttysend((char *)data, nitems * format / 8);
+                       ttywrite("\033[200~", 6, 0);
+               ttywrite((char *)data, nitems * format / 8, 1);

                if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
                if (IS_SET(MODE_BRCKTPASTE) && rem == 0)

-                       ttywrite("\033[201~", 6);
+                       ttywrite("\033[201~", 6, 0);

                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;


@@ -630,16 +630,10 @@ brelease(XEvent *e)
                return;
        }
 
                return;
        }
 

-       if (e->xbutton.button == Button2) {
+       if (e->xbutton.button == Button2)

                selpaste(NULL);
                selpaste(NULL);

-       } else if (e->xbutton.button == Button1) {
-               if (sel.mode == SEL_READY) {
-                       mousesel(e);
-                       setsel(getsel(), e->xbutton.time);
-               } else
-                       selclear_(NULL);
-               sel.mode = SEL_IDLE;
-       }
+       else if (e->xbutton.button == Button1)
+               mousesel(e, 1);

 }
 
 void
 }
 
 void


@@ -650,11 +644,7 @@ bmotion(XEvent *e)
                return;
        }
 
                return;
        }
 

-       if (!sel.mode)
-               return;
-
-       sel.mode = SEL_READY;
-       mousesel(e);
+       mousesel(e, 0);

 }
 
 void
 }
 
 void


@@ -1643,12 +1633,12 @@ focus(XEvent *ev)
                win.state |= WIN_FOCUSED;
                xseturgency(0);
                if (IS_SET(MODE_FOCUS))
                win.state |= WIN_FOCUSED;
                xseturgency(0);
                if (IS_SET(MODE_FOCUS))

-                       ttywrite("\033[I", 3);
+                       ttywrite("\033[I", 3, 0);

        } else {
                XUnsetICFocus(xw.xic);
                win.state &= ~WIN_FOCUSED;
                if (IS_SET(MODE_FOCUS))
        } else {
                XUnsetICFocus(xw.xic);
                win.state &= ~WIN_FOCUSED;
                if (IS_SET(MODE_FOCUS))

-                       ttywrite("\033[O", 3);
+                       ttywrite("\033[O", 3, 0);

        }
 }
 
        }
 }
 


@@ -1689,9 +1679,6 @@ kmap(KeySym k, uint state)
                if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
                        continue;
 
                if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
                        continue;
 

-               if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
-                       continue;
-

                return kp->s;
        }
 
                return kp->s;
        }
 


@@ -1723,7 +1710,7 @@ kpress(XEvent *ev)
 
        /* 2. custom keys from config.h */
        if ((customkey = kmap(ksym, e->state))) {
 
        /* 2. custom keys from config.h */
        if ((customkey = kmap(ksym, e->state))) {

-               ttysend(customkey, strlen(customkey));
+               ttywrite(customkey, strlen(customkey), 1);

                return;
        }
 
                return;
        }
 


@@ -1742,7 +1729,7 @@ kpress(XEvent *ev)
                        len = 2;
                }
        }
                        len = 2;
                }
        }

-       ttysend(buf, len);
+       ttywrite(buf, len, 1);

 }
 
 
 }