X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=18935d4aac0f75133802b3681cfb3848e676b8e6;hb=580c8bbd4691218849c9a809acaa4c95f65cb846;hp=8b5ba644af423de6932eec728ccf475d63e3761d;hpb=1c1621da699adae49a4344b145f856dacb57270c;p=st.git

diff --git a/st.c b/st.c
index 8b5ba64..18935d4 100644
--- a/st.c
+++ b/st.c
@@ -1,5 +1,4 @@
 /* See LICENSE for licence details. */
-#define _XOPEN_SOURCE 600
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -44,7 +43,7 @@
 
 #define USAGE \
 	"st " VERSION " (c) 2010-2013 st engineers\n" \
-	"usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+	"usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
 	" [-t title] [-w windowid] [-e command ...]\n"
 
 /* XEMBED messages */
@@ -650,23 +649,18 @@ selected(int x, int y) {
 	if(sel.ey == y && sel.by == y) {
 		bx = MIN(sel.bx, sel.ex);
 		ex = MAX(sel.bx, sel.ex);
+
 		return BETWEEN(x, bx, ex);
 	}
 
-	return ((sel.b.y < y && y < sel.e.y)
-			|| (y == sel.e.y && x <= sel.e.x))
-			|| (y == sel.b.y && x >= sel.b.x
-				&& (x <= sel.e.x || sel.b.y != sel.e.y));
-	switch(sel.type) {
-	case SEL_REGULAR:
-		return ((sel.b.y < y && y < sel.e.y)
-			|| (y == sel.e.y && x <= sel.e.x))
-			|| (y == sel.b.y && x >= sel.b.x
-				&& (x <= sel.e.x || sel.b.y != sel.e.y));
-	case SEL_RECTANGULAR:
+	if(sel.type == SEL_RECTANGULAR) {
 		return ((sel.b.y <= y && y <= sel.e.y)
 			&& (sel.b.x <= x && x <= sel.e.x));
-	};
+	}
+	return ((sel.b.y < y && y < sel.e.y)
+		|| (y == sel.e.y && x <= sel.e.x))
+		|| (y == sel.b.y && x >= sel.b.x
+			&& (x <= sel.e.x || sel.b.y != sel.e.y));
 }
 
 void
@@ -1258,8 +1252,12 @@ selscroll(int orig, int n) {
 			sel.bx = -1;
 			return;
 		}
-		switch(sel.type) {
-		case SEL_REGULAR:
+		if(sel.type == SEL_RECTANGULAR) {
+			if(sel.by < term.top)
+				sel.by = term.top;
+			if(sel.ey > term.bot)
+				sel.ey = term.bot;
+		} else {
 			if(sel.by < term.top) {
 				sel.by = term.top;
 				sel.bx = 0;
@@ -1268,14 +1266,7 @@ selscroll(int orig, int n) {
 				sel.ey = term.bot;
 				sel.ex = term.col;
 			}
-			break;
-		case SEL_RECTANGULAR:
-			if(sel.by < term.top)
-				sel.by = term.top;
-			if(sel.ey > term.bot)
-				sel.ey = term.bot;
-			break;
-		};
+		}
 		sel.b.y = sel.by, sel.b.x = sel.bx;
 		sel.e.y = sel.ey, sel.e.x = sel.ex;
 	}
@@ -1304,6 +1295,7 @@ csiparse(void) {
 		p++;
 	}
 
+	csiescseq.buf[csiescseq.len] = '\0';
 	while(p < csiescseq.buf+csiescseq.len) {
 		np = NULL;
 		v = strtol(p, &np, 10);
@@ -1623,7 +1615,10 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 				break;
 			case 1049: /* = 1047 and 1048 */
 			case 47:
-			case 1047: {
+			case 1047:
+				if (!allowaltscreen)
+					break;
+
 				alt = IS_SET(MODE_ALTSCREEN);
 				if(alt) {
 					tclearregion(0, 0, term.col-1,
@@ -1633,8 +1628,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 					tswapscreen();
 				if(*args != 1049)
 					break;
-			}
-				/* pass through */
+				/* FALLTRU */
 			case 1048:
 				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
 				break;
@@ -1925,14 +1919,12 @@ strhandle(void) {
 
 void
 strparse(void) {
-	char *p = strescseq.buf, *sp;
+	char *p = strescseq.buf;
 
+	strescseq.narg = 0;
 	strescseq.buf[strescseq.len] = '\0';
-	for(p = strtok_r(p, ";", &sp); p; p = strtok_r(NULL, ";", &sp)) {
-		if(strescseq.narg == STR_ARG_SIZ)
-			return;
-		strescseq.args[strescseq.narg++] = p;
-	}
+	while(p && strescseq.narg < STR_ARG_SIZ)
+		strescseq.args[strescseq.narg++] = strsep(&p, ";");
 }
 
 void
@@ -2109,7 +2101,8 @@ tputc(char *c, int len) {
 		if(term.esc & ESC_CSI) {
 			csiescseq.buf[csiescseq.len++] = ascii;
 			if(BETWEEN(ascii, 0x40, 0x7E)
-					|| csiescseq.len >= ESC_BUF_SIZ) {
+					|| csiescseq.len >= \
+					sizeof(csiescseq.buf)-1) {
 				term.esc = 0;
 				csiparse();
 				csihandle();
@@ -2494,7 +2487,7 @@ xloadfont(Font *f, FcPattern *pattern) {
 	f->lbearing = 0;
 	f->rbearing = f->match->max_advance_width;
 
-	f->height = f->match->height;
+	f->height = f->ascent + f->descent;
 	f->width = f->lbearing + f->rbearing;
 
 	return 0;
@@ -2720,12 +2713,28 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 	FcPattern *fcpattern, *fontpattern;
 	FcFontSet *fcsets[] = { NULL };
 	FcCharSet *fccharset;
-	Colour *fg = &dc.col[base.fg], *bg = &dc.col[base.bg],
-		 *temp, revfg, revbg;
+	Colour *fg, *bg, *temp, revfg, revbg;
 	XRenderColor colfg, colbg;
 
 	frcflags = FRC_NORMAL;
 
+	if(base.mode & ATTR_ITALIC) {
+		if(base.fg == defaultfg)
+			base.fg = defaultitalic;
+		font = &dc.ifont;
+		frcflags = FRC_ITALIC;
+	} else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+		if(base.fg == defaultfg)
+			base.fg = defaultitalic;
+		font = &dc.ibfont;
+		frcflags = FRC_ITALICBOLD;
+	} else if(base.mode & ATTR_UNDERLINE) {
+		if(base.fg == defaultfg)
+			base.fg = defaultunderline;
+	}
+	fg = &dc.col[base.fg];
+	bg = &dc.col[base.bg];
+
 	if(base.mode & ATTR_BOLD) {
 		if(BETWEEN(base.fg, 0, 7)) {
 			/* basic system colors */
@@ -2747,15 +2756,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 		frcflags = FRC_BOLD;
 	}
 
-	if(base.mode & ATTR_ITALIC) {
-		font = &dc.ifont;
-		frcflags = FRC_ITALIC;
-	}
-	if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
-		font = &dc.ibfont;
-		frcflags = FRC_ITALICBOLD;
-	}
-
 	if(IS_SET(MODE_REVERSE)) {
 		if(fg == &dc.col[defaultfg]) {
 			fg = &dc.col[defaultbg];
@@ -2882,8 +2882,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 					FcTrue, fcpattern, &fcres);
 
 			/*
-			 * Overwrite or create the new cache entry
-			 * entry.
+			 * Overwrite or create the new cache entry.
 			 */
 			frccur++;
 			frclen++;
@@ -3319,6 +3318,9 @@ main(int argc, char *argv[]) {
 
 	for(i = 1; i < argc; i++) {
 		switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+		case 'a':
+			allowaltscreen = false;
+			break;
 		case 'c':
 			if(++i < argc)
 				opt_class = argv[i];