X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/a226a258f1c08e8dc9b2bb3003955dff3bdf5159..440357a3333f32304e21957542e50eb33eaddf21:/vimperator.plp
diff --git a/vimperator.plp b/vimperator.plp
index 660d819..84d9106 100644
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -5,21 +5,11 @@ use warnings;
no warnings 'qw'; # you know what you doing
no warnings 'uninitialized'; # save some useless checks for more legible code
-our $VERSION = '1.0';
-
-our $ascii = 0;
-if (exists $get{ascii}) {
- $ascii = $get{ascii} ne '0'; # manual override
-} elsif (defined $ENV{HTTP_ACCEPT_CHARSET}) {
- $ascii = 1;
- for (split q{,}, $ENV{HTTP_ACCEPT_CHARSET}) {
- $ascii = 0, last if $_ eq '*' or m{utf-?8}i;
- }
-}
-
-my $charset = $ascii ? 'us-ascii' : 'utf-8';
-my $ctype = "text/html; charset=$charset";
-$header{content_type} = $ctype;
+use Shiar_Sheet::KeySigns qw(%sign);
+
+our $VERSION = 'v1.0';
+
+$header{content_type} = "text/html; charset=$sign{charset}";
:>
@@ -27,7 +17,7 @@ $header{content_type} = $ctype;
vimperator cheat sheet
-
+
<:
@@ -38,8 +28,8 @@ $header{content_type} = $ctype;
) for keys %styles;
our $showkeys = exists $get{keys} && $get{keys} ne '0';
- print "\n" unless $showkeys;
- print "\n"
+ print "\n".'' unless $showkeys;
+ print "\n".''
if $showkeys and $get{keys} eq 'ghost';
:>
@@ -54,30 +44,16 @@ $header{content_type} = $ctype;
- - Esc normal mode
+
- Esc normal mode
<:
-our %sign = (
- arg => $ascii ? '.' : '·', # described as 'dot'
- args => $ascii ? ':' : 'â', # described as 'two dots'
- alias => $ascii ? 'see: ' : '»',
- up => $ascii ? 'up' : 'â²',
- right => $ascii ? 'right' : 'â¶',
- down => $ascii ? 'down' : 'â¼',
- left => $ascii ? 'left' : 'â',
- sep => $ascii ? '*' : 'â¢',
- _ => exists $get{ascii} && !$ascii ? "\x{200b}" : '',
- # use the correct ZWNJ only when unicode is forced on
- # default to use unofficial html for best support
-);
-
use Shiar_Sheet::Keyboard;
my $keys = Shiar_Sheet::Keyboard->new({do 'vimperator.inc.pl'});
$keys->map($get{map}) or undef $get{map};
-$keys->print_rows($get{static});
+$keys->print_rows($get{rows});
:>
@@ -119,8 +95,8 @@ $keys->print_rows($get{static});
keyboard map is
<:= $get{map} ? 'set to ' : '' :><:= $keys->{map} :>
ascii mode is
- <:= exists $get{ascii} && 'forced ' :><:=
- $ascii ? 'on' : 'off' :>
+ <:= defined $sign{-ascii} && 'forced ' :><:=
+ $sign{-ascii} ? 'on' : 'off' :>
keys are
<:= $showkeys ? 'always shown' : 'hidden if unassigned' :><:=
!exists $get{keys} && ' by default' :>
@@ -131,15 +107,11 @@ $keys->print_rows($get{static});