keyboard: resupport key texts after definition flags

[sheet.git] / Shiar_Sheet / Keyboard.pm

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 936b811f08c0e1e66be0c22ff7f32f3133660959..c5ab0167c0877b7a6ce20acbadc595c48afb6fe0 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 $self = shift;
        my ($mode, $key, $flags) = @_;
 

-       my $txt = $self->{key}->{$mode.$key};
-       my ($desc, $mnem) = defined $txt ? @$txt : ();
-

        if (not defined $flags) {
        if (not defined $flags) {

-               $flags = $key eq '^0' ? 'ni' : 'no';
+               $flags = [$key eq '^0' ? 'ni' : 'no'];

        }
        elsif (not ref $flags) { # alias
        }
        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};
        }
 
 #      $key = $keytrans{$key} if defined $keytrans{$key};