summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-23 17:30:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-23 17:30:36 +0000
commited76955e239d467e996ea3d20e8ae14c13db0253 (patch)
treef2166989b89a195fb7c55ec83bde252793f8d106 /perl-install/install_steps_gtk.pm
parent70e35bb3512a6b6022d784ccfcc752148d7cece7 (diff)
downloaddrakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.gz
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.bz2
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.tar.xz
drakx-backup-do-not-use-ed76955e239d467e996ea3d20e8ae14c13db0253.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm27
1 files changed, 26 insertions, 1 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index b7ce8b00c..33b5997de 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -258,6 +258,21 @@ sub selectLanguage {
}
#------------------------------------------------------------------------------
+sub selectMouse {
+ my ($o, $force) = @_;
+ my $old_dev = $o->{mouse}{device};
+ $o->SUPER::selectMouse($force);
+
+ my $dev = $o->{mouse}{device};
+ if ($old_dev ne $dev && $dev =~ /ttyS/) {
+ log::l("telling X server to use another mouse");
+ eval { commands::modprobe("serial") };
+ symlinkf($dev, "/dev/mouse");
+ c::setMouseMicrosoft($ENV{DISPLAY});
+ }
+}
+
+#------------------------------------------------------------------------------
sub doPartitionDisks($$) {
my ($o, $hds, $raid) = @_;
@@ -494,6 +509,10 @@ sub installPackages {
),
$text,
$progress_total,
+ '',
+ gtkadd(create_hbox(),
+ gtksignal_connect(new Gtk::Button(_("Cancel")),
+ clicked => sub { $pkgs::cancel_install = 1 })),
)));
$msg->set(_("Preparing installation"));
$w->sync;
@@ -563,6 +582,10 @@ _("There was an error ordering packages:"), $1, _("Go on anyway?") ], 1) and ret
}
0;
};
+ if ($pkgs::cancel_install) {
+ $pkgs::cancel_install = 0;
+ die "setstep choosePackages\n";
+ }
$w->destroy;
}
@@ -773,6 +796,8 @@ sub init_sizes() {
sub createXconf($$$) {
my ($file, $mouse_type, $mouse_dev, $wacom_dev) = @_;
+ symlinkf($mouse_dev, "/dev/mouse");
+
my $wacom;
if ($wacom_dev) {
$wacom_dev = devices::make($wacom_dev);
@@ -835,7 +860,7 @@ EndSection
Section "Pointer"
Protocol "$mouse_type"
- Device "/dev/$mouse_dev"
+ Device "/dev/mouse"
Emulate3Buttons
Emulate3Timeout 50
EndSection