use POSIX;
use IO::File;
use Getopt::Long;
+use File::Glob qw(:glob);
+use Data::Dumper;
+use IO::Pipe;
our $prefix="/usr/local";
our $package='xfonts-traditional';
our $sharedir="$prefix/share/$package";
-our @fontsdirs=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
+our @fontparentdirs=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
+our $donefile="$package.done";
+our $logfile="$package.log";
+our $fontprefix="trad--";
our @rulespath;
our $mode;
our %foundrymap;
return $cache{$key}=undef;
}
-sub processbdf ($$$) {
- my ($inbdf,$outbdf,$what) = @_;
+sub processbdf ($$$$) {
+ my ($inbdf,$outbdf,$logfile,$what) = @_;
my $state='idle';
my ($foundry,$font);
my ($w,$h,$xo,$yo,$y,$bitmap,$glyph);
}
if ($state eq 'idle' && m/^FONT\s+/) {
die if defined $font;
- return 0 unless m/^(FONT\s+)\-(\w+)\-/;
+ return (0,'simple font name') unless m/^(FONT\s+)\-(\w+)\-/;
$font = $foundrymap{lc $2};
return (0,'no foundry') unless defined $font;
$_ = "FONT -$font-$'";
die $! if $outbdf->error or !$outbdf->flush;
die unless $state eq 'idle';
if ($modified) {
- printf $reportfh "%s: %d glyphs changed\n", $what, $modified
+ printf $logfile "%s: %d glyphs changed\n", $what, $modified
or die $!;
} else {
- printf $reportfh "%s: unchanged - no rules matched\n", $what
+ printf $logfile "%s: unchanged - no rules matched\n", $what
or die $!;
}
return $modified;
die "no foundry maps\n" unless %foundrymap;
}
+sub processpcfgz ($$$$) {
+ my ($inpcfgz,$outpcfgz,$logfile,$what) = @_;
+
+ my $current = new IO::File $inpcfgz, '<' or die "$inpcfgz $!";
+ my ($usread,$uswrite);
+ my ($reader,$writer);
+ my @children;
+ foreach my $proc (['zcat'], ['pcf2bdf'], [],
+ ['bdftopcf'],['',qw(gzip -1)]) {
+ my $isfinal = (@$proc && $proc->[0] eq '');
+ if (!$isfinal) {
+ $reader = new IO::Handle or die $!;
+ $writer = new IO::Handle or die $!;
+ new IO::Pipe($reader,$writer) or die $!;
+ } else {
+ shift @$proc;
+ $reader = undef;
+ $writer = new IO::File $outpcfgz, '>' or die "$outpcfgz $!";
+ }
+ if (@$proc) {
+ my $exe = $proc->[0];
+ my $child = fork; defined $child or die $!;
+ if (!$child) {
+ open STDIN, '<&', $current or die $!;
+ open STDOUT, '>&', $writer or die $!;
+ if (!$isfinal) {
+ close $reader or die $!;
+ }
+ close $usread or die $! if $usread;
+ close $uswrite or die $! if $uswrite;
+ exec $exe @$proc or die "$exe $!";
+ }
+ push @children, [ $child, $exe, defined $usread ];
+ close $current or die $!;
+ close $writer or die $!;
+ $current = $reader;
+ } else {
+ $usread = $current;
+ $uswrite = $writer;
+ $current = $reader;
+ }
+ }
+ my $r = processbdf($usread,$uswrite,$logfile,$what);
+ my $none = $r !~ m/^\d/;
+ if ($none) {
+ flush $uswrite or die $!;
+ } else {
+ close $uswrite or die $!;
+ }
+ close $usread or die $!;
+ foreach my $chinfo (@children) {
+ my ($child,$exe,$isoutput)=@$chinfo;
+ my $sigok = 0;
+ if ($none) {
+ if ($isoutput) {
+ $sigok = 9;
+ kill 9, $child or die "$child $!";
+ } else {
+ $sigok = 13;
+ }
+ }
+ $!=0; waitpid($child, 0) == $child or die "$child $!";
+ !$? or ($?&~128)==$sigok or die "$exe [$child] $sigok $?";
+ }
+ return $r;
+}
+
+sub processfontdir ($) {
+ my ($fontdir) = @_;
+ if (!opendir FD, $fontdir) {
+ die "$fontdir $!" unless $!==&ENOENT;
+ return;
+ }
+ my $olddone = do "$fontdir/$donefile";
+ if (!$olddone) {
+ die "$fontdir $! $@ " unless $!==&ENOENT;
+ $olddone = { };
+ }
+ my $newdone = { };
+ my $log = new IO::File "$fontdir/$logfile", "w"
+ or die "$fontdir/$logfile $!";
+ my %outfiles; # bitmask: 1 /*exists*/ | 2 /*wanted*/
+ my $changed;
+ my $updated=0;
+
+ print $reportfh "processing $fontdir...\n" or die $!;
+ flush $reportfh or die $!;
+ while (my $dent = scalar readdir FD) {
+ if ($dent =~ m/^\Q$fontprefix\E.*\.new$/) {
+ unlink "$fontdir/$dent" or $!==&ENOENT or die "$fontdir $dent $!";
+ next;
+ }
+ next unless $dent =~ m/^[^.\/].*\.pcf\.gz$/;
+ if ($dent =~ m/^\Q$fontprefix/) {
+ $outfiles{$dent} |= 1;
+ next;
+ }
+ if (!stat "$fontdir/$dent") {
+ die "$fontdir $dent $!" unless $!==&ENOENT;
+ next;
+ }
+ die "$fontdir $dent" unless -f _;
+ my $stats = join ' ', ((stat _)[1,7,9,10]);
+ my $tdone = $olddone->{$dent};
+ my $outdent = $fontprefix.$dent;
+ if (defined $tdone && $tdone eq $stats) {
+ $outfiles{$outdent} |= 2;
+ $newdone->{$dent} = $stats;
+ next;
+ }
+
+ my $r = processpcfgz("$fontdir/$dent",
+ "$fontdir/$outdent.new",
+ $log, $dent);
+ if ($r !~ m/^\d/) {
+ printf $log "%s: unchanged - %s\n", $dent, $r;
+ unlink "$fontdir/$outdent.new" or die "$fontdir $outdent $!";
+ } else {
+ rename "$fontdir/$outdent.new", "$fontdir/$outdent"
+ or die "$fontdir $outdent $!";
+ $updated++;
+ $outfiles{$outdent} |= 3;
+ $changed = 1;
+ }
+ $newdone->{$dent} = $stats;
+ }
+ my $affected=0;
+ foreach my $olddent (keys %outfiles) {
+ my $state = $outfiles{$olddent};
+ if ($state & 2) {
+ $affected++ if $state & 1;
+ next;
+ }
+ unlink "$fontdir/$olddent" or die "$fontdir $olddent $!";
+ $changed = 1;
+ }
+ if (!%$newdone) {
+ unlink "$fontdir/$logfile" or die "$fontdir $!";
+ unlink "$fontdir/$donefile" or $!==&ENOENT or die "$fontdir $!";
+ } elsif ($changed) {
+ $!=0; $?=0; system 'mkfontdir',$fontdir;
+ die "$fontdir $? $!" if $? or $!;
+ my $newdoneh = new IO::File "$fontdir/$donefile.new", 'w'
+ or die "$fontdir $!";
+ print $newdoneh Dumper($newdone) or die "$fontdir $!";
+ close $newdoneh or die "$fontdir $!";
+ rename "$fontdir/$donefile.new","$fontdir/$donefile"
+ or die "$fontdir $!";
+ }
+ printf " processed %s: %d pcfs, %d affected, %d updated.\n",
+ $fontdir, (scalar keys %$newdone), $affected, $updated;
+}
+
our $stdin = new IO::File '<&STDIN' or die $!;
our $stdout = new IO::File '>&STDOUT' or die $!;
our $stderr = new IO::File '>&STDERR' or die $!;
die "no arguments allowed with --bdf-filter\n" if @ARGV;
$reportfh = $stderr;
loadfoundries();
- my $r = processbdf($stdin,$stdout,'stdin');
+ my $r = processbdf($stdin,$stdout,$reportfh,'stdin');
if ($r !~ m/^\d/) {
print STDERR "stdin not processed: $r\n";
exit 2;
}
});
+define_mode('process-pcf', sub {
+ die "need source and destination pcf.gz\n" if @ARGV!=2;
+ loadfoundries();
+ my $r = processpcfgz($ARGV[0],$ARGV[1],$reportfh,"pcf");
+ if ($r !~ m/^\d/) {
+ print STDERR "pcf not processed: $r\n";
+ exit 2;
+ }
+});
+
+define_mode('process-fontdir', sub {
+ die "need font dir(s)\n" unless @ARGV;
+ loadfoundries();
+ foreach my $d (@ARGV) {
+ processfontdir($d);
+ }
+});
+
Getopt::Long::Configure(qw(bundling));
GetOptions(@options) or exit 127;
~mdw / xfonts-traditional / blobdiff