amassivus/clusterssh
1
0
Fork 0
mirror of https://github.com/duncs/clusterssh.git synced 2025-07-01 17:11:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pastes uses a strange keyboard layout

Browse source 
Patch taken from Debian bug ID #364565
This commit is contained in:
Duncan Ferguson 2013-02-14 21:12:40 +00:00
parent ec55e5eabc
commit 042780f873
2 changed files with 42 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Changes
View file

@ -5,6 +5,7 @@
* Allow the path to rsh/ssh/telnet to be defined in the configuration file
* Move .csshrc to .csshrc.DISABLED since it should no longer be used
* Error emitted when adding a host via the "Hosts" drop-down (Debian bug ID #578208)
* Pastes uses a strange keyboard layout (Debian bug ID #364565)
2012-12-09 Duncan Ferguson <duncan_ferguson@user.sf.net> - v4.01_02
* Fix logic when using 'autoclose' on the command line or config file

87
lib/App/ClusterSSH.pm
View file

@ -277,53 +277,48 @@ sub load_keyboard_map() {
logmsg( 1, "Loading keymaps and keycodes" );
foreach ( 0 .. $#keyboard ) {
if ( defined $keyboard[$_][3] ) {
if ( defined( $keycodetosym{ $keyboard[$_][3] } ) ) {
$keyboardmap{ $keycodetosym{ $keyboard[$_][3] } }
= 'sa' . ( $_ + $min );
}
else {
logmsg( 2, "Unknown keycode ", $keyboard[$_][3] )
if ( $keyboard[$_][3] != 0 );
}
}
if ( defined $keyboard[$_][2] ) {
if ( defined( $keycodetosym{ $keyboard[$_][2] } ) ) {
$keyboardmap{ $keycodetosym{ $keyboard[$_][2] } }
= 'a' . ( $_ + $min );
}
else {
logmsg( 2, "Unknown keycode ", $keyboard[$_][2] )
if ( $keyboard[$_][2] != 0 );
}
}
if ( defined $keyboard[$_][1] ) {
if ( defined( $keycodetosym{ $keyboard[$_][1] } ) ) {
$keyboardmap{ $keycodetosym{ $keyboard[$_][1] } }
= 's' . ( $_ + $min );
}
else {
logmsg( 2, "Unknown keycode ", $keyboard[$_][1] )
if ( $keyboard[$_][1] != 0 );
}
}
if ( defined $keyboard[$_][0] ) {
if ( defined( $keycodetosym{ $keyboard[$_][0] } ) ) {
$keyboardmap{ $keycodetosym{ $keyboard[$_][0] } }
= 'n' . ( $_ + $min );
}
else {
logmsg( 2, "Unknown keycode ", $keyboard[$_][0] )
if ( $keyboard[$_][0] != 0 );
}
}
# dont know these two key combs yet...
#$keyboardmap{ $keycodetosym { $keyboard[$_][4] } } = $_ + $min;
#$keyboardmap{ $keycodetosym { $keyboard[$_][5] } } = $_ + $min;
}
my %keyboard_modifier_priority = (
'sa' => 3, # lowest
'a' => 2,
's' => 1,
'n' => 0, # highest
);
my %keyboard_stringlike_modifiers = reverse %keyboard_modifier_priority;
# try to associate $keyboard=X11->GetKeyboardMapping table with X11::Keysyms
foreach my $i ( 0 .. $#keyboard ) {
for my $modifier ( 0 .. 3 ) {
if( defined( $keycodetosym{ $keyboard[$i][$modifier] } ) ) {
# keyboard layout contains the keycode at $modifier level
if( defined( $keyboardmap{ $keycodetosym{ $keyboard[$i][$modifier] } } ) ) {
# we already have a mapping, let's see whether current one is better (lower shift state)
my ($mod_code,$key_code) = $keyboardmap{ $keycodetosym{ $keyboard[$i][$modifier] } } =~ /^(\D+)(\d+)$/;
# it is not easy to get around our own alien logic storing modifiers ;-)
if( $modifier < $keyboard_modifier_priority{$mod_code} ) {
# YES! current keycode have priority over old one (phew!)
$keyboardmap{ $keycodetosym{ $keyboard[$i][$modifier] } } =
$keyboard_stringlike_modifiers{$modifier} . ( $i + $min );
}
} else {
# we don't yet have a mapping... piece of cake!
$keyboardmap{ $keycodetosym{ $keyboard[$i][$modifier] } } =
$keyboard_stringlike_modifiers{$modifier} . ( $i + $min );
}
} else {
# we didn't get the code from X11::Keysyms
if( $keyboard[$i][$modifier] != 0 ) {
# ignore code=0
logmsg( 2, "Unknown keycode ", $keyboard[$i][$modifier] );
}
}
}
}
# dont know these two key combs yet...
#$keyboardmap{ $keycodetosym { $keyboard[$_][4] } } = $_ + $min;
#$keyboardmap{ $keycodetosym { $keyboard[$_][5] } } = $_ + $min;
#print "$_ => $keyboardmap{$_}\n" foreach(sort(keys(%keyboardmap)));
#print "keysymtocode: $keysymtocode{o}\n";
#die;