X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5e459bbed48de06b1896f0ea685707a9ed66125a..b485ba4f63ebd10b905cd68e37cad8a5de3a0624:/Shiar_Sheet/Keyboard.pm?ds=sidebyside diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index c5ab016..e8e33aa 100644 --- 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 = 'v2.02'; +our $VERSION = 'v2.03'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -88,11 +88,13 @@ sub print_key { $flags = [$key eq '^0' ? 'ni' : 'no']; } elsif (not ref $flags) { # alias - $flags = [$self->keyunalias($flags) . ' alias', $self->{sign}->{alias} . $flags]; + my $desc = $self->{sign}->{alias}; + $desc .= $flags eq "\e" ? 'esc' : $flags; + $flags = [$self->keyunalias($flags) . ' alias', $desc]; } my ($flags, $desc, $mnem) = @{$flags}; if (my $txt = $self->{key}->{$mode.$key}) { - ($desc, $mnem) = @{$txt}; + ($desc, $mnem) = split /\n/, $txt; } # $key = $keytrans{$key} if defined $keytrans{$key}; @@ -111,7 +113,7 @@ sub print_key { ); $flags .= ' chr'.ord(substr $key, -1) if $key ne '^0'; - print qq{\t\t
%s: %s | ', # XXX insert here to fix msie<=6 $self->{mode}->{$mode} || "mode $basemode", "$rowdesc[$row] row $casedesc[$case]" ) unless $row < 0; print "\n"; - my $caseclass = 'keys'; - $caseclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown - $caseclass .= " $casedesc[$case]" if defined $casedesc[$case]; - print qq{\t\t
---|