diff options
Diffstat (limited to 'perl-install/Xconfig/default.pm')
| -rw-r--r-- | perl-install/Xconfig/default.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index 9d317fc3a..f41fccaf7 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -10,29 +10,29 @@ use mouse; sub configure { - my ($keyboard, $mouse) = @_; + my ($do_pkgs, $o_keyboard, $o_mouse) = @_; - $keyboard ||= keyboard::read(); - $mouse ||= do { + my $keyboard = $o_keyboard || keyboard::read(); + my $mouse = $o_mouse || do { my $mouse = mouse::read(); - add2hash($mouse, mouse::detect()) if !$::noauto; + add2hash($mouse, mouse::detect(modules::any_conf->read)) if !$::noauto; $mouse; }; - my $raw_X = Xconfig::xfree->empty_config; $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 { |