From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 2 Nov 2015 17:21:22 +0000 (+0100)
Subject: termcol: support multiple images
X-Git-Tag: v1.9~65
X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/36cc824ce76ec496c1eecfa33d2d3c8957e84951

termcol: support multiple images
---

diff --git a/termcol.plp b/termcol.plp
index 748625c..affceb9 100644
--- a/termcol.plp
+++ b/termcol.plp
@@ -14,7 +14,8 @@ Html({
 	stylesheet => [qw'light dark'],
 });
 
-my $imgfile = $get{img} // 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';
@@ -73,15 +74,17 @@ sub colcell {
 }
 
 sub img_egapal {
-	my ($palette) = @_;
+	my ($palette, $imgfile, $reindex) = @_;
 	return eval {
 		require Imager;
 		require MIME::Base64;
 
 		my @imgpal = map { Imager::Color->new(ref $_ ? @$_ : $_) } @{$palette};
-		state $reindex = $imgfile =~ s/!$//;
-		state $img = Imager->new(file => "data/palimage/$imgfile")
+		state $imgcache = {};
+		my $img = $imgcache->{$imgfile}
+			//= Imager->new(file => "data/palimage/$imgfile")
 			or die Imager->errstr.$/;
+
 		do {
 			if ($reindex) {
 				$img->to_paletted({
@@ -138,7 +141,7 @@ for my $term (@termlist) {
 			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";
 	}
 }
@@ -199,10 +202,10 @@ sub coltable_hsv {
 		}
 	}
 
-	if ($imgfile) {
+	if (@draw) {
 		my @palette = map { [ @{$_}[1 .. 3] ] } @greymap, map {@$_} map {@$_} @colmap;
-		my $imgdata = img_egapal(\@palette);
 		my $tablespan = scalar map { @$_ } @colmap;
+		my $imgdata = img_egapal(\@palette, @{ $draw[0] });
 		$out .= "<tr><td colspan=$tablespan>$imgdata";
 	}