X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/32a6cc3086f1c4ff99aadd88c976fe854a3fd826..14080bda5528468fe4dbc5ae3b1a3c62c47a5806:/Shiar_Sheet/Keyboard.pm?ds=sidebyside diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm index 98c5a40..327b20c 100644 --- a/Shiar_Sheet/Keyboard.pm +++ b/Shiar_Sheet/Keyboard.pm @@ -6,7 +6,7 @@ use warnings; no warnings 'uninitialized'; # save some useless checks for more legible code use Carp; -our $VERSION = '2.07'; +our $VERSION = '2.10'; my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta'); my @rowdesc = qw(numeric top home bottom); @@ -56,6 +56,7 @@ sub escapeclass { s/\+/_m/g; s/\[/_sbo/g; s/\]/_sbc/g; + s/\\/_b/g; s/^$/_/; return $_; } @@ -110,18 +111,18 @@ sub print_key { if (not defined $flags) { $flags = $key eq '^0' ? 'ni' : 'no'; } - elsif ($flags =~ s/^=//) { # alias - $desc = $self->{sign}->{alias}; - $desc .= $flags eq "\e" ? 'esc' : $flags; - $flags = $self->keyunalias($flags) . ' alias'; + elsif ($flags =~ s/^=(\S+)\s?//) { # alias + my $ref = $1; + $desc = $self->{sign}->{alias} . ($ref eq "\e" ? 'esc' : $ref); + $flags = join ' ', $self->keyunalias($ref), 'alias', $flags; } if (my $txt = $self->{key}->{$mode.$key}) { ($desc, $mnem) = split /\n/, $self->escapedesc($txt); } my $keytxt = $self->print_letter($key, $mode); - $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 .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments my $keyhint = defined($mnem) && qq{ title="$mnem"}; $keytxt = "$keytxt"; $keytxt .= ' '.$desc if defined $desc; @@ -130,6 +131,8 @@ sub print_key { ' onclick="setmode(%s)"', $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1)) ); + $flags =~ s/\bx\w+/ext/; + $flags =~ s/\bv\d+/new/; $flags .= ' chr'.ord(substr $key, -1) if $key ne '^0'; print qq{\t\t