flexible keyboard ?rows override option

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index e6982f71c1101cc22410aff1f217f6e3e9b62cba..4bc142c2c1153a4f87703b0cf087259a27df6750 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -5,7 +5,7 @@ use warnings;
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 
 no  warnings 'uninitialized';  # save some useless checks for more legible code
 use Carp;
 

-our $VERSION = 'v1.03';
+our $VERSION = 'v1.04';

 
 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);


@@ -107,28 +107,37 @@ sub print_key {
 
 sub print_rows {
        my $self = shift;
 
 sub print_rows {
        my $self = shift;

-       my $static = shift;
-       my @moderows = $static ? split(/\s+/, $static) : sort keys %{ $self->{keys} };
+       my %moderows = (
+               -DEFAULT => !@_ ? '' : split(/(?:\s*([^=\s]*)=\s*)/, shift),
+               # plus specific mode overrides prefixed by '='
+       );
+       my $defrows = shift || [2, 1, 0];
+       my @modes = sort keys %{ $self->{keys} };

 
        for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
                my $keyrow = $keyrows{$self->{map}}->[$row];
 
                print qq{<li class="row row$row"><ul>\n};
 
        for (my $row = 0; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
                my $keyrow = $keyrows{$self->{map}}->[$row];
 
                print qq{<li class="row row$row"><ul>\n};

-               for my $modefull (@moderows) {
-                       my $mode = $modefull;
-                       my @showcase = $mode =~ s/(\d+)(?:-(\d+))?$//
-                               ? (map {$_ - 1} split //, $row == 0 && $2 || $1) : (2, 1, 0);
+               for my $basemode (@modes) {
+                       my @moderows = split /\s+/,
+                               defined $moderows{$basemode} ? $moderows{$basemode} : $moderows{-DEFAULT};
+
+               for my $submode (@moderows ? @moderows : '') {
+                       my $mode = $basemode . $submode;
+                       my @caserows = $mode =~ s/(\d+)(?:-(\d+))?$//
+                               ? (map {$_ - 1} split //, $row == 0 && $2 || $1)  # user override
+                               : @$defrows;  # default

                        my $modekeys = $self->{keys}{$mode};
 
                        my $modekeys = $self->{keys}{$mode};
 

-                       for my $case (@showcase) {
+                       for my $case (@caserows) {

                                my $keycase = $keyrow->[$case] or next;
                                  @$keycase or next;
 
                                my $keycase = $keyrow->[$case] or next;
                                  @$keycase or next;
 

-                               printf "\t<li%s>", $mode ne '' && sprintf(
-                                       ' class="%s"', ($static ? '' : 'mode ') . 'mode' . escapeclass($mode)
+                               printf "\t<li%s>", $basemode ne '' && sprintf(
+                                       ' class="%s"', 'mode mode' . escapeclass($basemode)

                                );
                                printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6
                                );
                                printf("<h3>%s<small>: %s</small></h3>\n", # XXX insert &nbsp; here to fix msie<=6

-                                               $modekeys->{desc} || "mode $mode",
+                                               $modekeys->{desc} || "mode $basemode",

                                                "$rowdesc[$row] row $casedesc[$case]"
                                );
                                my $caseclass = 'keys';
                                                "$rowdesc[$row] row $casedesc[$case]"
                                );
                                my $caseclass = 'keys';


@@ -139,7 +148,9 @@ sub print_rows {
                                print qq{\t\t</ul>\n};
                        } # case
 
                                print qq{\t\t</ul>\n};
                        } # case
 

-               } # mode
+               } # submode
+
+               } # basemode

                print qq{\t</ul>\n};
        } # row
 }
                print qq{\t</ul>\n};
        } # row
 }

diff --git a/nethack.plp b/nethack.plp
index 5db14cd4c24fbda23c227c1bf958112d0c166184..9b8606babc5499f0782521ac1d232e683da5899e 100644 (file)
--- a/nethack.plp
+++ b/nethack.plp
@@ -53,7 +53,7 @@ $header{content_type} = "text/html; charset=$sign{charset}";
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'nethack.inc.pl'});
 $keys->map($get{map}) or undef $get{map};
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'nethack.inc.pl'});
 $keys->map($get{map}) or undef $get{map};

-$keys->print_rows($get{static} || '4321-421');
+$keys->print_rows($get{rows} || '4321-421', [3,2,1,0]);

 :>
 </ul>
 
 :>
 </ul>
 

diff --git a/readline.plp b/readline.plp
index 0e6a3da3220199cd2de792d4241eb6afd872d35a..dd81cbe9aa6f0be6936c28dd42507f6f7ebf64b5 100644 (file)
--- a/readline.plp
+++ b/readline.plp
@@ -52,7 +52,7 @@ $header{content_type} = "text/html; charset=$sign{charset}";
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'readline.inc.pl'});
 $keys->map($get{map}) or undef $get{map};
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'readline.inc.pl'});
 $keys->map($get{map}) or undef $get{map};

-$keys->print_rows($get{static} || '543');
+$keys->print_rows($get{rows}, [4,3,2]);

 :>
 </ul>
 
 :>
 </ul>
 

diff --git a/vim.plp b/vim.plp
index 92a1f5f49af11fde39ceda8082b1ead4f8b3e353..e357b73d2626205a1cb1a3a33f4bbf39f5b03b15 100644 (file)
--- a/vim.plp
+++ b/vim.plp
@@ -53,7 +53,7 @@ $header{content_type} = "text/html; charset=$sign{charset}";
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'vim.inc.pl'});
 $keys->map($get{map}) or undef $get{map};
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'vim.inc.pl'});
 $keys->map($get{map}) or undef $get{map};

-$keys->print_rows($get{static});
+$keys->print_rows($get{rows});

 :>
 </ul>
 
 :>
 </ul>
 

diff --git a/vimperator.plp b/vimperator.plp
index 731c0f20db6d5e4dd1ef805855430f122e8936a3..55c635f680e28b7da085c372018bcfb6d34cfb9b 100644 (file)
--- a/vimperator.plp
+++ b/vimperator.plp
@@ -53,7 +53,7 @@ $header{content_type} = "text/html; charset=$sign{charset}";
 use Shiar_Sheet::Keyboard;
 my $keys = Shiar_Sheet::Keyboard->new({do 'vimperator.inc.pl'});
 $keys->map($get{map}) or undef $get{map};
 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});

 :>
 </ul>
 
 :>
 </ul>