Making rectangular selection work again.

[st.git] / st.c

diff --git a/st.c b/st.c
index 2ebb15b..131cba8 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,5 +1,4 @@
 /* See LICENSE for licence details. */
 /* See LICENSE for licence details. */

-#define _XOPEN_SOURCE 600

 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -266,9 +265,10 @@ typedef struct {
 } Shortcut;
 
 /* function definitions used in config.h */
 } Shortcut;
 
 /* function definitions used in config.h */

-static void xzoom(const Arg *);
-static void selpaste(const Arg *);
+static void clippaste(const Arg *);

 static void numlock(const Arg *);
 static void numlock(const Arg *);

+static void selpaste(const Arg *);
+static void xzoom(const Arg *);

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


@@ -649,13 +649,10 @@ selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                bx = MIN(sel.bx, sel.ex);
                ex = MAX(sel.bx, sel.ex);
        if(sel.ey == y && sel.by == y) {
                bx = MIN(sel.bx, sel.ex);
                ex = MAX(sel.bx, sel.ex);

+

                return BETWEEN(x, bx, ex);
        }
 
                return BETWEEN(x, bx, ex);
        }
 

-       return ((sel.b.y < y && y < sel.e.y)
-                       || (y == sel.e.y && x <= sel.e.x))
-                       || (y == sel.b.y && x >= sel.b.x
-                               && (x <= sel.e.x || sel.b.y != sel.e.y));

        switch(sel.type) {
        case SEL_REGULAR:
                return ((sel.b.y < y && y < sel.e.y)
        switch(sel.type) {
        case SEL_REGULAR:
                return ((sel.b.y < y && y < sel.e.y)


@@ -795,7 +792,7 @@ selcopy(void) {
                        }
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)
                        }
                        /* \n at the end of every selected line except for the last one */
                        if(is_selected && y < sel.e.y)

-                               *ptr++ = '\n';
+                               *ptr++ = '\r';

                }
                *ptr = 0;
        }
                }
                *ptr = 0;
        }


@@ -830,7 +827,17 @@ selpaste(const Arg *dummy) {
                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 

-void selclear(XEvent *e) {
+void
+clippaste(const Arg *dummy) {
+       Atom clipboard;
+
+       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+       XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);
+}
+
+void
+selclear(XEvent *e) {

        if(sel.bx == -1)
                return;
        sel.bx = -1;
        if(sel.bx == -1)
                return;
        sel.bx = -1;


@@ -1284,27 +1291,30 @@ tnewline(int first_col) {
 
 void
 csiparse(void) {
 
 void
 csiparse(void) {

-       /* int noarg = 1; */
-       char *p = csiescseq.buf;
+       char *p = csiescseq.buf, *np;
+       long int v;

 
        csiescseq.narg = 0;
 
        csiescseq.narg = 0;

-       if(*p == '?')
-               csiescseq.priv = 1, p++;
+       if(*p == '?') {
+               csiescseq.priv = 1;
+               p++;
+       }

 
 

+       csiescseq.buf[csiescseq.len] = '\0';

        while(p < csiescseq.buf+csiescseq.len) {
        while(p < csiescseq.buf+csiescseq.len) {

-               while(isdigit(*p)) {
-                       csiescseq.arg[csiescseq.narg] *= 10;
-                       csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
-               }
-               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) {
-                       csiescseq.narg++, p++;
-               } else {
-                       csiescseq.mode = *p;
-                       csiescseq.narg++;
-
-                       return;
-               }
+               np = NULL;
+               v = strtol(p, &np, 10);
+               if(np == p)
+                       v = 0;
+               if(v == LONG_MAX || v == LONG_MIN)
+                       v = -1;
+               csiescseq.arg[csiescseq.narg++] = v;
+               p = np;
+               if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+                       break;
+               p++;

        }
        }

+       csiescseq.mode = *p;

 }
 
 /* for absolute user moves, when decom is set */
 }
 
 /* for absolute user moves, when decom is set */


@@ -1912,23 +1922,12 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {

-       /*
-        * TODO: Implement parsing like for CSI when required.
-        * Format: ESC type cmd ';' arg0 [';' argn] ESC \
-        */
-       int narg = 0;
-       char *start = strescseq.buf, *end = start + strescseq.len;
-       strescseq.args[0] = start;
-       while(start < end && narg < LEN(strescseq.args)) {
-               start = memchr(start, ';', end - start);
-               if(!start)
-                       break;
-               *start++ = '\0';
-               if(start < end) {
-                       strescseq.args[++narg] = start;
-               }
-       }
-       strescseq.narg = narg + 1;
+       char *p = strescseq.buf;
+
+       strescseq.narg = 0;
+       strescseq.buf[strescseq.len] = '\0';
+       while(p && strescseq.narg < STR_ARG_SIZ)
+               strescseq.args[strescseq.narg++] = strsep(&p, ";");

 }
 
 void
 }
 
 void


@@ -1939,7 +1938,9 @@ strdump(void) {
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;

-               if(isprint(c)) {
+               if(c == '\0') {
+                       return;
+               } else if(isprint(c)) {

                        putchar(c);
                } else if(c == '\n') {
                        printf("(\\n)");
                        putchar(c);
                } else if(c == '\n') {
                        printf("(\\n)");


@@ -2027,7 +2028,7 @@ tputc(char *c, int len) {
                        strhandle();
                        break;
                default:
                        strhandle();
                        break;
                default:

-                       if(strescseq.len + len < sizeof(strescseq.buf)) {
+                       if(strescseq.len + len < sizeof(strescseq.buf) - 1) {

                                memmove(&strescseq.buf[strescseq.len], c, len);
                                strescseq.len += len;
                        } else {
                                memmove(&strescseq.buf[strescseq.len], c, len);
                                strescseq.len += len;
                        } else {


@@ -2103,9 +2104,11 @@ tputc(char *c, int len) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                        if(BETWEEN(ascii, 0x40, 0x7E)

-                                       || csiescseq.len >= ESC_BUF_SIZ) {
+                                       || csiescseq.len >= \
+                                       sizeof(csiescseq.buf)-1) {

                                term.esc = 0;
                                term.esc = 0;

-                               csiparse(), csihandle();
+                               csiparse();
+                               csihandle();

                        }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;
                        }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;


@@ -2487,7 +2490,7 @@ xloadfont(Font *f, FcPattern *pattern) {
        f->lbearing = 0;
        f->rbearing = f->match->max_advance_width;
 
        f->lbearing = 0;
        f->rbearing = f->match->max_advance_width;
 

-       f->height = f->match->height;
+       f->height = f->ascent + f->descent;

        f->width = f->lbearing + f->rbearing;
 
        return 0;
        f->width = f->lbearing + f->rbearing;
 
        return 0;