$totals{bgdirs} = 0;
for (@{$opts{bgdirs}}) {
- my @pics = `find "$_" -type f -name "*.jpg"`;
+ my ($status, @pics) = Execute "find \"$_\" -type f";
chomp @pics;
- push @images, @pics;
+ push @images, grep(/jpg$|png$|gif$/i, @pics);
+
push @{$opts{bgdircnt}}, scalar @pics;
$totals{bgdirs}++;
return @images;
} # fillPictures
+sub writeHistory($) {
+ my ($msg) = @_;
+
+ open my $hist, '>>', "$ENV{HOME}/.$FindBin::Script.hist"
+ or error "Unable to open $ENV{HOME}/.$FindBin::Script.hist for append - $!", 1;
+
+ $msg = localtime() . $msg;
+
+ display $msg, $hist;
-sub updateSetBG ($$) {
+ close $hist;
+} # writeHistory
+
+sub updateSetBG($$) {
my ($bgimage, $lockimage) = @_;
open my $setbg, '>', "$ENV{HOME}/.$FindBin::Script"
close $setbg;
- my $msg = localtime() . ":$bgimage";
+ my $msg = ":$bgimage";
$msg .= " lock:$lockimage" if $opts{lockscreen};
- open my $hist, '>>', "$ENV{HOME}/.$FindBin::Script.hist"
- or error "Unable to open $ENV{HOME}/.$FindBin::Script.hist for append - $!", 1;
-
- display $msg, $hist;
-
- close $hist;
+ writeHistory $msg;
return;
} # updateSetBG
EnterDaemonMode unless defined $DB::OUT;
+my $pickNewImages = 1;
+
while () {
- my $bgimage = escapeHTML ($images[int (rand $#images)]);
- my $lockimage = escapeHTML ($images[int (rand $#images)]);
+ my ($bgimage, $lockimage);
+
+ if ($pickNewImages) {
+ $bgimage = escapeHTML ($images[int (rand $#images)]);
+ $lockimage = escapeHTML ($images[int (rand $#images)]);
+ } # if
- my $cmd = "$setbg $setbgOpts$bgimage\" 2> /dev/null";
+ my $monitorIsOn;
- my @output = `$cmd`;
+ my ($status, @output) = Execute("xset q | grep Monitor | awk '{print \$3}'");
- if ($? != 0) {
- error "Trying to set background - command used \"$cmd\"\n\nOutput\n\n" .
- join "\n", @output;
- $totals{errors}++;
+ if ($status or $output[0] eq 'Off') {
+ writeHistory ":Monitor off, not setting background to $bgimage - will keep trying";
+
+ $pickNewImages = 0;
} else {
- $totals{'Images displayed'}++;
- } # if
+ $pickNewImages = 1;
- if ($opts{lockscreen}) {
- $cmd = "$setbg $setLockOpts$lockimage\" 2> /dev/null";
+ my $cmd = "$setbg $setbgOpts$bgimage\" 2> /dev/null";
- @output = `$cmd`;
+ ($status, @output) = Execute $cmd;
- if ($? != 0) {
- error "Trying to set lock screen - command used \"$cmd\"\n\nOutput\n\n" .
+ if ($status) {
+ error "Trying to set background - command used \"$cmd\"\n\nOutput\n\n" .
join "\n", @output;
$totals{errors}++;
} else {
- $totals{'Lock screens displayed'}++;
+ $totals{'Images displayed'}++;
} # if
- } # if
- updateSetBG $bgimage, $lockimage;
+ if ($opts{lockscreen}) {
+ $cmd = "$setbg $setLockOpts$lockimage\" 2> /dev/null";
- displayStats;
+ ($status, @output) = Execute $cmd;
+
+ if ($status != 0) {
+ error "Trying to set lock screen - command used \"$cmd\"\n\nOutput\n\n" .
+ join "\n", @output;
+ $totals{errors}++;
+ } else {
+ $totals{'Lock screens displayed'}++;
+ } # if
+ } # if
+
+ updateSetBG $bgimage, $lockimage;
+
+ displayStats;
+ } # if
$today = YMD;