diff options
| author | Bruce Evans <bde@FreeBSD.org> | 2017-04-14 17:02:24 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 2017-04-14 17:02:24 +0000 |
| commit | b95fde5020a1c9e3b77603000c58d43346674269 (patch) | |
| tree | 5e854d7c3ca930b0d213e8a08e7b5f8c78d8e14f /sys/dev/syscons | |
| parent | a65d524afc882d2d5a494a95c5184f76e2d3c7d4 (diff) | |
| download | src-b95fde5020a1c9e3b77603000c58d43346674269.tar.gz src-b95fde5020a1c9e3b77603000c58d43346674269.zip | |
Adjust shifting so that cursor widths up to 17 (was 9) work in vga planar
mode.
Direct mode always supported widths up to 32, except for its hard-coded
16s matching the pixmap size. Text mode is still limited to 9 its 2x2
character cell method and missing adjustments for the gap between
characters, if any.
Cursor heights can be almost anything in graphics modes.
Notes
Notes:
svn path=/head/; revision=316865
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/scvgarndr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index 9e4867b8b7e4..9edd052df8cb 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -1045,9 +1045,9 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y) outw(GDCIDX, 0x0803); /* data rotate/function select (and) */ p = scp->sc->adp->va_window + line_width*y + x/8; for (i = y, j = 0; i < ymax; ++i, ++j) { - m = ~((mouse_and_mask[j] & ~mouse_or_mask[j]) >> xoff); - for (k = 0; k < 2; ++k) { - m1 = m >> (8 * (1 - k)); + m = ~((mouse_and_mask[j] & ~mouse_or_mask[j]) << 8 >> xoff); + for (k = 0; k < 3; ++k) { + m1 = m >> (8 * (2 - k)); if (m1 != 0xff && x + 8 * k < scp->xpixel) { readb(p + k); writeb(p + k, m1); @@ -1058,9 +1058,9 @@ draw_pxlmouse_planar(scr_stat *scp, int x, int y) outw(GDCIDX, 0x1003); /* data rotate/function select (or) */ p = scp->sc->adp->va_window + line_width*y + x/8; for (i = y, j = 0; i < ymax; ++i, ++j) { - m = mouse_or_mask[j] >> xoff; - for (k = 0; k < 2; ++k) { - m1 = m >> (8 * (1 - k)); + m = mouse_or_mask[j] << 8 >> xoff; + for (k = 0; k < 3; ++k) { + m1 = m >> (8 * (2 - k)); if (m1 != 0 && x + 8 * k < scp->xpixel) { readb(p + k); writeb(p + k, m1); |