--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/11/19 20:31:29 1.88 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/04/06 07:45:35 1.96 @@ -6,8 +6,11 @@ use Crossfire::Protocol::Constants; use CFPlus; +use CFPlus::DB; use CFPlus::UI; use CFPlus::Pod; +use CFPlus::Macro; +use CFPlus::Item; use Crossfire::Protocol::Base 0.95; @@ -37,14 +40,28 @@ map ["$cmd$_", $text], sort { (length $a) <=> (length $b) } @args - } sort { $a->{par} <=> $b->{par} } - CFPlus::Pod::find command => "*"; + } sort { $a->{par} <=> $b->{par} } + CFPlus::Pod::find command => "*"; - $self->{map_widget}->add_command (@$_) - for @cmd_help; + $self->connect_ext (event_capabilities => sub { + my ($cap) = @_; - $self->{noface} = new_from_file CFPlus::Texture - CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; + if (my $ts = $cap->{tileset}) { + if (my ($default) = grep $_->[2] & 1, @$ts) { + $self->{tileset} = $default; + $self->{tilesize} = $default->[3]; + $self->setup_req (tileset => $default->[0]); + + my $w = int $self->{mapw} * 32 / $self->{tilesize}; + my $h = int $self->{maph} * 32 / $self->{tilesize}; + + $self->setup_req (mapsize => "${w}x${h}"); + } + } + }); + + $self->{map_widget}->add_command (@$_) + for @cmd_help; { $self->{dialogue} = my $tex = new_from_file CFPlus::Texture @@ -52,17 +69,16 @@ $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); } - $self->{open_container} = 0; + { + $self->{noface} = my $tex = new_from_file CFPlus::Texture + CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; + $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); + } - # "global" - $self->{tilecache} = CFPlus::db_table "tilecache" - or die "tilecache: unable to open database table"; - $self->{facemap} = CFPlus::db_table "facemap" - or die "facemap: unable to open database table"; + $self->{open_container} = 0; # per server - $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" - or die "mapcache_$self->{host}_$self->{port}: unable to open database table"; + $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; $self } @@ -290,10 +306,11 @@ } elsif ($ev->{button} == 2) { $::CONN->user_send ("use_skill $name"); } elsif ($ev->{button} == 3) { + my $shortname = CFPlus::shorten $name, 14; (new CFPlus::UI::Menu items => [ - ["bind ready_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], - ["bind use_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], + ["bind ready_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], + ["bind use_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], ], )->popup ($ev); } else { @@ -320,10 +337,18 @@ } } +sub macro_send { + my ($self, $macro) = @_; + + for my $cmd (@{ $macro->{action} }) { + $self->send_command ($cmd); + } +} + sub user_send { my ($self, $command) = @_; - push @{$self->{record}}, $command + $self->{record}->($command) if $self->{record}; $self->logprint ("send: ", $command); @@ -331,15 +356,10 @@ ::status ($command); } -sub start_record { - my ($self) = @_; +sub record { + my ($self, $cb) = @_; - $self->{record} = []; -} - -sub stop_record { - my ($self) = @_; - return delete $self->{record}; + $self->{record} = $cb; } sub map_scroll { @@ -370,7 +390,7 @@ my ($hash, $x, $y, $w, $h) = @$map_info; my $data = $self->{map}->get_rect ($x, $y, $w, $h); - $self->{mapcache}->put ($hash => Compress::LZF::compress $data); + CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# } @@ -388,16 +408,22 @@ sub load_map($$$) { my ($self, $hash, $x, $y) = @_; - if (defined (my $data = $self->{mapcache}->get ($hash))) { - $data = Compress::LZF::decompress $data; - #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# - for my $id ($self->{map}->set_rect ($x, $y, $data)) { - my $data = $self->{tilecache}->get ($id) - or next; + CFPlus::DB::get $self->{mapcache} => $hash, sub { + my ($data) = @_; - $self->set_texture ($id => $data); + if (defined $data) { + $data = Compress::LZF::decompress $data; + #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# + for my $id ($self->{map}->set_rect ($x, $y, $data)) { + CFPlus::DB::get tilecache => $id, sub { + my ($data) = @_; + + $self->set_texture ($id => $data) + if defined $data; + }; + } } - } + }; } # hardcode /world/world_xxx_xxx map names, the savings are enourmous, @@ -521,54 +547,25 @@ } sub face_find { - my ($self, $facenum, $face) = @_; + my ($self, $facenum, $face, $cb) = @_; my $hash = "$face->{chksum},$face->{name}"; - my $id = $self->{facemap}->get ($hash); - - unless ($id) { - # create new id for face - # I love transactions - for (1..100) { - my $txn = $CFPlus::DB_ENV->txn_begin; - my $status = $self->{facemap}->db_get (id => $id); - if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { - $id = ($id || 64) + 1; - if ($self->{facemap}->put (id => $id) == 0 - && $self->{facemap}->put ($hash => $id) == 0) { - $txn->txn_commit; - - goto gotid; - } - } - $txn->txn_abort; - } + my $id = CFPlus::DB::get_tile_id_sync $hash; - CFPlus::fatal "maximum number of transaction retries reached - database problems?"; - } + $face->{id} = $id; + $self->{faceid}[$facenum] = $id; -gotid: - $face->{id} = $id; - $self->{map}->set_face ($facenum => $id); - $self->{faceid}[$facenum] = $id;#d# + $self->{map}->set_tileid ($facenum => $id); - my $face = $self->{tilecache}->get ($id); - - if ($face) { - #$self->face_prefetch; - $face - } else { - my $tex = $self->{noface}; - $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); - undef - }; + CFPlus::DB::get tilecache => $id, $cb; } sub face_update { my ($self, $facenum, $face, $changed) = @_; - $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; + CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } + if $changed; $self->set_texture ($face->{id} => delete $face->{image}); } @@ -624,6 +621,8 @@ [0.74, 0.65, 0.41], ); + my $fg = $color[$color % @color]; + $self->logprint ("info: ", $text); # try to create single paragraphs of multiple lines sent by the server @@ -633,12 +632,12 @@ $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g; $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; - ::message ({ fg => $color[$color], markup => $_ }) + ::message ({ fg => $fg, markup => $_ }) for split /\n/, $text; $self->{statusbox}->add ($text, group => $text, - fg => $color[$color], + fg => $fg, timeout => $color >= 2 ? 180 : 10, tooltip_font => $::FONT_FIXED, ); @@ -673,6 +672,7 @@ sub setup { my ($self, $setup) = @_; + $self->{map_widget}->set_tilesize ($self->{tilesize}); $::MAP->resize ($self->{mapw}, $self->{maph}); } @@ -895,6 +895,8 @@ . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" . "map size $self->{mapw}×$self->{maph}\n" ); + + ::setup_build_button ($self->{editor_support}->{builder_ui}); } sub logged_in { @@ -920,9 +922,18 @@ $self->send_command ("output-sync $::CFG->{output_sync}"); $self->send_command ("output-count $::CFG->{output_count}"); + $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; $self->send_command ("pickup $::CFG->{pickup}"); } +sub buildat { + my ($self, $builditem, $x, $y) = @_; + + if ($self->{cfplus_ext}) { + $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); + } +} + sub lookat { my ($self, $x, $y) = @_; @@ -973,7 +984,7 @@ @_, ); - Scalar::Util::weaken (my $this = $self); + CFPlus::weaken (my $this = $self); $self->connect (delete => sub { $this->destroy; 1 }); @@ -1027,7 +1038,7 @@ sub update_options { my ($self) = @_; - Scalar::Util::weaken $self; + CFPlus::weaken $self; $self->{options}->clear; $self->{options}->add ($self->{bye_button}); @@ -1046,7 +1057,7 @@ sub feed { my ($self, $msg) = @_; - Scalar::Util::weaken $self; + CFPlus::weaken $self; if ($msg->{msgtype} eq "reply") { $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};