cleanup.

[st.git] / st.c

diff --git a/st.c b/st.c
index 67ba8d5..bff500b 100644 (file)
--- a/st.c
+++ b/st.c
@@ -218,13 +218,13 @@ selinit(void) {
 }
 
 static inline int selected(int x, int y) {
-       if ((sel.ey==y && sel.by==y)) {
+       if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
                int ex = MAX(sel.bx, sel.ex);
-               return (x>=bx && x<=ex);
+               return BETWEEN(x, bx, ex);
        }
-       return (((y>sel.b[1] && y<sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) || \
-               (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1])));
+       return ((sel.b[1] < y&&y < sel.e[1]) || (y==sel.e[1] && x<=sel.e[0])) 
+               || (y==sel.b[1] && x>=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1]));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -232,9 +232,9 @@ static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
                *b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
        *x = e->xbutton.x/xw.cw;
        *y = e->xbutton.y/xw.ch;
-       sel.b[0] = sel.by<sel.ey?sel.bx:sel.ex;
+       sel.b[0] = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b[1] = MIN(sel.by, sel.ey);
-       sel.e[0] = sel.by<sel.ey?sel.ex:sel.bx;
+       sel.e[0] = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.e[1] = MAX(sel.by, sel.ey);
 }
 
@@ -247,21 +247,16 @@ static void bpress(XEvent *e) {
 static char *getseltext() {
        char *str, *ptr;
        int ls, x, y, sz;
-       if(sel.bx==-1)
+       if(sel.bx == -1)
                return NULL;
-       sz = ((xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2));
-       ptr = str = malloc (sz);
+       sz = (term.col+1) * (sel.e[1]-sel.b[1]+1);
+       ptr = str = malloc(sz);
        for(y = 0; y < term.row; y++) {
-               for(x = 0; x < term.col; x++) {
-                       if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y))) {
-                               *ptr = term.line[y][x].c;
-                               ptr++;
-                       }
-               }
-               if (ls) {
-                       *ptr = '\n';
-                       ptr++;
-               }
+               for(x = 0; x < term.col; x++)
+                       if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y)))
+                               *ptr = term.line[y][x].c, ptr++;
+               if(ls)
+                       *ptr = '\n', ptr++;
        }
        *ptr = 0;
        return str;
@@ -283,19 +278,13 @@ static void brelease(XEvent *e) {
        int b;
        sel.mode = 0;
        getbuttoninfo(e, &b, &sel.ex, &sel.ey);
-       if(b==4)
-               tscrollup(1);
-       else
-       if(b==5)
-               tscrolldown(1);
-       else
        if(sel.bx==sel.ex && sel.by==sel.ey) {
                sel.bx = -1;
                if(b==2)
-                       clipboard_paste();
+                       selpaste();
        } else {
                if(b==1)
-                       clipboard_copy(getseltext());
+                       selcopy(getseltext());
        }
        draw(1);
 }
@@ -1411,7 +1400,7 @@ kpress(XEvent *ev) {
                        break;
                case XK_Insert:
                        if(shift)
-                               draw(1), puts("draw!")/* XXX: paste X clipboard */;
+                               selpaste(), draw(1);
                        break;
                default:
                        fprintf(stderr, "errkey: %d\n", (int)ksym);