#!/usr/bin/perl -w
-# Copyright © 2005-2009 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2005-2011 Jamie Zawinski <jwz@jwz.org>
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
use bytes;
my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.18 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.24 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
my $verbose = 0;
my $http_proxy = undef;
my ($text) = @_;
$text =~ s/(&(\#)?([[:alpha:]\d]+);?)/
{
- my $c;
- if ($2) {
- $c = chr($3); # the &#number is always decimal, right?
+ my $c = $3;
+ if (! defined($2)) {
+ $c = $entity_table{$c}; # for Á
} else {
- $c = $entity_table{$3};
+ if ($c =~ m@^x([\dA-F]+)$@si) { # for A
+ $c = chr(hex($1));
+ } elsif ($c =~ m@^\d+$@si) { # for A
+ $c = chr($c);
+ } else {
+ $c = undef;
+ }
}
-# print STDERR "$progname: warning: unknown HTML character entity \"$1\"\n"
-# unless $c;
- ($c ? $c : "[$3]");
+ ($c || "[$3]"); # for &unknown; => "[unknown]"
}
/gexi;
return $text;
elsif ($text_mode eq '1') { $text_mode = 'literal'; }
elsif ($text_mode eq '2') { $text_mode = 'file'; }
elsif ($text_mode eq '3') { $text_mode = 'url'; }
+ elsif ($text_mode eq '4') { $text_mode = 'program'; }
$v = get_cocoa_pref_1 ($id, "textLiteral");
$text_literal = $v if defined ($v);
} else { # $text_mode eq 'date'
- safe_system ("uname", "-n");
+ my $n = `uname -n`;
+ $n =~ s/\.local\n/\n/s;
+ print $n;
my $unamep = 1;
if (-f "/etc/redhat-release") { # "Fedora Core release 4 (Stentz)"
- system ("cat", "/etc/redhat-release");
+ safe_system ("cat", "/etc/redhat-release");
}
if (-f "/etc/release") { # "Solaris 10 3/05 s10_74L2a X86"
my $sp = # "iMac G5"
`/usr/sbin/system_profiler SPSoftwareDataType SPHardwareDataType`;
my ($v) = ($sp =~ m/^\s*System Version:\s*(.*)$/mi);
- my ($s) = ($sp =~ m/^\s*CPU Speed:\s*(.*)$/mi);
- my ($t) = ($sp =~ m/^\s*Machine Name:\s*(.*)$/mi);
+ my ($s) = ($sp =~ m/^\s*(?:CPU|Processor) Speed:\s*(.*)$/mi);
+ my ($t) = ($sp =~ m/^\s*(?:Machine|Model) Name:\s*(.*)$/mi);
print "$v\n" if ($v);
print "$s $t\n" if ($s && $t);
$unamep = !defined ($v);
sub get_url_1($;$) {
my ($url, $referer) = @_;
- if (! ($url =~ m@^(http|feed)://@i)) {
+ $url =~ s@^feed:@http:@si;
+ if (! ($url =~ m@^http://@i)) {
error ("not an HTTP URL: $url");
}
my ($body, $rss_p) = @_;
$_ = $body;
+ # In HTML, try to preserve newlines inside of PRE.
+ #
+ if (! $rss_p) {
+ s@(<PRE\b[^<>]*>\s*)(.*?)(</PRE)@{
+ my ($a, $b, $c) = ($1, $2, $3);
+ $b =~ s/[\r\n]/<BR>/gs;
+ $a . $b . $c;
+ }@gsexi;
+ }
+
if (! $rss_p) {
- # In HTML, unfold lines (this breaks PRE. Sue me.)
+ # In HTML, unfold lines.
# In RSS, assume \n means literal line break.
s@[\r\n]@ @gsi;
}
}
output();
+
+
+ if (defined ($cocoa_id)) {
+ #
+ # On MacOS, sleep for 10 seconds between when the last output is
+ # printed, and when this process exits. This is because MacOS
+ # 10.5.0 and later broke ptys in a new and exciting way: basically,
+ # once the process at the end of the pty exits, you have exactly
+ # 1 second to read all the queued data off the pipe before it is
+ # summarily flushed.
+ #
+ # Many of the screen savers were written to depend on being able
+ # to read a small number of bytes, and continue reading until they
+ # reached EOF. This is no longer possible.
+ #
+ # Note that the current MacOS behavior has all four of these
+ # awesome properties: 1) Inconvenient; 2) Has no sane workaround;
+ # 3) Different behavior than MacOS 10.1 through 10.4; and 4)
+ # Different behavior than every other Unix in the world.
+ #
+ # See http://jwz.livejournal.com/817438.html, and for those of
+ # you inside Apple, "Problem ID 5606018".
+ #
+ # One workaround would be to rewrite the savers to have an
+ # internal buffer, and always read as much data as possible as
+ # 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
+ # 10 seconds is enough.
+ #
+ # This will solve the problem for invocations of xscreensaver-text
+ # 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
+ # amount of time (e.g., url-mode.)
+ #
+ sleep (10);
+ }
}
main();