Author: jkim
Date: Fri Sep 17 23:09:31 2010
New Revision: 212806
URL: http://svn.freebsd.org/changeset/base/212806
Log:
Rework r210248. Although it fixed most of problems, it did not fix one
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)
Modified:
head/sys/dev/syscons/scvgarndr.c
Modified: head/sys/dev/syscons/scvgarndr.c
==============================================================================
--- head/sys/dev/syscons/scvgarndr.c Fri Sep 17 22:59:15 2010
(r212805)
+++ head/sys/dev/syscons/scvgarndr.c Fri Sep 17 23:09:31 2010
(r212806)
@@ -716,8 +716,7 @@ vga_egadraw(scr_stat *scp, int from, int
}
++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 fr
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 fr
}
++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 */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
