git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unicode: drop u- prefix from script classes
[sheet.git]
/
Shiar_Sheet
/
Keyboard.pm
diff --git
a/Shiar_Sheet/Keyboard.pm
b/Shiar_Sheet/Keyboard.pm
index 936b811f08c0e1e66be0c22ff7f32f3133660959..6819236812e00c2e4126d17383766d59481b151c 100644
(file)
--- a/
Shiar_Sheet/Keyboard.pm
+++ b/
Shiar_Sheet/Keyboard.pm
@@
-84,18
+84,17
@@
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
my $self = shift;
my ($mode, $key, $flags) = @_;
- my $txt = $self->{key}->{$mode.$key};
- my ($desc, $mnem) = defined $txt ? @$txt : ();
-
if (not defined $flags) {
if (not defined $flags) {
- $flags =
$key eq '^0' ? 'ni' : 'no'
;
+ $flags =
[$key eq '^0' ? 'ni' : 'no']
;
}
elsif (not ref $flags) { # alias
}
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) = @{$txt};
}
# $key = $keytrans{$key} if defined $keytrans{$key};
}
# $key = $keytrans{$key} if defined $keytrans{$key};
@@
-127,12
+126,15
@@
sub print_rows {
my $defrows = shift || [2, 1, 0];
my @modes = sort keys %{ $self->{def} };
my $defrows = shift || [2, 1, 0];
my @modes = sort keys %{ $self->{def} };
+ print '<ul id="rows">'."\n\n";
+
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
printf qq{<li class="row row%d"><ul>\n}, $row+1;
for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
printf qq{<li class="row row%d"><ul>\n}, $row+1;
- for my $basemode (
$row < 0 ? '' :
@modes) {
+ for my $basemode (@modes) {
my @moderows = split /\s+/,
my @moderows = split /\s+/,
+ $row < 0 ? "0" :
defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
for my $submode (@moderows ? @moderows : '') {
defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
for my $submode (@moderows ? @moderows : '') {
@@
-167,6
+169,8
@@
sub print_rows {
} # basemode
print qq{\t</ul>\n};
} # row
} # basemode
print qq{\t</ul>\n};
} # row
+
+ print "</ul>\n";
}
sub print_legend {
}
sub print_legend {