X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=6b525c38da87060ba956bebe7ad2add9ecc99e72;hb=499c70cda048e9d62ab9085efb3a6d484c64bf37;hp=ee79a33759fd23cbbd8e15c064c664974d7a29a8;hpb=d01c55c9ab58588d98239c515aa8db6443ae75ca;p=st.git

diff --git a/st.c b/st.c
index ee79a33..6b525c3 100755
--- a/st.c
+++ b/st.c
@@ -39,7 +39,8 @@
 
 /* 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, CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, 
+       CURSOR_SAVE, CURSOR_LOAD };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
 enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
@@ -56,7 +57,7 @@ typedef struct {
 typedef Glyph* Line;
 
 typedef struct {
-	Glyph attr;  /* current char attributes */
+	Glyph attr;	 /* current char attributes */
 	int x;
 	int y;
 } TCursor;
@@ -65,24 +66,24 @@ typedef struct {
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
 	char buf[ESC_BUF_SIZ]; /* raw string */
-	int len;               /* raw string length */
+	int len;			   /* raw string length */
 	char priv;
 	int arg[ESC_ARG_SIZ];
-	int narg;              /* nb of args */
+	int narg;			   /* nb of args */
 	char mode;
 } CSIEscape;
 
 /* Internal representation of the screen */
 typedef struct {
-	int row;    /* nb row */  
-	int col;    /* nb col */
+	int row;	/* nb row */  
+	int col;	/* nb col */
 	Line* line; /* screen */
-	TCursor c;  /* cursor */
+	TCursor c;	/* cursor */
 	char hidec;
-	int top;    /* top    scroll limit */
-	int bot;    /* bottom scroll limit */
-	int mode;   /* terminal mode flags */
-	int esc;    /* escape state flags */
+	int top;	/* top	  scroll limit */
+	int bot;	/* bottom scroll limit */
+	int mode;	/* terminal mode flags */
+	int esc;	/* escape state flags */
 	char title[ESC_TITLE_SIZ];
 	int titlelen;
 } Term;
@@ -93,8 +94,10 @@ typedef struct {
 	Window win;
 	Pixmap buf;
 	int scr;
-	int w;  /* window width  */
-	int h;  /* window height */
+	int w;	/* window width	 */
+	int h;	/* window height */
+	int bufw; /* pixmap width  */
+	int bufh; /* pixmap height */
 	int ch; /* char height */
 	int cw; /* char width  */
 } XWindow; 
@@ -208,17 +211,15 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-	char *shell = getenv("SHELL");
-	if(!shell)
-		shell = "/bin/sh";
-	char *args[3] = {shell, "-i", NULL};
+	char *args[3] = {getenv("SHELL"), "-i", NULL};
+	DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
 	putenv("TERM=" TNAME);
-	execvp(shell, args);
+	execvp(args[0], args);
 }
 
 void
 xbell(void) { /* visual bell */
-	XRectangle r = { BORDER, BORDER, xw.w, xw.h };
+	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); */
@@ -369,7 +370,7 @@ tscrolldown (int n) {
 
 	for(i = 0; i < n; i++)
 		memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
-   	
+	
 	for(i = term.bot; i >= term.top+n; i--) {
 		temp = term.line[i];
 		term.line[i] = term.line[i-n];
@@ -584,7 +585,7 @@ tsetattr(int *attr, int l) {
 			term.c.attr.mode |= ATTR_REVERSE;	
 			break;
 		case 22: 
-			term.c.attr.mode &= ~ATTR_BOLD;  
+			term.c.attr.mode &= ~ATTR_BOLD;	 
 			break;
 		case 24: 
 			term.c.attr.mode &= ~ATTR_UNDERLINE;
@@ -596,7 +597,7 @@ tsetattr(int *attr, int l) {
 			term.c.attr.fg = DefaultFG;
 			break;
 		case 49:
-			term.c.attr.fg = DefaultBG;
+			term.c.attr.bg = DefaultBG;
 			break;
 		default:
 			if(BETWEEN(attr[i], 30, 37))
@@ -667,7 +668,7 @@ csihandle(void) {
 	case 'G': /* CHA -- Move to <col> */
 	case '`': /* XXX: HPA -- same? */
 		DEFAULT(escseq.arg[0], 1);
-     	tmoveto(escseq.arg[0]-1, term.c.y);
+		tmoveto(escseq.arg[0]-1, term.c.y);
 		break;
 	case 'H': /* CUP -- Move to <row> <col> */
 	case 'f': /* XXX: HVP -- same? */
@@ -879,7 +880,7 @@ tputc(char c) {
 				printf("esc unhandled charset: ESC ( %c\n", c);
 			}
 			term.esc = 0;
-		} else {		
+		} else {
 			switch(c) {
 			case '[':
 				term.esc |= ESC_CSI;
@@ -972,7 +973,7 @@ tputc(char c) {
 }
 
 void
-tputs(char *s, int len) { 
+tputs(char *s, int len) {
 	for(; len > 0; len--)
 		tputc(*s++);
 }
@@ -1024,16 +1025,29 @@ void
 xclear(int x1, int y1, int x2, int y2) {
 	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
 	XFillRectangle(xw.dis, xw.buf, dc.gc,
-				   x1 * xw.cw, y1 * xw.ch, 
-				   (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+	               x1 * xw.cw, y1 * xw.ch,
+	               (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+}
+
+void
+xhints(void)
+{
+	XClassHint class = {TNAME, TNAME};
+	XWMHints wm = {.flags = InputHint, .input = 1};
+	XSizeHints size = {
+		.flags = PSize | PResizeInc | PBaseSize,
+		.height = xw.h,
+		.width = xw.w,
+		.height_inc = xw.ch,
+		.width_inc = xw.cw,
+		.base_height = 2*BORDER,
+		.base_width = 2*BORDER,
+	};
+	XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
 }
 
 void
 xinit(void) {
-	XClassHint chint;
-	XWMHints wmhint;
-	XSizeHints shint;
-	char *args[] = {NULL};
 	int i;
 
 	xw.dis = XOpenDisplay(NULL);
@@ -1057,27 +1071,21 @@ xinit(void) {
 	term.c.attr.bg = DefaultBG;
 	term.c.attr.mode = ATTR_NULL;
 	/* windows */
-	xw.h = term.row * xw.ch;
-	xw.w = term.col * xw.cw;
+	xw.h = term.row * xw.ch + 2*BORDER;
+	xw.w = term.col * xw.cw + 2*BORDER;
 	xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-			xw.w + 2*BORDER, xw.h + 2*BORDER, 0, 
+			xw.w, xw.h, 0,
 			dc.col[DefaultBG],
 			dc.col[DefaultBG]);
-	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, 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));
 	/* gc */
 	dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
 	XMapWindow(xw.dis, xw.win);
-	/* wm stuff */
-	chint.res_name = TNAME, chint.res_class = TNAME;
-	wmhint.input = 1, wmhint.flags = InputHint;
-	shint.height_inc = xw.ch, shint.width_inc = xw.cw;
-	shint.height = xw.h + 2*BORDER, shint.width = xw.w + 2*BORDER;
-	shint.flags = PSize | PResizeInc;
-	XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
-	XStoreName(xw.dis, xw.win, TNAME);
-	XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+	xhints();
+	XStoreName(xw.dis, xw.win, "st");
 	XSync(xw.dis, 0);
-
 }
 
 void
@@ -1098,7 +1106,7 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
 		for(i = 0; i < len; i++)
 			s[i] = gfx[s[i]];
 
-	XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);	
+	XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
 	XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
 	
 	if(base.mode & ATTR_UNDERLINE)
@@ -1130,7 +1138,6 @@ xcursor(int mode) {
 	}
 }
 
-
 #ifdef DEBUG
 /* basic drawing routines */
 void
@@ -1143,7 +1150,7 @@ xdrawc(int x, int y, Glyph g) {
 }
 
 void
-draw_(int dummy) {
+draw(int dummy) {
 	int x, y;
 
 	xclear(0, 0, term.col-1, term.row-1);
@@ -1154,11 +1161,12 @@ draw_(int dummy) {
 
 	if(!term.hidec)
 		xcursor(CURSOR_DRAW);
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
+	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 	XFlush(xw.dis);
 }
-#endif
 
+#else
+/* optimized drawing routine */
 void
 draw(int redraw_all) {
 	int i, x, y, ox;
@@ -1183,10 +1191,12 @@ draw(int redraw_all) {
 		xdraws(buf, base, ox, y, i);
 	}
 	xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
+	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 	XFlush(xw.dis);
 }
 
+#endif
+
 void
 expose(XEvent *ev) {
 	draw(SCREEN_REDRAW);
@@ -1211,7 +1221,7 @@ kpress(XEvent *ev) {
 	int meta;
 	int shift;
 
-	meta  = e->state & Mod1Mask;
+	meta = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
 
@@ -1244,18 +1254,21 @@ kpress(XEvent *ev) {
 void
 resize(XEvent *e) {
 	int col, row;
-	col = e->xconfigure.width / xw.cw;
-	row = e->xconfigure.height / xw.ch;
 	
-	if(term.col != col || term.row != row) {
-		tresize(col, row);
-		ttyresize(col, row);
-		xw.w = e->xconfigure.width;
-		xw.h = e->xconfigure.height;
-		XFreePixmap(xw.dis, xw.buf);
-		xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr));
-		draw(SCREEN_REDRAW);
-	}
+	if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+		return;
+	
+	xw.w = e->xconfigure.width;
+	xw.h = e->xconfigure.height;
+	xw.bufw = xw.w - 2*BORDER;
+	xw.bufh = xw.h - 2*BORDER;
+	col = xw.bufw / xw.cw;
+	row = xw.bufh / xw.ch;
+	tresize(col, row);
+	ttyresize(col, row);
+	XFreePixmap(xw.dis, xw.buf);
+	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+	draw(SCREEN_REDRAW);
 }
 
 void
@@ -1266,7 +1279,7 @@ run(void) {
 
 	running = 1;
 	XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
-	XResizeWindow(xw.dis, xw.win, xw.w+2*BORDER, xw.h+2*BORDER); /* fix resize bug in wmii (?) */
+	XResizeWindow(xw.dis, xw.win, xw.w, xw.h); /* XXX: fix resize bug in wmii (?) */
 
 	while(running) {
 		FD_ZERO(&rfd);