diff options
Diffstat (limited to 'lib/keyboard.pm')
| -rw-r--r-- | lib/keyboard.pm | 43 |
1 files changed, 4 insertions, 39 deletions
diff --git a/lib/keyboard.pm b/lib/keyboard.pm index dceda25..8dbb27a 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -181,22 +181,6 @@ my @usb2keyboard = #- #- note: there seems to be a limit of 4 stackable xkb layouts my %keyboards = ( -arch() =~ /^sparc/ ? ( -#- do we still support those? all but "se" and "us" have dissapeared from -#- symbols/sun/ directory in Xorg package. - "cz" => [ N_("_: keyboard\nCzech (QWERTZ)"), "sunt5-cz-us", "cz", "", 0 ], - "de" => [ N_("_: keyboard\nGerman"), "sunt5-de-latin1", "de", "", 0 ], - "dvorak" => [ N_("_: keyboard\nDvorak"), "sundvorak", "dvorak", "", 0 ], - "es" => [ N_("_: keyboard\nSpanish"), "sunt5-es", "es", "", 0 ], - "fi" => [ N_("_: keyboard\nFinnish"), "sunt5-fi-latin1", "fi", "", 0 ], - "fr" => [ N_("_: keyboard\nFrench"), "sunt5-fr-latin1", "fr", "", 0 ], - "gb" => [ N_("UK keyboard"), "sunt5-uk", "gb", "", 0 ], - "no" => [ N_("_: keyboard\nNorwegian"), "sunt4-no-latin1", "no", "", 0 ], - "pl" => [ N_("_: keyboard\nPolish"), "sun-pl-altgraph", "pl", "", 0 ], - "ru" => [ N_("_: keyboard\nRussian"), "sunt5-ru", "ru", "", 1 ], - "se" => [ N_("_: keyboard\nSwedish"), "sunt5-fi-latin1", "se", "", 0 ], - "us" => [ N_("US keyboard"), "sunkeymap", "us", "", 0 ], -) : ( "al" => [ N_("_: keyboard\nAlbanian"), "al", "al", "", 0 ], #"am_old" => [ N_("_: keyboard\nArmenian (old)"), "am_old", "am", "", 1 ], # X11 variant BROKEN (was: am(old) ) "am" => [ N_("_: keyboard\nArmenian (typewriter)"), "am-armscii8", "am", "", 1 ], @@ -332,7 +316,6 @@ arch() =~ /^sparc/ ? ( # old XKB layout "vn" => [ N_("_: keyboard\nVietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn", "", 0 ], "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "srp", "latin", 0 ], -), ); #- list of possible choices for the key combinations to toggle XKB groups @@ -412,7 +395,7 @@ key to switch between the different keyboard layouts."))); # used by rescue's make_rescue_img: sub loadkeys_files { my ($err) = @_; - my $archkbd = arch() =~ /^sparc/ ? "sun" : arch() =~ /i.86|x86_64/ ? "i386" : arch() =~ /ppc/ ? "mac" : arch(); + my $archkbd = arch() =~ /i.86|x86_64/ ? "i386" : arch(); my $p = "/usr/lib/kbd/keymaps/$archkbd"; my $post = ".map.gz"; my %trans = ("cz-latin2" => "cz-lat2"); @@ -536,9 +519,8 @@ sub default_XkbModel { my $Layout = _keyboard2xkbl($keyboard); - (arch() =~ /sparc/ ? 'sun' : - $Layout eq 'jp' ? 'jp106' : - $Layout eq 'br' ? 'abnt2' : 'pc105'); + $Layout eq 'jp' ? 'jp106' : + $Layout eq 'br' ? 'abnt2' : 'pc105'; } sub keyboard2full_xkb { @@ -577,16 +559,7 @@ sub _setxkbmap { sub setup_install { my ($keyboard) = @_; - return if arch() =~ /^sparc/ || $::local_install; - - #- Xpmac does not map keys quite right - if (arch() =~ /ppc/ && !$::testing && $ENV{DISPLAY}) { - log::l("Fixing Mac keyboard"); - run_program::run('xmodmap', "-e", "keycode 59 = BackSpace"); - run_program::run('xmodmap', "-e", "keycode 131 = Shift_R"); - run_program::run('xmodmap', "-e", "add shift = Shift_R"); - return; - } + return if $::local_install; my $kmap = keyboard2kmap($keyboard) or return; @@ -650,15 +623,7 @@ sub write { $xorgconf .= "EndSection\n"; output_p("$::prefix/etc/X11/xorg.conf.d/00-keyboard.conf", $xorgconf); - if (arch() =~ /ppc/) { - my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1\n"; - substInFile { - $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/; - $_ .= $s if eof; - } "$::prefix/etc/sysctl.d/51-drakx.conf"; - } else { run_program::rooted($::prefix, 'dumpkeys', '>', '/etc/sysconfig/console/default.kmap') or log::l("dumpkeys failed"); - } run_program::run('mageia-setup-keyboard'); } |