diff options
Diffstat (limited to 'lib/mouse.pm')
| -rw-r--r-- | lib/mouse.pm | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/lib/mouse.pm b/lib/mouse.pm index ef1d272..c6d8cc5 100644 --- a/lib/mouse.pm +++ b/lib/mouse.pm @@ -19,13 +19,6 @@ use any; use log; sub _all_mice() { - arch() =~ /^sparc/ ? -( - 'sunmouse' => - [ [ 'sunmouse' ], - [ [ 3, 'sun', 'sun', N_("Sun - Mouse") ] - ] ] -) : ( 'PS/2' => [ [ 'psaux' ], @@ -74,8 +67,8 @@ sub _all_mice() { ] ], N_("busmouse") => - [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ], - [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', N_("1 button") ]), + [ [ ('atibm', 'inportbm', 'logibm') ], + [ [ 2, 'Busmouse', 'BusMouse', N_("2 buttons") ], [ 3, 'Busmouse', 'BusMouse', N_("3 buttons") ], [ 3, 'Busmouse', 'BusMouse', N_("3 buttons with Wheel emulation"), 'wheel' ], @@ -132,8 +125,6 @@ my %mouse_btn_keymap = ( 117 => "Num: =", 96 => "Enter", ); -sub _ppc_one_button_keys() { keys %mouse_btn_keymap } -sub _ppc_one_button_key2text { $mouse_btn_keymap{$_[0]} } my @mouses_fields = qw(nbuttons MOUSETYPE Protocol name EmulateWheel); @@ -177,18 +168,6 @@ sub write { }); various_xfree_conf($do_pkgs, $mouse); - - if (arch() =~ /ppc/) { - my $s = join('', - "dev.mac_hid.mouse_button_emulation = " . to_bool($mouse->{button2_key} || $mouse->{button3_key}) . "\n", - if_($mouse->{button2_key}, "dev.mac_hid.mouse_button2_keycode = $mouse->{button2_key}\n"), - if_($mouse->{button3_key}, "dev.mac_hid.mouse_button3_keycode = $mouse->{button3_key}\n"), - ); - substInFile { - $_ = '' if /^\Qdev.mac_hid.mouse_button/; - $_ .= $s if eof; - } "$::prefix/etc/sysctl.d/51-drakx.conf"; - } } sub _input_entry_to_device_by_id { @@ -303,19 +282,11 @@ sub detect { my $fullname = detect_devices::is_xbox() ? 'Universal|Microsoft Xbox Controller S' : - arch() eq "ppc" ? - 'USB|1 button' : 'Universal|Any PS/2 & USB mice'; fullname2mouse($fullname, wacom => \@wacom, synaptics => $synaptics[0], if_($evdev_opts, %$evdev_opts)); - } elsif (arch() eq 'ppc') { - # No need to search for an ADB mouse. If I did, the PPC kernel would - # find one whether or not I had one installed! So.. default to it. - fullname2mouse("busmouse|1 button"); - } elsif (arch() =~ /^sparc/) { - fullname2mouse("sunmouse|Sun - Mouse"); } else { #- probe serial device to make sure a wacom has been detected. eval { modules::load("serial") }; @@ -541,16 +512,6 @@ sub select { }, [ { list => [ detect_devices::serialPorts() ], format => \&detect_devices::serialPort2text, val => \$mouse->{device} } ]) or return &select; } - if (arch() =~ /ppc/ && $mouse->{nbuttons} == 1) { - #- set a sane default F11/F12 - $mouse->{button2_key} = 87; - $mouse->{button3_key} = 88; - $in->ask_from('', N("Buttons emulation"), - [ - { label => N("Button 2 Emulation"), val => \$mouse->{button2_key}, list => [ _ppc_one_button_keys() ], format => \&_ppc_one_button_key2text }, - { label => N("Button 3 Emulation"), val => \$mouse->{button3_key}, list => [ _ppc_one_button_keys() ], format => \&_ppc_one_button_key2text }, - ]) or return; - } 1; } |