no_comment

8 files changed, 36 insertions, 23 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index f0607916b..b65b692a5 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,8 +1,23 @@
+2000-09-19  Pixel  <pixel@mandrakesoft.com>
+
+	* many files: changed some access to get_root to get_root_	
+	
+	* install_steps_interactive.pm (choosePackages): added code for
+	desktop meta_class install type
+
+	* install_steps_gtk.pm (selectMouse): cleanup, give parameter
+	emulate3buttons to setMouseLive
+	* c/stuff.xs.pm (setMouseLive): add argument emulate3buttons
+
 2000-09-19  Guillaume Cottenceau <gc@mandrakesoft.com>
 
 	* interactive*.pm: changed `suspend' and `resume' to behave as expected,
 	added `enter_console' and `leave_console'
 
+2000-09-19  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
 2000-09-19  Pixel  <pixel@mandrakesoft.com>
 
 	* install2.pm (miscellaneous): renamed LITTLE_FRIED_OIGNONS by
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 395b97173..d9107561f 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -98,9 +98,10 @@ Xtest(display)
   RETVAL
 
 void
-setMouseLive(display, type)
+setMouseLive(display, type, emulate3buttons)
   char *display
   int type
+  int emulate3buttons
   CODE:
   {
     XF86MiscMouseSettings mseinfo;
@@ -108,7 +109,8 @@ setMouseLive(display, type)
     if (d) {
       if (XF86MiscGetMouseSettings(d, &mseinfo) == True) {
         mseinfo.type = type;
-        mseinfo.flags |= 128;
+        mseinfo.flags |= MF_REOPEN;
+        mseinfo.emulate3buttons = emulate3buttons;
         XF86MiscSetMouseSettings(d, &mseinfo);
         XFlush(d);
         if (type == MTYPE_IMPS2) initIMPS2();
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index ea1c80a81..126897889 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -217,10 +217,11 @@ sub has_mntpoint {
     my ($mntpoint, $hds) = @_;
     mntpoint2part($mntpoint, [ get_fstab(@$hds) ]);
 }
-sub get_root {
+sub get_root_ {
     my ($fstab, $boot) = @_;
     $boot && mntpoint2part("/boot", $fstab) || mntpoint2part("/", $fstab);
 }
+sub get_root { &get_root_ || {} }
 
 #- do this before modifying $part->{mntpoint}
 #- $part->{mntpoint} should not be used here, use $mntpoint instead
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index 45766abaa..115275634 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -34,7 +34,7 @@ sub partition_with_diskdrake {
 	delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake');
 	my @fstab = fsedit::get_fstab(@$hds);
 	
-	unless (fsedit::get_root(\@fstab)) {
+	unless (fsedit::get_root_(\@fstab)) {
 	    $ok = 0;
 	    $o->ask_okcancel('', _("You must have a root partition.
 For this, create a partition (or click on an existing one).
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ef6ce2e6d..c0246035e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -145,7 +145,7 @@ sub doPartitionDisksAfter {
     }
 
     $o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}, $o->{raid}) ];
-    fsedit::get_root($o->{fstab}) or die "Oops, no root partition";
+    fsedit::get_root_($o->{fstab}) or die "Oops, no root partition";
 
     if (my $s = delete $o->{stage1_hd}) {
 	my ($part) = grep { $_->{device} eq $s->{device} } @{$o->{fstab}};
@@ -170,7 +170,7 @@ sub doPartitionDisks {
 
     if ($o->{isUpgrade}) {
 	# either one root is defined (and all is ok), or we take the first one we find
-	my $p = fsedit::get_root($o->{fstab}) || first(install_any::find_root_parts($o->{hds}, $o->{prefix})) or die;
+	my $p = fsedit::get_root_($o->{fstab}) || first(install_any::find_root_parts($o->{hds}, $o->{prefix})) or die;
 	install_any::use_root_part($o->{fstab}, $p, $o->{prefix});
     } elsif ($o->{partitioning}{auto_allocate}) {
 	fsedit::auto_allocate($o->{hds}, $o->{partitions});
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 4562bc127..6144af723 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -168,29 +168,24 @@ sub selectInstallClass1 {
 #------------------------------------------------------------------------------
 sub selectMouse {
     my ($o, $force) = @_;
-
-    my $set = sub {
-	my ($mouse) = @_;
-	symlinkf($mouse->{device}, "/dev/mouse");
-	c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($mouse->{XMOUSETYPE}));
-    };
-
     my %old = %{$o->{mouse}};
     $o->SUPER::selectMouse($force);
-    $old{type} eq $o->{mouse}{type} && $old{name} eq $o->{mouse}{name} && !$force and return;
+    my $mouse = $o->{mouse};
+    $old{type} eq $mouse->{type} && $old{name} eq $mouse->{name} && !$force and return;
 
     local $my_gtk::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere
 
     while (1) {
 	log::l("telling X server to use another mouse");
-	eval { modules::load('serial') } if $o->{mouse}{device} =~ /ttyS/;
+	eval { modules::load('serial') } if $mouse->{device} =~ /ttyS/;
 
 	if (!$::testing) {
-	    symlinkf($o->{mouse}{device}, "/dev/mouse");
-	    c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($o->{mouse}{XMOUSETYPE}));
+	    symlinkf($mouse->{device}, "/dev/mouse");
+	    c::setMouseLive($ENV{DISPLAY}, mouse::xmouse2xId($mouse->{XMOUSETYPE}), $mouse->{nbuttons} < 3);
 	}
-	install_gtk::test_mouse($o->{mouse}) and return;
+	install_gtk::test_mouse($mouse) and return;
 	$o->SUPER::selectMouse(1);
+	$mouse = $o->{mouse};
     } 
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 64cfa1ea9..b2da1209f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -245,7 +245,7 @@ Continue at your own risk!"));
     if ($o->{isUpgrade}) {
 	# either one root is defined (and all is ok), or we take the first one we find
 	my $p = 
-	  fsedit::get_root($o->{fstab}) ||
+	  fsedit::get_root_($o->{fstab}) ||
 	  $o->ask_from_listf(_("Root Partition"),
 			     _("What is the root partition (/) of your system?"),
 			     \&partition_table_raw::description, 
@@ -372,7 +372,7 @@ sub choosePackages {
 	    }
 	});
 	if (!$size2install) { #- special case for desktop
-	    $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual);
+	    $o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
 	}
 	($o->{packages_}{ind}) =
 	  pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, $size2install, $o->{installClass});
@@ -394,8 +394,8 @@ sub chooseGroups {
 			       _("Package Group Selection"),
 			       [ @$compssUsersSorted, _("Miscellaneous") ],
 			       [ map { \$o->{compssUsersChoice}{$_} } @$compssUsersSorted, "Miscellaneous" ],
-			       [  _("Individual package selection") ], [ $individual ],			       
-			       ) or goto &chooseGroups;
+			       $individual ? ([  _("Individual package selection") ], [ $individual ]) : (),
+			      ) or goto &chooseGroups;
 
     unless ($o->{compssUsersChoice}{Miscellaneous}) {
 	my %l;
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm
index 9aa80b4c8..edd26fd11 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive_newt.pm
@@ -24,7 +24,7 @@ sub new() {
 }
 
 sub enter_console { Newt::Suspend }
-sub leave_console { Newt::Suspend }
+sub leave_console { Newt::Resume }
 sub suspend { Newt::Suspend }
 sub resume { Newt::Resume }
 sub end() { Newt::Finished }