Rewrite video emulation. Features:

- slightly more accurate VGA hardware emulation;
- more int 10 functions, especially wrt to palette handling;
- first shot at graphics support;
- mode switching.

Bugs:

- graphics too slow;
- only 16 color modes work for now;
- works only under X, and only with 16 bit TrueColor visuals;
- far from being genuinely useful (I can play an old EGA game now, though
  (mahjongg.exe)).

Also, the code has been cleaned up a bit (more to come in a separate commit).

1 files changed, 30 insertions, 7 deletions

diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 714b1eb..2400384 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -7,10 +7,10 @@ SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
 	cwd.c debug.c disktab.c doscmd.c ems.c emuint.c exe.c i386-pinsn.c \
 	int.c int10.c int13.c int14.c int16.c int17.c int1a.c int2f.c intff.c \
 	mem.c mouse.c net.c port.c setver.c signal.c timer.c trace.c trap.c \
-	tty.c xms.c
+	tty.c video.c xms.c
 
-CFLAGS+=	-I. -DDISASSEMBLER
-CLEANFILES=	cp437-8x16.pcf.gz emsdriv.sys redir.com
+CFLAGS+=	-DDISASSEMBLER
+CLEANFILES=	${FONTFILES} ${FONTHDRS} emsdriv.sys redir.com
 
 .if ${OBJFORMAT} == "aout"
 CLEANFILES+=	doscmd.kernel crt0.o doscmd_loader.o
@@ -35,6 +35,11 @@ DPADD+=		${XLIBDIR}/libX11.a
 CFLAGS+=	-DNO_X
 .endif
 
+FONTFILES=	cp437-8x8.pcf.gz cp437-8x14.pcf.gz cp437-8x16.pcf.gz
+FONTHDRS=	font8x8.h font8x14.h font8x16.h
+
+beforedepend:	${FONTHDRS}
+
 beforeinstall:
 .if ${OBJFORMAT} == "aout"
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
@@ -43,10 +48,10 @@ beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
 	    emsdriv.sys redir.com ${DESTDIR}/usr/libdata/doscmd/
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
-	    cp437-8x16.pcf.gz ${DESTDIR}/usr/libdata/doscmd/fonts
+	    ${FONTFILES} ${DESTDIR}/usr/libdata/doscmd/fonts
 	cd ${.CURDIR} && \
 	    ${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
-		fonts.dir ${DESTDIR}/usr/libdata/doscmd/fonts
+		fonts.alias fonts.dir ${DESTDIR}/usr/libdata/doscmd/fonts
 
 .if ${OBJFORMAT} == "aout"
 doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC}
@@ -57,14 +62,32 @@ doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC}
 .depend: doscmd_loader.c
 
 # Bogus dependencies to get more than one binary created by `make all'.
-doscmd: cp437-8x16.pcf.gz doscmd.kernel emsdriv.sys redir.com
+doscmd: ${FONTFILES} ${FONTHDRS} doscmd.kernel emsdriv.sys redir.com
 .else
-doscmd: cp437-8x16.pcf.gz emsdriv.sys redir.com
+doscmd: ${FONTFILES} ${FONTHDRS} emsdriv.sys redir.com
 .endif
 
+cp437-8x8.pcf.gz: cp437-8x8.pcf.gz.uu
+	uudecode ${.CURDIR}/cp437-8x8.pcf.gz.uu
+
+cp437-8x14.pcf.gz: cp437-8x14.pcf.gz.uu
+	uudecode ${.CURDIR}/cp437-8x14.pcf.gz.uu
+
 cp437-8x16.pcf.gz: cp437-8x16.pcf.gz.uu
 	uudecode ${.CURDIR}/cp437-8x16.pcf.gz.uu
 
+font8x8.h:
+	uudecode -p /usr/src/share/syscons/fonts/cp437-8x8.fnt | \
+		file2c 'u_int8_t font8x8[] = {' '};' > ${.TARGET}
+
+font8x14.h:
+	uudecode -p /usr/src/share/syscons/fonts/cp437-8x14.fnt | \
+		file2c 'u_int8_t font8x14[] = {' '};' > ${.TARGET}
+
+font8x16.h:
+	uudecode -p /usr/src/share/syscons/fonts/cp437-8x16.fnt | \
+		file2c 'u_int8_t font8x16[] = {' '};' > ${.TARGET}
+
 emsdriv.sys: emsdriv.sys.uu
 	uudecode ${.CURDIR}/emsdriv.sys.uu