Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
use one global struct instead of many vars for selection. Cleanup.
[st.git] / st.c
diff --git a/st.c b/st.c
index 864dfc7..4a89876 100644 (file)
--- a/st.c
+++ b/st.c
@@ -125,6 +125,14 @@ typedef struct {
        GC gc;
 } DC;
 
        GC gc;
 } DC;
 
+typedef struct {
+       int mode;
+       int bx, by;
+       int ex, ey;
+       int b[2], e[2];
+       char *clip;
+} Selection;
+
 #include "config.h"
 
 static void die(const char *errstr, ...);
 #include "config.h"
 
 static void die(const char *errstr, ...);
@@ -200,23 +208,18 @@ static Term term;
 static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
 static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
+static Selection sel;
 
 
-/* selection */
-// TODO: use X11 clipboard
-static int selmode = 0;
-static int selbx = -1, selby;
-static int selex, seley;
-int sb[2], se[2];
-static const char *clipboard = NULL;
+/* TODO: use X11 clipboard */
 
 static inline int selected(int x, int y) {
 
 static inline int selected(int x, int y) {
-       if ((seley==y && selby==y)) {
-               int bx = MIN(selbx, selex);
-               int ex = MAX(selbx, selex);
-               return if(x>=bx && x<=ex)
+       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 (((y>sb[1] && y<se[1]) || (y==se[1] && x<=se[0])) || \
-               (y==sb[1] && x>=sb[0] && (x<=se[0] || sb[1]!=se[1])))
+       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])));
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 }
 
 static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
@@ -224,28 +227,28 @@ 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;
                *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;
-       sb[0] = selby<seley?selbx:selex;
-       sb[1] = MIN(selby, seley);
-       se[0] = selby<seley?selex:selbx;
-       se[1] = MAX(selby, seley);
+       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[1] = MAX(sel.by, sel.ey);
 }
 
 static void bpress(XEvent *e) {
 }
 
 static void bpress(XEvent *e) {
-       selmode = 1;
-       selex = selbx = e->xbutton.x/xw.cw;
-       seley = selby = e->xbutton.y/xw.ch;
+       sel.mode = 1;
+       sel.ex = sel.bx = e->xbutton.x/xw.cw;
+       sel.ey = sel.by = e->xbutton.y/xw.ch;
 }
 
 static char *getseltext() {
        char *str, *ptr;
        int ls, x, y, sz;
 }
 
 static char *getseltext() {
        char *str, *ptr;
        int ls, x, y, sz;
-       if(selbx==-1)
+       if(sel.bx==-1)
                return NULL;
                return NULL;
-       sz = ((xw.w/xw.ch) * (se[1]-sb[1]+2));
+       sz = ((xw.w/xw.ch) * (sel.e[1]-sel.b[1]+2));
        ptr = str = malloc (sz);
        for(y = 0; y < term.row; y++) {
                for(x = 0; x < term.col; x++) {
        ptr = str = malloc (sz);
        for(y = 0; y < term.row; y++) {
                for(x = 0; x < term.col; x++) {
-                       if(term.line[y][x].c && (ls=selected(x, y))) {
+                       if(term.line[y][x].state & GLYPH_SET && (ls=selected(x, y))) {
                                *ptr = term.line[y][x].c;
                                ptr++;
                        }
                                *ptr = term.line[y][x].c;
                                ptr++;
                        }
@@ -259,29 +262,29 @@ static char *getseltext() {
        return str;
 }
 
        return str;
 }
 
-static void clipboard_copy(const char *str) {
-       free((void *)clipboard);
-       clipboard = str;
+static void clipboard_copy(char *str) {
+       free(sel.clip);
+       sel.clip = str;
 }
 
 static void clipboard_paste() {
 }
 
 static void clipboard_paste() {
-       if(clipboard)
-               ttywrite(clipboard, strlen(clipboard));
+       if(sel.clip)
+               ttywrite(sel.clip, strlen(sel.clip));
 }
 
 // TODO: doubleclick to select word
 static void brelease(XEvent *e) {
        int b;
 }
 
 // TODO: doubleclick to select word
 static void brelease(XEvent *e) {
        int b;
-       selmode = 0;
-       getbuttoninfo(e, &b, &selex, &seley);
+       sel.mode = 0;
+       getbuttoninfo(e, &b, &sel.ex, &sel.ey);
        if(b==4)
                tscrollup(1);
        else
        if(b==5)
                tscrolldown(1);
        else
        if(b==4)
                tscrollup(1);
        else
        if(b==5)
                tscrolldown(1);
        else
-       if(selbx==selex && selby==seley) {
-               selbx = -1;
+       if(sel.bx==sel.ex && sel.by==sel.ey) {
+               sel.bx = -1;
                if(b==2)
                        clipboard_paste();
        } else {
                if(b==2)
                        clipboard_paste();
        } else {
@@ -292,8 +295,8 @@ static void brelease(XEvent *e) {
 }
 
 static void bmotion(XEvent *e) {
 }
 
 static void bmotion(XEvent *e) {
-       if (selmode) {
-               getbuttoninfo(e, NULL, &selex, &seley);
+       if (sel.mode) {
+               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
                draw(1);
        }
 }
                draw(1);
        }
 }
@@ -331,7 +334,7 @@ die(const char *errstr, ...) {
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
 void
 execsh(void) {
        char *args[3] = {getenv("SHELL"), "-i", NULL};
-       DEFAULT(args[0], "/bin/sh"); /* if getenv() failed */
+       DEFAULT(args[0], SHELL); /* if getenv() failed */
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
        putenv("TERM=" TNAME);
        execvp(args[0], args);
 }
@@ -784,7 +787,6 @@ csihandle(void) {
                case 2: /* all */
                        tclearregion(0, 0, term.col-1, term.row-1);
                        break;
                case 2: /* all */
                        tclearregion(0, 0, term.col-1, term.row-1);
                        break;
-               case 3: /* XXX: erase saved lines (xterm) */
                default:
                        goto unknown;
                }
                default:
                        goto unknown;
                }
@@ -828,22 +830,17 @@ csihandle(void) {
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;
+                       case 1049: /* = 1047 and 1048 */
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }
-                               break;
+                               if(escseq.arg[0] == 1047)
+                                       break;
                        case 1048:
                                tcursor(CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor(CURSOR_LOAD);
                                break;
-                       case 1049:
-                               tcursor(CURSOR_LOAD);
-                               if(IS_SET(MODE_ALTSCREEN)) {
-                                       tclearregion(0, 0, term.col-1, term.row-1);
-                                       tswapscreen();
-                               }
-                               break;
                        default:
                                goto unknown;
                        }
                        default:
                                goto unknown;
                        }
@@ -888,22 +885,17 @@ csihandle(void) {
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
+                       case 1049: /* = 1047 and 1048 */
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();
-                               break;                          
+                               if(escseq.arg[0] == 1047)
+                                       break;
                        case 1048:
                                tcursor(CURSOR_SAVE);
                                break;
                        case 1048:
                                tcursor(CURSOR_SAVE);
                                break;
-                       case 1049:
-                               tcursor(CURSOR_SAVE);
-                               if(IS_SET(MODE_ALTSCREEN))
-                                       tclearregion(0, 0, term.col-1, term.row-1);
-                               else
-                                       tswapscreen();
-                               break;
                        default: goto unknown;
                        }
                } else {
                        default: goto unknown;
                        }
                } else {
@@ -1035,7 +1027,7 @@ tputc(char c) {
                                term.mode &= ~MODE_APPKEYPAD;
                                term.esc = 0;
                                break;
                                term.mode &= ~MODE_APPKEYPAD;
                                term.esc = 0;
                                break;
-                       case '7': /* DECSC -- Save Cursor*/
+                       case '7': /* DECSC -- Save Cursor */
                                tcursor(CURSOR_SAVE);
                                term.esc = 0;
                                break;
                                tcursor(CURSOR_SAVE);
                                term.esc = 0;
                                break;
@@ -1106,7 +1098,7 @@ tresize(int col, int row) {
 
        /* resize to new height */
        term.line = realloc(term.line, row * sizeof(Line));
 
        /* resize to new height */
        term.line = realloc(term.line, row * sizeof(Line));
-       term.alt = realloc(term.alt,  row * sizeof(Line));
+       term.alt  = realloc(term.alt,  row * sizeof(Line));
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
@@ -1222,6 +1214,7 @@ xinit(void) {
        xw.bufw = xw.w - 2*BORDER;
        xw.bufh = xw.h - 2*BORDER;
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
        xw.bufw = xw.w - 2*BORDER;
        xw.bufh = xw.h - 2*BORDER;
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+       xw.hasfocus = 1;
        /* gc */
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
        XMapWindow(xw.dis, xw.win);
        /* gc */
        dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
        XMapWindow(xw.dis, xw.win);
@@ -1321,8 +1314,8 @@ draw(int redraw_all) {
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];
                i = ox = 0;
                for(x = 0; x < term.col; x++) {
                        new = term.line[y][x];
-                       if(selbx!=-1 && new.c && selected(x, y))
-                               new.mode = ATTR_REVERSE;
+                       if(sel.bx!=-1 && new.c && selected(x, y))
+                               new.mode ^= ATTR_REVERSE;
                        if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                        i >= DRAW_BUF_SIZ)) {
                                xdraws(buf, base, ox, y, i);
                        if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                        i >= DRAW_BUF_SIZ)) {
                                xdraws(buf, base, ox, y, i);
@@ -1430,6 +1423,8 @@ resize(XEvent *e) {
        row = xw.bufh / xw.ch;
        tresize(col, row);
        ttyresize(col, row);
        row = xw.bufh / xw.ch;
        tresize(col, row);
        ttyresize(col, row);
+       xw.bufh = MAX(1, xw.bufh);
+       xw.bufw = MAX(1, xw.bufw);
        XFreePixmap(xw.dis, xw.buf);
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
        draw(SCREEN_REDRAW);
        XFreePixmap(xw.dis, xw.buf);
        xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
        draw(SCREEN_REDRAW);
@@ -1440,12 +1435,14 @@ run(void) {
        XEvent ev;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dis);
        XEvent ev;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dis);
-       long mask = ExposureMask | KeyPressMask | StructureNotifyMask | FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+       long mask = ExposureMask | KeyPressMask | StructureNotifyMask
+               | FocusChangeMask | PointerMotionMask | ButtonPressMask 
+               | ButtonReleaseMask;
 
        XSelectInput(xw.dis, xw.win, mask);
        XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */
 
 
        XSelectInput(xw.dis, xw.win, mask);
        XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */
 
-       while(1) {
+       for(;;) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);