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

Rework r210248. Although it fixed most of problems, it did not fix one

Browse Source 
particular edge case where X-axis resolution is not multiple of font width.
Now we just advance enough scan lines, then deduct a partial scan line.
It is more intuitive than the previous code.  Apply the same wisdom to EGA
and VGA planar renderers for consistency.

Reported by:	David DEMELIER (demelier dot david at gmail dot com)
This commit is contained in:
Jung-uk Kim 2010-09-17 23:09:31 +00:00
parent 1d09a9b999
commit a90b8833d2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,8 +716,7 @@ vga_egadraw(scr_stat *scp, int from, int count, int flip)
}
++d;
if ((i % scp->xsize) == scp->xsize - 1)
d += scp->xoff*2
+ (scp->font_size - 1)*line_width;
d += scp->font_size * line_width - scp->xsize;
}
outw(GDCIDX, 0x0000); /* set/reset */
outw(GDCIDX, 0x0001); /* set/reset enable */
@ -769,9 +768,8 @@ vga_vgadraw_direct(scr_stat *scp, int from, int count, int flip)
d += 8 * pixel_size;
if ((i % scp->xsize) == scp->xsize - 1)
d += scp->xoff * scp->font_size * pixel_size +
scp->font_size * line_width -
scp->xpixel * pixel_size;
d += scp->font_size * line_width -
scp->xsize * 8 * pixel_size;
}
}
@ -827,8 +825,7 @@ vga_vgadraw_planar(scr_stat *scp, int from, int count, int flip)
}
++d;
if ((i % scp->xsize) == scp->xsize - 1)
d += scp->xoff*2
+ (scp->font_size - 1)*line_width;
d += scp->font_size * line_width - scp->xsize;
}
outw(GDCIDX, 0x0005); /* read mode 0, write mode 0 */
outw(GDCIDX, 0x0000); /* set/reset */