X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a0208e056389c8d9d21f9b0d8bf093e087809b21..adc1751d8423b078e9f0fb7c5cd88ec8cc9f6935:/Shiar_Sheet/Keyboard.pm diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index 58d7da2..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 = '1.02'; +our $VERSION = 'v2.03'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -22,18 +22,22 @@ my %keytrans = qw( ); sub new { - my $self = shift; - my ($keys) = @_; + my $class = shift; + my ($self) = @_; + + croak 'Invalid keyboard definitions specified' unless ref $self eq 'HASH'; + croak 'No key definitions specified' unless ref $self->{def} eq 'HASH'; + $self->{map} ||= 'qwerty'; - croak 'Invalid key table specified' unless ref $keys eq 'HASH'; my $parent = (caller)[0]; # calling module my $sign = do { no strict 'refs'; # temporarily allow variable references \%{ $parent.'::sign' }; # return %sign from parent }; croak "%${parent}::sign not found" unless %$sign; + $self->{sign} = $sign; - bless {sign => $sign, keys => $keys, map => 'qwerty'}, $self; + bless $self, $class; } sub map { @@ -68,78 +72,116 @@ sub keyunalias { $key =~ s/(\S*?)(\+?\^?\S)($|\s.*)/$2/; my $mode = $1; - my $keyinfo = $self->{keys}->{$mode}->{$key}; + my $keyinfo = $self->{def}->{$mode}->{$key}; - return [] unless defined $keyinfo; - return $keyinfo if ref $keyinfo; - return if $ancestry->{$key}++; # endless loop failsafe + return unless defined $keyinfo; + return $keyinfo->[0] if ref $keyinfo; + return '' if $ancestry->{$key}++; # endless loop failsafe return $self->keyunalias($keyinfo, $ancestry); } sub print_key { my $self = shift; - my ($mode, $key, $keyinfo) = @_; - - $keyinfo = [ $self->{sign}->{alias}.$keyinfo, $self->keyunalias($keyinfo)->[1] . ' alias' ] - if defined $keyinfo and not ref $keyinfo; # alias - my ($desc, $flags, $mnem) = @$keyinfo if defined $keyinfo; - defined $desc or $flags = $key eq '^0' ? 'ni' : 'no'; + my ($mode, $key, $flags) = @_; + + if (not defined $flags) { + $flags = [$key eq '^0' ? 'ni' : 'no']; + } + elsif (not ref $flags) { # alias + 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) = split /\n/, $txt; + } # $key = $keytrans{$key} if defined $keytrans{$key}; - my $keytxt = $mode . escapehtml($key) if $key ne '^0'; + my $keytxt = $key eq "\e" ? 'Esc' : $self->{def}{$mode}{lead} . escapehtml($key) if $key ne '^0'; $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments $keytxt .= "$self->{sign}->{motion}" if $flags =~ s/ ?\bargm\b//; # motion argument $keytxt =~ s{\^(?=.)}{^}; # element around ctrl-identifier - my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{keys}{$1} && sprintf( + $keytxt =~ s{\+(?=.)}{+}; # meta + my $keyhint = defined($mnem) && qq{ title="$mnem"}; + $keytxt = "$keytxt"; + $keytxt .= ' '.$desc if defined $desc; + $keytxt = qq{$keytxt} if $flags =~ s/ ?\blink(\S*)//; + my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $self->{def}{$1} && sprintf( ' onclick="setmode(%s)"', $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1)) ); - $onclick .= sprintf(q{ onclick="document.location='%s'"}, $1) - if $flags =~ s/ ?\blink(\S*)//; - my $keyhint = defined($mnem) && qq{ title="$mnem"}; + $flags .= ' chr'.ord(substr $key, -1) if $key ne '^0'; - print qq{\t\t
  • $keytxt}; - print ' ', $desc if defined $desc; + print qq{\t\t$keytxt}; print "\n"; } sub print_rows { my $self = shift; - my $static = shift; - my @moderows = $static ? split(/\s+/, $static) : sort keys %{ $self->{keys} }; + my %moderows = ( + -DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift), + # plus specific mode overrides prefixed by '=' + ); + my $defrows = shift || [2, 1, 0]; + my @modes = sort keys %{ $self->{def} }; + + print ''."\n\n"; - for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) { - my $keyrow = $keyrows{$self->{map}}->[$row]; + for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) { + my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row]; - print qq{
    • \n}; - for my $modefull (@moderows) { - my $mode = $modefull; - my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$// - ? (map {$_ - 1} split //, $row == 0 && $2 || $1) : (2, 1, 0); - my $modekeys = $self->{keys}{$mode}; + printf qq{
    • \n}, $row+1; + for my $basemode (@modes) { + my @moderows = split /\s+/, + $row < 0 ? "0" : + defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT}; - for my $case (@showcase) { + for my $submode (@moderows ? @moderows : '') { + my $mode = $basemode . $submode; + my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$// + ? (map {$_ - 1} split //, $row == 0 && $2 || $1) # user override + : @$defrows; # default + my $modekeys = $self->{def}{$mode}; + + for my $case (@caserows) { my $keycase = $keyrow->[$case] or next; @$keycase or next; + my @caseclass; + push @caseclass, 'mode', 'mode'.escapeclass($basemode) if $basemode ne ''; + push @caseclass, 'lead' if defined $modekeys->{lead}; # leading command key shown + push @caseclass, $casedesc[$case] if defined $casedesc[$case]; - printf "\t", $mode ne '' && sprintf( - ' class="%s"', ($static ? '' : 'mode ') . 'mode' . escapeclass($mode) + printf "\t", @caseclass > 0 && sprintf( + ' class="%s"', join ' ', @caseclass ); - printf("

    %s: %s

    \n", # XXX insert   here to fix msie<=6 - $modekeys->{desc} || "mode $mode", + printf('    ', # XXX insert   here to fix msie<=6 + $self->{mode}->{$mode} || "mode $basemode", "$rowdesc[$row] row $casedesc[$case]" - ); - my $caseclass = 'keys'; - $caseclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown - $caseclass .= " $casedesc[$case]" if defined $casedesc[$case]; - print qq{\t\t
      \n}; - $self->print_key($modekeys->{lead}, $_, $modekeys->{$_}) for @$keycase; - print qq{\t\t
    \n}; + ) unless $row < 0; + print "\n"; + $self->print_key($mode, $_, $modekeys->{$_}) for @$keycase; + print qq{\t\t\n}; } # case - } # mode - print qq{\t\n}; + } # submode + + } # basemode + print qq{\t\n}; } # row + + print "
    %s: %s
    \n"; +} + +sub print_legend { + my $self = shift; + my ($class, $flags) = @_; + + print qq{\t\t
    \n}; + printf("\t\t".'
    %s'."\n\t\t\t".'
    %s'."\n", + $_, @{ $self->{flag}->{$_} || ["($_)", '...'] } + ) for @$flags; + print "\t\t
    "; } 1; @@ -153,10 +195,17 @@ Shiar_Sheet::Keyboard - Output HTML for key sheets our %sign = (alias => 'see: '); my $keys = Shiar_Sheet::Keyboard({ - 'mode' => { - desc => 'mode description', - 'A' => 'a', # alias - 'a' => ['description', 'classes', 'comments (on hover)'], + def => { + 'lead' => { + 'A' => 'a', # alias + 'a' => ['classes'], + }, + }, + key => { + 'leada' => ['description', 'comments (on hover)'], + }, + mode => { + 'lead' => 'mode description', }, }); $keys->map('dvorak') or die "Keyboard map not found";