Pull term references out of xdrawcursor

Gradually reducing x.c dependency on Term object.  Old and new cursor
glyph/position are passed to xdrawcursor.  (There may be an opportunity
to refactor further if we can unify "clear old cursor" and "draw new
cursor" functionality.)

Signed-off-by: Devin J. Pohly <djpohly@gmail.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/st.c b/st.c
index 504239e..4bf6378 100644
--- a/st.c
+++ b/st.c
@@ -2544,10 +2544,23 @@ drawregion(int x1, int y1, int x2, int y2)
 void
 draw(void)
 {
+        int cx = term.c.x;
+
         if (!xstartdraw())
                 return;
+
+        /* adjust cursor position */
+        LIMIT(term.ocx, 0, term.col-1);
+        LIMIT(term.ocy, 0, term.row-1);
+        if (term.line[term.ocy][term.ocx].mode & ATTR_WDUMMY)
+                term.ocx--;
+        if (term.line[term.c.y][cx].mode & ATTR_WDUMMY)
+                cx--;
+
         drawregion(0, 0, term.col, term.row);
-        xdrawcursor();
+        xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+                        term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
+        term.ocx = cx, term.ocy = term.c.y;
         xfinishdraw();
 }