summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-10 16:33:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-10 16:33:21 +0000
commit640255572c30658ad75a7ed7948617dd56fdeaa4 (patch)
treeaad1cfd9e13b4490a611dbdd51200621b65fe4ed /perl-install/Xconfigurator.pm
parent8177c7b2bdc55ff489f39c471085db9064ae359b (diff)
downloaddrakx-640255572c30658ad75a7ed7948617dd56fdeaa4.tar
drakx-640255572c30658ad75a7ed7948617dd56fdeaa4.tar.gz
drakx-640255572c30658ad75a7ed7948617dd56fdeaa4.tar.bz2
drakx-640255572c30658ad75a7ed7948617dd56fdeaa4.tar.xz
drakx-640255572c30658ad75a7ed7948617dd56fdeaa4.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 1de705d0f..c69a3c477 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -659,8 +659,8 @@ sub write_XF86Config {
print F qq( Device "/dev/$O->{device}"\n);
print G qq( Option "Device" "/dev/$O->{device}"\n);
#- this will enable the "wheel" or "knob" functionality if the mouse supports it
- print F " ZAxisMapping 4 5\n" if
- member($O->{XMOUSETYPE}, qw(IntelliMouse IMPS/2 ThinkingMousePS/2 NetScrollPS/2 NetMousePS/2 MouseManPlusPS/2));
+ print F " ZAxisMapping 4 5\n" if $O->{nbuttons} > 3;
+ print F " ZAxisMapping 6 7\n" if $O->{nbuttons} > 5;
print F "#" unless $O->{XEMU3};
print G "#" unless $O->{XEMU3};
@@ -896,7 +896,7 @@ Section "ServerLayout"
print G '
InputDevice "Keyboard1" "CoreKeyboard"
EndSection
-';
+'; #-"
close F;
close G;
@@ -1015,7 +1015,7 @@ sub main {
$in->ask_warn('', _("Please log out and then use Ctrl-Alt-BackSpace")) unless $found;
} else {
$in->set_help('configureXxdm') unless $::isStandalone;
- my $run = $o->{xdm} || $::auto || $in->ask_yesorno(_("X at startup"),
+ my $run = exists $o->{xdm} ? $o->{xdm} : $::auto || $in->ask_yesorno(_("X at startup"),
_("I can set up your computer to automatically start X upon booting.
Would you like X to start when you reboot?"), 1);