git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perl: silence warning about skipping dropped features
[sheet.git]
/
Shiar_Sheet
/
Keyboard.pm
diff --git
a/Shiar_Sheet/Keyboard.pm
b/Shiar_Sheet/Keyboard.pm
index 98c5a40a330a774e564464f4ceb005db21227ce0..0108cf1d10f43c70ed846339c549ea0604ee4612 100644
(file)
--- a/
Shiar_Sheet/Keyboard.pm
+++ b/
Shiar_Sheet/Keyboard.pm
@@
-120,8
+120,8
@@
sub print_key {
}
my $keytxt = $self->print_letter($key, $mode);
}
my $keytxt = $self->print_letter($key, $mode);
- $keytxt .= $self->{sign}->{$1} while $flags =~ s/(?:^| )(arg[a-ln-z]?)\b//; # arguments
$keytxt .= "<small>$self->{sign}->{motion}</small>" if $flags =~ s/ ?\bargm\b//; # motion argument
$keytxt .= "<small>$self->{sign}->{motion}</small>" 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 = "<b$keyhint>$keytxt</b>";
$keytxt .= ' '.$desc if defined $desc;
my $keyhint = defined($mnem) && qq{ title="$mnem"};
$keytxt = "<b$keyhint>$keytxt</b>";
$keytxt .= ' '.$desc if defined $desc;
@@
-130,6
+130,8
@@
sub print_key {
' onclick="setmode(%s)"',
$1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
);
' 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<td class="$flags"$onclick>$keytxt};
$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
print qq{\t\t<td class="$flags"$onclick>$keytxt};
@@
-149,9
+151,14
@@
sub print_rows {
print '<table id="rows" class="keys">'."\n\n";
print '<table id="rows" class="keys">'."\n\n";
+print_row:
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
+# grep {
+# defined $self->{def}->{''}->{$_} or defined $self->{def}->{g}->{$_}
+# } map { @{$_} } @{$keyrow} or next;
+
printf qq{<tbody class="row row%d">\n}, $row+1;
for my $basemode (@modes) {
my @moderows = split /\s+/,
printf qq{<tbody class="row row%d">\n}, $row+1;
for my $basemode (@modes) {
my @moderows = split /\s+/,