summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/main.pm8
-rw-r--r--perl-install/Xconfig/monitor.pm8
-rw-r--r--perl-install/Xconfig/parse.pm8
-rw-r--r--perl-install/Xconfig/resolution_and_depth.pm4
-rw-r--r--perl-install/Xconfig/various.pm10
-rw-r--r--perl-install/Xconfig/xfreeX.pm16
6 files changed, 27 insertions, 27 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 6aa5376a7..38b0c0e64 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -69,7 +69,7 @@ sub configure_everything {
}
sub configure_chooser_raw {
- my ($in, $raw_X, $do_pkgs, $options, $X, $modified) = @_;
+ my ($in, $raw_X, $do_pkgs, $options, $X, $b_modified) = @_;
my %texts;
@@ -87,7 +87,7 @@ sub configure_chooser_raw {
if ($val) {
$X->{$field} = $val;
$X->{"modified_$field"} = 1;
- $modified = 1;
+ $b_modified = 1;
$update_texts->();
if (member($field, 'card', 'monitor')) {
@@ -122,7 +122,7 @@ sub configure_chooser_raw {
$X->{various} = 'done';
} },
]);
- $ok, $modified;
+ $ok, $b_modified;
}
sub configure_chooser {
@@ -135,7 +135,7 @@ sub configure_chooser {
};
my ($ok, $modified) = configure_chooser_raw($in, $raw_X, $do_pkgs, $options, $X);
- $modified and may_write($in, $raw_X, $X, $ok) or return;
+ $modified && may_write($in, $raw_X, $X, $ok) or return;
'config_changed';
}
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 372086fe9..1df15ecd5 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -42,10 +42,10 @@ sub from_raw_X {
}
sub configure {
- my ($in, $raw_X, $auto) = @_;
+ my ($in, $raw_X, $b_auto) = @_;
my $monitor = from_raw_X($raw_X);
- choose($in, $monitor, $auto) or return;
+ choose($in, $monitor, $b_auto) or return;
$raw_X->set_monitors($monitor);
$monitor;
}
@@ -67,12 +67,12 @@ sub configure_auto_install {
}
sub choose {
- my ($in, $monitor, $auto) = @_;
+ my ($in, $monitor, $b_auto) = @_;
my $monitors = monitors();
my $ok = configure_automatic($monitor, $monitors);
- if ($auto) {
+ if ($b_auto) {
log::l("Xconfig::monitor: auto failed") if !$ok;
return $ok;
}
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
index a2e662009..ea1054835 100644
--- a/perl-install/Xconfig/parse.pm
+++ b/perl-install/Xconfig/parse.pm
@@ -30,10 +30,10 @@ sub read_XF86Config_from_string {
#- raw reading/saving
#-###############################################################################
sub raw_from_file { #- internal
- my ($file, $lines) = @_;
+ my ($file, $o_lines) = @_;
my $raw_X = [];
- $lines ||= [ cat_($file) ];
+ my $lines = $o_lines || [ cat_($file) ];
my $line;
my ($comment, $obj, @objs);
@@ -109,7 +109,7 @@ sub raw_from_file { #- internal
}
sub raw_to_string {
- my ($e, $want_spacing) = @_;
+ my ($e, $b_want_spacing) = @_;
my $s = do {
if ($e->{l}) {
my $inside = join('', map_index { raw_to_string($_, $::i) } @{$e->{l}});
@@ -121,7 +121,7 @@ sub raw_to_string {
(defined $e->{val} ? ($e->{Option} && $e->{val} !~ /^"/ ? qq( "$e->{val}") : qq( $e->{val})) : '');
}
};
- ($e->{pre_comment} ? ($want_spacing ? "\n" : '') . $e->{pre_comment} : '') . $s . ($e->{comment_on_line} || '') . "\n" . ($e->{post_comment} || '');
+ ($e->{pre_comment} ? ($b_want_spacing ? "\n" : '') . $e->{pre_comment} : '') . $s . ($e->{comment_on_line} || '') . "\n" . ($e->{post_comment} || '');
}
#-###############################################################################
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 45608e1f5..81559dee7 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -169,11 +169,11 @@ sub choices {
}
sub configure {
- my ($in, $raw_X, $card, $monitor, $auto) = @_;
+ my ($in, $raw_X, $card, $monitor, $b_auto) = @_;
my ($default_resolution, @resolutions) = choices($raw_X, $raw_X->get_resolution, $card, $monitor);
- if ($auto) {
+ if ($b_auto) {
#- use $default_resolution
} elsif ($in->isa('interactive::gtk')) {
$default_resolution = choose_gtk($in, $card, $default_resolution, @resolutions) or return;
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 3b1b145cf..d277937c5 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -44,10 +44,10 @@ sub info {
}
sub various {
- my ($in, $card, $options, $auto) = @_;
+ my ($in, $card, $options, $b_auto) = @_;
- tvout($in, $card, $options) if !$auto;
- choose_xdm($in, $auto);
+ tvout($in, $card, $options) if !$b_auto;
+ choose_xdm($in, $b_auto);
1;
}
@@ -63,10 +63,10 @@ sub runlevel {
}
sub choose_xdm {
- my ($in, $auto) = @_;
+ my ($in, $b_auto) = @_;
my $xdm = $::isStandalone ? runlevel() == 5 : 1;
- if (!$auto || $::isStandalone) {
+ if (!$b_auto || $::isStandalone) {
$xdm = $in->ask_yesorno_({
title => N("Graphical interface at startup"),
messages =>
diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm
index 5ffe2c0b3..e8d5f33f4 100644
--- a/perl-install/Xconfig/xfreeX.pm
+++ b/perl-install/Xconfig/xfreeX.pm
@@ -259,8 +259,8 @@ sub raw_export_section {
}
sub raw_import_section {
- my ($section, $h, $fields) = @_;
- foreach ($fields ? grep { exists $h->{$_} } @$fields : keys %$h) {
+ my ($section, $h, $o_fields) = @_;
+ foreach ($o_fields ? grep { exists $h->{$_} } @$o_fields : keys %$h) {
my @l = map { ref($_) eq 'HASH' ? $_ : { val => $_ } } deref_array($h->{$_});
$section->{$_} = (ref($h->{$_}) eq 'ARRAY' ? \@l : $l[0]);
}
@@ -282,17 +282,17 @@ sub add_Section {
$h;
}
sub remove_Section {
- my ($raw_X, $Section, $when) = @_;
- @$raw_X = grep { $_->{name} ne $Section || $when && $when->($_->{l}) } @$raw_X;
+ my ($raw_X, $Section, $o_when) = @_;
+ @$raw_X = grep { $_->{name} ne $Section || $o_when && $o_when->($_->{l}) } @$raw_X;
$raw_X;
}
sub get_Sections {
- my ($raw_X, $Section, $when) = @_;
- map { if_($_->{name} eq $Section && (!$when || $when->($_->{l})), $_->{l}) } @$raw_X;
+ my ($raw_X, $Section, $o_when) = @_;
+ map { if_($_->{name} eq $Section && (!$o_when || $o_when->($_->{l})), $_->{l}) } @$raw_X;
}
sub get_Section {
- my ($raw_X, $Section, $when) = @_;
- my @l = get_Sections($raw_X, $Section, $when);
+ my ($raw_X, $Section, $o_when) = @_;
+ my @l = get_Sections($raw_X, $Section, $o_when);
@l > 1 and log::l("Xconfig: found more than one Section $Section");
$l[0];
}