projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.27.tar.gz
[xscreensaver]
/
hacks
/
check-configs.pl
diff --git
a/hacks/check-configs.pl
b/hacks/check-configs.pl
index 382ce4b06d8950acf22cdd8a9f199d280f2a5187..260250e95512ab87212babebc26a78a06b4e3f8b 100755
(executable)
--- a/
hacks/check-configs.pl
+++ b/
hacks/check-configs.pl
@@
-19,7
+19,7
@@
use diagnostics;
use strict;
my $progname = $0; $progname =~ s@.*/@@g;
use strict;
my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.
6
$ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
+my $version = q{ $Revision: 1.
7
$ }; $version =~ s/^[^\d]+([\d.]+).*/$1/;
my $verbose = 0;
my $verbose = 0;
@@
-32,11
+32,17
@@
$xlockmore_default_opts .=
"{\"-wireframe\", \".wireframe\", XrmoptionNoArg, \"true\"},\n" .
"{\"-3d\", \".use3d\", XrmoptionNoArg, \"true\"},\n";
"{\"-wireframe\", \".wireframe\", XrmoptionNoArg, \"true\"},\n" .
"{\"-3d\", \".use3d\", XrmoptionNoArg, \"true\"},\n";
+my $thread_default_opts =
+ "{\"-threads\", \".useThreads\", XrmoptionNoArg, \"True\"},\n" .
+ "{\"-no-threads\", \".useThreads\", XrmoptionNoArg, \"False\"},\n";
+
my $analogtv_default_opts = '';
foreach (qw(color tint brightness contrast)) {
$analogtv_default_opts .= "{\"-tv-$_\", \".TV$_\", XrmoptionSepArg, 0},\n";
}
my $analogtv_default_opts = '';
foreach (qw(color tint brightness contrast)) {
$analogtv_default_opts .= "{\"-tv-$_\", \".TV$_\", XrmoptionSepArg, 0},\n";
}
+$analogtv_default_opts .= $thread_default_opts;
+
# Returns two tables:
# Returns two tables:
@@
-63,11
+69,12
@@
sub parse_src($) {
$file =~ s@^.*/@@;
my $xlockmore_p = 0;
$file =~ s@^.*/@@;
my $xlockmore_p = 0;
+ my $thread_p = ($body =~ m/THREAD_DEFAULTS/);
my $analogtv_p = ($body =~ m/ANALOGTV_DEFAULTS/);
$body =~ s@/\*.*?\*/@@gs;
$body =~ s@^#\s*(if|ifdef|ifndef|elif|else|endif).*$@@gm;
my $analogtv_p = ($body =~ m/ANALOGTV_DEFAULTS/);
$body =~ s@/\*.*?\*/@@gs;
$body =~ s@^#\s*(if|ifdef|ifndef|elif|else|endif).*$@@gm;
- $body =~ s/
ANALOGTV
_(DEFAULTS|OPTIONS)//gs;
+ $body =~ s/
(THREAD|ANALOGTV)
_(DEFAULTS|OPTIONS)//gs;
print STDERR "$progname: $file: defaults:\n" if ($verbose > 2);
my %res_to_val;
print STDERR "$progname: $file: defaults:\n" if ($verbose > 2);
my %res_to_val;
@@
-125,9
+132,10
@@
sub parse_src($) {
$switch_to_res{-bg} = 'background: %';
my ($ign, $opts) = ($body =~ m/(_options|\bopts)\s*\[\]\s*=\s*{(.*?)}\s*;/s);
$switch_to_res{-bg} = 'background: %';
my ($ign, $opts) = ($body =~ m/(_options|\bopts)\s*\[\]\s*=\s*{(.*?)}\s*;/s);
- if ($xlockmore_p || $analogtv_p || $opts) {
+ if ($xlockmore_p || $
thread_p || $
analogtv_p || $opts) {
$opts = '' unless $opts;
$opts .= ",\n$xlockmore_default_opts" if ($xlockmore_p);
$opts = '' unless $opts;
$opts .= ",\n$xlockmore_default_opts" if ($xlockmore_p);
+ $opts .= ",\n$thread_default_opts" if ($thread_p);
$opts .= ",\n$analogtv_default_opts" if ($analogtv_p);
foreach (split (/,\s*\n/, $opts)) {
$opts .= ",\n$analogtv_default_opts" if ($analogtv_p);
foreach (split (/,\s*\n/, $opts)) {
@@
-193,7
+201,7
@@
sub parse_xml($$) {
error ("$progname: $file: unparsable: $_") unless $type;
next if ($type =~ m@^/@);
error ("$progname: $file: unparsable: $_") unless $type;
next if ($type =~ m@^/@);
- if ($type =~ m/^([hv]group|\?xml|command|string|file|_description|xscreensaver-(image|text))/s) {
+ if ($type =~ m/^([hv]group|\?xml|command|string|file|_description|xscreensaver-(image|text
|updater
))/s) {
} elsif ($type eq 'screensaver') {
my ($name) = ($args =~ m/\b_label\s*=\s*\"([^\"]+)\"/);
} elsif ($type eq 'screensaver') {
my ($name) = ($args =~ m/\b_label\s*=\s*\"([^\"]+)\"/);