summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2005-03-22 15:34:38 +0000
committerStew Benedict <stewb@mandriva.org>2005-03-22 15:34:38 +0000
commit9dc52f06f8967b0385afeef34beaa3744bb06a98 (patch)
tree92f744aebd8d42ed60d0c2e7c746f0c1dd230932
parent4cb023bf5d9c1c23c13e9ed9351e79b0b3ca5c05 (diff)
downloaddrakx-backup-do-not-use-9dc52f06f8967b0385afeef34beaa3744bb06a98.tar
drakx-backup-do-not-use-9dc52f06f8967b0385afeef34beaa3744bb06a98.tar.gz
drakx-backup-do-not-use-9dc52f06f8967b0385afeef34beaa3744bb06a98.tar.bz2
drakx-backup-do-not-use-9dc52f06f8967b0385afeef34beaa3744bb06a98.tar.xz
drakx-backup-do-not-use-9dc52f06f8967b0385afeef34beaa3744bb06a98.zip
XBox - get xpad to work in install (added xset)
-rw-r--r--perl-install/install_steps_gtk.pm1
-rw-r--r--perl-install/mouse.pm12
-rw-r--r--perl-install/share/list.i3861
3 files changed, 12 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 61226e08d..5596c3a83 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -133,6 +133,7 @@ sub new($$) {
}
OK:
$ENV{DISPLAY} = $wanted_DISPLAY;
+ run_program::run('xset', 'm', '1/8', '1') if is_xbox();
install_gtk::init_gtk($o);
install_gtk::init_sizes();
install_gtk::install_theme($o);
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index f126c9cc0..822fe5a38 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -294,7 +294,7 @@ sub detect {
my $synaptics_mouse;
if (my $mouse_nb = scalar grep { /^H: Handlers=mouse/ } @input_devices) {
if (is_xbox()) {
- return fullname2mouse('Universal|Microsoft Xbox Controller S');
+ return fullname2mouse('Universal|Microsoft Xbox Controller S', if_($::isInstall, alternate_install => fullname2mouse('Universal|Microsoft Xbox Controller S')));
}
my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom);
if (my $synaptics_name = find { m!^N: Name="(?:SynPS/2 Synaptics TouchPad|AlpsPS/2 ALPS TouchPad)"$! } @input_devices) {
@@ -421,7 +421,15 @@ sub various_xfree_conf {
output_with_perm($f, 0755, "xinput set-button-map Mouse2 1 2 3 6 7 4 5\n");
}
}
-
+ {
+ my $f = "$::prefix/etc/X11/xinit.d/xpad";
+ if ($mouse->{name} !~ /^Microsoft Xbox Controller/) {
+ unlink($f);
+ } else {
+ output_with_perm($f, 0755, "xset m 1/8 1\n");
+ }
+ }
+
if (member(N_("Synaptics Touchpad"), $mouse->{name}, $mouse->{auxmouse} && $mouse->{auxmouse}{name})) {
$do_pkgs->install("synaptics");
}
diff --git a/perl-install/share/list.i386 b/perl-install/share/list.i386
index 3f071b21f..01b7fca2d 100644
--- a/perl-install/share/list.i386
+++ b/perl-install/share/list.i386
@@ -18,3 +18,4 @@
/usr/X11R6/lib/modules/linux/libfbdevhw.a
/usr/X11R6/lib/modules/libfb.a
/usr/X11R6/lib/modules/libshadow.a
+/usr/X11R6/bin/xset