no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = 'v2.01';
+our $VERSION = 'v2.03';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
croak 'No key definitions specified' unless ref $self->{def} eq 'HASH';
$self->{map} ||= 'qwerty';
- my $parent = (caller)[0]; # calling module
- my $sign = do {
- no strict 'refs'; # temporarily allow variable references
- \%{ $parent.'::sign' }; # return %sign from parent
+ $self->{sign} ||= do {
+ require Shiar_Sheet::KeySigns;
+ Shiar_Sheet::KeySigns->VERSION(1.03);
+ \%Shiar_Sheet::KeySigns::sign;
};
- croak "%${parent}::sign not found" unless %$sign;
- $self->{sign} = $sign;
bless $self, $class;
}
my $self = shift;
my ($mode, $key, $flags) = @_;
- my $txt = $self->{key}->{$mode.$key};
- my ($desc, $mnem) = defined $txt ? @$txt : ();
-
if (not defined $flags) {
- $flags = $key eq '^0' ? 'ni' : 'no';
+ $flags = [$key eq '^0' ? 'ni' : 'no'];
}
elsif (not ref $flags) { # alias
- $desc = $self->{sign}->{alias} . $flags;
- $flags = $self->keyunalias($flags) . ' alias';
+ my $desc = $self->{sign}->{alias};
+ $desc .= $flags eq "\e" ? 'esc' : $flags;
+ $flags = [$self->keyunalias($flags) . ' alias', $desc];
}
- else {
- $flags = $flags->[0];
+ my ($flags, $desc, $mnem) = @{$flags};
+ if (my $txt = $self->{key}->{$mode.$key}) {
+ ($desc, $mnem) = split /\n/, $txt;
}
# $key = $keytrans{$key} if defined $keytrans{$key};
- my $keytxt = $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
+ my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0';
$keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments
$keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//; # motion argument
$keytxt =~ s{\^(?=.)}{<small>^</small>}; # element around ctrl-identifier
);
$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
- print qq{\t\t<li class="$flags"$onclick>$keytxt};
+ print qq{\t\t<td class="$flags"$onclick>$keytxt};
print "\n";
}
my $defrows = shift || [2, 1, 0];
my @modes = sort keys %{ $self->{def} };
- for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
- my $keyrow = $keyrows{$self->{map}}->[$row];
+ print '<table id="rows" class="keys">'."\n\n";
+
+ for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
+ my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
- print qq{<li class="row row$row"><ul>\n};
+ printf qq{<tbody class="row row%d">\n}, $row+1;
for my $basemode (@modes) {
my @moderows = split /\s+/,
+ $row < 0 ? "0" :
defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
for my $submode (@moderows ? @moderows : '') {
for my $case (@caserows) {
my $keycase = $keyrow->[$case] or next;
@$keycase or next;
+ my @caseclass;
+ push @caseclass, 'mode', 'mode'.escapeclass($basemode) if $basemode ne '';
+ push @caseclass, 'lead' if defined $modekeys->{lead}; # leading command key shown
+ push @caseclass, $casedesc[$case] if defined $casedesc[$case];
- printf "\t<li%s>", $basemode ne '' && sprintf(
- ' class="%s"', 'mode mode' . escapeclass($basemode)
+ printf "\t<tr%s>", @caseclass > 0 && sprintf(
+ ' class="%s"', join ' ', @caseclass
);
- printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert here to fix msie<=6
+ printf('<th>%s<small>: %s</small></th>', # XXX insert here to fix msie<=6
$self->{mode}->{$mode} || "mode $basemode",
"$rowdesc[$row] row $casedesc[$case]"
- );
- my $caseclass = 'keys';
- $caseclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown
- $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
- print qq{\t\t<ul class="$caseclass">\n};
+ ) unless $row < 0;
+ print "\n";
$self->print_key($mode, $_, $modekeys->{$_}) for @$keycase;
- print qq{\t\t</ul>\n};
+ print qq{\t\t</tr>\n};
} # case
} # submode
} # basemode
- print qq{\t</ul>\n};
+ print qq{\t</tbody>\n};
} # row
+
+ print "</table>\n";
}
sub print_legend {