X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver-text;h=2f7372516a4d020f7722ede34e2075cc77fcb3af;hp=52f9f577b16562a82321686b6ecee4197f3f11e2;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=3f438031d610c7e15fd33876a879b97e290e05fb diff --git a/driver/xscreensaver-text b/driver/xscreensaver-text index 52f9f577..2f737251 100755 --- a/driver/xscreensaver-text +++ b/driver/xscreensaver-text @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# Copyright © 2005 Jamie Zawinski +# Copyright © 2005-2008 Jamie Zawinski # # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that @@ -13,18 +13,24 @@ # .xscreensaver file. It may load a file, a URL, run a program, or just # print the date. # +# In a native MacOS build of xscreensaver, this script is included in +# the Contents/Resources/ directory of each screen saver .bundle that +# uses it; and in that case, it looks up its resources using +# /usr/bin/defaults instead. +# # Created: 19-Mar-2005. require 5; -use diagnostics; +#use diagnostics; # Fails on some MacOS 10.5 systems use strict; + use Socket; use POSIX qw(strftime); use Text::Wrap qw(wrap); use bytes; my $progname = $0; $progname =~ s@.*/@@g; -my $version = q{ $Revision: 1.5 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/; +my $version = q{ $Revision: 1.15 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/; my $verbose = 0; my $http_proxy = undef; @@ -37,6 +43,7 @@ my $text_program = ''; my $text_url = ''; my $wrap_columns = undef; +my $nyarlathotep_p = 0; # Maps HTML character entities to the corresponding Latin1 characters. @@ -142,8 +149,7 @@ sub de_unicoddle($) { # Reads the prefs we use from ~/.xscreensaver # -sub get_prefs() { - +sub get_x11_prefs() { my $got_any_p = 0; local *IN; @@ -152,20 +158,20 @@ sub get_prefs() { my $body = ''; while () { $body .= $_; } close IN; - $got_any_p = get_prefs_1 ($body); + $got_any_p = get_x11_prefs_1 ($body); } elsif ($verbose > 1) { print STDERR "$progname: $config_file: $!\n"; } - if (! $got_any_p) { + if (! $got_any_p && defined ($ENV{DISPLAY})) { # We weren't able to read settings from the .xscreensaver file. # Fall back to any settings in the X resource database # (/usr/X11R6/lib/X11/app-defaults/XScreenSaver) # print STDERR "$progname: reading X resources\n" if ($verbose > 1); my $body = `appres XScreenSaver xscreensaver -1`; - $got_any_p = get_prefs_1 ($body); + $got_any_p = get_x11_prefs_1 ($body); } if ($verbose > 1) { @@ -181,7 +187,7 @@ sub get_prefs() { } -sub get_prefs_1($) { +sub get_x11_prefs_1($) { my ($body) = @_; my $got_any_p = 0; @@ -208,6 +214,60 @@ sub get_prefs_1($) { } +sub get_cocoa_prefs($) { + my ($id) = @_; + my $v; + + print STDERR "$progname: reading Cocoa prefs: \"$id\"\n" if ($verbose > 1); + + $v = get_cocoa_pref_1 ($id, "textMode"); + $text_mode = $v if defined ($v); + + # The "textMode" pref is set to a number instead of a string because I + # can't figure out the black magic to make Cocoa bindings work right. + # + if ($text_mode eq '0') { $text_mode = 'date'; } + elsif ($text_mode eq '1') { $text_mode = 'literal'; } + elsif ($text_mode eq '2') { $text_mode = 'file'; } + elsif ($text_mode eq '3') { $text_mode = 'url'; } + + $v = get_cocoa_pref_1 ($id, "textLiteral"); + $text_literal = $v if defined ($v); + + $v = get_cocoa_pref_1 ($id, "textFile"); + $text_file = $v if defined ($v); + + $v = get_cocoa_pref_1 ($id, "textProgram"); + $text_program = $v if defined ($v); + + $v = get_cocoa_pref_1 ($id, "textURL"); + $text_url = $v if defined ($v); +} + + +sub get_cocoa_pref_1($$) { + my ($id, $key) = @_; + # make sure there's nothing stupid/malicious in either string. + $id =~ s/[^-a-z\d. ]/_/gsi; + $key =~ s/[^-a-z\d. ]/_/gsi; + my $cmd = "defaults -currentHost read \"$id\" \"$key\""; + + print STDERR "$progname: executing $cmd\n" + if ($verbose > 3); + + my $val = `$cmd 2>/dev/null`; + $val =~ s/^\s+//s; + $val =~ s/\s+$//s; + + print STDERR "$progname: Cocoa: $id $key = \"$val\"\n" + if ($verbose > 2); + + $val = undef if ($val =~ m/^$/s); + + return $val; +} + + # like system() but checks errors. # sub safe_system(@) { @@ -257,11 +317,14 @@ sub output() { if ($text_mode eq 'literal') { $text_literal = strftime ($text_literal, localtime); + $text_literal =~ y/A-Za-z/N-ZA-Mn-za-m/ if ($nyarlathotep_p); print STDOUT $text_literal; print STDOUT "\n" unless ($text_literal =~ m/\n$/s); } elsif ($text_mode eq 'file') { + $text_file =~ s@^~/@$ENV{HOME}/@s; # allow literal "~/" + local *IN; if (open (IN, "<$text_file")) { print STDERR "$progname: reading $text_file\n" if ($verbose); @@ -273,7 +336,10 @@ sub output() { reformat_text ($body); } else { # stream it - while () { print $_; } + while () { + y/A-Za-z/N-ZA-Mn-za-m/ if ($nyarlathotep_p); + print $_; + } } close IN; } else { @@ -282,7 +348,8 @@ sub output() { } elsif ($text_mode eq 'program') { - $text_program = which ($text_program); + my ($prog, $args) = ($text_program =~ m/^([^\s]+)(.*)$/); + $text_program = which ($prog) . $args; print STDERR "$progname: running $text_program\n" if ($verbose); if ($wrap_columns && $wrap_columns > 0) { @@ -301,13 +368,37 @@ sub output() { } else { # $text_mode eq 'date' safe_system ("uname", "-n"); - if (-f "/etc/redhat-release") { system ("cat", "/etc/redhat-release"); } - safe_system ("uname", "-sr"); + + my $unamep = 1; + + if (-f "/etc/redhat-release") { # "Fedora Core release 4 (Stentz)" + system ("cat", "/etc/redhat-release"); + } + + if (-f "/etc/release") { # "Solaris 10 3/05 s10_74L2a X86" + safe_system ("head", "-1", "/etc/release"); + } + + if (-f "/usr/sbin/system_profiler") { # "Mac OS X 10.4.5 (8H14)" + 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); + print "$v\n" if ($v); + print "$s $t\n" if ($s && $t); + $unamep = !defined ($v); + } + + if ($unamep) { + safe_system ("uname", "-sr"); # "Linux 2.6.15-1.1831_FC4" + } + print "\n"; safe_system ("date", "+%c"); print "\n"; my $ut = `uptime`; - $ut =~ s/^[ \d:]*//; + $ut =~ s/^[ \d:]*(am|pm)?//i; $ut =~ s/,\s*(load)/\n$1/; print "$ut\n"; } @@ -320,7 +411,7 @@ sub output() { sub get_url_1($;$) { my ($url, $referer) = @_; - if (! ($url =~ m@^http://@i)) { + if (! ($url =~ m@^(http|feed)://@i)) { error ("not an HTTP URL: $url"); } @@ -540,6 +631,7 @@ sub reformat_html($$) { s/[ \t]+$//gm; # lose whitespace at end of line again } + y/A-Za-z/N-ZA-Mn-za-m/ if ($nyarlathotep_p); print STDOUT $_; } @@ -637,6 +729,7 @@ sub reformat_text($) { $body =~ s/[ \t]+$//gm; } + $body =~ y/A-Za-z/N-ZA-Mn-za-m/ if ($nyarlathotep_p); print STDOUT $body; } @@ -708,6 +801,7 @@ sub usage() { sub main() { my $load_p = 1; + my $cocoa_id = undef; while ($#ARGV >= 0) { $_ = shift @ARGV; @@ -728,11 +822,26 @@ sub main() { $text_url = shift @ARGV; $load_p = 0; } elsif (m/^--?col(umn)?s?$/) { $wrap_columns = 0 + shift @ARGV; } + elsif (m/^--?cocoa$/) { $cocoa_id = shift @ARGV; } + elsif (m/^--?nyarlathotep$/) { $nyarlathotep_p++; } elsif (m/^-./) { usage; } else { usage; } } - get_prefs() if ($load_p); + if ($load_p) { + + if (!defined ($cocoa_id)) { + # see OSX/XScreenSaverView.m + $cocoa_id = $ENV{XSCREENSAVER_CLASSPATH}; + } + + if (defined ($cocoa_id)) { + get_cocoa_prefs($cocoa_id); + } else { + get_x11_prefs(); + } + } + output(); }