Merge remote-tracking branch 'origin/master'

[st.git] / st.c

diff --git a/st.c b/st.c
index 4d543d1..37bec70 100644 (file)
--- a/st.c
+++ b/st.c
@@ -953,11 +953,12 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];

-                       last = gp + term.col;
+                       last = &gp[term.col-1];

 
 

-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+                       while(last >= gp && !(selected(last - gp, y) &&
+                                             strcmp(last->c, " ") != 0)) {
+                               --last;
+                       }

 
                        for(x = 0; gp <= last; x++, ++gp) {
                                if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
 
                        for(x = 0; gp <= last; x++, ++gp) {
                                if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))


@@ -2152,20 +2153,21 @@ csireset(void) {
 void
 strhandle(void) {
        char *p = NULL;
 void
 strhandle(void) {
        char *p = NULL;

-       int i, j, narg;
+       int j, narg, par;

 
        strparse();
        narg = strescseq.narg;
 
        strparse();
        narg = strescseq.narg;

+       par = atoi(strescseq.args[0]);

 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */
 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */

-               switch(i = atoi(strescseq.args[0])) {
+               switch(par) {

                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);
                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);

-                       break;
+                       return;

                case 4: /* color set */
                        if(narg < 3)
                                break;
                case 4: /* color set */
                        if(narg < 3)
                                break;


@@ -2182,25 +2184,20 @@ strhandle(void) {
                                 */
                                redraw(0);
                        }
                                 */
                                redraw(0);
                        }

-                       break;
-               default:
-                       fprintf(stderr, "erresc: unknown str ");
-                       strdump();
-                       break;
+                       return;

                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);

-               break;
+               return;

        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */

-       default:
-               fprintf(stderr, "erresc: unknown str ");
-               strdump();
-               /* die(""); */
-               break;
+               return;

        }
        }

+
+       fprintf(stderr, "erresc: unknown str ");
+       strdump();

 }
 
 void
 }
 
 void