X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/16fb9fc2233f3a3c0b61aee034da4c49979e30c2..c1032338b64b1cec81af6139847d69089acfa69d:/termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 04157ef..51efa0a 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -14,14 +14,15 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
-my $imgfile = exists $get{img} && 'indi.png';
+my @draw = map { [$_, s/\W+\z//] } grep { $_ } split m(/),
+	$get{img} // exists $get{img} && 'indi.png';
 
 my @termlist;
 push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
 
 my %termgroup = (
 	default => [qw( ansi xkcd ansi88 )],
-	more    => [qw( ansi legacy ansi256 )],
+	more    => [qw( ansi mirc legacy ansi256 )],
 	msx     => [qw( msx1 msx2 arnejmp )],
 	ansi    => [qw( cga xterm tango app html )],
 	legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
@@ -45,7 +46,7 @@ print
 <div class="section">
 <:
 use 5.010;
-use Shiar_Sheet::Colour '1.03';
+use Shiar_Sheet::Colour '1.04';
 use List::Util qw( min max );
 
 my $palettes = do 'termcol.inc.pl';
@@ -73,22 +74,32 @@ sub colcell {
 }
 
 sub img_egapal {
-	my ($palette) = @_;
+	my ($palette, $imgfile, $reindex) = @_;
 	return eval {
+		require Imager;
 		require MIME::Base64;
-		require Digest::CRC;
-
-		local $/;
-		open my $img, '<:bytes', "data/$imgfile" or die "$!\n";
-		my $imgdata = readline $img;
-
-		my $offset = 0x29 - 4;
-		my $len = 16 * 3;
-		my $chunklen = $len + 4;
-		substr($imgdata, $offset+4, $len) = pack 'H*', join '', @{$palette};
-		my ($p, $crc) = unpack "x${offset}a${chunklen}N", $imgdata;
-		substr($imgdata, $offset+4+$len, 4) = pack 'N', Digest::CRC::crc32($p);
 
+		my @imgpal = map { Imager::Color->new(ref $_ ? @$_ : $_) } @{$palette};
+		state $imgcache = {};
+		my $img = $imgcache->{$imgfile}
+			//= Imager->new(file => "data/palimage/$imgfile")
+			or die Imager->errstr.$/;
+
+		do {
+			if ($reindex) {
+				$img->to_paletted({
+					make_colors => 'none',
+					colors => \@imgpal,
+					translate => 'closest',
+				});
+			}
+			else {
+				@{[ $img->getcolors ]} == @imgpal
+					or die "incompatible palette size\n";
+				$img->setcolors(colors => \@imgpal);
+				$img;
+			}
+		}->write(data => \my $imgdata, type => 'png');
 		return sprintf '<img src="data:image/png;base64,%s">',
 			MIME::Base64::encode_base64($imgdata);
 	} || $@;
@@ -124,13 +135,13 @@ for my $term (@termlist) {
 		printf "<caption>%s</caption>\n", $caption;
 		for my $num (0 .. $#{$colours}) {
 			my ($rgb, $name) = split /:/, $colours->[$num], 3;
-			$name ||= $num;
+			$name //= $num;
 			$name = [ $name, [] ] if $term =~ /^msx/ and !$num;
 			$name = [ $name, ['#333'] ] if $term eq 'xkcd';
 			print '<tr>', colcell($name, $rgb);
 		}
 
-		print '<tr><td>', img_egapal(\@{$colours}) if $imgfile;
+		print '<tr><td>', img_egapal(\@{$colours}, @{$_}) for @draw;
 		print "</table>\n\n";
 	}
 }
@@ -143,31 +154,28 @@ sub coltable_hsv {
 	my $smax = $dim - 1;
 	$rgbval ||= sub { join('', @_), map { int $_ * 255 / $vmax } @_ };
 
-	my %greymap;  # name => value
+	my @greymap = @{$greyramp || []};  # [name, r, g=l, b]
 	my @colmap;  # saturation => value => hue => [name, r,g,b]
-	my $offset = 16 * ($dim > 3);
 
 	for my $r (0 .. $dim - 1) {
 		for my $g (0 .. $dim - 1) {
 			for my $b (0 .. $dim - 1) {
 				my @rgb = ($r, $g, $b);
 
-				my $h = Shiar_Sheet::Colour->new(@rgb)->hue * $hmax;
-				my $v = max(@rgb);
-				my $s = abs(min(@rgb) - max(@rgb));
+				my ($h, $s, $v) = Shiar_Sheet::Colour->new(@rgb)->hsv;
 
 				if (!$s) {
-					if ($greyramp) {
-						my ($index, $l) = $rgbval->(@rgb);
-						$greymap{$index} = $l;
+					if (@greymap) {
+						push @greymap, [ $rgbval->(@rgb) ];
 						next;
 					}
 
-					$h = $hmax;  # greyscale hue
+					$h = 1;  # greyscale hue
 					$s = 1;  # lowest saturation for other hues
 					$v = $s = $vmax if !$v;  # black at full saturation
 				}
 
+				$h *= $hmax;
 				$v = $vmax - $v;
 				$s = $smax - $s - $v;
 
@@ -184,25 +192,20 @@ sub coltable_hsv {
 		$out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
 	}
 
-	if ($greyramp) {
-		$offset += $dim ** 3;
-		$greymap{$offset++} = $_ for @{$greyramp};
-	}
-
-	if (%greymap) {
+	if (@greymap) {
 		$out .= '<tbody>';
 		my $col = 0;
 		my $colbreak = scalar map { @$_ } @colmap;  # same width as hue rows
-		for my $num (sort { $greymap{$a} <=> $greymap{$b} } keys %greymap) {
+		for my $cell (sort { $a->[1] <=> $b->[1] || $a->[0] <=> $b->[0] } @greymap) {
 			$out .= '<tr>' unless $col++ % $colbreak;
-			$out .= colcell($num, ($greymap{$num}));
+			$out .= colcell(@{$cell});
 		}
 	}
 
-	if ($imgfile) {
-		my @palette = map { [ @{$_}[1 .. 3] ] } map {@$_} map {@$_} @colmap;
-		my $imgdata = img_egapal(\@palette);
+	if (@draw) {
+		my @palette = map { [ @{$_}[1 .. 3] ] } @greymap, map {@$_} map {@$_} @colmap;
 		my $tablespan = scalar map { @$_ } @colmap;
+		my $imgdata = img_egapal(\@palette, @{ $draw[0] });
 		$out .= "<tr><td colspan=$tablespan>$imgdata";
 	}