3 files changed, 13 insertions, 5 deletions

diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 29a2d3011b24..133a9bef77f5 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -256,7 +256,8 @@ gfb_cursor(scr_stat *scp, int at, int blink, int on, int flip)
 	video_adapter_t *adp;
 
 	adp = scp->sc->adp;
-	if (scp->cursor_height <= 0)	/* the text cursor is disabled */
+	if (scp->curs_attr.height <= 0) 
+		/* the text cursor is disabled */
 		return;
 
 	if (on) {
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 037b00531b65..982c7c25c5ef 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -2907,14 +2907,14 @@ init_scp(sc_softc_t *sc, int vty, scr_stat *scp)
 	scp->status |= GRAPHICS_MODE;
 	scp->xpixel = info.vi_width;
 	scp->ypixel = info.vi_height;
-	scp->xsize = info.vi_width/8;
+	scp->xsize = info.vi_width/info.vi_cwidth;
 	scp->ysize = info.vi_height/info.vi_cheight;
 	scp->font_size = 0;
 	scp->font = NULL;
     } else {
 	scp->xsize = info.vi_width;
 	scp->ysize = info.vi_height;
-	scp->xpixel = scp->xsize*8;
+	scp->xpixel = scp->xsize*info.vi_cwidth;
 	scp->ypixel = scp->ysize*info.vi_cheight;
 	if (info.vi_cheight < 14) {
 	    scp->font_size = 8;
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index b5e206af5bdc..08e8dfcc44ee 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -129,8 +129,15 @@
 /* misc defines */
 #define FALSE		0
 #define TRUE		1
-#define	COL		80
-#define	ROW		25
+
+/*
+   The following #defines are hard-coded for a maximum text
+   resolution corresponding to a maximum framebuffer
+   resolution of 1600x1200 with an 8x8 font...
+*/
+#define	COL		200
+#define	ROW		150
+
 #define PCBURST		128
 
 #ifndef BELL_DURATION