From ae1ca0772cea076c0098a83c15de2581e8aee3f5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 15 Sep 2001 13:41:51 +0000
Subject: - add and use aewm-drakx - add some "skip" title on help/logo/steps
 windows so that aewm-drakx know they don't need keyboard focus - add some
 more title to ease debugging (when aewm-drakx is in debug mode)

---
 perl-install/any.pm               | 1 +
 perl-install/install_gtk.pm       | 3 +++
 perl-install/install_steps_gtk.pm | 9 +++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index a26666ae9..55391995c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -774,6 +774,7 @@ sub selectLanguage {
     my ($in, $lang, $langs) = @_;
     $in->ask_from_(
 	{ messages => _("Please, choose a language to use."),
+	  title => 'language choice',
 	  advanced_messages => _("You can choose other languages that will be available after install"),
 	  callbacks => {
 	      focus_out => sub { $langs->{$lang} = 1 },
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm
index da7ade600..f9dfab493 100644
--- a/perl-install/install_gtk.pm
+++ b/perl-install/install_gtk.pm
@@ -100,6 +100,7 @@ sub create_help_window {
 	$w->{rwindow} = $w->{window} = new Gtk::Window;
 	$w->{rwindow}->set_uposition($::rootwidth - $::helpwidth, $::rootheight - $::helpheight);
 	$w->{rwindow}->set_usize($::helpwidth, $::helpheight);
+	$w->{rwindow}->set_title('skip');
 	$w->sync;
     }
     my $pixmap = gtkpng("$ENV{SHARE_PATH}/help.png");
@@ -127,6 +128,7 @@ sub create_steps_window {
     $w->{rwindow}->set_usize($::stepswidth, $::stepsheight);
     $w->{rwindow}->set_name('Steps');
     $w->{rwindow}->set_events('button_press_mask');
+    $w->{rwindow}->set_title('skip');
     #$w->show;
 
     gtkadd($w->{window},
@@ -187,6 +189,7 @@ sub create_logo_window {
     $w->{rwindow}->set_uposition($::stepswidth, 0);
     $w->{rwindow}->set_usize($::logowidth, $::logoheight);
     $w->{rwindow}->set_name("logo");
+    $w->{rwindow}->set_title('skip');
     $w->show;
     my $file = $o->{meta_class} eq 'desktop' ? "logo-mandrake-Desktop.png" : "logo-mandrake.png";
     $o->{meta_class} eq 'firewall' and $file = "logo-mandrake-Firewall.png";
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 36f183245..471e322fe 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -33,8 +33,6 @@ sub new($$) {
 
     $ENV{DISPLAY} ||= $o->{display} || ":0";
     unless ($::testing) {
-	$my_gtk::force_focus = $ENV{DISPLAY} eq ":0";
-
 	if ($ENV{DISPLAY} eq ":0" && !$::live) {
 	    my $f = "/tmp/Xconf";
 	    install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{wacom}[0]);
@@ -58,7 +56,10 @@ sub new($$) {
 		foreach (1..60) {
 		    sleep 1;
 		    log::l("Server died"), return 0 if !$ok;
-		    return 1 if c::Xtest($ENV{DISPLAY});
+		    if (c::Xtest($ENV{DISPLAY})) {
+			fork || exec("aewm-drakx") || exec("true");
+			return 1;
+		    }
 		}
 		log::l("Timeout!!");
 		0;
@@ -155,7 +156,7 @@ sub selectInstallClass1 {
     my ($o, $verif, $l, $def, $l2, $def2) = @_;
     $::live || @$l == 1 and return $o->SUPER::selectInstallClass1($verif, $l, $def, $l2, $def2);
 
-    my $w = my_gtk->new('');
+    my $w = my_gtk->new(_("Install Class"));
     my $focused;
     gtkadd($w->{window},
 	   gtkpack($w->create_box_with_title(_("Please, choose one of the following classes of installation:")),
-- 
cgit v1.2.1