X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=c2f294a94f37fba153da80f3c68184a996b3bfa0;hb=591d147af7d59f31a68513f613124d49f25f9859;hp=af3ec6d14b1bc18c746f6cf225b4c4b5b943c37d;hpb=bef87acd0d0e22ba4689be6f1c39ce2d90812317;p=st.git diff --git a/st.c b/st.c index af3ec6d..c2f294a 100644 --- a/st.c +++ b/st.c @@ -20,11 +20,11 @@ #include #include -#if defined(LINUX) +#if defined(__linux) #include -#elif defined(OPENBSD) || defined(NETBSD) +#elif defined(__OpenBSD__) || defined(__NetBSD__) #include -#elif defined(FREEBSD) +#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #endif @@ -50,7 +50,7 @@ enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_SAVE, CURSOR_LOAD }; enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 }; enum { GLYPH_SET=1, GLYPH_DIRTY=2 }; -enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 }; +enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8 }; enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 }; enum { SCREEN_UPDATE, SCREEN_REDRAW }; @@ -86,7 +86,8 @@ typedef struct { typedef struct { int row; /* nb row */ int col; /* nb col */ - Line* line; /* screen */ + Line* line; /* screen */ + Line* alt; /* alternate screen */ TCursor c; /* cursor */ int top; /* top scroll limit */ int bot; /* bottom scroll limit */ @@ -124,6 +125,14 @@ typedef struct { 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, ...); @@ -156,6 +165,7 @@ static void tscrolldown(int); static void tsetattr(int*, int); static void tsetchar(char); static void tsetscroll(int, int); +static void tswapscreen(void); static void ttynew(void); static void ttyread(void); @@ -175,6 +185,9 @@ static char* kmap(KeySym); static void kpress(XEvent *); static void resize(XEvent *); static void focus(XEvent *); +static void brelease(XEvent *); +static void bpress(XEvent *); +static void bmotion(XEvent *); static void (*handler[LASTEvent])(XEvent *) = { @@ -183,6 +196,9 @@ static void (*handler[LASTEvent])(XEvent *) = { [ConfigureNotify] = resize, [FocusIn] = focus, [FocusOut] = focus, + [MotionNotify] = bmotion, + [ButtonPress] = bpress, + [ButtonRelease] = brelease, }; /* Globals */ @@ -192,6 +208,94 @@ static Term term; static CSIEscape escseq; static int cmdfd; static pid_t pid; +static Selection sel; + +void +selinit(void) { + sel.mode = 0; + sel.bx = -1; + sel.clip = NULL; +} + +static inline int selected(int x, int 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 (((y>sel.b[1] && y=sel.b[0] && (x<=sel.e[0] || sel.b[1]!=sel.e[1]))); +} + +static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) { + if(b) *b = e->xbutton.state, + *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.byxbutton.x/xw.cw; + sel.ey = sel.by = e->xbutton.y/xw.ch; +} + +static char *getseltext() { + char *str, *ptr; + int ls, x, y, sz; + if(sel.bx==-1) + return NULL; + 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++; + } + *ptr = 0; + return str; +} + +/* TODO: use X11 clipboard */ +static void selcopy(char *str) { + free(sel.clip); + sel.clip = str; +} + +static void selpaste() { + if(sel.clip) + ttywrite(sel.clip, strlen(sel.clip)); +} + +/* TODO: doubleclick to select word */ +static void brelease(XEvent *e) { + int b; + sel.mode = 0; + getbuttoninfo(e, &b, &sel.ex, &sel.ey); + if(sel.bx==sel.ex && sel.by==sel.ey) { + sel.bx = -1; + if(b==2) + selpaste(); + } else { + if(b==1) + selcopy(getseltext()); + } + draw(1); +} + +static void bmotion(XEvent *e) { + if (sel.mode) { + getbuttoninfo(e, NULL, &sel.ex, &sel.ey); + draw(1); + } +} #ifdef DEBUG void @@ -226,7 +330,7 @@ die(const char *errstr, ...) { 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); } @@ -337,13 +441,24 @@ tnew(int col, int row) { /* set screen size */ term.row = row, term.col = col; term.line = malloc(term.row * sizeof(Line)); - for(row = 0 ; row < term.row; row++) + term.alt = malloc(term.row * sizeof(Line)); + for(row = 0 ; row < term.row; row++) { term.line[row] = malloc(term.col * sizeof(Glyph)); + term.alt [row] = malloc(term.col * sizeof(Glyph)); + } /* setup screen */ treset(); } void +tswapscreen(void) { + Line* tmp = term.line; + term.line = term.alt; + term.alt = tmp; + term.mode ^= MODE_ALTSCREEN; +} + +void tscrolldown (int n) { int i; Line temp; @@ -668,7 +783,6 @@ csihandle(void) { case 2: /* all */ tclearregion(0, 0, term.col-1, term.row-1); break; - case 3: /* XXX: erase saved lines (xterm) */ default: goto unknown; } @@ -712,10 +826,16 @@ csihandle(void) { case 25: term.c.state |= CURSOR_HIDE; break; - case 1048: /* XXX: no alt. screen to erase/save */ - case 1049: + case 1049: /* = 1047 and 1048 */ + case 1047: + if(IS_SET(MODE_ALTSCREEN)) { + tclearregion(0, 0, term.col-1, term.row-1); + tswapscreen(); + } + if(escseq.arg[0] == 1047) + break; + case 1048: tcursor(CURSOR_LOAD); - tclearregion(0, 0, term.col-1, term.row-1); break; default: goto unknown; @@ -761,10 +881,16 @@ csihandle(void) { case 25: term.c.state &= ~CURSOR_HIDE; break; - case 1048: - case 1049: /* XXX: no alt. screen to erase/save */ + case 1049: /* = 1047 and 1048 */ + case 1047: + if(IS_SET(MODE_ALTSCREEN)) + tclearregion(0, 0, term.col-1, term.row-1); + else + tswapscreen(); + if(escseq.arg[0] == 1047) + break; + case 1048: tcursor(CURSOR_SAVE); - tclearregion(0, 0, term.col-1, term.row-1); break; default: goto unknown; } @@ -889,19 +1015,19 @@ tputc(char c) { treset(); term.esc = 0; break; - case '=': /* DECPAM */ + case '=': /* DECPAM -- Application keypad */ term.mode |= MODE_APPKEYPAD; term.esc = 0; break; - case '>': /* DECPNM */ + case '>': /* DECPNM -- Normal keypad */ term.mode &= ~MODE_APPKEYPAD; term.esc = 0; break; - case '7': + case '7': /* DECSC -- Save Cursor */ tcursor(CURSOR_SAVE); term.esc = 0; break; - case '8': + case '8': /* DECRC -- Restore Cursor */ tcursor(CURSOR_LOAD); term.esc = 0; break; @@ -961,21 +1087,28 @@ tresize(int col, int row) { return; /* free uneeded rows */ - for(i = row; i < term.row; i++) + for(i = row; i < term.row; i++) { free(term.line[i]); + free(term.alt[i]); + } /* resize to new height */ term.line = realloc(term.line, 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++) { term.line[i] = realloc(term.line[i], col * sizeof(Glyph)); + term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph)); memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph)); + memset(term.alt[i] + mincol, 0, (col - mincol) * sizeof(Glyph)); } /* allocate any new rows */ - for(/* i == minrow */; i < row; i++) + for(/* i == minrow */; i < row; i++) { term.line[i] = calloc(col, sizeof(Glyph)); + term.alt [i] = calloc(col, sizeof(Glyph)); + } /* update terminal size */ term.col = col, term.row = row; @@ -1079,6 +1212,12 @@ xinit(void) { xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr)); /* gc */ dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL); + + /* event mask */ + XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask + | StructureNotifyMask | FocusChangeMask | PointerMotionMask + | ButtonPressMask | ButtonReleaseMask); + XMapWindow(xw.dis, xw.win); xhints(); XStoreName(xw.dis, xw.win, "st"); @@ -1129,7 +1268,7 @@ xdrawcursor(void) { xclear(oldx, oldy, oldx, oldy); /* draw the new one */ - if(!(term.c.state & CURSOR_HIDE)) { + if(!(term.c.state & CURSOR_HIDE) && xw.hasfocus) { xdraws(&g.c, g, term.c.x, term.c.y, 1); oldx = term.c.x, oldy = term.c.y; } @@ -1168,7 +1307,7 @@ draw(int redraw_all) { int i, x, y, ox; Glyph base, new; char buf[DRAW_BUF_SIZ]; - + XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]); XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh); for(y = 0; y < term.row; y++) { @@ -1176,8 +1315,10 @@ draw(int redraw_all) { i = ox = 0; for(x = 0; x < term.col; x++) { new = term.line[y][x]; + 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)) { + i >= DRAW_BUF_SIZ)) { xdraws(buf, base, ox, y, i); i = 0; } @@ -1216,6 +1357,7 @@ void focus(XEvent *ev) { if((xw.hasfocus = ev->type == FocusIn)) xseturgency(0); + draw(SCREEN_UPDATE); } char* @@ -1259,7 +1401,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); @@ -1282,6 +1424,8 @@ resize(XEvent *e) { 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); @@ -1292,12 +1436,8 @@ run(void) { XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dis); - long mask = ExposureMask | KeyPressMask | StructureNotifyMask | FocusChangeMask; - - 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); @@ -1328,6 +1468,7 @@ main(int argc, char *argv[]) { tnew(80, 24); ttynew(); xinit(); + selinit(); run(); return 0; }