X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/59fe59d3d1f922ec3a99c758e54ab88cfdf939be..a1cd28f8099eac3938461f9e63ff6b74d4d824ef:/st.c?ds=inline diff --git a/st.c b/st.c index d483d85..7852de0 100644 --- a/st.c +++ b/st.c @@ -76,6 +76,7 @@ enum glyph_attribute { ATTR_UNDERLINE = 2, ATTR_BOLD = 4, ATTR_GFX = 8, + ATTR_ITALIC = 16, }; enum cursor_movement { @@ -238,7 +239,7 @@ typedef struct { short lbearing; short rbearing; XFontSet set; - } font, bfont; + } font, bfont, ifont; } DC; static void die(const char*, ...); @@ -290,7 +291,7 @@ static void ttywrite(const char *, size_t); static void xdraws(char *, Glyph, int, int, int, int); static void xhints(void); static void xclear(int, int, int, int); -static void xcopy(); +static void xcopy(void); static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); @@ -310,12 +311,13 @@ static void brelease(XEvent *); static void bpress(XEvent *); static void bmotion(XEvent *); static void selnotify(XEvent *); +static void selclear(XEvent *); static void selrequest(XEvent *); static void selinit(void); static inline bool selected(int, int); static void selcopy(void); -static void selpaste(); +static void selpaste(void); static void selscroll(int, int); static int utf8decode(char *, long *); @@ -335,6 +337,7 @@ static void (*handler[LASTEvent])(XEvent *) = { [MotionNotify] = bmotion, [ButtonPress] = bpress, [ButtonRelease] = brelease, + [SelectionClear] = selclear, [SelectionNotify] = selnotify, [SelectionRequest] = selrequest, }; @@ -548,6 +551,7 @@ bpress(XEvent *e) { sel.mode = 1; sel.ex = sel.bx = X2COL(e->xbutton.x); sel.ey = sel.by = Y2ROW(e->xbutton.y); + draw(); } } @@ -611,6 +615,14 @@ selpaste() { XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime); } +void selclear(XEvent *e) { + if(sel.bx == -1) + return; + sel.bx = -1; + tsetdirt(sel.b.y, sel.e.y); + draw(); +} + void selrequest(XEvent *e) { XSelectionRequestEvent *xsre; @@ -739,6 +751,10 @@ execsh(void) { char **args; char *envshell = getenv("SHELL"); + unsetenv("COLUMNS"); + unsetenv("LINES"); + unsetenv("TERMCAP"); + DEFAULT(envshell, SHELL); putenv("TERM="TNAME); args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; @@ -785,9 +801,15 @@ ttynew(void) { close(s); cmdfd = m; signal(SIGCHLD, sigchld); - if(opt_io && !(fileio = fopen(opt_io, "w"))) { - fprintf(stderr, "Error opening %s:%s\n", - opt_io, strerror(errno)); + if(opt_io) { + if(!strcmp(opt_io, "-")) { + fileio = stdout; + } else { + if(!(fileio = fopen(opt_io, "w"))) { + fprintf(stderr, "Error opening %s:%s\n", + opt_io, strerror(errno)); + } + } } } } @@ -841,7 +863,8 @@ ttyresize(int x, int y) { w.ws_row = term.row; w.ws_col = term.col; - w.ws_xpixel = w.ws_ypixel = 0; + w.ws_xpixel = xw.w; + w.ws_ypixel = xw.h; if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0) fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); } @@ -1110,15 +1133,16 @@ tsetattr(int *attr, int l) { for(i = 0; i < l; i++) { switch(attr[i]) { case 0: - term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD); + term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \ + | ATTR_ITALIC); term.c.attr.fg = DefaultFG; term.c.attr.bg = DefaultBG; break; case 1: term.c.attr.mode |= ATTR_BOLD; break; - case 3: /* enter standout (highlight) mode TODO: make it italic */ - term.c.attr.mode |= ATTR_REVERSE; + case 3: /* enter standout (highlight) */ + term.c.attr.mode |= ATTR_ITALIC; break; case 4: term.c.attr.mode |= ATTR_UNDERLINE; @@ -1129,8 +1153,8 @@ tsetattr(int *attr, int l) { case 22: term.c.attr.mode &= ~ATTR_BOLD; break; - case 23: /* leave standout (highlight) mode TODO: make it italic */ - term.c.attr.mode &= ~ATTR_REVERSE; + case 23: /* leave standout (highlight) mode */ + term.c.attr.mode &= ~ATTR_ITALIC; break; case 24: term.c.attr.mode &= ~ATTR_UNDERLINE; @@ -1322,12 +1346,12 @@ csihandle(void) { } break; case 'G': /* CHA -- Move to