Replace Windows font utility with native utilities

To generate new fonts, the freetype2 library is required. This
can now be specified by configure in the usual way. If it's missing,
new fonts cannot be generated.

3 files changed, 149 insertions, 1 deletions

diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index b55919fe..8da6cd96 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -1,3 +1,9 @@
+if USE_FREETYPE2
+  MKFV1_MAN = xrdp-mkfv1.8
+else
+  MKFV1_MAN =
+endif
+
 man_MANS = \
   xrdp-dis.1 \
   sesman.ini.5 \
@@ -8,7 +14,9 @@ man_MANS = \
   xrdp-keygen.8 \
   xrdp-sesadmin.8 \
   xrdp-sesman.8 \
-  xrdp-sesrun.8
+  xrdp-sesrun.8 \
+  xrdp-dumpfv1.8 \
+  $(MKFV1_MAN)
 
 EXTRA_DIST = $(man_MANS:=.in)
 
@@ -21,6 +29,7 @@ SUBST_VARS = sed \
    -e 's|@socketdir[@]|$(socketdir)|g' \
    -e 's|@sesmanruntimedir[@]|$(sesmanruntimedir)|g' \
    -e 's|@xrdpconfdir[@]|$(sysconfdir)/xrdp|g' \
+   -e 's|@xrdpdatadir[@]|$(datadir)/xrdp|g' \
    -e 's|@xrdphomeurl[@]|http://www.xrdp.org/|g'
 
 subst_verbose = $(subst_verbose_@AM_V@)
diff --git a/docs/man/xrdp-dumpfv1.8.in b/docs/man/xrdp-dumpfv1.8.in
new file mode 100644
index 00000000..a175e22a
--- /dev/null
+++ b/docs/man/xrdp-dumpfv1.8.in
@@ -0,0 +1,58 @@
+.TH "xrdp-dumpfv1" "8" "@PACKAGE_VERSION@" "xrdp team"
+.SH NAME
+xrdp\-dumpfv1 \- Display content of .fv1 font files
+
+.SH SYNOPSIS
+\fBxrdp-dumpfv1\fR [ options ] fv1_file
+
+.SH DESCRIPTION
+\fBxrdp\-dumpfv1\fP can be used to display the contents of an fv1 file.
+
+.SH OPTIONS
+A summary of options is included below.
+
+One of \fB\-i\fR, \fB\-t\fR, or \fB\-c\fR must be specified.
+.TP
+\fB\-i\fR
+Displays general information about the fv1 file.
+
+.TP
+\fB\-t\fR
+Displays a CSV table of all the glyphs in the font. This table can be
+imported into a spreadsheet program for further manipulation.
+
+.TP
+\fB\-c\fR <character>
+Displays detailed information about a particular glyph in the font,
+including a representation of the bitmap for the glyph.
+
+Specify the character using one of the following strings:
+
+\fBU+<hex>\fR - Unicode character, e.g. \fBU+25\fR for a percentage symbol (%).
+
+\fB@<char>\fR - Unicode character, e.g. \fB@%\fR for a percentage symbol.
+
+\fBnumber\fR - Unicode value as an integer, e.g. \fB37\fR for a
+percentage symbol
+
+Note that the row numbers shown in the font data are relative to the
+natural font baseline. If comparing two fonts, be aware that when the
+glyph is drawn, the row number may be affected by the global descender
+value for the font (displayed with \fB\-i\fR).
+
+.SH "EXAMPLES"
+.TP
+\fBxrdp\-dumpfv1 -i @xrdpdatadir@/sans-10.fv1\fR
+Displays global information about the sans 10 font file distributed with xrdp.
+
+.TP
+\fBxrdp\-dumpfv1 -c @'*' @xrdpdatadir@/sans-10.fv1\fR
+Displays information about the asterisk symbol in the sans 10 font file distributed with xrdp.
+
+.SH SEE ALSO
+.BR xrdp\-mkfv1(8).
+
+More info on \fBxrdp\fR can be found on the
+.UR @xrdphomeurl@
+xrdp homepage
+.UE
diff --git a/docs/man/xrdp-mkfv1.8.in b/docs/man/xrdp-mkfv1.8.in
new file mode 100644
index 00000000..10023e53
--- /dev/null
+++ b/docs/man/xrdp-mkfv1.8.in
@@ -0,0 +1,81 @@
+.TH "xrdp-mkfv1" "8" "@PACKAGE_VERSION@" "xrdp team"
+.SH NAME
+xrdp\-mkfv1 \- Create .fv1 font files from other font files
+
+.SH SYNOPSIS
+\fBxrdp-mkfv1\fR [ options ] font_file fv1_file
+
+.SH DESCRIPTION
+\fBxrdp\-mkfv1\fP can be used to convert a font file such as a TrueType
+font to a fv1 file.
+
+.SH OPTIONS
+A summary of options is included below.
+
+.TP
+\fB\-n\fR <font_name>
+Give the font a name, which is stored in the font header.
+
+The default is to use the font family name from the source font.
+
+.TP
+\fB\-p\fR <number>
+Set the point size of the font. A fixed DPI value of 96 is used for
+converting this value into a pixel size.
+
+The default value for this option is '10'.
+
+.TP
+\fB\-m\fR <glyph>
+Set the limit on the glyphs stored in the font file. The argument is the last
+glyph stored in the font file.
+
+Specify the glyph using one of the following strings:
+
+\fBU+<hex>\fR - Unicode character, e.g. \fBU+25\fR for a percentage symbol (%).
+
+\fB@<char>\fR - Unicode character, e.g. \fB@%\fR for a percentage symbol.
+
+\fBnumber\fR - Unicode value as an integer, e.g. \fB37\fR for a
+percentage symbol
+
+The default value for this option is 'U+4DFF'.
+
+.TP
+\fB\-C\fR
+When used with the "DejaVu Sans" font at a point-size of 10, a small
+number of glyphs are assigned a different x-offset than they have
+when the original Windows font generation program is used.
+
+This switch can be used to preserve the original x-offsets for glyphs in
+the range U+0020 - U+00FF when a 10 point DajaVu Sans font is generated.
+
+Use one of the following arguments to this option:-
+
+\fBauto\fR - Automatic mode. Offsets are preserved if a "DajaVu Sans" 10-point font is converted.
+
+\fBon / true / yes\fR - Preserve offsets if automatic font detection does not work.
+
+\fBoff / false / no\fR - Do not tamper with the offsets generated by the program.
+
+The default value of this switch is \fRauto\fR.
+
+To see the effects of this switch, set the \fBMKFV1_LOG_LEVEL\fR environment
+variable to \fBinfo\fR before running the program.
+
+.SH "EXAMPLES"
+.TP
+\fBxrdp-mkfv1 -p18 /path/to/DejaVuSans.ttf ./sans-18.fv1\fR
+Generate an 18-point Deja Sans font.
+
+.TP
+\fBxrdp-mkfv1 -C off -p10 /path/to/DejaVuSans.ttf ./sans-10.fv1\fR
+Generate a 10-point DajaVu Sans font using natural offsets.
+
+.SH SEE ALSO
+.BR xrdp\-dumpfv1(8).
+
+More info on \fBxrdp\fR can be found on the
+.UR @xrdphomeurl@
+xrdp homepage
+.UE