git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce5eed3
)
termcol: support multiple images
author
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 2 Nov 2015 17:21:22 +0000
(18:21 +0100)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Tue, 5 Jan 2016 00:05:07 +0000
(
01:05
+0100)
termcol.plp
patch
|
blob
|
history
diff --git
a/termcol.plp
b/termcol.plp
index 748625cae0636f5b67ec90a2405fb3b72a4873ae..affceb936df03e1c53667f8e17b18c7ead2ec4cc 100644
(file)
--- a/
termcol.plp
+++ b/
termcol.plp
@@
-14,7
+14,8
@@
Html({
stylesheet => [qw'light dark'],
});
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';
my @termlist;
push @termlist, split /\W+/, $ENV{PATH_INFO} || 'default';
@@
-73,15
+74,17
@@
sub colcell {
}
sub img_egapal {
}
sub img_egapal {
- my ($palette) = @_;
+ my ($palette
, $imgfile, $reindex
) = @_;
return eval {
require Imager;
require MIME::Base64;
my @imgpal = map { Imager::Color->new(ref $_ ? @$_ : $_) } @{$palette};
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.$/;
or die Imager->errstr.$/;
+
do {
if ($reindex) {
$img->to_paletted({
do {
if ($reindex) {
$img->to_paletted({
@@
-138,7
+141,7
@@
for my $term (@termlist) {
print '<tr>', colcell($name, $rgb);
}
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";
}
}
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 @palette = map { [ @{$_}[1 .. 3] ] } @greymap, map {@$_} map {@$_} @colmap;
- my $imgdata = img_egapal(\@palette);
my $tablespan = scalar map { @$_ } @colmap;
my $tablespan = scalar map { @$_ } @colmap;
+ my $imgdata = img_egapal(\@palette, @{ $draw[0] });
$out .= "<tr><td colspan=$tablespan>$imgdata";
}
$out .= "<tr><td colspan=$tablespan>$imgdata";
}