termcol: declare and include cgarne

[sheet.git] / termcol.plp

diff --git a/termcol.plp b/termcol.plp
index 267d5a74a7821f4bfd5a54aba6c420a0c2b55589..850ff83e9ccaf98bc67aef81593b70f592d77088 100644 (file)
--- 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';
@@ -23,7 +24,7 @@ my %termgroup = (
        default => [qw( ansi xkcd ansi88 )],
        more    => [qw( ansi mirc legacy ansi256 )],
        msx     => [qw( msx1 msx2 arnejmp )],
-       ansi    => [qw( cga xterm tango app html )],
+       ansi    => [qw( cga xterm tango app html cgarne )],
        legacy  => [qw( c64 msx2 mac2 risc arnegame cpc )],
 );
 @{$_} = map { $termgroup{$_} ? @{ $termgroup{$_} } : $_ } @{$_}
@@ -45,8 +46,9 @@ 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 );
+use POSIX qw( ceil );
 
 my $palettes = do 'termcol.inc.pl';
 die "Cannot open palette data: $_\n" for $@ || $! || ();
@@ -73,15 +75,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({
@@ -123,26 +127,56 @@ for my $term (@termlist) {
                print "</table>\n\n";
        }
 
-       if (my $colours = $info->{list}) {
-               if (my $reorder = $info->{ansiorder} and $get{v}) {
-                       $colours = [ map { $colours->[$_] =~ s/:|$/:$_/r } @{$reorder} ];
+       if (my $table = $info->{table}) {
+               print '<table class="color mapped">'."\n";
+               printf "<caption>%s</caption>\n", $caption;
+               for my $row (@$table) {
+                       print '<tr>';
+                       print colcell(@$_) for @$row;
                }
+               print "</table>\n\n";
+       }
+
+       if (my $palette = $info->{list}) {
+               my $order = $get{order} && $get{order}.'order';
+               my $colours = colorder($palette,
+                       $info->{$order} // $palettes->{ $info->{parent} }->{$order}
+               );
+
+               my $rows = 8;
+               my $columns = ceil(@{$palette} / $rows);
 
                print '<table class=color>', "\n";
                printf "<caption>%s</caption>\n", $caption;
-               for my $num (0 .. $#{$colours}) {
-                       my ($rgb, $name) = split /:/, $colours->[$num], 3;
-                       $name ||= $num;
-                       $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
-                       $name = [ $name, ['#333'] ] if $term eq 'xkcd';
-                       print '<tr>', colcell($name, $rgb);
+               for my $row (0 .. $rows - 1) {
+                       print '<tr>';
+                       for my $col (0 .. $columns - 1) {
+                               my $num = $row + $col * $rows;
+                               my ($rgb, $name) = split /:/, $colours->[$num], 3;
+                               $name //= $rgb && $num;
+                               $name = [ $name, [] ] if $term =~ /^msx/ and !$num;
+                               $name = [ $name, ['#333'] ] if $term eq 'xkcd';
+                               print colcell($name, $rgb);
+                       }
                }
 
-               print '<tr><td>', img_egapal(\@{$colours}) if $imgfile;
+               for (@draw) {
+                       my $imgpal = colorder($palette,
+                               $info->{ansiorder} // $palettes->{ $info->{parent} }->{ansiorder}
+                       );
+                       print "<tr><td colspan=$columns>", img_egapal($imgpal, @{$_});
+               }
                print "</table>\n\n";
        }
 }
 
+sub colorder {
+       my ($palette, $reorder) = @_;
+       return [ map { $palette->[$_] =~ s/:(?![^:])|$/:$_/r } @{$reorder} ]
+               if $reorder;
+       return $palette;
+}
+
 sub coltable_hsv {
        my ($dim, $rgbval, $greyramp) = @_;
 
@@ -159,9 +193,7 @@ sub coltable_hsv {
                        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 (@greymap) {
@@ -169,11 +201,13 @@ sub coltable_hsv {
                                                next;
                                        }
 
-                                       $h = $hmax;  # greyscale hue
-                                       $s = 1;  # lowest saturation for other hues
-                                       $v = $s = $vmax if !$v;  # black at full saturation
+                                       $h = 1;  # greyscale hue
+                                       $s = $smax - $v + 1;  # spread brightness over saturation groups
+                                       $v &&= $smax  # highest saturation
+                                               or $v = $s = 1;  # black at initial column
                                }
 
+                               $h *= $hmax;
                                $v = $vmax - $v;
                                $s = $smax - $s - $v;
 
@@ -187,7 +221,7 @@ sub coltable_hsv {
        my $huerow = $colmap[0][0]; # first {$_} map { @{$_} } @colmap;
        for my $h (grep { $huerow->[$_] } 0 .. $#{$huerow}) {
                $out .= '<tr>';
-               $out .= colcell(@$_) for map { $_->[$h] } map { @{$_} } @colmap;
+               $out .= colcell(@$_) for map { $_->[$h] } map { reverse @{$_} } @colmap;
        }
 
        if (@greymap) {
@@ -200,10 +234,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";
        }