Module Name: src
Committed By: macallan
Date: Thu Jan 28 17:40:00 UTC 2021
Modified Files:
src/sys/dev/wscons: wsdisplay_vcons.c
Log Message:
fix logic botch from previous - if we're asked to draw the cursor somewhere
else and it's still visible we need to clear it
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/wscons/wsdisplay_vcons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.50 src/sys/dev/wscons/wsdisplay_vcons.c:1.51
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.50 Tue Jan 26 16:24:17 2021
+++ src/sys/dev/wscons/wsdisplay_vcons.c Thu Jan 28 17:40:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.50 2021/01/26 16:24:17 macallan Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.51 2021/01/28 17:40:00 macallan Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.50 2021/01/26 16:24:17 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.51 2021/01/28 17:40:00 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1334,7 +1334,7 @@ vcons_cursor_noread(void *cookie, int on
#endif
ofs = offset + ri->ri_crow * ri->ri_cols + ri->ri_ccol;
if ((ri->ri_flg & RI_CURSOR) &&
- ((scr->scr_flags & VCONS_DONT_READ) != VCONS_DONT_READ)) {
+ (((scr->scr_flags & VCONS_DONT_READ) != VCONS_DONT_READ) || on)) {
scr->putchar(cookie, ri->ri_crow, ri->ri_ccol,
scr->scr_chars[ofs], scr->scr_attrs[ofs]);
ri->ri_flg &= ~RI_CURSOR;
