X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=0b21404ab8618114ce8b7eaa02b5644aefef47ec;hb=596bb133a55a6aba13b55795a9a38e29fcf1b38b;hp=eabc0c585c334b17050cc40a0f505f03ec514880;hpb=c186c8ef9a995616384c425c5568b6913676b252;p=st.git diff --git a/st.c b/st.c index eabc0c5..0b21404 100644 --- a/st.c +++ b/st.c @@ -20,11 +20,11 @@ #include #include -#if defined(LINUX) +#if defined(__linux) #include -#elif defined(OPENBSD) +#elif defined(__OpenBSD__) || defined(__NetBSD__) #include -#elif defined(FREEBSD) +#elif defined(__FreeBSD__) || defined(__DragonFly__) #include #endif @@ -46,10 +46,11 @@ /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */ enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 }; -enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, +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 }; @@ -67,6 +68,7 @@ typedef struct { Glyph attr; /* current char attributes */ int x; int y; + char state; } TCursor; /* CSI Escape sequence structs */ @@ -84,9 +86,9 @@ 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 */ - char hidec; int top; /* top scroll limit */ int bot; /* bottom scroll limit */ int mode; /* terminal mode flags */ @@ -107,6 +109,7 @@ typedef struct { int bufh; /* pixmap height */ int ch; /* char height */ int cw; /* char width */ + int hasfocus; } XWindow; typedef struct { @@ -154,29 +157,40 @@ 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); static void ttyresize(int, int); static void ttywrite(const char *, size_t); -static void xbell(void); static void xdraws(char *, Glyph, int, int, int); static void xhints(void); static void xclear(int, int, int, int); -static void xcursor(int); +static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); +static void xseturgency(int); static void expose(XEvent *); static char* kmap(KeySym); static void kpress(XEvent *); static void resize(XEvent *); +static void focus(XEvent *); +static void brelease(XEvent *e); +static void bpress(XEvent *e); +static void bmotion(XEvent *e); + static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, [Expose] = expose, - [ConfigureNotify] = resize + [ConfigureNotify] = resize, + [FocusIn] = focus, + [FocusOut] = focus, + [MotionNotify] = bmotion, + [ButtonPress] = bpress, + [ButtonRelease] = brelease, }; /* Globals */ @@ -186,7 +200,103 @@ static Term term; static CSIEscape escseq; static int cmdfd; static pid_t pid; -static int running; + +/* 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; + +static inline int selected(int x, int y) { + if ((seley==y && selby==y)) { + int bx = MIN(selbx, selex); + int ex = MAX(selbx, selex); + return (x>=bx && x<=ex); + } + return (((y>sb[1] && y=sb[0] && (x<=se[0] || sb[1]!=se[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; + sb[0] = selbyxbutton.x/xw.cw; + seley = selby = e->xbutton.y/xw.ch; +} + +static char *getseltext() { + char *str, *ptr; + int ls, x, y, sz; + if(selbx==-1) + return NULL; + sz = ((xw.w/xw.ch) * (se[1]-sb[1]+2)); + 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))) { + *ptr = term.line[y][x].c; + ptr++; + } + } + if (ls) { + *ptr = '\n'; + ptr++; + } + } + *ptr = 0; + return str; +} + +static void clipboard_copy(const char *str) { + free((void *)clipboard); + clipboard = str; +} + +static void clipboard_paste() { + if(clipboard) + ttywrite(clipboard, strlen(clipboard)); +} + +// TODO: doubleclick to select word +static void brelease(XEvent *e) { + int b; + selmode = 0; + getbuttoninfo(e, &b, &selex, &seley); + if(b==4) + tscrollup(1); + else + if(b==5) + tscrolldown(1); + else + if(selbx==selex && selby==seley) { + selbx = -1; + if(b==2) + clipboard_paste(); + } else { + if(b==1) + clipboard_copy(getseltext()); + } + draw(1); +} + +static void bmotion(XEvent *e) { + if (selmode) { + getbuttoninfo(e, NULL, &selex, &seley); + draw(1); + } +} #ifdef DEBUG void @@ -221,20 +331,11 @@ die(const char *errstr, ...) { void execsh(void) { char *args[3] = {getenv("SHELL"), "-i", NULL}; - DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */ + DEFAULT(args[0], SHELL); /* if getenv() failed */ putenv("TERM=" TNAME); execvp(args[0], args); } -void -xbell(void) { /* visual bell */ - XRectangle r = { BORDER, BORDER, xw.bufw, xw.bufh }; - XSetForeground(xw.dis, dc.gc, dc.col[BellCol]); - XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1); - /* usleep(30000); */ - draw(SCREEN_REDRAW); -} - void sigchld(int a) { int stat = 0; @@ -325,11 +426,12 @@ tcursor(int mode) { void treset(void) { - term.c.attr.mode = ATTR_NULL; - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; - term.c.x = term.c.y = 0; - term.hidec = 0; + term.c = (TCursor){{ + .mode = ATTR_NULL, + .fg = DefaultFG, + .bg = DefaultBG + }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; + term.top = 0, term.bot = term.row - 1; term.mode = MODE_WRAP; tclearregion(0, 0, term.col-1, term.row-1); @@ -337,21 +439,24 @@ treset(void) { void tnew(int col, int row) { - /* screen size */ + /* set screen size */ term.row = row, term.col = col; - term.top = 0, term.bot = term.row - 1; - /* mode */ - term.mode = MODE_WRAP; - /* cursor */ - term.c.attr.mode = ATTR_NULL; - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; - term.c.x = term.c.y = 0; - term.hidec = 0; - /* allocate screen */ - term.line = calloc(term.row, sizeof(Line)); - for(row = 0 ; row < term.row; row++) - term.line[row] = calloc(term.col, sizeof(Glyph)); + term.line = malloc(term.row * sizeof(Line)); + 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 @@ -380,11 +485,11 @@ tscrollup (int n) { for(i = 0; i < n; i++) memset(term.line[term.top+i], 0, term.col*sizeof(Glyph)); - for(i = term.top; i <= term.bot-n; i++) { + for(i = term.top; i <= term.bot-n; i++) { temp = term.line[i]; term.line[i] = term.line[i+n]; term.line[i+n] = temp; - } + } } void @@ -421,8 +526,11 @@ csiparse(void) { void tmoveto(int x, int y) { - term.c.x = x < 0 ? 0 : x >= term.col ? term.col-1 : x; - term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y; + LIMIT(x, 0, term.col-1); + LIMIT(y, 0, term.row-1); + term.c.state &= ~CURSOR_WRAPNEXT; + term.c.x = x; + term.c.y = y; } void @@ -718,12 +826,23 @@ csihandle(void) { case 12: /* att610 -- Stop blinking cursor (IGNORED) */ break; case 25: - term.hidec = 1; + term.c.state |= CURSOR_HIDE; + break; + case 1047: + if(IS_SET(MODE_ALTSCREEN)) { + tclearregion(0, 0, term.col-1, term.row-1); + tswapscreen(); + } + break; + case 1048: + tcursor(CURSOR_LOAD); break; - case 1048: /* XXX: no alt. screen to erase/save */ case 1049: tcursor(CURSOR_LOAD); - tclearregion(0, 0, term.col-1, term.row-1); + if(IS_SET(MODE_ALTSCREEN)) { + tclearregion(0, 0, term.col-1, term.row-1); + tswapscreen(); + } break; default: goto unknown; @@ -767,12 +886,23 @@ csihandle(void) { case 12: /* att610 -- Start blinking cursor (IGNORED) */ break; case 25: - term.hidec = 0; + term.c.state &= ~CURSOR_HIDE; break; - case 1048: - case 1049: /* XXX: no alt. screen to erase/save */ + case 1047: + if(IS_SET(MODE_ALTSCREEN)) + tclearregion(0, 0, term.col-1, term.row-1); + else + tswapscreen(); + break; + case 1048: tcursor(CURSOR_SAVE); - tclearregion(0, 0, term.col-1, term.row-1); + 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; } @@ -795,6 +925,7 @@ csihandle(void) { DEFAULT(escseq.arg[0], 1); DEFAULT(escseq.arg[1], term.row); tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); + tmoveto(0, 0); } break; case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ @@ -874,20 +1005,11 @@ tputc(char c) { case '(': term.esc |= ESC_ALTCHARSET; break; - case 'A': - tmoveto(term.c.x, term.c.y-1); - term.esc = 0; - break; - case 'B': - tmoveto(term.c.x, term.c.y+1); - term.esc = 0; - break; - case 'C': - tmoveto(term.c.x+1, term.c.y); - term.esc = 0; - break; - case 'D': /* XXX: CUP (VT100) or IND (VT52) ... */ - tmoveto(term.c.x-1, term.c.y); + case 'D': /* IND -- Linefeed */ + if(term.c.y == term.bot) + tscrollup(1); + else + tmoveto(term.c.x, term.c.y+1); term.esc = 0; break; case 'E': /* NEL -- Next line */ @@ -905,19 +1027,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; @@ -941,18 +1063,21 @@ tputc(char c) { tnewline(); break; case '\a': - xbell(); + if(!xw.hasfocus) + xseturgency(1); break; case '\033': csireset(); term.esc = ESC_START; break; default: + if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT) + tnewline(); tsetchar(c); - if(term.c.x+1 < term.col) { + if(term.c.x+1 < term.col) tmoveto(term.c.x+1, term.c.y); - } else if(IS_SET(MODE_WRAP)) - tnewline(); + else + term.c.state |= CURSOR_WRAPNEXT; break; } } @@ -974,29 +1099,35 @@ 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)); + } - LIMIT(term.c.x, 0, col-1); - LIMIT(term.c.y, 0, row-1); - LIMIT(term.top, 0, row-1); - LIMIT(term.bot, 0, row-1); - - term.bot = row-1; + /* update terminal size */ term.col = col, term.row = row; + /* make use of the LIMIT in tmoveto */ + tmoveto(term.c.x, term.c.y); + /* reset scrolling region */ + tsetscroll(0, row-1); } void @@ -1081,9 +1212,6 @@ xinit(void) { /* colors */ xloadcols(); - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; - term.c.attr.mode = ATTR_NULL; /* windows */ xw.h = term.row * xw.ch + 2*BORDER; xw.w = term.col * xw.cw + 2*BORDER; @@ -1128,7 +1256,7 @@ xdraws(char *s, Glyph base, int x, int y, int len) { } void -xcursor(int mode) { +xdrawcursor(void) { static int oldx = 0; static int oldy = 0; Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0}; @@ -1146,7 +1274,7 @@ xcursor(int mode) { xclear(oldx, oldy, oldx, oldy); /* draw the new one */ - if(mode == CURSOR_DRAW) { + 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; } @@ -1173,8 +1301,7 @@ draw(int dummy) { if(term.line[y][x].state & GLYPH_SET) xdrawc(x, y, term.line[y][x]); - if(!term.hidec) - xcursor(CURSOR_DRAW); + xdrawcursor(); XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); XFlush(xw.dis); } @@ -1186,27 +1313,33 @@ 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.w, xw.h); + XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh); for(y = 0; y < term.row; y++) { base = term.line[y][0]; i = ox = 0; for(x = 0; x < term.col; x++) { new = term.line[y][x]; - if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ) - buf[i++] = new.c; - else { + if(selbx!=-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); - buf[0] = new.c; - i = 1; - ox = x; - base = new; + i = 0; + } + if(new.state & GLYPH_SET) { + if(i == 0) { + ox = x; + base = new; + } + buf[i++] = new.c; } } - xdraws(buf, base, ox, y, i); + if(i > 0) + xdraws(buf, base, ox, y, i); } - xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW); + xdrawcursor(); XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); XFlush(xw.dis); } @@ -1218,6 +1351,21 @@ expose(XEvent *ev) { draw(SCREEN_REDRAW); } +void +xseturgency(int add) { + XWMHints *h = XGetWMHints(xw.dis, xw.win); + h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint); + XSetWMHints(xw.dis, xw.win, h); + XFree(h); +} + +void +focus(XEvent *ev) { + if((xw.hasfocus = ev->type == FocusIn)) + xseturgency(0); + draw(SCREEN_UPDATE); +} + char* kmap(KeySym k) { int i; @@ -1292,16 +1440,16 @@ run(void) { XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dis); + long mask = ExposureMask | KeyPressMask | StructureNotifyMask | FocusChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; - running = 1; - XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask); + XSelectInput(xw.dis, xw.win, mask); XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */ - while(running) { + while(1) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); - if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) { + if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) { if(errno == EINTR) continue; die("select failed: %s\n", SERRNO);