aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/syscons
diff options
context:
space:
mode:
authorCraig Rodrigues <rodrigc@FreeBSD.org>2005-09-07 22:58:59 +0000
committerCraig Rodrigues <rodrigc@FreeBSD.org>2005-09-07 22:58:59 +0000
commit6038f5e8264b63267c0e60d79c622127fa1fc852 (patch)
tree6232dd114f5a45a5df5cb24e81373633ae04c90f /sys/dev/syscons
parent7adcfc967dc3ddbdcede4d2267f535c3afc4c216 (diff)
Notes
Diffstat (limited to 'sys/dev/syscons')
-rw-r--r--sys/dev/syscons/scmouse.c3
-rw-r--r--sys/dev/syscons/scvidctl.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 794a4bafabb7..ef5c0260cf0a 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -157,7 +157,8 @@ set_mouse_pos(scr_stat *scp)
scp->mouse_ypos = (scp->ysize + scp->yoff)*scp->font_size - 1;
}
- if (scp->mouse_xpos != scp->mouse_oldxpos || scp->mouse_ypos != scp->mouse_oldypos) {
+ if ((scp->mouse_xpos != scp->mouse_oldxpos || scp->mouse_ypos != scp->mouse_oldypos)
+ && (scp->font_size != 0 && scp->font_width != 0)) {
scp->status |= MOUSE_MOVED;
scp->mouse_pos =
(scp->mouse_ypos/scp->font_size - scp->yoff)*scp->xsize
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 62d46c27530f..dff5d8923a18 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -145,6 +145,8 @@ sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, int xsize, int ysize,
return ENODEV;
/* adjust argument values */
+ if (fontwidth <= 0)
+ fontwidth = info.vi_cwidth;
if (fontsize <= 0)
fontsize = info.vi_cheight;
if (fontsize < 14) {