d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust shifting so that cursor widths up to 17 (was 9) work in vga planar

Browse Source 
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.
This commit is contained in:
Bruce Evans 2017-04-14 17:02:24 +00:00
parent a65d524afc
commit b95fde5020
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=316865
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/syscons/scvgarndr.c
View File

@ -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);