keys: replace omni-present escape keys

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 936b811f08c0e1e66be0c22ff7f32f3133660959..2cbaffe4087f8da9db5c7e41394a25fb9d014229 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -84,18 +84,15 @@ sub print_key {
        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';
+               $flags = [$self->keyunalias($flags) . ' alias', $self->{sign}->{alias} . $flags];
        }
-       else {
-               $flags = $flags->[0];
+       my ($flags, $desc, $mnem) = @{$flags};
+       if (my $txt = $self->{key}->{$mode.$key}) {
+               ($desc, $mnem) = @{$txt};
        }
 
 #      $key = $keytrans{$key} if defined $keytrans{$key};
@@ -131,7 +128,7 @@ sub print_rows {
                my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
                printf qq{<li class="row row%d"><ul>\n}, $row+1;
-               for my $basemode ($row < 0 ? '' : @modes) {
+               for my $basemode (@modes) {
                        my @moderows = split /\s+/,
                                defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};