diff options
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
| -rw-r--r-- | usr.bin/doscmd/Makefile | 18 | ||||
| -rw-r--r-- | usr.bin/doscmd/doscmd.1 | 14 | ||||
| -rw-r--r-- | usr.bin/doscmd/doscmd.c | 3 |
4 files changed, 31 insertions, 6 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index bef12a4815b7..cb814d950f74 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -23,6 +23,8 @@ .. libdata doscmd + fonts + .. .. gcc .. diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index 8ecdcec1363a..714b1eb2c39c 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -10,7 +10,7 @@ SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \ tty.c xms.c CFLAGS+= -I. -DDISASSEMBLER -CLEANFILES= emsdriv.sys redir.com +CLEANFILES= cp437-8x16.pcf.gz emsdriv.sys redir.com .if ${OBJFORMAT} == "aout" CLEANFILES+= doscmd.kernel crt0.o doscmd_loader.o @@ -42,6 +42,11 @@ beforeinstall: .endif ${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 + cd ${.CURDIR} && \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \ + fonts.dir ${DESTDIR}/usr/libdata/doscmd/fonts .if ${OBJFORMAT} == "aout" doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC} @@ -52,17 +57,20 @@ doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC} .depend: doscmd_loader.c # Bogus dependencies to get more than one binary created by `make all'. -doscmd: doscmd.kernel emsdriv.sys redir.com +doscmd: cp437-8x16.pcf.gz doscmd.kernel emsdriv.sys redir.com .else -doscmd: emsdriv.sys redir.com +doscmd: cp437-8x16.pcf.gz emsdriv.sys redir.com .endif -redir.com: redir.com.uu - uudecode ${.CURDIR}/redir.com.uu +cp437-8x16.pcf.gz: cp437-8x16.pcf.gz.uu + uudecode ${.CURDIR}/cp437-8x16.pcf.gz.uu emsdriv.sys: emsdriv.sys.uu uudecode ${.CURDIR}/emsdriv.sys.uu +redir.com: redir.com.uu + uudecode ${.CURDIR}/redir.com.uu + # Make sure the library names are defined. We want to specify the full # path to the standard crt0.o, and building two binaries in one directory # breaks the automatic generation of dependencies for binaries. diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1 index 6a31998672cc..ec1c1b92d69b 100644 --- a/usr.bin/doscmd/doscmd.1 +++ b/usr.bin/doscmd/doscmd.1 @@ -525,7 +525,19 @@ To change it to version 3.2 (the default in previous versions of .Nm doscmd ) use the value of .Cm 320 . -.El +.It Cm X11_FONT +The value of this variable determines the font used in an X window. +The default font is +.Cm vga , +which is installed in +.Pa /usr/libdata/doscmd/fonts . +Add the line +.Ql xset fp+ /usr/libdata/doscmd/fonts +to your +.Pa ${HOME}/.xsession +or +.Pa ${HOME}/.xinitrc +to let the X server find it. .Sh FILE TRANSLATION .Nm Doscmd translates diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c index 11665aa885d9..8b6727b832ed 100644 --- a/usr.bin/doscmd/doscmd.c +++ b/usr.bin/doscmd/doscmd.c @@ -132,6 +132,9 @@ main(int argc, char **argv) argc -= optind; argv += optind; + if (getenv("DISPLAY") != NULL) + xmode = 1; + if (vflag && debugf == stderr) { debugf = stdout; setbuf (stdout, NULL); |