diff options
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r-- | perl-install/Xconfig/default.pm | 7 | ||||
-rw-r--r-- | perl-install/Xconfig/main.pm | 2 | ||||
-rw-r--r-- | perl-install/Xconfig/various.pm | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index 75947bf11..f41fccaf7 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -10,7 +10,7 @@ use mouse; sub configure { - my ($o_keyboard, $o_mouse) = @_; + my ($do_pkgs, $o_keyboard, $o_mouse) = @_; my $keyboard = $o_keyboard || keyboard::read(); my $mouse = $o_mouse || do { @@ -24,14 +24,15 @@ sub configure { $raw_X->add_load_module($_) foreach qw(dbe v4l extmod type1 freetype); config_keyboard($raw_X, $keyboard); - config_mouse($raw_X, $mouse); + config_mouse($raw_X, $do_pkgs, $mouse); $raw_X; } sub config_mouse { - my ($raw_X, $mouse) = @_; + my ($raw_X, $do_pkgs, $mouse) = @_; mouse::set_xfree_conf($mouse, $raw_X); + mouse::various_xfree_conf($do_pkgs, $mouse); } sub config_keyboard { diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm index f260d48b5..a794f3297 100644 --- a/perl-install/Xconfig/main.pm +++ b/perl-install/Xconfig/main.pm @@ -169,7 +169,7 @@ sub configure_everything_or_configure_chooser { } if (is_empty_array_ref($raw_X)) { - $raw_X = Xconfig::default::configure($o_keyboard, $o_mouse); + $raw_X = Xconfig::default::configure($in->do_pkgs, $o_keyboard, $o_mouse); Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options) or return; } else { Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options) or return if !$auto; diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index 5532ee182..1ce1ce37e 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -98,13 +98,13 @@ Do you have this feature?")) or return; $norm = $in->ask_from_list('', N("What norm is your TV using?"), [ 'NTSC', 'PAL' ], $norm) or return; - configure_FB_TVOUT({ norm => $norm }); + configure_FB_TVOUT($in->do_pkgs, { norm => $norm }); } sub configure_FB_TVOUT { - my ($use_FB_TVOUT) = @_; + my ($do_pkgs, $use_FB_TVOUT) = @_; - my $raw_X = Xconfig::default::configure(); + my $raw_X = Xconfig::default::configure($do_pkgs); return if is_empty_array_ref($raw_X); $raw_X->set_monitors({ HorizSync => '30-50', VertRefresh => ($use_FB_TVOUT->{norm} eq 'NTSC' ? 60 : 50) }); |