Branch for updates

4 files changed, 1943 insertions, 0 deletions

diff --git a/perl-install/interactive/curses.pm b/perl-install/interactive/curses.pm
new file mode 100644
index 000000000..cdcb6fe7f
--- /dev/null
+++ b/perl-install/interactive/curses.pm
@@ -0,0 +1,615 @@
+# implementer tree
+
+# to debug, use something like
+# PERLDB_OPTS=TTY=`tty` LC_ALL=fr_FR.UTF-8 xterm -geometry 80x25 -e sh -c 'DISPLAY= perl -d t.pl'
+
+package interactive::curses; # $Id: curses.pm 262575 2009-10-22 17:25:42Z blino $
+
+use diagnostics;
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw(interactive);
+
+use interactive;
+use common;
+use log;
+use Curses::UI;
+
+my $SAVEERR;
+my $stderr_file = "/tmp/curses-stderr.$$";
+my $padleft = 1;
+my $padright = 1;
+my $indent = 1;
+my $cui;
+
+sub new {
+    my ($class) = @_;
+    if ($::isInstall && !$::local_install) {
+	system('unicode_start'); #- do not use run_program, we must do it on current console
+    }
+    open $SAVEERR, ">&STDERR";
+    open STDERR, ">", common::secured_file($stderr_file);
+
+    $cui ||= Curses::UI->new('-color_support' => 1);
+    bless { cui => $cui }, $class;
+}
+
+sub enter_console { &suspend }
+sub leave_console { &end }
+sub suspend { $cui->leave_curses }
+sub resume { $cui->reset_curses }
+sub end { &suspend; print $SAVEERR $_ foreach cat_($stderr_file); unlink $stderr_file }
+sub exit { end(); CORE::exit($_[1] || 0) }
+END { end() }
+
+sub _messages { 
+    my ($width, @messages) = @_;
+    warp_text(join("\n", @messages), $width);
+}
+
+sub _enable_disable {
+    my ($w, $disabled) = @_;
+
+    if ($disabled ? $w->{'-is-disabled'} : !$w->{'-is-disabled'}) {
+	return;
+    }
+    $w->{'-is-disabled'} = $disabled;
+
+    if ($disabled) {
+	add2hash_($w, { '-was-focusable' => $w->focusable, '-was-fg' => $w->{'-fg'}, '-was-bfg' => $w->{'-bfg'} });
+	$w->focusable(0);
+	$w->{'-fg'} = $w->{'-bfg'} = 'blue';
+    } else {
+	$w->focusable($w->{'-was-focusable'});
+	$w->{'-fg'} = $w->{'-was-fg'};
+	$w->{'-bfg'} = $w->{'-was-bfg'};
+    }
+    $w->intellidraw;
+}
+
+sub filter_widget {
+    my ($e) = @_;
+
+    if ($e->{title} || $e->{type} eq 'expander') {
+	$e->{no_indent} = 1;
+    }
+
+    $e->{type} = 'list' if $e->{type} =~ /iconlist|treelist/;
+
+    #- combo does not allow modifications
+    $e->{type} = 'entry' if $e->{type} eq 'combo' && !$e->{not_edit};
+
+    $e->{formatted_list} = [ map { my $t = warp_text(may_apply($e->{format}, $_), 80); $t } @{$e->{list}} ];
+
+    $e->{default_curses} ||= delete $e->{curses};
+}
+sub filter_widgets {
+    my ($l) = @_;
+
+    filter_widget($_) foreach @$l;
+
+    map {
+	if (@$_ > 1) {
+	    my $e = { type => 'checkboxes', label => $_->[0]{label}, val => \ (my $_ignored),
+		      list => [ map { $_->{text} } @$_ ], children => $_ };
+	    filter_widget($e);
+	    $e;
+	} else {
+	    @$_;
+	}
+    } common::group_by { !$_[0]{disabled} && 
+			   $_[0]{type} eq 'bool' && $_[1]{type} eq 'bool'
+			     && !$_[1]{label} } @$l;
+}
+
+
+sub heights {
+    my ($best, @fallbacks) = @_;
+    join(',', $best, grep { $_ < $best } @fallbacks);
+}
+
+sub entry_height {
+    my ($e) = @_;
+    to_int(max($e->{curses}{'-height'}, $e->{label_height} || 0));
+}
+
+sub compute_label_size {
+    my ($e, $available_width, $o_fixed_width) = @_;
+
+    $e->{label} or return;
+
+    my @text = _messages(min(80, $o_fixed_width || $available_width), $e->{label});
+    $e->{label_text_wrapped} = join("\n", @text);
+    $e->{label_height} = int(@text);
+    $e->{label_width} = $o_fixed_width || max(map { length } @text);
+}
+sub compute_label_sizes {
+    my ($cui, $wanted_widgets) = @_;
+
+    my $available_width = $cui->{'-width'} - 4;
+
+    foreach (@$wanted_widgets) {
+	compute_label_size($_, $available_width);
+    }
+}
+
+sub compute_size {
+    my ($e, $previous_e, $available_width, $o_labels_width) = @_;
+
+    {
+	my %c = %{$e->{default_curses} || {}};
+	$e->{curses} = \%c;
+    }
+    #- if $o_labels_width is given, it will be used
+    compute_label_size($e, $available_width, $o_labels_width);
+    $e->{curses}{'-x'} ||= 
+      $previous_e && $previous_e->{same_line} ? 1 + $previous_e->{curses}{'-x'} + $previous_e->{curses}{'-width'} :
+      $e->{no_indent} ? $padleft :
+      $padleft + $indent + ($e->{label_width} ? $e->{label_width} + 1 : 0);
+
+    my $width_avail = $available_width - $e->{curses}{'-x'};
+
+    if ($e->{type} eq 'bool') {
+	my $indent = length("[X] ");
+	my @text = _messages($width_avail - $indent, $e->{text} || '');
+	$e->{curses}{'-height'} ||= heights(int(@text), 4);
+	$e->{curses}{'-width'} ||= max(map { length } @text) + $indent + 1;
+	$e->{curses}{'-label'} = join("\n", @text);
+    } elsif ($e->{type} eq 'combo') {
+	$e->{curses}{'-height'} ||= 1;
+	$e->{curses}{'-width'} ||= max(map { length } @{$e->{formatted_list}}) + 3;	
+    } elsif ($e->{type} eq 'checkboxes') {
+	$e->{curses}{'-height'} ||= heights(map { $_ + 2 } int(@{$e->{formatted_list}}), 10, 4);
+	$e->{curses}{'-width'} ||= max(map { length } @{$e->{formatted_list}}) + 7;
+    } elsif ($e->{type} =~ /list/) {
+	$e->{curses}{'-height'} ||= heights(map { $_ + 2 } int(map { split("\n", $_) } @{$e->{formatted_list}}), 5, 4);
+	$e->{curses}{'-width'} ||= max(map { length } map { split("\n", $_) } @{$e->{formatted_list}}) + 3;	
+    } elsif ($e->{type} eq 'button') {
+	my $s = sprintf('< %s >', may_apply($e->{format}, ${$e->{val}}));
+	$e->{curses}{'-width'} ||= length($s);
+    } elsif ($e->{type} eq 'expander') {
+	$e->{curses}{'-width'} ||= length("<+> $e->{text}");
+    } elsif ($e->{type} eq 'text' || $e->{type} eq 'label' || $e->{type} eq 'only_label') {
+	my @text = _messages(min(80, $width_avail - 1), ${$e->{val}}); #- -1 because of the scrollbar
+	$e->{curses}{'-focusable'} = 0;
+	$e->{curses}{'-height'} ||= heights(int(@text), 10, 4);
+	$e->{curses}{'-width'} ||= 1 + max(map { length } @text);
+    } else {
+	$e->{curses}{'-width'} ||= 20;
+    }
+    $e->{curses}{'-height'} ||= 1;
+
+}
+
+sub compute_sizes {
+    my ($cui, $wanted_widgets, $o_labels_width, $b_first_time) = @_;
+
+    my ($available_width, $available_height) = ($cui->{'-width'} - 2, $cui->{'-height'} - 2);
+
+    my $previous;
+    foreach (@$wanted_widgets) {
+	compute_size($_, $previous, $available_width, $o_labels_width);
+	$previous = $_;
+    }
+
+    my $width = max(map { $_->{curses}{'-x'} + $_->{curses}{'-width'} } @$wanted_widgets);
+    if ($width > $available_width) {
+	log::l("oops, could not fit... (width $width > $available_width)\n");
+	if ($o_labels_width && $b_first_time) {
+	    log::l("retrying without aligning entries");
+	    return compute_sizes($cui, $wanted_widgets);
+	} elsif (!$o_labels_width) {
+	    my $width_no_labels = 4 + max(map { $_->{label} ? $_->{curses}{'-width'} : 0 } @$wanted_widgets);
+	    if ($width_no_labels < $available_width) {
+		#- trying to force a smaller labels width
+		log::l("retrying forcing a smaller size for labels ($available_width - $width_no_labels)");
+		return compute_sizes($cui, $wanted_widgets, $available_width - $width_no_labels);
+	    } else {
+		log::l("going on even if labels are too wide ($width_no_labels >= $available_width");
+	    }
+	} else {
+	    log::l("going on even if labels can't fit forced to $o_labels_width ($width < $available_width)");
+	}
+    }
+    my $height;
+    my $i = @$wanted_widgets;
+  retry: while (1) {
+	$height = sum(map { entry_height($_) } grep { !$_->{same_line} } @$wanted_widgets) + 1;
+	$height > $available_height or last;
+	while ($i--) {
+	    if ($wanted_widgets->[$i]{curses}{'-height'} =~ s/\d+,//) {
+#-		warn "retring after modifying $wanted_widgets->[$i]{type}\n";
+		if ($wanted_widgets->[$i]{type} eq 'text') {
+		    $wanted_widgets->[$i]{curses}{'-vscrollbar'} = 1;
+		    $wanted_widgets->[$i]{curses}{'-focusable'} = 1;
+		}
+		goto retry;
+	    }
+	}
+	log::l("oops, could not fit... (height $height > $available_height)\n");
+	if ($o_labels_width) {
+	    log::l("retrying without aligning entries");
+	    compute_sizes($cui, $wanted_widgets);
+	} else {
+	    #- hum, we need to use expander to split things
+	    my $nb;
+	    my $height = 5; #- room from buttons and expander
+	    foreach (@$wanted_widgets) {
+		$height += to_int($_->{curses}{'-height'}) if !$_->{same_line};
+		$height <= $available_height or die "too_many $nb\n";
+		$nb++;
+	    }
+	    internal_error("should have died");
+	}
+    }
+
+    +{
+	'-x' => int(($available_width - $width) / 2 - 1),
+	'-y' => int(($available_height - $height) / 2 - 1),
+	'-width' => $width + 2,
+	'-height' => $height + 2,
+    };
+}
+
+sub compute_buttons {
+    my ($common, $validate) = @_;
+
+    my %buttons = (ok => $common->{ok}, cancel => $common->{cancel});
+    if (!defined $buttons{cancel} && !defined $buttons{ok}) {
+        $buttons{cancel} = $::isWizard && !$::Wizard_no_previous ? N("Previous") : N("Cancel");
+#        $need_to_die = 1 if !($::isWizard && !$::Wizard_no_previous);
+    }
+    $buttons{ok} ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok");
+
+    my @button_names = grep { $buttons{$_} } 'ok', 'cancel';
+    @button_names = reverse(@button_names) if $::isWizard;
+
+    my $same_line = @button_names;
+
+    my %buttons_e = map {
+	my $name = $_;
+	my $label = "< $buttons{$name} >";
+
+	$name =>
+	  { type => 'button', val => \$buttons{$name}, same_line => --$same_line, no_indent => 1,
+	    default_curses => { '-height' => 1, '-width' => length($label) },
+	    clicked_may_quit => $name eq 'ok' ? $validate : sub { '0 but true' },
+	};
+    } @button_names;
+
+    $buttons_e{$common->{focus_cancel} ? 'cancel' : 'ok'}{focus} = sub { 1 };
+    $buttons_e{ok}{disabled} = $common->{ok_disabled} if $common->{ok_disabled};
+
+    map { $buttons_e{$_} } @button_names;
+}
+
+sub create_widget {
+    my ($cui, $win, $e, $y, $changed, $focus_out) = @_;
+
+    my $onchange = sub {
+	my ($f) = @_;
+	sub { 
+	    ${$e->{val}} = $f->(); 
+	    $changed->() if $changed;
+	};
+    };
+
+    #- take the best remaining proposed height
+    $e->{curses}{'-height'} = to_int($e->{curses}{'-height'});
+
+    my %options = ('-y' => $y, %{$e->{curses}});
+
+    if ($e->{label}) {
+	$e->{label_w} = $win->add(undef, 
+				  $e->{label_height} <= 1 ? 'Label' : 
+				    ('TextViewer', 
+				     '-width' => $e->{label_width},
+				     '-focusable' => 0,
+				     '-height' => $e->{label_height}),
+				  '-text' => $e->{label_text_wrapped}, 
+				  '-y' => $options{'-y'}, '-x' => $padleft + 1,
+			      );
+    }
+
+    if (!$e->{same_line}) {
+	delete $options{'-width'};
+	$options{'-padright'} = $padright;
+    }
+    $options{'-onblur'} = $focus_out if $focus_out;
+
+    my ($w, $set);
+    if ($e->{type} eq 'bool') {
+	$w = $win->add(
+	    undef, 'Checkbox',
+	    '-checked' => ${$e->{val}},
+	    '-onchange' => $onchange->(sub { $w->get }),
+	    %options);
+	$set = sub { my $meth = $_[0] ? 'check' : 'uncheck'; $w->$meth; $w->intellidraw };
+    } elsif ($e->{type} eq 'expander') {
+	my $toggle_s = '<+> ';
+	$e->{label_w} = $win->add(undef, 'Label', '-bold' => 1, '-text' => $toggle_s, %options);
+	$options{'-x'} += length($toggle_s);
+	$w = $win->add(undef, 'Buttonbox', '-buttons' => [ {
+	    '-label' => $e->{text},
+	    '-onpress' => sub { 
+		my $common = { ok => "Close", cancel => '', messages => [ if_($e->{message}, $e->{message}) ] };
+		ask_fromW_($cui, $common, $e->{children});
+	    },
+	} ], %options);
+    } elsif ($e->{type} eq 'button') {
+	my $clicked_may_quit = delete $options{clicked_may_quit};
+	$w = $win->add(undef, 'Buttonbox', '-buttons' => [ {
+	    '-onpress' => $clicked_may_quit || sub { 1 },
+	} ], %options);
+	$w->set_binding('focus-up', Curses::KEY_LEFT());
+	$w->set_binding('focus-down', Curses::KEY_RIGHT());
+	$set = sub { $w->set_label(0, sprintf('< %s >', may_apply($e->{format}, $_[0]))) };
+    } elsif ($e->{type} eq 'list' || $e->{type} eq 'combo') {
+	$w = $win->add(undef, $e->{type} eq 'combo' ? 'Popupmenu' : 'Listbox', 
+		       '-values' => $e->{formatted_list},
+		       '-onchange' => $onchange->(sub { $e->{list}[$w->id] }),
+		       if_($e->{type} eq 'list',
+			   '-vscrollbar' => 1,
+			   '-onselchange' => sub {
+			       #- we don't want selection AND active, so ensuring they are the same
+			       $w->id == $w->get_active_id or $w->set_selection($w->get_active_id);
+			   }),
+		       %options);
+	$set = sub {
+	    my ($val) = @_;
+	    my $s = may_apply($e->{format}, $val);
+	    eval { 
+		my $id = find_index { $s eq $_ } @{$e->{formatted_list}};
+		$w->set_selection($id);
+		if ($w->can('set_active_id')) {
+		    $w->set_active_id($id);
+		    $w->intellidraw;
+		}
+	    };
+	};
+    } elsif ($e->{type} eq 'checkboxes') {
+	my @selection;
+	$w = $win->add(undef, 'Listbox', 
+		       '-values' => $e->{formatted_list},
+		       '-vscrollbar' => 1,
+		       '-multi' => 1,
+		       '-onselchange' => sub {
+			   my @new = $w->id;
+			   my %ids = (
+			       (map { $_ => 1 } difference2(\@new, \@selection)),
+			       (map { $_ => 0 } difference2(\@selection, \@new)),
+			   );
+			   foreach (keys %ids) {
+			       my $sub_e = $e->{children}[$_];
+			       ${$sub_e->{val}} = $ids{$_};
+			       $changed->() if $changed;
+			   }
+		       },			   
+		       %options);
+	$set = sub {
+	    @selection = map_index { if_(${$_->{val}}, $::i) } @{$e->{children}};
+	    $w->set_selection(@selection);
+	};
+    } elsif ($e->{type} eq 'only_label' && $e->{curses}{'-height'} == 1) {
+	$w = $win->add(undef, 'Label', '-text' => ${$e->{val}}, 
+		       if_($e->{title}, '-bold' => 1), 
+		       %options);
+    } elsif ($e->{type} eq 'label' && $e->{curses}{'-height'} == 1) {
+	$w = $win->add(undef, 'Label', %options);
+	$set = sub { $w->text($_[0] || '') };
+    } elsif ($e->{type} eq 'label' || $e->{type} eq 'only_label' || $e->{type} eq 'text') {
+	$w = $win->add(undef, 'TextViewer', %options);
+	$set = sub { 
+	    my ($text) = @_;
+	    my $width = $w->{'-sw'} - ($w->{'-vscrollbar'} ? 1 : 0);
+	    $w->text(join("\n", _messages($width, $text)));
+	};
+    } else {
+	$w = $win->add(undef, $e->{hidden} ? 'PasswordEntry' : 'TextEntry', 
+		       '-sbborder' => 1,
+		       '-text' => '', 
+		       '-onchange' => $onchange->(sub { $w->text }),
+		       %options);
+	$set = sub { $w->text($_[0] || '') };
+    }
+
+    $e->{w} = $w;
+    $e->{set} = $set || sub {};
+}
+
+sub create_widgets {
+    my ($cui, $win, $l) = @_;
+
+    my $ignore; #-to handle recursivity
+    my $set_all = sub {
+	$ignore = 1;
+	foreach my $e (@$l) {
+	    $e->{set}->(${$e->{val}});
+	    my $disabled = $e->{disabled} && $e->{disabled}();
+	    _enable_disable($e->{w}, $disabled);
+	    _enable_disable($e->{label_w}, $disabled) if $e->{label_w};
+	}
+	$ignore = 0;
+    };
+    my $sub_update = sub {
+	my ($f) = @_;
+	sub {
+	    return if $ignore;
+	    $f->() if $f;
+	    $set_all->();
+	};
+    };
+
+    my $to_focus;
+    my $y = 1;
+    foreach (@$l) {
+	my $e = $_;
+
+	$e->{curses}{clicked_may_quit} = sub {
+	    if (my $v = $e->{clicked_may_quit}()) {
+		die "exit_mainloop $v";
+	    }
+	    $set_all->();
+	} if $e->{clicked_may_quit};
+
+	create_widget($cui, $win, $e, $y, $sub_update->($e->{changed}), $sub_update->($e->{focus_out}));
+	$to_focus ||= $e if $e->{focus} && $e->{focus}->();
+	$y += entry_height($e) if !$e->{same_line};
+    }
+
+    ($to_focus || $l->[-1])->{w}->focus;
+
+    $set_all->();
+
+    $set_all;
+}
+
+sub all_entries {
+    my ($l) = @_;
+    map { $_, if_($_->{children}, @{$_->{children}}) } @$l;
+}
+
+sub ask_fromW {
+    my ($o, $common, $l) = @_;
+    ask_fromW_($o->{cui}, $common, $l);
+}
+
+sub ask_fromW_ {
+    my ($cui, $common, $l) = @_;
+
+    $l = [ filter_widgets($l) ];
+
+    my $set_all;
+    my $validate = sub {
+	my @all = all_entries($l);
+	my $e = find { $_->{validate} && !$_->{validate}->() } @all;
+	$e ||= $common->{validate} && !$common->{validate}() && $all[0];
+	if ($e) {
+	    $set_all->();
+	    $e->{w}->focus if $e->{w}; #- widget may not exist if it is inside an expander
+	}
+	!$e;
+    };
+
+    my @wanted_widgets = (
+	if_(@{$common->{messages}}, { type => 'text', val => \(join("\n", @{$common->{messages}}, ' ')) }),
+	@$l,
+	{ type => 'label', val => \ (my $_ignore) },
+	compute_buttons($common, $validate),
+    );
+
+    compute_label_sizes($cui, $l);
+    my $labels_width = max(map { $_->{label_width} } @$l);
+    my $window_size;
+    eval { $window_size = compute_sizes($cui, \@wanted_widgets, $labels_width, 'first_time') } or do {
+	my ($nb) = $@ =~ /^too_many (\d+)$/ or die;
+	$nb -= 1; #- remove {messages}
+	$nb != @$l or internal_error("dead-loop detected");
+
+	my @l = (
+	    (@$l)[0 .. $nb - 1], 
+	    { type => 'expander', text => N("More"), children => [ (@$l)[$nb .. $#$l] ] },
+	);
+	return ask_fromW_($cui, $common, \@l);
+    };
+
+    my $win = $cui->add(undef, 'Window',
+			     %$window_size,
+			     '-border' => 1, 
+			     '-bfg' => 'blue', '-tfg' => 'yellow', '-tbg' => 'blue', '-titlereverse' => 0,
+			     '-focusable' => 1,
+			     if_($common->{title}, '-title' => $common->{title}),
+			 );
+
+    $set_all = create_widgets($cui, $win, \@wanted_widgets);
+
+    $win->set_binding(\&exit, "\cC");
+    $win->set_binding(sub { suspend(); kill 19, $$ }, "\cZ");
+
+    $cui->focus($win, 1);
+    eval { $win->modalfocus };
+
+    my $err = $@;
+    $cui->delete_object($win);
+    $cui->draw;
+
+    my ($v) = $err =~ /^exit_mainloop (\S*)/ or die $err;
+
+    $v eq '0 but true' ? 0 : $v;
+}
+
+sub ask_fileW {
+    my ($o, $opts) = @_;
+    my ($file, $dir);
+
+    $dir = $opts->{directory} || $opts->{file} && dirname($opts->{file});
+
+    if($opts->{save}) {
+        $file = $o->{cui}->savefilebrowser('-title' => $opts->{title}, '-path' => $dir, '-file' => basename($file));
+    } else {
+        $file = $o->{cui}->loadfilebrowser('-title' => $opts->{title}, '-path' => $dir, '-file' => basename($file));
+    }
+
+    my $err;
+    if (!$file) {
+	$err = N("No file chosen");
+    } elsif(-f $file && $opts->{want_a_dir}) {
+        $file = dirname($file);
+    } elsif(-d $file && !$opts->{want_a_dir}) {
+        $err = N("You have chosen a directory, not a file");
+    } elsif (!-e $file && !$opts->{save}) {
+	$err = $opts->{want_a_dir} ? N("No such directory") : N("No such file");
+    };
+    $err and $o->ask_warn('', $err) or $file;
+}
+
+sub wait_messageW {
+    my ($o, $title, $message, $message_modifiable) = @_;
+
+    my $w = { title => $title, message_header => $message };
+    wait_message_nextW($o, $message_modifiable, $w);
+    $w;
+}
+
+sub wait_message_nextW {
+    my ($o, $message, $w) = @_;
+
+    wait_message_endW($o, $w) if $w->{w};
+    my $msg = join("\n", _messages($o->{cui}{'-width'}, $w->{message_header} . "\n" . $message));
+    $w->{w} = $o->{cui}->add(undef, 'Dialog::Status', '-title' => $w->{title}, '-message' => $msg);
+    $w->{w}->draw;
+}
+sub wait_message_endW {
+    my ($o, $w) = @_;
+    $o->{cui}->delete_object($w->{w});
+    $o->{cui}->draw;
+}
+
+sub wait_message_with_progress_bar {
+    my ($o, $o_title) = @_;
+
+    my $w = {};
+    my $b = before_leaving { $o->wait_message_endW($w) };
+    $b, sub {
+	my ($msg, $current, $total) = @_;
+	if (!$w->{w} || $w->{total} != $total) {
+	    $o->{cui}->delete_object($w->{w}) if $w->{w};
+
+	    $w->{w} = $o->{cui}->add(undef, 
+				     $total ? ('Dialog::Progress', '-max' => $total) : 'Dialog::Status', 
+				     if_($o_title, '-title' => $o_title),
+				     '-message' => $msg || $w->{msg});
+	    $w->{total} = $total;
+	    $w->{msg} = $msg;
+	} elsif ($msg) {
+	    $w->{w}->message($msg);
+	}
+	if ($current) {
+	    $w->{w}->pos($current);
+	}
+	$o->{cui}->draw;
+    };
+}
+
+1;
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
new file mode 100644
index 000000000..4648c2d6b
--- /dev/null
+++ b/perl-install/interactive/gtk.pm
@@ -0,0 +1,985 @@
+package interactive::gtk; # $Id: gtk.pm 261628 2009-10-09 16:25:51Z tv $
+
+use diagnostics;
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw(interactive);
+
+use interactive;
+use common;
+use mygtk2;
+use ugtk2 qw(:helpers :wrappers :create);
+use Gtk2::Gdk::Keysyms;
+
+my $forgetTime = 1000; #- in milli-seconds
+
+sub new {
+    my $w = &interactive::new;
+    ($w->{windowwidth}, $w->{windowheight}) = gtkroot()->get_size if !$::isInstall;
+    $w;
+}
+sub enter_console { my ($o) = @_; $o->{suspended} = common::setVirtual(1) }
+sub leave_console { my ($o) = @_; common::setVirtual(delete $o->{suspended}) }
+sub adapt_markup { 
+    #- nothing needed, the default markup is gtk2's
+    my ($_o, $s) = @_; return $s;
+}
+
+sub exit { ugtk2::exit(@_) }
+
+sub ask_fileW {
+    my ($in, $common) = @_;
+
+    my $w = ugtk2::create_file_selector(%$common);
+
+    my $file;
+    $w->main(sub { 
+	$file = $w->{chooser}->get_filename;
+	my $err = ugtk2::file_selected_check($common->{save}, $common->{want_a_dir}, $file);
+	$err and $in->ask_warn('', $err);
+	!$err;
+    }) && $file;
+}
+
+sub create_boxradio {
+    my ($e, $onchange_f, $double_click) = @_;
+
+    my $boxradio = gtkpack2__(Gtk2::VBox->new,
+			      my @radios = gtkradio('', @{$e->{formatted_list}}));
+    my $tips = Gtk2::Tooltips->new;
+    mapn {
+	my ($txt, $w) = @_;
+	# workaround infamous 6 years old gnome bug #101968:
+	$w->child->set_size_request(mygtk2::get_label_width(), -1) if $e->{alignment} ne 'right' && !$e->{label};
+	$w->signal_connect(button_press_event => $double_click) if $double_click;
+
+	$w->signal_connect(key_press_event => $e->{may_go_to_next});
+	$w->signal_connect(clicked => sub { 
+	    ${$e->{val}} ne $txt or return;
+	    $onchange_f->(sub { $txt });
+	});
+	if ($e->{help}) {
+	    gtkset_tip($tips, $w,
+		       ref($e->{help}) eq 'HASH' ? $e->{help}{$txt} :
+		       ref($e->{help}) eq 'CODE' ? $e->{help}($txt) : $e->{help});
+	}
+    } $e->{list}, \@radios;
+
+    $boxradio, sub {
+	my ($v, $full_struct) = @_;
+	mapn { 
+	    $_[0]->set_active($_[1] eq $v);
+	    $full_struct->{focus_w} = $_[0] if $_[1] eq $v;
+	} \@radios, $e->{list};
+    }, $radios[0];
+}
+
+sub create_treeview_list {
+    my ($e, $onchange_f, $double_click) = @_;
+    my $curr;
+
+    my $list = Gtk2::ListStore->new("Glib::String");
+    my $list_tv = Gtk2::TreeView->new_with_model($list);
+    $list_tv->set_headers_visible(0);
+    $list_tv->get_selection->set_mode('browse');
+    my $textcolumn = Gtk2::TreeViewColumn->new_with_attributes(undef, my $renderer = Gtk2::CellRendererText->new, 'text' => 0);
+    $list_tv->append_column($textcolumn);
+    $renderer->set_property('ellipsize', 'end');
+    
+    my $select = sub {
+	my ($path) = @_;
+	return if !$list_tv->get_model;
+	$list_tv->set_cursor($path, undef, 0);
+	Glib::Timeout->add(100, sub { $list_tv->scroll_to_cell($path, undef, 1, 0.5, 0); 0 });
+    };
+
+    my ($starting_word, $start_reg) = ('', '^');
+    my $timeout;
+    $list_tv->set_enable_search(0);
+    $list_tv->signal_connect(key_press_event => sub {
+        my ($_w, $event) = @_;
+	my $c = chr($event->keyval & 0xff);
+
+	Glib::Source->remove($timeout) if $timeout; $timeout = '';
+	
+	if ($event->keyval >= 0x100) {
+	    $e->{may_go_to_next}(), return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter}));
+	    $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R}));
+	} else {
+	    if (member('control-mask', @{$event->state})) {
+		$c eq 's' or return 1;
+		$start_reg and $start_reg = '', return 1;
+		$curr++;
+	    } else {
+		$e->{may_go_to_next}(), return 1 if $c eq ' ';
+
+		$curr++ if $starting_word eq '' || $starting_word eq $c;
+		$starting_word .= $c unless $starting_word eq $c;
+	    }
+	    my @l = @{$e->{formatted_list}};
+	    my $word = quotemeta $starting_word;
+	    my $j; for ($j = 0; $j < @l; $j++) {
+		 $l[($j + $curr) % @l] =~ /$start_reg$word/i and last;
+	    }
+	    if ($j == @l) {
+		$starting_word = '';
+	    } else {
+		$select->(Gtk2::TreePath->new_from_string(($j + $curr) % @l));
+	    }
+
+	    $timeout = Glib::Timeout->add($forgetTime, sub { $timeout = $starting_word = ''; 0 });
+	}
+	0;
+    });
+    $list_tv->show;
+
+    $list->append_set([ 0 => $_ ]) foreach @{$e->{formatted_list}};
+
+    $list_tv->get_selection->signal_connect(changed => sub {
+	my ($model, $iter) = $_[0]->get_selected;
+	$model && $iter or return;
+	$onchange_f->(sub {
+	    my $row = $model->get_path_str($iter);
+	    $e->{list}[$curr = $row];
+	});
+    });
+    $list_tv->signal_connect(button_press_event => $double_click) if $double_click;
+
+    $list_tv, sub {
+	my ($v) = @_;
+	eval {
+	    my $nb = find_index { $_ eq $v } @{$e->{list}};
+	    my ($old_path) = $list_tv->get_cursor;
+	    if (!$old_path || $nb != $old_path->to_string) {
+		$select->(Gtk2::TreePath->new_from_string($nb));
+	    }
+	    undef $old_path if $old_path;
+	};
+    };
+}
+
+sub __create_tree_model {
+    my ($e) = @_;
+
+    my $sep = quotemeta $e->{separator};
+    my $tree_model = Gtk2::TreeStore->new("Glib::String", if_($e->{image2f}, "Gtk2::Gdk::Pixbuf"));
+
+    my $build_value = sub {
+	my ($v) = @_;
+	my $type = 0;
+	if ($e->{image2f}) {
+	    my $image = $e->{image2f}->($_[0]);
+	    ($type, $v) = (1, gtkcreate_pixbuf($image)) if $image; 
+	}
+	[ $type => $v ];
+    };
+
+    my (%wtree, $parent);
+    $parent = sub {
+	if (my $w = $wtree{"$_[0]$e->{separator}"}) { return $w }
+	my $s = '';
+	foreach (split $sep, $_[0]) {
+	    $wtree{"$s$_$e->{separator}"} ||= 
+	      $tree_model->append_set($s ? $parent->($s) : undef, $build_value->($_));
+	    $s .= "$_$e->{separator}";
+	}
+	$wtree{$s};
+    };
+
+    $tree_model->{path_str_list} = [ map {
+	my ($root, $leaf) = /(.*)$sep(.+)/ ? ($1, $2) : ('', $_);
+	my $iter = $tree_model->append_set($parent->($root), $build_value->($leaf));
+
+	$tree_model->get_path_str($iter);
+    } @{$e->{formatted_list}} ];
+
+    undef $_ foreach values %wtree;
+    undef %wtree;
+
+    $tree_model;
+}
+
+sub create_treeview_tree {
+    my ($e, $onchange_f, $double_click) = @_;
+
+    my $tree_model = __create_tree_model($e);
+    my $tree = Gtk2::TreeView->new_with_model($tree_model);
+    $tree->get_selection->set_mode('browse');
+    {
+	my $col = Gtk2::TreeViewColumn->new;
+	$col->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
+	$col->add_attribute($texrender, text => 0);
+	if ($e->{image2f}) {
+	    $col->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+	    $col->add_attribute($pixrender, pixbuf => 1);
+	}
+	$tree->append_column($col);
+    }
+    $tree->set_headers_visible(0);
+
+    my $select = sub {
+	my ($path_str) = @_;
+	my $path = Gtk2::TreePath->new_from_string($path_str);
+	$tree->expand_to_path($path);
+	$tree->set_cursor($path, undef, 0);
+        gtkflush();  #- workaround gtk2 bug not honouring centering on the given row if node was closed
+	$tree->scroll_to_cell($path, undef, 1, 0.5, 0);
+    };
+
+    my $curr = $tree_model->get_iter_first; #- default value
+    $tree->expand_all if $e->{tree_expanded};
+
+    my $selected_via_click;
+
+    $tree->get_selection->signal_connect(changed => sub {
+	my ($model, $iter) = $_[0]->get_selected;
+	$model && $iter or return;
+	undef $curr if ref $curr;
+	my $path = $tree_model->get_path($curr = $iter);
+	if (!$tree_model->iter_has_child($iter)) {
+	    $onchange_f->(sub {
+		my $path_str = $path->to_string;
+		my $i = find_index { $path_str eq $_ } @{$tree_model->{path_str_list}};
+		$e->{list}[$i];
+	    });
+	} else {
+	    $tree->expand_row($path, 0) if $selected_via_click;
+	}
+    });
+    my ($starting_word, $start_reg) = ('', "^");
+    my $timeout;
+
+    my $toggle = sub {
+	if ($tree_model->iter_has_child($curr)) {
+	    $tree->toggle_expansion($tree_model->get_path($curr), 0);
+
+	} else {
+	    &{$e->{may_go_to_next}};
+	}
+    };
+
+    $tree->set_enable_search(0);
+    $tree->signal_connect(key_press_event => sub {
+        my ($_w, $event) = @_;
+	$selected_via_click = 0;
+	my $c = chr($event->keyval & 0xff);
+	$curr or return 0;
+	Glib::Source->remove($timeout) if $timeout; $timeout = '';
+
+	if ($event->keyval >= 0x100) {
+	    &$toggle and return 1 if member($event->keyval, ($Gtk2::Gdk::Keysyms{Return}, $Gtk2::Gdk::Keysyms{KP_Enter}));
+	    $starting_word = '' if !member($event->keyval, ($Gtk2::Gdk::Keysyms{Control_L}, $Gtk2::Gdk::Keysyms{Control_R}));
+	} else {
+	    my $next;
+	    if (member('control-mask', @{$event->state})) {
+		$c eq "s" or return 1;
+		$start_reg and $start_reg = '', return 0;
+		$next = 1;
+	    } else {
+		&$toggle and return 1 if $c eq ' ';
+		$next = 1 if $starting_word eq '' || $starting_word eq $c;
+		$starting_word .= $c unless $starting_word eq $c;
+	    }
+	    my $word = quotemeta $starting_word;
+	    my ($after, $best);
+
+	    my $sep = quotemeta $e->{separator};
+	    my $currpath = $tree_model->get_path_str($curr);
+	    mapn {
+		my ($path_str, $v) = @_;
+		$next &&= !$after;
+		$after ||= $path_str eq $currpath;
+		$v =~ s/.*$sep//;
+		if ($v =~ /$start_reg$word/i) {
+		    if ($after && !$next) {
+			($best, $after) = ($path_str, 0);
+		    } else {
+			$best ||= $path_str;
+		    }
+		}
+	    } $tree_model->{path_str_list}, $e->{formatted_list};
+
+	    if (defined $best) {
+		$select->($best);
+	    } else {
+		$starting_word = '';
+	    }
+
+	    $timeout = Glib::Timeout->add($forgetTime, sub { $timeout = $starting_word = ''; 0 });
+	}
+	0;
+    });
+    $tree->signal_connect(button_press_event => sub {
+	$selected_via_click = 1;
+	&$double_click if $curr && !$tree_model->iter_has_child($curr) && $double_click;
+    });
+
+    $tree, sub {
+        my $v = may_apply($e->{format}, $_[0]);
+        eval {
+            my $i = find_index { $v eq $_ } @{$e->{formatted_list}};
+
+            my ($model, $iter) = $tree->get_selection->get_selected;
+
+            my $new_path_str = $tree_model->{path_str_list}[$i];
+            my $old_path_str = $model && $tree_model->get_path_str($iter);
+
+            $select->($new_path_str) if $new_path_str ne $old_path_str;
+            undef $iter if ref $iter;
+        };
+    };
+}
+
+#- $actions is a ref list of $action
+#- $action is a { kind => $kind, action => sub { ... }, button => Gtk2::Button->new(...) }
+#-   where $kind is one of '', 'modify', 'remove', 'add'
+sub add_modify_remove_action {
+    my ($button, $buttons, $e, $treelist) = @_;
+
+    if (member($button->{kind}, 'modify', 'remove')) {
+	@{$e->{list}} or return;
+    }
+    my $r = $button->{action}->(${$e->{val}});
+    defined $r or return;
+    
+    if ($button->{kind} eq 'add') {
+	${$e->{val}} = $r;
+    } elsif ($button->{kind} eq 'remove') {
+	${$e->{val}} = $e->{list}[0];
+    }
+    ugtk2::gtk_set_treelist($treelist, [ map { may_apply($e->{format}, $_) } @{$e->{list}} ]);
+
+    add_modify_remove_sensitive($buttons, $e);
+    1;
+}
+
+sub add_padding {
+    my ($w) = @_;
+    gtknew('HBox', children => [
+        0, gtknew('Alignment', width => $mygtk2::left_padding),
+        1, $w
+    ]);
+}  
+
+sub create_widget {
+    my ($o, $common, $e, $onchange_f, $update, $ignore_ref) = @_;
+
+    my $onchange = sub {
+	my ($f) = @_;
+	sub { $onchange_f->($f, @_) };
+    };
+
+    my ($w, $real_w, $focus_w, $set);
+    if ($e->{type} eq 'iconlist') {
+	$w = Gtk2::Button->new;
+	$set = sub {
+	    gtkdestroy($e->{icon});
+	    my $f = $e->{icon2f}->($_[0]);
+	    $e->{icon} = -e $f ?
+	      gtkcreate_img($f) :
+		Gtk2::WrappedLabel->new(may_apply($e->{format}, $_[0]));
+	    $w->add(gtkshow($e->{icon}));
+	};
+	$w->signal_connect(clicked => sub {
+			       $onchange_f->(sub { next_val_in_array(${$e->{val}}, $e->{list}) });
+			       $set->(${$e->{val}});
+			   });
+        if ($e->{alignment} eq 'right') {
+            $real_w = gtknew('HButtonBox', layout => 'start', children_tight => [ $w ]);
+        } else {
+            $real_w = gtkpack_(Gtk2::HBox->new(0,10), 1, Gtk2::HBox->new(0,0), 0, $w, 1, Gtk2::HBox->new(0,0));
+        }
+    } elsif ($e->{type} eq 'bool') {
+	if ($e->{image}) {
+	    $w = ugtk2::gtkadd(Gtk2::CheckButton->new, gtkshow(gtkcreate_img($e->{image})));
+	} else {
+	    #-		warn "\"text\" member should have been used instead of \"label\" one at:\n", common::backtrace(), "\n" if $e->{label} && !$e->{text};
+	    $w = Gtk2::CheckButton->new_with_label($e->{text});
+	}
+	$w->signal_connect(clicked => $onchange->(sub { $w->get_active }));
+	$set = sub { $w->set_active($_[0]) };
+        $real_w = add_padding($w);
+    } elsif ($e->{type} eq 'only_label') {
+        my @common = (
+            # workaround infamous 6 years old gnome bug #101968:
+            if_($e->{alignment} ne 'right', width => mygtk2::get_label_width())
+        );
+	$w = $e->{title} ? 
+	         gtknew('Title2', label => escape_text_for_TextView_markup_format(${$e->{val}}), @common) :
+		 gtknew($e->{alignment} eq 'right' ? 'Label_Right' : 'Label_Left',
+                        line_wrap => 1, text_markup => ${$e->{val}}, @common);
+    } elsif ($e->{type} eq 'label') {
+	$w = gtknew('WrappedLabel', text_markup => ${$e->{val}});
+	$set = sub { $w->set($_[0]) };
+    } elsif ($e->{type} eq 'empty') {
+	$w = gtknew('HBox', height => $e->{height});
+    } elsif ($e->{type} eq 'button') {
+	$w = gtknew(($e->{install_button} ? 'Install_Button' : 'Button'), 
+                    text => '', clicked => $e->{clicked_may_quit_cooked});
+	$set = sub {
+            my $w = $w->child;
+            # handle Install_Buttons:
+            if (ref($w) =~ /Gtk2::HBox/) {
+                ($w) = find { ref($_) =~ /Gtk2::Label/ } $w->get_children;
+            }
+            # guard against 'advanced' widgets that are now in their own dialog
+            # (instead of in another block child of an expander):
+            return if !$w;
+            $w->set_label(may_apply($e->{format}, $_[0])) };
+    } elsif ($e->{type} eq 'range') {
+	my $adj = Gtk2::Adjustment->new(${$e->{val}}, $e->{min}, $e->{max} + ($e->{SpinButton} ? 0 : 1), 1, ($e->{max} - $e->{min}) / 10, 1);
+	$w = $e->{SpinButton} ? Gtk2::SpinButton->new($adj, 10, 0) : Gtk2::HScale->new($adj);
+	$w->set_size_request($e->{SpinButton} ? 100 : 200, -1);
+	$w->set_digits(0);
+	$adj->signal_connect(value_changed => $onchange->(sub { $adj->get_value }));
+	$w->signal_connect(key_press_event => $e->{may_go_to_next});
+	$set = sub { $adj->set_value($_[0]) };
+    } elsif ($e->{type} eq 'expander') {
+	$e->{grow} = 'fill';
+	my $children = [ if_($e->{message}, { type => 'only_label', no_indent => 1, val => \$e->{message} }), @{$e->{children}} ];
+	create_widgets_block($o, $common, $children, $update, $ignore_ref);
+	$w = gtknew('HBox', children_tight => [
+            gtknew('Install_Button', text => $e->{text},
+                   clicked => sub {
+                       ask_fromW($o, { title => $common->{title} || N("Advanced") }, $children) }
+               )
+        ]);
+    } elsif ($e->{type} =~ /list/) {
+
+	$e->{formatted_list} = [ map { may_apply($e->{format}, $_) } @{$e->{list}} ];
+
+	if (my $actions = $e->{add_modify_remove}) {
+	    my @buttons = (N_("Add"), N_("Modify"), N_("Remove"));
+	    # Add Up/Down buttons if their actions are defined
+	    foreach (qw(Up Down)) {
+	        push @buttons, 'gtk-go-' . $_ if $actions->{$_};
+	    }
+	    @buttons = map {
+                my $button = /^gtk-/ ? gtknew('Button', image => gtknew('Image', stock => lc($_)))
+                  : Gtk2::Button->new(translate($_));
+		my $kind = $_;
+		$kind =~ s/^gtk-go-//;
+		{ kind => lc $kind, action => $actions->{$kind}, button => $button, real_kind => $_ };
+	    } @buttons;
+	    my $modify = find { $_->{kind} eq 'modify' } @buttons;
+
+	    my $do_action = sub {
+		my ($button) = @_;
+		add_modify_remove_action($button, \@buttons, $e, $w) and $update->();
+	    };
+
+	    ($w, $set, $focus_w) = create_treeview_list($e, $onchange_f, 
+							sub { $do_action->($modify) if $_[1]->type =~ /^2/ });
+
+	    foreach my $button (@buttons) {
+		$button->{button}->signal_connect(clicked => sub { $do_action->($button) });
+	    }
+	    add_modify_remove_sensitive(\@buttons, $e);
+
+	    my ($images, $real_buttons) = partition { $_->{real_kind} =~ /^gtk-/ } @buttons;
+	    $real_w = gtkpack_(Gtk2::HBox->new(0,0),
+			       1, create_scrolled_window($w), 
+			       0, gtkpack__(Gtk2::VBox->new(0,0),
+                                            (map { $_->{button} } @$real_buttons),
+                                            if_($images,
+                                                gtknew('HButtonBox',
+                                                       layout => 'spread',
+                                                       children_loose => [ map { $_->{button} } @$images]
+                                                      )
+                                            ),
+                                        ),
+                           );
+	    $e->{grow} = 'expand';
+	} else {
+	    my $use_boxradio = exists $e->{gtk}{use_boxradio} ? $e->{gtk}{use_boxradio} : @{$e->{list}} <= 8;
+
+	    if ($e->{help} || $use_boxradio && $e->{type} ne 'treelist') {
+		#- used only when needed, as key bindings are dropped by List (ListStore does not seems to accepts Tooltips).
+		($w, $set, $focus_w) = create_boxradio($e, $onchange_f, $e->{quit_if_double_click_cooked});
+                $real_w = add_padding($w);
+	    } elsif ($e->{type} eq 'treelist') {
+		($w, $set) = create_treeview_tree($e, $onchange_f, $e->{quit_if_double_click_cooked});
+	    } else {
+		($w, $set, $focus_w) = create_treeview_list($e, $onchange_f, $e->{quit_if_double_click_cooked});
+	    }
+	    if (@{$e->{list}} > 10 || $e->{gtk}{use_scrolling}) {
+		$real_w = create_scrolled_window($w);
+		$e->{grow} = 'expand';
+	    }
+	}
+    } else {
+	if ($e->{type} eq "combo") {
+	    my $model;
+
+	    my @formatted_list = map { may_apply($e->{format}, $_) } @{$e->{list}};
+	    $e->{formatted_list} = \@formatted_list;
+
+	    if (!$e->{separator}) {
+		if ($e->{not_edit}) {
+		    $real_w = $w = Gtk2::ComboBox->new_text;
+		    # FIXME: the following causes Gtk-CRITICAL but not solvable at realize time:
+		    first($w->child->get_cell_renderers)->set_property('ellipsize', 'end') if !$e->{do_not_ellipsize};
+		    $w->set_wrap_width($e->{gtk}{wrap_width}) if exists $e->{gtk}{wrap_width};
+		} else {
+		    $w = Gtk2::ComboBoxEntry->new_text;
+		    ($real_w, $w) = ($w, $w->child);
+		}
+		$real_w->set_popdown_strings(@formatted_list);
+	    } else {
+		$model = __create_tree_model($e);
+		$real_w = $w = Gtk2::ComboBox->new_with_model($model);
+
+		$w->pack_start(my $texrender = Gtk2::CellRendererText->new, 0);
+		$w->add_attribute($texrender, text => 0);
+		if ($e->{image2f}) {
+		    $w->pack_start(my $pixrender = Gtk2::CellRendererPixbuf->new, 0);
+		    $w->add_attribute($pixrender, pixbuf => 1);
+		}
+	    }
+
+	    my $get = sub {
+		my $i = $model ? do {
+		    my $s = $model->get_string_from_iter($w->get_active_iter);
+		    eval { find_index { $s eq $_ } @{$model->{path_str_list}} };
+		} : do {
+		    my $s = $w->get_text;
+		    eval { find_index { $s eq $_ } @formatted_list };
+		};
+		defined $i ? $e->{list}[$i] : $w->get_text;
+	    };
+	    $w->signal_connect(changed => $onchange->($get));
+
+	    $set = sub {
+		my $s = may_apply($e->{format}, $_[0]);
+		if ($model) {
+		    eval {
+			my $i = find_index { $s eq $_ } @{$e->{formatted_list}};
+			my $path_str = $model->{path_str_list}[$i];
+			$w->set_active_iter($model->get_iter_from_string($path_str));
+		    };
+		} else {
+		    $w->set_text($s) if $s ne $w->get_text && $_[0] ne $w->get_text;
+		}
+	    };
+	} else {
+	    if ($e->{weakness_check}) {
+		$w = gtknew('WeaknessCheckEntry');
+	    }
+	    else {
+		$w = Gtk2::Entry->new;
+	    }
+	    $w->signal_connect(changed => $onchange->(sub { $w->get_text }));
+	    $w->signal_connect(focus_in_event => sub { $w->select_region(0, -1) });
+	    $w->signal_connect(focus_out_event => sub { $w->select_region(0, 0) });
+	    $set = sub { $w->set_text($_[0]) if $_[0] ne $w->get_text };
+	    if ($e->{type} eq 'file') {
+		my $button = gtksignal_connect(Gtk2::Button->new_from_stock('gtk-open'), clicked => sub {
+						   my $file = $o->ask_fileW({
+                                                       title => $e->{label},
+                                                       want_a_dir => to_bool($e->{want_a_dir}),
+                                                   });
+						   $set->($file) if $file;
+					       });
+		$real_w = gtkpack_(Gtk2::HBox->new(0,0), 1, $w, 0, $button);
+	    }
+	}
+	$w->signal_connect(key_press_event => $e->{may_go_to_next});
+	if ($e->{hidden}) {
+	    $w->set_visibility(0);
+	    $w->signal_connect(key_press_event => sub {
+		my (undef, $event) = @_;
+		if (!$o->{capslock_warned} && member('lock-mask', @{$event->state}) && !$w->get_text) {
+		    $o->{capslock_warned} = 1;
+		    $o->ask_warn('', N("Beware, Caps Lock is enabled"));
+		}
+		0;
+	    });
+	}
+    }
+
+    if (my $focus_out = $e->{focus_out}) {
+	$w->signal_connect(focus_out_event => sub { $update->($focus_out) });
+    }
+    $real_w ||= $w;
+
+    $e->{w} = $w;
+    $e->{real_w} = $real_w;
+    $e->{focus_w} = $focus_w || $w if $e->{type} ne 'empty';
+    $e->{set} = $set || sub {};
+}
+
+sub all_entries {
+    my ($l) = @_;
+    map { $_, if_($_->{children}, @{$_->{children}}) } @$l;
+}
+
+sub all_focusable_entries {
+    my ($l) = @_;
+    grep { $_->{focus_w} } @$l;
+}
+
+sub all_title_entries {
+    my ($l) = @_;
+    grep { $_->{title} } @$l;
+}
+
+sub create_widgets_block {
+    my ($o, $common, $l, $update, $ignore_ref) = @_;
+
+    my $label_sizegrp = Gtk2::SizeGroup->new('horizontal');
+    my $right_label_sizegrp = Gtk2::SizeGroup->new('horizontal');
+    my $realw_sizegrp = Gtk2::SizeGroup->new('horizontal');
+
+    @$l = map_index {
+	if ($::i && ($_->{type} eq 'expander' || $_->{title})) {
+	    ({ type => 'empty', height => 4 }, $_);
+	} else {
+	    $_;
+	}
+    } @$l;
+
+    foreach my $e (@$l) {
+	my $onchange_f = sub {
+	    my ($f, @para) = @_;
+	    return if $$ignore_ref;
+	    ${$e->{val}} = $f->(@para); 
+	    $update->($e->{changed});
+	};
+
+	create_widget($o, $common, $e, $onchange_f, $update, $ignore_ref);
+
+	my $label_w;
+	if ($e->{label} || !$e->{no_indent}) {
+	    $label_w = gtknew($e->{alignment} eq 'right' ? 'Label_Right' : 'Label_Left', text_markup => $e->{label} || '',
+			      size_group => ($e->{alignment} eq 'right' ? $right_label_sizegrp : $label_sizegrp),
+                          );
+            $realw_sizegrp->add_widget($e->{real_w});
+	}
+
+	if ($e->{do_not_expand}) {
+            $e->{real_w} = gtknew('HBox', children => [
+                0, $e->{real_w},
+                1, gtknew('Label'),
+            ]);
+	}
+
+	my $eater = gtknew('Label') if $e->{alignment} eq 'right' && !$label_w;
+
+	$e->{real_w} = gtkpack_(Gtk2::HBox->new,
+				if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
+				if_($eater, 1, $eater),
+				if_($label_w, $e->{alignment} eq 'right', $label_w),
+				(!$eater, $e->{real_w}),
+			    );
+    }
+    gtknew('VBox', children => [ map { $_->{grow} || 0, $_->{real_w} } @$l ]);
+}
+
+sub create_widgets {
+    my ($o, $common, $mainw, $l) = @_;
+
+    my $ignore = 0; #-to handle recursivity
+    my $set_all = sub {
+	$ignore = 1;
+	my @all = all_entries($l);
+	$_->{set}->(${$_->{val}}, $_) foreach @all; #- nb: the parameter "$_" is needed for create_boxradio
+	$_->{disabled} and $_->{real_w}->set_sensitive(!$_->{disabled}()) foreach @all;
+	$_->{hidden} and $_->{w}->set_visibility(!(ref($_->{hidden}) eq 'CODE' ? $_->{hidden}() : $_->{hidden})) foreach @all;
+	$mainw->{ok}->set_sensitive(!$common->{ok_disabled}()) if $common->{ok_disabled};
+	$ignore = 0;
+    };
+    my $update = sub {
+	my ($f) = @_;
+	return if $ignore;
+	$f->() if $f;
+	$set_all->();
+    };
+
+    my $ok_clicked = sub { 
+	!$mainw->{ok} || $mainw->{ok}->get_property('sensitive') or return;
+	$mainw->{retval} = 1;
+	Gtk2->main_quit;
+    };
+
+    my @all = all_entries($l);
+    foreach (@all) {
+	my $e = $_; #- for closures
+
+	# we only consider real widgets (aka ignoring labels and Help/Release Notes/... buttons):
+	if ((grep { !$_->{install_button} && $_->{type} ne 'only_label' } @all) == 1 || $e->{quit_if_double_click}) {
+	    #- i'm the only one, double click means accepting
+	    $e->{quit_if_double_click_cooked} = sub { $_[1]->type =~ /^2/ && $ok_clicked->() };
+	}
+
+	if ($e->{clicked_may_quit}) {
+	    $e->{clicked_may_quit_cooked} = sub {
+		$mainw->{rwindow}->hide;
+		if (my $v = $e->{clicked_may_quit}()) {
+		    $mainw->{retval} = $v;
+		    Gtk2->main_quit;
+		}
+		$mainw->{rwindow}->show;
+		$update->();
+	    };
+	}
+
+	$e->{may_go_to_next} = sub {
+	    my (undef, $event) = @_;
+	    if (!$event || ($event->keyval & 0x7f) == 0xd) {
+		my @current_all = all_focusable_entries($l);
+		my $ind = eval { find_index { $_ == $e } @current_all };
+		if (my $e_ = $current_all[$ind+1]) {
+		    $e_->{focus_w}->grab_focus;
+		} else {
+		    @current_all == 1 ? $ok_clicked->() : $mainw->{ok}->grab_focus;
+		}
+		1; #- prevent an action on the just grabbed focus
+	    } else {
+		0;
+	    }
+	};
+    }
+
+    # add asterisks before titles when there're more than one:
+    my @all_titles = all_title_entries($l);
+    if (2 <= @all_titles) {
+        ${$_->{val}} = mygtk2::asteriskize(${$_->{val}}) foreach @all_titles;
+    }
+
+    my $box = create_widgets_block($o, $common, $l, $update, \$ignore);
+
+    my $tooltips = Gtk2::Tooltips->new;
+    foreach my $e (@all) {
+	$tooltips->set_tip($e->{w}, $e->{help}) if $e->{help} && !ref($e->{help});
+    }
+
+    $box, $set_all;
+}
+
+sub add_modify_remove_sensitive {
+    my ($buttons, $e) = @_;
+    $_->{button}->set_sensitive(@{$e->{list}} != ()) foreach 
+      grep { member($_->{kind}, 'modify', 'remove') } @$buttons;
+}
+
+sub filter_widgets {
+    my ($l) = @_;
+
+    foreach my $e (all_entries($l)) {
+	$e->{no_indent} = 1 if member($e->{type}, 'list', 'treelist', 'expander', 'bool', 'only_label');
+    }
+}
+
+my $help_path = "/usr/share/doc/installer-help/";
+
+sub is_help_file_exist {
+    my ($_o, $id) = @_;
+    # just ignore anchors:
+    $id =~ s/#.*//;
+    -e "$help_path/$id.html";
+}
+
+sub load_from_uri {
+    my ($view, $url) = @_;
+    $view->open(get_html_file($::o, $url));
+}
+
+sub get_html_file {
+    my ($o, $url) = @_;
+    my $anchor;
+    ($url, $anchor) = $url =~ /(.*)#(.*)/ if $url =~ /#/;
+    $url .= '.html' if $url !~ /\.html$/;
+    $url = find { -e $_ } map { "$help_path/${_}" }
+      map {
+          my $id = $_;
+          require lang;
+          map { ("$_/$id") } map { $_, lc($_) } (split ':', lang::getLANGUAGE($o->{locale}{lang})), '';
+      } $url;
+    $url = "file://$url";
+    $anchor ? "$url#$anchor" : $url;
+}
+
+sub display_help {
+    my ($o, $common, $mainw) = @_;
+    if (my $file = $common->{interactive_help_id}) {
+        require Gtk2::WebKit;
+        my $view = gtknew('WebKit_View');
+
+        load_from_uri($view, $file);
+
+        my $w = ugtk2->new(N("Help"), transient => $mainw->{real_window}, modal => 1);
+        gtkadd($w->{rwindow},
+               gtkpack_(Gtk2::VBox->new,
+                        1, create_scrolled_window(gtkset_border_width($view, 5),
+                                                  [ 'never', 'automatic' ],
+                                              ),
+                        0, Gtk2::HSeparator->new,
+                        0, gtkpack(create_hbox('end'),
+                                   gtknew('Button', text => N("Close"), clicked => sub { Gtk2->main_quit })
+                               ),
+                    ),
+           );
+        mygtk2::set_main_window_size($w->{rwindow});
+        $w->{real_window}->grab_focus;
+        $w->{real_window}->show_all;
+        $w->main;
+        return;
+    } elsif (my $message = $common->{interactive_help}->()) {
+        $o->ask_warn(N("Help"), $message);
+    }
+}
+
+sub ask_fromW {
+    my ($o, $common, $l) = @_;
+
+    filter_widgets($l);
+
+    my $mainw = ugtk2->new($common->{title}, %$o, if__($::main_window, transient => $::main_window),
+                           if_($common->{icon}, icon => $common->{icon}), banner_title => $common->{banner_title},
+		       );
+ 
+    my ($box, $set_all) = create_widgets($o, $common, $mainw, $l);
+
+    $mainw->{box_allow_grow} = 1;
+    my $pack = create_box_with_title($mainw, @{$common->{messages}});
+    mygtk2::set_main_window_size($mainw->{rwindow}) if $mainw->{pop_it} && !$common->{auto_window_size} && (@$l || $mainw->{box_size} == 200);
+
+    my @more_buttons = (
+			if_($common->{interactive_help} || $common->{interactive_help_id}, 
+                            [ gtknew('Install_Button', text => N("Help"),
+                                     clicked => sub { display_help($o, $common, $mainw) }), undef, 1 ]),
+			if_($common->{more_buttons}, @{$common->{more_buttons}}),
+		       );
+    my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @more_buttons);
+
+    gtkpack_($pack, 1, gtknew('ScrolledWindow', shadow_type => 'none', child => $box)) if @$l;
+	    
+    if ($buttons_pack) {
+	$pack->pack_end(gtkshow($buttons_pack), 0, 0, 0);
+    }
+    ugtk2::gtkadd($mainw->{window}, $pack);
+    $set_all->();
+
+    my $entry_to_focus = find { $_->{focus} && $_->{focus}() } @$l;
+    my $widget_to_focus = $entry_to_focus ? $entry_to_focus->{focus_w} :
+                          $common->{focus_cancel} ? $mainw->{cancel} :
+			    @$l && (!$mainw->{ok} || @$l == 1 && member(ref($l->[0]{focus_w}), "Gtk2::TreeView", "Gtk2::RadioButton")) ? 
+			      $l->[0]{focus_w} : 
+			      $mainw->{ok};
+    $widget_to_focus->grab_focus if $widget_to_focus;
+
+    my $validate = sub {
+	my @all = all_entries($l);
+	my $e = find { $_->{validate} && !$_->{validate}->() } @all;
+	$e ||= $common->{validate} && !$common->{validate}() && $all[0];
+	if ($e) {
+	    $set_all->();
+	    $e->{focus_w}->grab_focus;
+	}
+	!$e;
+    };
+
+    $mainw->main($validate);
+}
+
+
+sub ask_browse_tree_info_refW {
+    my ($o, $common) = @_;
+    add2hash($common, { wait_message => sub { $o->wait_message(@_) } });
+    ugtk2::ask_browse_tree_info($common);
+}
+
+
+sub ask_from__add_modify_removeW {
+    my ($o, $title, $message, $l, %callback) = @_;
+
+    my $e = $l->[0];
+    my $chosen_element;
+    put_in_hash($e, { allow_empty_list => 1, gtk => { use_boxradio => 0 }, sort => 0,
+		      val => \$chosen_element, type => 'list', add_modify_remove => \%callback });
+
+    $o->ask_from($title, $message, $l, %callback);
+}
+
+my $reuse_timeout;
+
+sub wait_messageW {
+    my ($o, $title, $message, $message_modifiable) = @_;
+
+    my $to_modify = Gtk2::Label->new(scalar warp_text(ref $message_modifiable ? '' : $message_modifiable));
+
+    Glib::Source->remove($reuse_timeout) if $reuse_timeout; $reuse_timeout = '';
+
+    my $Window = gtknew('MagicWindow',
+			title => $title,
+			pop_it => defined $o->{pop_wait_messages} ? $o->{pop_wait_messages} : 1, 
+			pop_and_reuse => $::isInstall,
+			modal => 1, 
+			$::isInstall ? (banner => gtknew('Install_Title', text => $message)) : (),
+			no_Window_Manager => exists $o->{no_Window_Manager} ? $o->{no_Window_Manager} : !$::isStandalone,
+			child => gtknew('VBox', padding => 4, border_width => 10, children => [
+			    1, $to_modify,
+			    if_(ref($message_modifiable), 0, $message_modifiable),
+			]),
+		      );
+    mygtk2::enable_sync_flush($Window);
+    $Window->{wait_messageW} = $to_modify;
+    mygtk2::sync_flush($Window);
+    $Window;
+}
+sub wait_message_nextW {
+    my ($_o, $message, $Window) = @_;
+    return if $message eq $Window->{wait_messageW}->get_text; #- needed otherwise no expose_event :(
+    $Window->{displayed} = 0;
+    $Window->{wait_messageW}->set($message);
+    mygtk2::sync($Window) while !$Window->{displayed};
+}
+sub wait_message_endW {
+    my ($_o, $Window) = @_;
+    if ($Window->{pop_and_reuse}) {
+	$reuse_timeout = Glib::Timeout->add(100, sub {
+	    mygtk2::destroy_previous_popped_and_reuse_window();
+	});
+    } else {
+	mygtk2::may_destroy($Window);
+	mygtk2::flush();
+    }
+}
+
+sub wait_message_with_progress_bar {
+    my ($in, $o_title) = @_;
+
+    my $progress = gtknew('ProgressBar');
+    my $w = $in->wait_message($o_title, $progress);
+    my $displayed;
+    $progress->signal_connect(expose_event => sub { $displayed = 1; 0 });
+    $w, sub {
+	my ($msg, $current, $total) = @_;
+	if ($msg) {
+	    $w->set($msg);
+	}
+
+	if ($total) {
+	    $progress or internal_error('You must first give some text to display');
+	    my $fraction = min(1, $current / $total);
+	    if ($fraction != $progress->get_fraction) {
+		$progress->set_fraction($fraction);
+		$progress->show;
+		$displayed = 0;
+		mygtk2::flush() while !$displayed;
+	    }
+	} else {
+	    $progress->hide;
+	    mygtk2::flush();
+	}
+    };
+}
+
+sub kill {
+    my ($_o) = @_;
+    $_->destroy foreach $::WizardTable ? $::WizardTable->get_children : (), @tempory::objects;
+    @tempory::objects = ();
+}
+
+1;
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm
new file mode 100644
index 000000000..1370a4a0e
--- /dev/null
+++ b/perl-install/interactive/http.pm
@@ -0,0 +1,164 @@
+package interactive::http; # $Id: http.pm 215411 2007-04-25 12:26:16Z pixel $
+
+use diagnostics;
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw(interactive);
+
+use CGI;
+use interactive;
+use common;
+use log;
+
+my $script_name = $ENV{INTERACTIVE_HTTP};
+my $no_header;
+my $pipe_r = "/tmp/interactive_http_r";
+my $pipe_w = "/tmp/interactive_http_w";
+
+sub open_stdout() {
+    open STDOUT, ">$pipe_w" or die;
+    $| = 1;
+    print CGI::header();
+    $no_header = 1;    
+}
+
+# cont_stdout must be called after open_stdout and before the first print
+sub cont_stdout {
+    my ($o_title) = @_;
+    print CGI::start_html('-title' => $o_title) if $no_header;
+    $no_header = 0;
+}
+
+sub new_uid() {
+    my ($s, $ms) = gettimeofday();
+    $s * 256 + $ms % 256;
+}
+
+sub new {
+    open_stdout();
+    bless {}, $_[0];
+}
+
+sub end { 
+    -e $pipe_r or return; # do not run this twice
+    my $q = CGI->new;
+    cont_stdout("Exit");
+    print "It's done, thanks for playing", $q->end_html;
+    close STDOUT;
+    unlink $pipe_r, $pipe_w;
+}
+sub exit { end(); exit($_[1]) }
+END { end() }
+
+sub ask_fromW {
+    my ($o, $common, $l, $_l2) = @_;
+
+  redisplay:
+    my $uid = new_uid();
+    my $q = CGI->new;
+    $q->param(state => 'next_step');
+    $q->param(uid => $uid);
+    cont_stdout($common->{title});
+
+#    print $q->img({ -src => "/icons/$o->{icon}" }) if $o->{icon};
+    print @{$common->{messages}};
+    print $q->start_form('-name' => 'form', '-action' => $script_name, '-method' => 'post');
+
+    print "<table>\n";
+
+    each_index {
+	my $e = $_;
+
+	print "<tr><td>$e->{label}</td><td>\n";
+
+	$e->{type} = 'list' if $e->{type} =~ /(icon|tree)list/;
+
+	#- combo does not exist, fallback to a sensible default
+	$e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo';
+
+	if ($e->{type} eq 'bool') {
+	    print $q->checkbox('-name' => "w$::i", '-checked' => ${$e->{val}} && 'on', '-label' => $e->{text} || " ");
+	} elsif ($e->{type} eq 'button') {
+	    print "nobuttonyet";
+	} elsif ($e->{type} =~ /list/) {
+	    my %t; 
+	    $t{$_} = may_apply($e->{format}, $_) foreach @{$e->{list}};
+
+	    print $q->scrolling_list('-name' => "w$::i",
+				     '-values' => $e->{list},
+				     '-default' => [ ${$e->{val}} ],
+				     '-size' => 5, '-multiple' => '', '-labels' => \%t);
+	} else {
+	    print $e->{hidden} ?
+	      $q->password_field('-name' => "w$::i", '-default' => ${$e->{val}}) :
+		   $q->textfield('-name' => "w$::i", '-default' => ${$e->{val}});
+	}
+
+	print "</td></tr>\n";
+    } @$l;
+
+    print "</table>\n";
+    print $q->p;
+    print $q->submit('-name' => 'ok_submit', '-value' => $common->{ok} || N("Ok"));
+    print $q->submit('-name' => 'cancel_submit', '-value' => $common->{cancel} || N("Cancel")) if $common->{cancel} || !exists $common->{ok};
+    print $q->hidden('state'), $q->hidden('uid');
+    print $q->end_form, $q->end_html;
+
+    close STDOUT; # page terminated
+
+    while (1) {	
+	open(my $F, "<$pipe_r") or die;
+	$q = CGI->new($F);
+	$q->param('force_exit_dead_prog') and $o->exit;
+	last if $q->param('uid') == $uid;
+
+	open_stdout(); # re-open for writing
+	cont_stdout(N("Error"));
+	print $q->h1(N("Error")), $q->p("Sorry, you cannot go back");
+	goto redisplay;
+    }
+    each_index {
+	my $e = $_;
+	my $v = $q->param("w$::i");
+	if ($e->{type} eq 'bool') {
+	    $v = $v eq 'on';
+	}
+	${$e->{val}} = $v;
+    } @$l;
+
+    open_stdout(); # re-open for writing
+    $q->param('ok_submit');
+}
+
+sub p {
+    print "\n" . CGI::br($_) foreach @_;
+}
+
+sub wait_messageW {
+    my ($_o, $_title, $message, $message_modifiable) = @_;
+    cont_stdout();
+    print "\n" . CGI::p();
+    p($message, $message_modifiable);
+}
+
+sub wait_message_nextW {
+    my ($_o, $message, $_w) = @_;
+    p($message);
+}
+sub wait_message_endW {
+    my ($_o, $_w) = @_;
+    p(N("Done"));
+    print "\n" . CGI::p();
+}
+
+sub ok {
+    N("Ok");
+}
+
+sub cancel {
+    N("Cancel");
+}
+
+
+1;
diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm
new file mode 100644
index 000000000..3d4370c2a
--- /dev/null
+++ b/perl-install/interactive/stdio.pm
@@ -0,0 +1,179 @@
+package interactive::stdio; # $Id: stdio.pm 226450 2007-08-27 13:23:35Z pixel $
+
+use diagnostics;
+use strict;
+use vars qw(@ISA);
+
+@ISA = qw(interactive);
+
+use interactive;
+use common;
+
+$| = 1;
+
+sub readln() {
+    my $l = <STDIN>;
+    chomp $l;
+    $l;
+}
+
+sub check_it {
+    my ($i, $n) = @_;
+    $i =~ /^\s*\d+\s*$/ && 1 <= $i && $i <= $n;
+}
+
+sub good_choice {
+    my ($def_s, $max) = @_;
+    my $i;
+    do {
+	defined $i and print N("Bad choice, try again\n");
+	print N("Your choice? (default %s) ", $def_s);
+	$i = readln();
+    } until !$i || check_it($i, $max);
+    $i;
+}
+
+sub ask_fromW {
+    my ($_o, $common, $l, $_l2) = @_;
+
+    add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") }) if !exists $common->{ok};
+
+ask_fromW_begin:
+
+    my $already_entries = 0;
+    my $predo_widget = sub {
+	my ($e) = @_;
+
+	$e->{type} = 'list' if $e->{type} =~ /(icon|tree)list/;
+	#- combo does not exist, fallback to a sensible default
+	$e->{type} = $e->{not_edit} ? 'list' : 'entry' if $e->{type} eq 'combo';
+
+	if ($e->{type} eq 'entry') {
+	    my $t = "\t$e->{label} $e->{text}\n";
+	    if ($already_entries) {
+		length($already_entries) > 1 and print N("Entries you'll have to fill:\n%s", $already_entries);
+		$already_entries = 1;
+		print $t;
+	    } else {
+		$already_entries = $t;
+	    }
+	}
+    };
+
+    my @labels;
+    my $format_label = sub { my ($e) = @_; return sprintf("`%s' %s %s\n", ${$e->{val}}, $e->{label}, $e->{text}) };
+    my $do_widget = sub {
+	my ($e, $ind) = @_;
+
+	if ($e->{type} eq 'bool') {
+	    print "$e->{text} $e->{label}\n";
+	    print N("Your choice? (0/1, default `%s') ", ${$e->{val}} || '0');
+	    my $i = readln();
+	    if ($i) {
+		to_bool($i) != to_bool(${$e->{val}}) && $e->{changed} and $e->{changed}->();
+		${$e->{val}} = $i;
+	    }
+	} elsif ($e->{type} =~ /list/) {
+	    $e->{text} || $e->{label} and print "=> $e->{label} $e->{text}\n";
+	    my $n = 0; my $size = 0;
+	    foreach (@{$e->{list}}) {
+		$n++;
+		my $t = "$n: " . may_apply($e->{format}, $_) . "\t";
+		if ($size + length($t) >= 80) {
+		    print "\n";
+		    $size = 0;
+		}
+		print $t;
+		$size += length($t);
+	    }
+	    print "\n";
+	    my $i = good_choice(may_apply($e->{format}, ${$e->{val}}), $n);
+	    print "Setting to <", $i ? ${$e->{list}}[$i-1] : ${$e->{val}}, ">\n";
+	    if ($i) { 
+		${$e->{val}} = ${$e->{list}}[$i-1];
+		$e->{changed} and $e->{changed}->();
+	    }
+	} elsif ($e->{type} eq 'button') {
+	    print N("Button `%s': %s", $e->{label}, may_apply($e->{format}, ${$e->{val}})), " $e->{text}\n";
+	    print N("Do you want to click on this button?");
+	    my $i = readln();
+	    if ($i && $i !~ /^n/i) {
+		$e->{clicked_may_quit}();
+		$e->{changed} and $e->{changed}->();
+	    }
+	} elsif ($e->{type} eq 'label') {
+	    my $t = $format_label->($e);
+	    push @labels, $t;
+	    print $t;
+	} elsif ($e->{type} eq 'entry') {
+	    print "$e->{label} $e->{text}\n";
+	    print N("Your choice? (default `%s'%s) ", ${$e->{val}}, ${$e->{val}} ? N(" enter `void' for void entry") : '');
+	    my $i = readln();
+	    ${$e->{val}} = $i || ${$e->{val}};
+	    ${$e->{val}} = '' if ${$e->{val}} eq 'void';
+	    print "Setting to <", ${$e->{val}}, ">\n";
+	    $i && $e->{changed} and $e->{changed}->();
+	} else {
+	    printf "UNSUPPORTED WIDGET TYPE (type <%s> label <%s> text <%s> val <%s>\n", $e->{type}, $e->{label}, $e->{text}, ${$e->{val}};
+	}
+    };
+
+    print "* ";
+    $common->{title} and print "$common->{title}\n";
+    print(map { "$_\n" } @{$common->{messages}});
+
+    $predo_widget->($_) foreach @$l;
+    if (listlength(@$l) > 30) {
+	my $ll = listlength(@$l);
+	print N("=> There are many things to choose from (%s).\n", $ll);
+ask_fromW_handle_verylonglist:
+	print
+N("Please choose the first number of the 10-range you wish to edit,
+or just hit Enter to proceed.
+Your choice? ");
+	my $i = readln();
+	if (check_it($i, $ll)) {
+	    each_index { $do_widget->($_, $::i) } grep_index { $::i >= $i-1 && $::i < $i+9 } @$l;
+	    goto ask_fromW_handle_verylonglist;
+	}
+    } else {
+	each_index { $do_widget->($_, $::i) } @$l;
+    }
+
+    my $lab;
+    each_index { $labels[$::i] && (($lab = $format_label->($_)) ne $labels[$::i]) and print N("=> Notice, a label changed:\n%s", $lab) }
+      grep { $_->{type} eq 'label' } @$l;
+
+    my $i;
+    if (listlength(@$l) != 1 || $common->{ok} ne N("Ok") || $common->{cancel} ne N("Cancel")) {
+	print "[1] ", $common->{ok} || N("Ok");
+	$common->{cancel} and print "  [2] $common->{cancel}";
+	@$l and print "  [9] ", N("Re-submit");
+	print "\n";
+	do {
+	    defined $i and print N("Bad choice, try again\n");
+	    print N("Your choice? (default %s) ", $common->{focus_cancel} ? $common->{cancel} : $common->{ok});
+	    $i = readln() || ($common->{focus_cancel} ? "2" : "1");
+	} until check_it($i, 9);
+	$i == 9 and goto ask_fromW_begin;
+    } else {
+	$i = 1;
+    }
+    if ($i == 1 && !$common->{validate}()) {
+	goto ask_fromW_begin;
+    }
+    return $i != 2;
+}
+
+sub wait_messageW {
+    my ($_o, $_title, $message, $message_modifiable) = @_;
+    print join "\n", $message, $message_modifiable;
+}
+sub wait_message_nextW { 
+    my $m = join "\n", $_[1];
+    print "\r$m", ' ' x (60 - length $m);
+}
+sub wait_message_endW { print "\nDone\n" }
+
+1;
+