better cursor drawing

3 files changed, 17 insertions, 30 deletions

diff --git a/st.c b/st.c
index a11cbd9..5dd53dc 100644
--- a/st.c
+++ b/st.c
@@ -536,40 +536,24 @@ retry:
 
 static void xdrawcursor(struct st_window *xw)
 {
-	struct st_glyph g, *p;
+	struct st_glyph g;
 
-	g.c = ' ';
+	if (xw->term.hide)
+		return;
+
+	g.c = term_pos(&xw->term, xw->term.c.pos)->c;
 	g.cmp = 0;
-	g.bg = defaultcs;
 	g.fg = defaultbg;
+	g.bg = xw->focused ? defaultcs : defaultucs;
 
-	xw->term.oldcursor.x = min(xw->term.oldcursor.x, xw->term.size.x - 1);
-	xw->term.oldcursor.y = min(xw->term.oldcursor.y, xw->term.size.y - 1);
-
-	p = term_pos(&xw->term, xw->term.c.pos);
-
-	g.c = p->c;
-
-	/* remove the old cursor */
-	xdraw_glyphs(xw, xw->term.oldcursor,
-		     *term_pos(&xw->term, xw->term.oldcursor),
-		     term_pos(&xw->term, xw->term.oldcursor), 1);
-
-	/* draw the new one */
-	if (!xw->term.hide) {
-		if (!xw->focused)
-			g.bg = defaultucs;
-
-		g.reverse = xw->term.reverse;
-		if (g.reverse) {
-			unsigned t = g.fg;
-			g.fg = g.bg;
-			g.bg = t;
-		}
-
-		xdraw_glyphs(xw, xw->term.c.pos, g, &g, 1);
-		xw->term.oldcursor = xw->term.c.pos;
+	g.reverse = xw->term.reverse;
+	if (g.reverse) {
+		unsigned t = g.fg;
+		g.fg = g.bg;
+		g.bg = t;
 	}
+
+	xdraw_glyphs(xw, xw->term.c.pos, g, &g, 1);
 }
 
 static struct st_glyph sel_glyph(struct st_window *xw, unsigned x, unsigned y)
diff --git a/term.c b/term.c
index 5cfe863..7d35e9f 100644
--- a/term.c
+++ b/term.c
@@ -307,6 +307,8 @@ static void tmovex(struct st_term *term, unsigned x)
 
 static void tmovey(struct st_term *term, unsigned y)
 {
+	term->dirty[term->c.pos.y] = 1;
+
 	term->c.wrapnext = 0;
 	term->c.pos.y = term->c.origin
 		? clamp(y, term->top, term->bot)
@@ -330,6 +332,8 @@ static void tmoveato(struct st_term *term, struct coord pos)
 
 static void tmoverel(struct st_term *term, int x, int y)
 {
+	term->dirty[term->c.pos.y] = 1;
+
 	term->c.pos.x = clamp_t(int, term->c.pos.x + x, 0, term->size.x - 1);
 	term->c.pos.y = clamp_t(int, term->c.pos.y + y, 0, term->size.y - 1);
 
diff --git a/term.h b/term.h
index f1f1d27..17dbbd9 100644
--- a/term.h
+++ b/term.h
@@ -160,7 +160,6 @@ struct st_term {
 
 	struct tcursor	c;	/* cursor */
 	struct tcursor	saved;
-	struct coord	oldcursor;
 	struct st_selection sel;
 	unsigned	top;	/* top    scroll limit */
 	unsigned	bot;	/* bottom scroll limit */