package Shiar_Sheet::Keyboard;
+use 5.010;
use strict;
use warnings;
no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = 'v2.02';
+our $VERSION = 'v2.05';
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.04);
+ \%Shiar_Sheet::KeySigns::sign;
};
- croak "%${parent}::sign not found" unless %$sign;
- $self->{sign} = $sign;
bless $self, $class;
}
return $_;
}
+sub escapedesc {
+ my $self = shift;
+ local $_ = shift;
+ s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg;
+ return $_;
+}
+
sub keyunalias {
my $self = shift;
my ($key, $ancestry) = @_;
my $keyinfo = $self->{def}->{$mode}->{$key};
return unless defined $keyinfo;
- return $keyinfo->[0] if ref $keyinfo;
+ $keyinfo =~ s/^=// or return $keyinfo;
return '' if $ancestry->{$key}++; # endless loop failsafe
return $self->keyunalias($keyinfo, $ancestry);
}
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
+ my ($desc, $mnem);
if (not defined $flags) {
- $flags = [$key eq '^0' ? 'ni' : 'no'];
+ $flags = $key eq '^0' ? 'ni' : 'no';
}
- elsif (not ref $flags) { # alias
- my $desc = $self->{sign}->{alias};
+ elsif ($flags =~ s/^=//) { # alias
+ $desc = $self->{sign}->{alias};
$desc .= $flags eq "\e" ? 'esc' : $flags;
- $flags = [$self->keyunalias($flags) . ' alias', $desc];
+ $flags = $self->keyunalias($flags) . ' alias';
}
- my ($flags, $desc, $mnem) = @{$flags};
if (my $txt = $self->{key}->{$mode.$key}) {
- ($desc, $mnem) = @{$txt};
+ ($desc, $mnem) = split /\n/, $self->escapedesc($txt);
}
# $key = $keytrans{$key} if defined $keytrans{$key};
sub print_rows {
my $self = shift;
my %moderows = (
- -DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+ -DEFAULT => !!@_ && $_[0] ne '' && split(/(?:\s*([^=\s]*)=\s*)/, shift),
# plus specific mode overrides prefixed by '='
);
my $defrows = shift || [2, 1, 0];
' class="%s"', join ' ', @caseclass
);
printf('<th>%s<small>: %s</small></th>', # XXX insert here to fix msie<=6
- $self->{mode}->{$mode} || "mode $basemode",
+ $self->escapedesc($self->{mode}->{$mode} || "mode $basemode"),
"$rowdesc[$row] row $casedesc[$case]"
) unless $row < 0;
print "\n";
print qq{\t\t<dl class="legend $class">\n};
printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\n",
- $_, @{ $self->{flag}->{$_} || ["($_)", '...'] }
+ $_, map { $self->escapedesc($_) } @{ $self->{flag}->{$_} || ["($_)", '...'] }
) for @$flags;
print "\t\t</dl>";
}
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
- 'A' => 'a', # alias
- 'a' => ['classes'],
+ 'A' => '=a', # alias
+ 'a' => 'classes',
},
},
key => {