X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/d16b2e5239f51485e63e27b1b8700611377e0d9f..v1.1-6-ga7550acb:/index.plp?ds=inline
diff --git a/index.plp b/index.plp
index 602eefc..01a3bf2 100644
--- a/index.plp
+++ b/index.plp
@@ -125,6 +125,29 @@ sub escapeclass {
return $_;
}
+sub print_key {
+ my ($mode, $key, $keyinfo) = @_;
+
+ $keyinfo = [ $sign{alias}.$keyinfo, 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 $keytxt = $mode . Entity($key) if $key ne '^0';
+ $keytxt .= $sign{arg} while $flags =~ s/ ?\barg\b//; # argument
+ $keytxt .= "$sign{motion}" if $flags =~ s/ ?\bargm\b//; # motion argument
+ $keytxt =~ s{\^(?=.)}{^}; # element around ctrl-identifier
+ my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $keys{$1} && sprintf(
+ ' onclick="setmode(%s)"',
+ $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
+ );
+ my $keyhint = defined($mnem) && qq{ title="$mnem"};
+
+ print qq{\t\t
$keytxt};
+ print ' ', $desc if defined $desc;
+ print "\n";
+}
+
our $map = defined $keyrows{$get{map}} ? $get{map} : 'qwerty';
my $keyrows = $keyrows{$map};
@@ -137,7 +160,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
@$keycase or next;
printf(qq{\t%s
\n}, # XXX insert here to fix msie<=6
- $mode eq '' ? '' : sprintf(
+ $mode ne '' && sprintf(
' class="%s"', 'mode mode' . escapeclass($mode)
),
sprintf('%s: %s',
@@ -149,29 +172,7 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
$modeclass .= ' lead' if defined $modekeys->{lead}; # leading command key shown
$modeclass .= " $casedesc[$case]" if defined $casedesc[$case];
print qq{\t\t\n};
-
- for my $key (@$keycase) {
- my $keyinfo = $modekeys->{$key};
- $keyinfo = [ $sign{alias}.$keyinfo, 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 $keytxt = $modekeys->{lead} . Entity($key) if $key ne '^0';
- $keytxt .= $sign{arg} while $flags =~ s/ ?\barg\b//; # argument
- $keytxt .= "$sign{motion}" if $flags =~ s/ ?\bargm\b//; # motion argument
- $keytxt =~ s{\^(?=.)}{^}; # element around ctrl-identifier
- my $onclick = $flags =~ s/ ?\bmode(\S*)// && defined $keys{$1} && sprintf(
- ' onclick="setmode(%s)"',
- $1 eq '' ? '' : sprintf(q{'mode%s'}, escapeclass($1))
- );
- my $keyhint = defined($mnem) && qq{ title="$mnem"};
-
- print qq{\t\t- $keytxt};
- print ' ', $desc if defined $desc;
- print "\n";
- } # key
-
+ print_key($modekeys->{lead}, $_, $modekeys->{$_}) for @$keycase;
print qq{\t\t
\n};
} # case
@@ -222,13 +223,13 @@ for (my $row = 0; $row <= $#$keyrows; $row++) {
keyboard map is
<:= $get{map} ? 'set to ' : '' :><:= $map :>
ascii mode is
- <:= exists $get{ascii} ? 'forced ' : '' :><:=
+ <:= exists $get{ascii} && 'forced ' :><:=
$ascii ? 'on' : 'off' :>
keys are
<:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:=
- exists $get{keys} ? '' : ' by default' :>
+ exists $get{keys} || ' by default' :>
default style is
- <:= defined $get{style} ? 'set to ' : '' :><:= $style :>
+ <:= defined $get{style} && 'set to ' :><:= $style :>