--- deliantra/Deliantra-Client/DC.pm 2008/09/02 16:27:34 1.188 +++ deliantra/Deliantra-Client/DC.pm 2008/09/03 06:07:39 1.191 @@ -147,7 +147,9 @@ package DC; -our $RC_THEME = "theme-metal"; +our $RC_THEME; +our $THEME; +our @RC_PATH; our $RC_BASE; for (grep !ref, @INC) { @@ -158,15 +160,31 @@ sub find_rcfile($) { my $path; - $path = "$RC_BASE/$RC_THEME/$_[0]"; - return $path if -r $path; - - $path = "$RC_BASE/$_[0]"; - return $path if -r $path; + for (@RC_PATH, "") { + $path = "$RC_BASE/$_/$_[0]"; + return $path if -r $path; + } die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n"; } +sub set_theme($) { + return if $RC_THEME eq $_[0]; + $RC_THEME = $_[0]; + + @RC_PATH = "theme-$RC_THEME"; + + { + open my $fh, "<:raw", find_rcfile "theme.json" + or die "cannot open theme description file"; + + local $/; + $THEME = JSON::XS->new->utf8->relaxed->decode (<$fh>); + } + + @RC_PATH = @{ $THEME->{path} } if $THEME->{path}; +} + sub read_cfg { my ($file) = @_;