--- deliantra/Deliantra-Client/DC.pm 2006/04/08 18:48:34 1.12 +++ deliantra/Deliantra-Client/DC.pm 2008/12/05 14:44:45 1.197 @@ -1,10 +1,10 @@ =head1 NAME -Crossfire::Client - undocumented utility garbage for our crossfire client +DC - undocumented utility garbage for our deliantra client =head1 SYNOPSIS - use Crossfire::Client; + use DC; =head1 DESCRIPTION @@ -12,203 +12,268 @@ =cut -package Crossfire::Client; +package DC; + +use Carp (); + +our $VERSION; BEGIN { - $VERSION = '0.1'; + $VERSION = '2.0'; use XSLoader; - XSLoader::load "Crossfire::Client", $VERSION; + XSLoader::load "Deliantra::Client", $VERSION; } -sub find_rcfile($) { - my $path; +use utf8; +use strict qw(vars subs); - for (@INC) { - $path = "$_/Crossfire/resources/$_[0]"; - return $path if -r $path; - } +use AnyEvent (); +use Pod::POM (); +use File::Path (); +use Storable (); # finally +use Fcntl (); +use JSON::XS qw(encode_json decode_json); - die "FATAL: can't find required file $_[0]\n"; -} +=item guard { BLOCK } -sub read_cfg { - my ($file) = @_; +Returns an object that executes the given block as soon as it is destroyed. - open CFG, $file - or return; +=cut - my $CFG; +sub guard(&) { + bless \(my $cb = $_[0]), "DC::Guard" +} - local $/; - $CFG = eval ; +sub DC::Guard::DESTROY { + ${$_[0]}->() +} - $::CFG = $CFG; +=item shorten $string[, $maxlength] - close CFG; +=cut + +sub shorten($;$) { + my ($str, $len) = @_; + substr $str, $len, (length $str), "..." if $len + 3 <= length $str; + $str } -sub write_cfg { - my ($file) = @_; +sub asxml($) { + local $_ = $_[0]; - open CFG, ">$file" - or return; + s/&/&/g; + s/>/>/g; + s/{VERSION} = $::VERSION; - print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); - } + $_ +} - close CFG; +sub socketpipe() { + socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC + or die "cannot establish bidirectional pipe: $!\n"; + + ($fh1, $fh2) } -package Crossfire::Client::Texture; +sub background(&;&) { + my ($bg, $cb) = @_; + + my ($fh_r, $fh_w) = DC::socketpipe; -use Scalar::Util; + my $pid = fork; -use SDL::OpenGL; + if (defined $pid && !$pid) { + local $SIG{__DIE__}; -my @textures; + open STDOUT, ">&", $fh_w; + open STDERR, ">&", $fh_w; + close $fh_r; + close $fh_w; -sub _new { - my ($class, %data) = @_; + $| = 1; - my $self = bless \%data, $class; + eval { $bg->() }; - push @textures, $self; - Scalar::Util::weaken $textures[-1]; + if ($@) { + my $msg = $@; + $msg =~ s/\n+/\n/; + warn "FATAL: $msg"; + DC::_exit 1; + } + + # win32 is fucked up, of course. exit will clean stuff up, + # which destroys our database etc. _exit will exit ALL + # forked processes, because of the dreaded fork emulation. + DC::_exit 0; + } - $self->upload; + close $fh_w; - $self + my $buffer; + + my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub { + unless (sysread $fh_r, $buffer, 4096, length $buffer) { + undef $w; + $cb->(); + return; + } + + while ($buffer =~ s/^(.*)\n//) { + my $line = $1; + $line =~ s/\s+$//; + utf8::decode $line; + if ($line =~ /^\x{e877}json_msg (.*)$/s) { + $cb->(JSON::XS->new->allow_nonref->decode ($1)); + } else { + ::message ({ + markup => "background($pid): " . DC::asxml $line, + }); + } + } + }); +} + +sub background_msg { + my ($msg) = @_; + + $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg); + $msg =~ s/\n//g; + utf8::encode $msg; + print $msg, "\n"; +} + +package DC; + +our $RC_THEME; +our %THEME; +our @RC_PATH; +our $RC_BASE; + +for (grep !ref, @INC) { + $RC_BASE = "$_/Deliantra/Client/private/resources"; + last if -d $RC_BASE; } -sub new_from_image { - my ($class, $image) = @_; +sub find_rcfile($) { + my $path; - $class->_new (image => $image) + 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 new_from_file { - my ($class, $path) = @_; +sub load_json($) { + my ($file) = @_; - open my $fh, "<:raw", $path - or die "$path: $!"; + open my $fh, $file + or return; local $/; - $class->new_from_image (<$fh>) + JSON::XS->new->utf8->relaxed->decode (<$fh>) } -sub new_from_surface { - my ($class, $surface) = @_; +sub set_theme($) { + return if $RC_THEME eq $_[0]; + $RC_THEME = $_[0]; - $surface->rgba; + # kind of hacky, find the main theme file, then load all theme files and merge them - $class->_new ( - data => $surface->pixels, - width => $surface->width, - height => $surface->height, - ) -} + %THEME = (); + @RC_PATH = "theme-$RC_THEME"; -sub new_from_ttf { - my ($class, $ttf, $text) = @_; + my $theme = load_json find_rcfile "theme.json" + or die "FATAL: theme resource file not found"; - utf8::encode $text; + @RC_PATH = @{ $theme->{path} } if $theme->{path}; - my $surface = SDL::TTFRenderUTF8Blended $ttf, $text, - (new SDL::Color -r => 255, -g => 255, -b => 255); + for (@RC_PATH, "") { + my $theme = load_json "$RC_BASE/$_/theme.json" + or next; - $class->new_from_surface (bless \$surface, SDL::Surface::) + %THEME = ( %$theme, %THEME ); + } } -sub new_from_opengl { - my ($class, $w, $h, $cb) = @_; +sub read_cfg { + my ($file) = @_; - $class->_new (width => $w, height => $h, rendercb => $cb) + $::CFG = load_json $file; } -sub upload { - my ($self) = @_; +sub write_cfg { + my $file = "$Deliantra::VARDIR/client.cf"; - return unless $SDL::App::USING_OPENGL; + $::CFG->{VERSION} = $::VERSION; - my $data; + open my $fh, ">:utf8", $file + or return; + print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); +} - if (exists $self->{data}) { - $data = $self->{data}; - } elsif (exists $self->{rendercb}) { - glViewport 0, 0, $self->{width}, $self->{height}; - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $self->{width}, $self->{height}, 0, -100, 100; - glMatrixMode GL_MODELVIEW; - glPushmatrix; - glLoadIdentity; - glClear GL_COLOR_BUFFER_BIT; +sub http_proxy { + my @proxy = win32_proxy_info; - $self->{rendercb}->($self, $self->{width}, $self->{height}); + if (@proxy) { + "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0] + } elsif (exists $ENV{http_proxy}) { + $ENV{http_proxy} } else { - my $pb = new Gtk2::Gdk::PixbufLoader; - $pb->write ($self->{image}); - $pb->close; + () + } +} - $pb = $pb->get_pixbuf; - $pb = $pb->add_alpha (0, 0, 0, 0); +sub set_proxy { + my $proxy = http_proxy + or return; - $self->{width} = $pb->get_width; - $self->{height} = $pb->get_height; + $ENV{http_proxy} = $proxy; +} - $data = $pb->get_pixels; - } +sub lwp_useragent { + require LWP::UserAgent; + + DC::set_proxy; - ($self->{name}) = @{glGenTextures 1}; + my $ua = LWP::UserAgent->new ( + agent => "deliantra $VERSION", + keep_alive => 1, + env_proxy => 1, + timeout => 30, + ); +} - glBindTexture GL_TEXTURE_2D, $self->{name}; +sub lwp_check($) { + my ($res) = @_; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;#_MIPMAP_LINEAR; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP; - glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP; - - if (defined $data) { - glTexImage2D GL_TEXTURE_2D, 0, - GL_RGBA8, - $self->{width}, $self->{height}, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - $data; + $res->is_error + and die $res->status_line; + + $res +} + +sub fh_nonblocking($$) { + my ($fh, $nb) = @_; + + if ($^O eq "MSWin32") { + $nb = (! ! $nb) + 0; + ioctl $fh, 0x8004667e, \$nb; # FIONBIO } else { - warn "I{DTEDRAW TEX: $self->{width} $self->{height} \n"; - warn "ERR: ". (glGetError). "\n"; - my ($bd, $br) = (glGet (GL_DRAW_BUFFER), glGet (GL_READ_BUFFER)); - warn "BUF:[$bd $br]\n"; - - glCopyTexImage2D GL_TEXTURE_2D, 0, - GL_RGBA8, - 0, 0, - $self->{width}, $self->{height}, - 0; - glPopmatrix; - warn "ERR: ". (glGetError). "\n"; - sleep 1; + fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; } } -sub DESTROY { - my ($self) = @_; +package DC::Layout; - return unless exists $self->{name}; - - glDeleteTextures delete $self->{name}; -} +$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { + glyph_cache_restore; +}; -push @::GLINIT, sub { - $_->upload - for grep $_, @textures; +$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub { + glyph_cache_backup; }; 1;