git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools: preserve make errors, ignore empty output
[sheet.git]
/
Shiar_Sheet
/
Keyboard.pm
diff --git
a/Shiar_Sheet/Keyboard.pm
b/Shiar_Sheet/Keyboard.pm
index c5ab0167c0877b7a6ce20acbadc595c48afb6fe0..2b3cc8629e8033d0d818dfd008b6e7efafb16418 100644
(file)
--- a/
Shiar_Sheet/Keyboard.pm
+++ b/
Shiar_Sheet/Keyboard.pm
@@
-1,11
+1,12
@@
package Shiar_Sheet::Keyboard;
package Shiar_Sheet::Keyboard;
+use 5.010;
use strict;
use warnings;
no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
use strict;
use warnings;
no warnings 'uninitialized'; # save some useless checks for more legible code
use Carp;
-our $VERSION = 'v2.0
2
';
+our $VERSION = 'v2.0
5
';
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
my @casedesc = (undef, qw/shift ctrl meta/, 'shift meta');
my @rowdesc = qw(numeric top home bottom);
@@
-29,13
+30,11
@@
sub new {
croak 'No key definitions specified' unless ref $self->{def} eq 'HASH';
$self->{map} ||= 'qwerty';
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;
}
bless $self, $class;
}
@@
-66,6
+65,13
@@
sub escapehtml {
return $_;
}
return $_;
}
+sub escapedesc {
+ my $self = shift;
+ local $_ = shift;
+ s{ (< ([^>]*) >) }{ $self->{sign}->{$2} // $1 }xeg;
+ return $_;
+}
+
sub keyunalias {
my $self = shift;
my ($key, $ancestry) = @_;
sub keyunalias {
my $self = shift;
my ($key, $ancestry) = @_;
@@
-75,7
+81,7
@@
sub keyunalias {
my $keyinfo = $self->{def}->{$mode}->{$key};
return unless defined $keyinfo;
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);
}
return '' if $ancestry->{$key}++; # endless loop failsafe
return $self->keyunalias($keyinfo, $ancestry);
}
@@
-83,16
+89,18
@@
sub keyunalias {
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
sub print_key {
my $self = shift;
my ($mode, $key, $flags) = @_;
+ my ($desc, $mnem);
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
- $flags = [$self->keyunalias($flags) . ' alias', $self->{sign}->{alias} . $flags];
+ elsif ($flags =~ s/^=//) { # alias
+ $desc = $self->{sign}->{alias};
+ $desc .= $flags eq "\e" ? 'esc' : $flags;
+ $flags = $self->keyunalias($flags) . ' alias';
}
}
- my ($flags, $desc, $mnem) = @{$flags};
if (my $txt = $self->{key}->{$mode.$key}) {
if (my $txt = $self->{key}->{$mode.$key}) {
- ($desc, $mnem) =
@{$txt}
;
+ ($desc, $mnem) =
split /\n/, $self->escapedesc($txt)
;
}
# $key = $keytrans{$key} if defined $keytrans{$key};
}
# $key = $keytrans{$key} if defined $keytrans{$key};
@@
-111,25
+119,28
@@
sub print_key {
);
$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
);
$flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
- print qq{\t\t<
li
class="$flags"$onclick>$keytxt};
+ print qq{\t\t<
td
class="$flags"$onclick>$keytxt};
print "\n";
}
sub print_rows {
my $self = shift;
my %moderows = (
print "\n";
}
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];
my @modes = sort keys %{ $self->{def} };
# plus specific mode overrides prefixed by '='
);
my $defrows = shift || [2, 1, 0];
my @modes = sort keys %{ $self->{def} };
+ print '<table id="rows" class="keys">'."\n\n";
+
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];
- printf qq{<
li class="row row%d"><ul
>\n}, $row+1;
- for my $basemode (
$row < 0 ? '' :
@modes) {
+ printf qq{<
tbody class="row row%d"
>\n}, $row+1;
+ 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 : '') {
@@
-142,28
+153,30
@@
sub print_rows {
for my $case (@caserows) {
my $keycase = $keyrow->[$case] or next;
@$keycase or next;
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<
li%s>", $basemode ne ''
&& sprintf(
- ' class="%s"',
'mode mode' . escapeclass($basemode)
+ printf "\t<
tr%s>", @caseclass > 0
&& sprintf(
+ ' class="%s"',
join ' ', @caseclass
);
);
- printf('<
h3>%s<small>: %s</small></h3
>', # XXX insert here to fix msie<=6
- $self->
{mode}->{$mode} || "mode $basemode"
,
+ printf('<
th>%s<small>: %s</small></th
>', # XXX insert here to fix msie<=6
+ $self->
escapedesc($self->{mode}->{$mode} || "mode $basemode")
,
"$rowdesc[$row] row $casedesc[$case]"
) unless $row < 0;
print "\n";
"$rowdesc[$row] row $casedesc[$case]"
) unless $row < 0;
print "\n";
- my $caseclass = 'keys';
- $caseclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown
- $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
- print qq{\t\t<ul class="$caseclass">\n};
$self->print_key($mode, $_, $modekeys->{$_}) for @$keycase;
$self->print_key($mode, $_, $modekeys->{$_}) for @$keycase;
- print qq{\t\t</
ul
>\n};
+ print qq{\t\t</
tr
>\n};
} # case
} # submode
} # basemode
} # case
} # submode
} # basemode
- print qq{\t</
ul
>\n};
+ print qq{\t</
tbody
>\n};
} # row
} # row
+
+ print "</table>\n";
}
sub print_legend {
}
sub print_legend {
@@
-172,7
+185,7
@@
sub print_legend {
print qq{\t\t<dl class="legend $class">\n};
printf("\t\t".'<dt class="%s">%s'."\n\t\t\t".'<dd>%s'."\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>";
}
) for @$flags;
print "\t\t</dl>";
}
@@
-190,8
+203,8
@@
Shiar_Sheet::Keyboard - Output HTML for key sheets
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
my $keys = Shiar_Sheet::Keyboard({
def => {
'lead' => {
- 'A' => 'a', # alias
- 'a' =>
['classes']
,
+ 'A' => '
=
a', # alias
+ 'a' =>
'classes'
,
},
},
key => {
},
},
key => {