X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/79d144c6834749e1e61c8ed1a9a60c8e4cc30a0d..4d0dfd97b2708e809741ad853bff0bd000fcbb33:/Shiar_Sheet/Keyboard.pm diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index 936b811..aecd0bc 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); @@ -29,13 +29,11 @@ sub new { 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; } @@ -84,18 +82,17 @@ 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'; + 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}; @@ -114,7 +111,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
---|