stop drawing a transparent cursor

3 files changed, 40 insertions, 35 deletions

diff --git a/src/display.c b/src/display.c
index 02e7d1a..e6cb1d9 100644
--- a/src/display.c
+++ b/src/display.c
@@ -16,7 +16,7 @@ void runes_display_init(RunesTerm *t)
 {
     runes_display_recalculate_font_metrics(t);
 
-    t->cursorcolor = cairo_pattern_create_rgba(0.0, 1.0, 0.0, 0.5);
+    t->cursorcolor = cairo_pattern_create_rgb(0.0, 1.0, 0.0);
 }
 
 void runes_display_set_window_size(RunesTerm *t)
@@ -104,6 +104,41 @@ void runes_display_draw_screen(RunesTerm *t)
     runes_window_backend_request_flush(t);
 }
 
+void runes_display_draw_cursor(RunesTerm *t, cairo_t *cr)
+{
+    if (!t->scr.hide_cursor) {
+        int row = t->scr.cur.row, col = t->scr.cur.col;
+
+        if (col >= t->scr.max.col) {
+            col = t->scr.max.col - 1;
+        }
+
+        cairo_save(cr);
+        cairo_set_source(cr, t->cursorcolor);
+        if (t->unfocused) {
+            cairo_set_line_width(cr, 1);
+            cairo_rectangle(
+                cr,
+                col * t->fontx + 0.5, row * t->fonty + 0.5,
+                t->fontx, t->fonty);
+            cairo_stroke(cr);
+        }
+        else {
+            struct runes_cell *cell = &t->scr.rows[row].cells[col];
+
+            cairo_rectangle(
+                cr,
+                col * t->fontx, row * t->fonty,
+                t->fontx, t->fonty);
+            cairo_fill(cr);
+            runes_display_draw_glyph(
+                t, cr, t->bgdefault, cell->attrs,
+                cell->contents, cell->len, row, col);
+        }
+        cairo_restore(cr);
+    }
+}
+
 void runes_display_cleanup(RunesTerm *t)
 {
     g_object_unref(t->layout);
@@ -261,7 +296,7 @@ static void runes_display_draw_glyph(
     cairo_move_to(cr, col * t->fontx, row * t->fonty);
     cairo_set_source(cr, pattern);
     pango_layout_set_text(t->layout, buf, len);
-    pango_cairo_update_layout(t->cr, t->layout);
-    pango_cairo_show_layout(t->cr, t->layout);
+    pango_cairo_update_layout(cr, t->layout);
+    pango_cairo_show_layout(cr, t->layout);
     cairo_restore(cr);
 }
diff --git a/src/display.h b/src/display.h
index d1a895b..182bef7 100644
--- a/src/display.h
+++ b/src/display.h
@@ -4,6 +4,7 @@
 void runes_display_init(RunesTerm *t);
 void runes_display_set_window_size(RunesTerm *t);
 void runes_display_draw_screen(RunesTerm *t);
+void runes_display_draw_cursor(RunesTerm *t, cairo_t *cr);
 void runes_display_cleanup(RunesTerm *t);
 
 #endif
diff --git a/src/window-xlib.c b/src/window-xlib.c
index 375e595..7e0c78a 100644
--- a/src/window-xlib.c
+++ b/src/window-xlib.c
@@ -87,7 +87,6 @@ static void runes_window_backend_visual_bell(RunesTerm *t);
 static void runes_window_backend_reset_visual_bell(uv_timer_t *handle);
 static void runes_window_backend_visual_bell_free_handle(uv_handle_t *handle);
 static void runes_window_backend_audible_bell(RunesTerm *t);
-static void runes_window_backend_draw_cursor(RunesTerm *t);
 static void runes_window_backend_set_urgent(RunesTerm *t);
 static void runes_window_backend_clear_urgent(RunesTerm *t);
 static void runes_window_backend_paste(RunesTerm *t, Time time);
@@ -472,7 +471,7 @@ static void runes_window_backend_flush(RunesTerm *t)
 
     cairo_set_source_surface(t->backend_cr, cairo_get_target(t->cr), 0.0, 0.0);
     cairo_paint(t->backend_cr);
-    runes_window_backend_draw_cursor(t);
+    runes_display_draw_cursor(t, t->backend_cr);
     cairo_surface_flush(cairo_get_target(t->backend_cr));
 }
 
@@ -525,36 +524,6 @@ static void runes_window_backend_audible_bell(RunesTerm *t)
     XBell(w->dpy, 0);
 }
 
-static void runes_window_backend_draw_cursor(RunesTerm *t)
-{
-    if (!t->scr.hide_cursor) {
-        int row = t->scr.cur.row, col = t->scr.cur.col;
-
-        if (col >= t->scr.max.col) {
-            col = t->scr.max.col - 1;
-        }
-
-        cairo_save(t->backend_cr);
-        cairo_set_source(t->backend_cr, t->cursorcolor);
-        if (t->unfocused) {
-            cairo_set_line_width(t->backend_cr, 1);
-            cairo_rectangle(
-                t->backend_cr,
-                col * t->fontx + 0.5, row * t->fonty + 0.5,
-                t->fontx, t->fonty);
-            cairo_stroke(t->backend_cr);
-        }
-        else {
-            cairo_rectangle(
-                t->backend_cr,
-                col * t->fontx, row * t->fonty,
-                t->fontx, t->fonty);
-            cairo_fill(t->backend_cr);
-        }
-        cairo_restore(t->backend_cr);
-    }
-}
-
 static void runes_window_backend_set_urgent(RunesTerm *t)
 {
     XWMHints *hints;