normal link tags to refer keys to other pages

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 05df1070020df3d3b889d3e5681aad69b474eceb..cca8333547d448d2dfbe98a34289d38bbf08da8c 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -5,7 +5,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
-our $VERSION = '1.03';
+our $VERSION = 'v1.05';
 
 my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
 my @rowdesc = qw(numeric top home bottom);
@@ -91,44 +91,53 @@ sub print_key {
           $keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//;  # motion argument
           $keytxt =~ s{\^(?=.)}{<small>^</small>};  # element around ctrl-identifier
           $keytxt =~ s{\+(?=.)}{<small>+</small>};  # meta
+       my $keyhint = defined($mnem) && qq{ title="$mnem"};
+          $keytxt  = "<b$keyhint>$keytxt</b>";
+          $keytxt .= ' '.$desc if defined $desc;
+          $keytxt = qq{<a href="/$1">$keytxt</a>} if $flags =~ s/ ?\blink(\S*)//;
        my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{keys}{$1} && sprintf(
                ' onclick="setmode(%s)"',
                $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
        );
-       $onclick .= sprintf(q{ onclick="document.location='%s'"}, $1)
-               if $flags =~ s/ ?\blink(\S*)//;
-       my $keyhint = defined($mnem) && qq{ title="$mnem"};
        $flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
 
-       print qq{\t\t<li class="$flags"$onclick><b$keyhint>$keytxt</b>};
-       print ' ', $desc if defined $desc;
+       print qq{\t\t<li class="$flags"$onclick>$keytxt};
        print "\n";
 }
 
 sub print_rows {
        my $self = shift;
-       my $static = shift;
-       my @moderows = $static ? split(/\s+/, $static) : sort keys %{ $self->{keys} };
+       my %moderows = (
+               -DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+               # plus specific mode overrides prefixed by '='
+       );
+       my $defrows = shift || [2, 1, 0];
+       my @modes = sort keys %{ $self->{keys} };
 
        for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
                my $keyrow = $keyrows{$self->{map}}->[$row];
 
                print qq{<li class="row row$row"><ul>\n};
-               for my $modefull (@moderows) {
-                       my $mode = $modefull;
-                       my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$//
-                               ? (map {$_ - 1} split //, $row == 0 && $2 || $1) : (2, 1, 0);
+               for my $basemode (@modes) {
+                       my @moderows = split /\s+/,
+                               defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
+
+               for my $submode (@moderows ? @moderows : '') {
+                       my $mode = $basemode . $submode;
+                       my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$//
+                               ? (map {$_ - 1} split //, $row == 0 && $2 || $1)  # user override
+                               : @$defrows;  # default
                        my $modekeys = $self->{keys}{$mode};
 
-                       for my $case (@showcase) {
+                       for my $case (@caserows) {
                                my $keycase = $keyrow->[$case] or next;
                                  @$keycase or next;
 
-                               printf "\t<li%s>", $mode ne '' && sprintf(
-                                       ' class="%s"', ($static ? '' : 'mode ') . 'mode' . escapeclass($mode)
+                               printf "\t<li%s>", $basemode ne '' && sprintf(
+                                       ' class="%s"', 'mode mode' . escapeclass($basemode)
                                );
                                printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6
-                                               $modekeys->{desc} || "mode $mode",
+                                               $modekeys->{desc} || "mode $basemode",
                                                "$rowdesc[$row] row $casedesc[$case]"
                                );
                                my $caseclass = 'keys';
@@ -139,7 +148,9 @@ sub print_rows {
                                print qq{\t\t</ul>\n};
                        } # case
 
-               } # mode
+               } # submode
+
+               } # basemode
                print qq{\t</ul>\n};
        } # row
 }