git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
959984a
)
keyboard: resupport key texts after definition flags
author
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 26 Mar 2012 14:15:52 +0000
(16:15 +0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Tue, 10 Apr 2012 01:03:24 +0000
(
03:03
+0200)
Shiar_Sheet/Keyboard.pm
patch
|
blob
|
history
diff --git
a/Shiar_Sheet/Keyboard.pm
b/Shiar_Sheet/Keyboard.pm
index 936b811f08c0e1e66be0c22ff7f32f3133660959..c5ab0167c0877b7a6ce20acbadc595c48afb6fe0 100644
(file)
--- a/
Shiar_Sheet/Keyboard.pm
+++ b/
Shiar_Sheet/Keyboard.pm
@@
-84,18
+84,15
@@
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';
+ $flags = [$self->keyunalias($flags) . ' alias', $self->{sign}->{alias} . $flags];
}
}
- 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};