"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "hacks/xscreensaver-text" between
xscreensaver-6.00.tar.gz and xscreensaver-6.01.tar.gz

About: XScreenSaver is a large collection of screen savers and also the framework for blanking and locking the screen.

xscreensaver-text  (xscreensaver-6.00):xscreensaver-text  (xscreensaver-6.01)
skipping to change at line 41 skipping to change at line 41
# Only error out if we're actually loading a URL instead of local data. # Only error out if we're actually loading a URL instead of local data.
BEGIN { eval 'use LWP::UserAgent;' } BEGIN { eval 'use LWP::UserAgent;' }
# Not sure how prevalent this is. Hope it's part of the default install. # Not sure how prevalent this is. Hope it's part of the default install.
BEGIN { eval 'use HTML::Entities;' } BEGIN { eval 'use HTML::Entities;' }
# I think this is part of the default install, but just in case. # I think this is part of the default install, but just in case.
BEGIN { eval 'use Text::Wrap qw(wrap);' } BEGIN { eval 'use Text::Wrap qw(wrap);' }
my $progname = $0; $progname =~ s@.*/@@g; my $progname = $0; $progname =~ s@.*/@@g;
my ($version) = ('$Revision: 1.60 $' =~ m/\s(\d[.\d]+)\s/s); my ($version) = ('$Revision: 1.62 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0; my $verbose = 0;
my $http_proxy = undef; my $http_proxy = undef;
my $config_file = $ENV{HOME} . "/.xscreensaver"; my $config_file = $ENV{HOME} . "/.xscreensaver";
my $text_mode = 'date'; my $text_mode = 'date';
my $text_literal = ''; my $text_literal = '';
my $text_file = ''; my $text_file = '';
my $text_program = ''; my $text_program = '';
my $text_url = 'https://en.wikipedia.org/w/index.php?title=Special:NewPages &feed=rss'; my $text_url = 'https://en.wikipedia.org/w/index.php?title=Special:NewPages &feed=rss';
skipping to change at line 373 skipping to change at line 373
my $unamep = 1; my $unamep = 1;
# The following code makes an effort to figure out the version of the # The following code makes an effort to figure out the version of the
# OS / distribution, and a one-line summary of the hardware. We can # OS / distribution, and a one-line summary of the hardware. We can
# easily get the kernel version from uname, but the kernel version has # easily get the kernel version from uname, but the kernel version has
# no relevance to anyone's life. The userspace version is what matters. # no relevance to anyone's life. The userspace version is what matters.
# #
# In a truly shocking turn of events, nearly every distro uses a different # In a truly shocking turn of events, nearly every distro uses a different
# file to identify itself. Are you shocked? I for one am shocked. # file to identify itself. Are you shocked? I for one am shocked.
$ENV{LC_NUMERIC} = 'C'; # Decimals with periods, not commas, plz.
if (open (my $in, "<:utf8", "/etc/os-release")) { if (open (my $in, "<:utf8", "/etc/os-release")) {
while (<$in>) { # PRETTY_NAME="CentOS Linux 7 (Core)" while (<$in>) { # PRETTY_NAME="CentOS Linux 7 (Core)"
if (m/^PRETTY_NAME="(.*)"/si) { # PRETTY_NAME="Raspbian 10 (buster)" if (m/^PRETTY_NAME="(.*)"/si) { # PRETTY_NAME="Raspbian 10 (buster)"
# Annoying that "10.6" is only in /etc/debian_version and # Annoying that "10.6" is only in /etc/debian_version and
# /etc/os-release only contains "10". # /etc/os-release only contains "10".
$body .= "$1\n"; $body .= "$1\n";
$unamep = 0; $unamep = 0;
last; last;
} }
} }
skipping to change at line 971 skipping to change at line 973
# soon as a pipe has input available. However, that's a lot more # soon as a pipe has input available. However, that's a lot more
# work, so instead, let's just not exit right away, and hope that # work, so instead, let's just not exit right away, and hope that
# 10 seconds is enough. # 10 seconds is enough.
# #
# This will solve the problem for invocations of xscreensaver-text # This will solve the problem for invocations of xscreensaver-text
# that produce little output (e.g., date-mode); and won't solve it # that produce little output (e.g., date-mode); and won't solve it
# in cases where a large amount of text is generated in a short # in cases where a large amount of text is generated in a short
# amount of time (e.g., url-mode.) # amount of time (e.g., url-mode.)
# #
my $secs = 10; my $secs = 10;
$secs = 1 if ($truncate_lines < 10); # for 'gltext' $secs = 1 if (($truncate_lines || 0) < 10); # for 'gltext'
sleep ($secs); sleep ($secs);
} }
} }
main(); main();
exit 0; exit 0;
 End of changes. 3 change blocks. 
2 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)