X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fcheck-configs.pl;fp=hacks%2Fcheck-configs.pl;h=260250e95512ab87212babebc26a78a06b4e3f8b;hp=94c8fd4fa2e5adfc89a51c06707dba166296d476;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hpb=3f1091236d800c43a3124c44c7da54e53f205b13 diff --git a/hacks/check-configs.pl b/hacks/check-configs.pl index 94c8fd4f..260250e9 100755 --- a/hacks/check-configs.pl +++ b/hacks/check-configs.pl @@ -32,11 +32,17 @@ $xlockmore_default_opts .= "{\"-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"; } +$analogtv_default_opts .= $thread_default_opts; + # Returns two tables: @@ -63,11 +69,12 @@ sub parse_src($) { $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; - $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; @@ -125,9 +132,10 @@ sub parse_src($) { $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 .= ",\n$thread_default_opts" if ($thread_p); $opts .= ",\n$analogtv_default_opts" if ($analogtv_p); foreach (split (/,\s*\n/, $opts)) {