X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=108908721d2dab133753096e02c1b4b5ebec7b5a;hb=638a30359d26c1f84a87f0f8df17df1765068029;hp=4f17752144b9f6e14a9290ef9279f6aae2b8e7d0;hpb=ce27e634910e10c470b2dcb2edcd20f05d25343b;p=st.git

diff --git a/st.c b/st.c
index 4f17752..1089087 100644
--- a/st.c
+++ b/st.c
@@ -55,7 +55,8 @@ 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, MODE_ALTSCREEN=8 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, 
+       MODE_CRLF=16 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { SCREEN_UPDATE, SCREEN_REDRAW };
 enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
@@ -164,7 +165,7 @@ static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
-static void tnewline(void);
+static void tnewline(int);
 static void tputtab(void);
 static void tputc(char);
 static void tputs(char*, int);
@@ -189,6 +190,7 @@ static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static void xseturgency(int);
+static void xresize(int, int);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
@@ -626,14 +628,13 @@ tscrollup(int orig, int n) {
 }
 
 void
-tnewline(void) {
-	int x = term.c.x+1 < term.col ? term.c.x : 0;
+tnewline(int first_col) {
 	int y = term.c.y;
-	if(term.c.y == term.bot)
+	if(y == term.bot)
 		tscrollup(term.top, 1);
 	else
 		y++;
-	tmoveto(x, y);
+	tmoveto(first_col ? 0 : term.c.x, y);
 }
 
 void
@@ -932,6 +933,9 @@ csihandle(void) {
 				break;
 			case 12: /* att610 -- Stop blinking cursor (IGNORED) */
 				break;
+			case 20:
+				term.mode &= ~MODE_CRLF;
+				break;
 			case 25:
 				term.c.state |= CURSOR_HIDE;
 				break;
@@ -988,6 +992,9 @@ csihandle(void) {
 			case 7:
 				term.mode |= MODE_WRAP;
 				break;
+			case 20:
+				term.mode |= MODE_CRLF;
+				break;
 			case 12: /* att610 -- Start blinking cursor (IGNORED) */
 				 /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
 				if(escseq.narg > 1 && escseq.arg[1] != 25)
@@ -1116,7 +1123,7 @@ tputc(char c) {
 				term.esc = 0;
 				break;
 			case 'E': /* NEL -- Next line */
-				tnewline();
+				tnewline(1); /* always go to first col */
 				term.esc = 0;
 				break;
 			case 'M': /* RI -- Reverse index */
@@ -1162,8 +1169,11 @@ tputc(char c) {
 		case '\r':
 			tmoveto(0, term.c.y);
 			break;
+		case '\f':
+		case '\v':
 		case '\n':
-			tnewline();
+			/* go to first col if the mode is set */
+			tnewline(IS_SET(MODE_CRLF));
 			break;
 		case '\a':
 			if(!(xw.state & WIN_FOCUSED))
@@ -1175,7 +1185,7 @@ tputc(char c) {
 			break;
 		default:
 			if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-				tnewline();
+				tnewline(1); /* always go to first col */
 			tsetchar(c);
 			if(term.c.x+1 < term.col)
 				tmoveto(term.c.x+1, term.c.y);
@@ -1248,6 +1258,36 @@ tresize(int col, int row) {
 	tsetscroll(0, row-1);
 }
 
+void
+xresize(int col, int row) {
+	Pixmap newbuf;
+	int oldw, oldh;
+
+	oldw = xw.bufw;
+	oldh = xw.bufh;
+	xw.bufw = MAX(1, col * xw.cw);
+	xw.bufh = MAX(1, row * xw.ch);
+	newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+	XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+	XFreePixmap(xw.dis, xw.buf);
+	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+	if(xw.bufw > oldw)
+		XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+				xw.bufw-oldw, MIN(xw.bufh, oldh));
+	else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
+		XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+				xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
+				False);
+	if(xw.bufh > oldh)
+		XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+				xw.bufw, xw.bufh-oldh);
+	else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
+		XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+				xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
+				False);
+	xw.buf = newbuf;
+}
+
 void
 xloadcols(void) {
 	int i, r, g, b;
@@ -1560,15 +1600,12 @@ kpress(XEvent *ev) {
 	meta = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
-
+	
+	/* 1. custom keys from config.h */
 	if((customkey = kmap(ksym)))
 		ttywrite(customkey, strlen(customkey));
-	else if(len > 0) {
-		buf[sizeof(buf)-1] = '\0';
-		if(meta && len == 1)
-			ttywrite("\033", 1);
-		ttywrite(buf, len);
-	} else
+	/* 2. hardcoded (overrides X lookup) */
+	else
 		switch(ksym) {
 		case XK_Up:
 		case XK_Down:
@@ -1581,8 +1618,21 @@ kpress(XEvent *ev) {
 			if(shift)
 				selpaste();
 			break;
+		case XK_Return:
+			if(IS_SET(MODE_CRLF))
+				ttywrite("\r\n", 2);
+			else
+				ttywrite("\r", 1);
+			break;
+			/* 3. X lookup  */
 		default:
-			fprintf(stderr, "errkey: %d\n", (int)ksym);
+			if(len > 0) {
+				buf[sizeof(buf)-1] = '\0';
+				if(meta && len == 1)
+					ttywrite("\033", 1);
+				ttywrite(buf, len);
+			} else /* 4. nothing to send */
+				fprintf(stderr, "errkey: %d\n", (int)ksym);
 			break;
 		}
 }
@@ -1596,16 +1646,13 @@ resize(XEvent *e) {
 	
 	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;
+	col = (xw.w - 2*BORDER) / xw.cw;
+	row = (xw.h - 2*BORDER) / xw.ch;
+	if(col == term.col && row == term.row)
+		return;
 	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));
+	xresize(col, row);
 }
 
 void