--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 13:16:44 1.69 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/04/23 19:17:41 1.103 @@ -6,58 +6,85 @@ 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; use base 'Crossfire::Protocol::Base'; sub new { - my $class = shift; + my ($class, %arg) = @_; - my $self = $class->SUPER::new (@_); + my $self = $class->SUPER::new (%arg, + setup_req => { + extmap => 1, + excmd => 1, + %{$arg{setup_req} || {}}, + }, + ); $self->{map_widget}->clr_commands; - my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { - my ($pom) = @_; - - my @cmd_help; - - for my $head2 ($pom->head1->[-2]->head2) { - $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x - or next; + my @cmd_help = map { + $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x + or die "unparseable command help: $_->{kw}[0]"; + + my $cmd = $1; + my @args = split /\|/, $2; + @args = (".*") unless @args; + + my (undef, @par) = CFPlus::Pod::section_of $_; + my $text = CFPlus::Pod::as_label @par; + + $_ = $_ eq ".*" ? "" : " $_" + for @args; + + map ["$cmd$_", $text], + sort { (length $a) <=> (length $b) } + @args + } sort { $a->{par} <=> $b->{par} } + CFPlus::Pod::find command => "*"; + + $self->connect_ext (event_capabilities => sub { + my ($cap) = @_; + + 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 $cmd = $1; - my @args = split /\|/, $2; - @args = (".*") unless @args; + my $w = int $self->{mapw} * 32 / $self->{tilesize}; + my $h = int $self->{maph} * 32 / $self->{tilesize}; - $_ = $_ eq ".*" ? "" : " $_" - for @args; - - my $text = CFPlus::Pod::as_markup $head2->content; - - push @cmd_help, ["$cmd$_", $text] - for sort { (length $a) <=> (length $b) } - @args; + $self->setup_req (mapsize => "${w}x${h}"); + } } - - \@cmd_help - }; + }); $self->{map_widget}->add_command (@$_) - for @$cmd_help; + for @cmd_help; - $self->{noface} = new_from_file CFPlus::Texture - CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; + { + $self->{dialogue} = my $tex = new_from_file CFPlus::Texture + CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; + $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"; - $self->{facemap} = CFPlus::db_table "facemap"; + $self->{open_container} = 0; # per server - $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; + $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; $self } @@ -267,7 +294,6 @@ my @TOOLTIP_LVL = (tooltip => "Level. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); - my @TOOLTIP_NAME = (tooltip => "Name. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); my ($x, $y) = (0, 1); for ( @@ -286,10 +312,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 { @@ -303,7 +330,8 @@ text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); - $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); + $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, + can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); $x++ and ($x, $y) = (0, $y + 1); } @@ -315,27 +343,29 @@ } } +sub macro_send { + my ($self, $macro) = @_; + + for my $cmd (@{ $macro->{action} }) { + $self->send_command ($cmd); + } +} + sub user_send { my ($self, $command) = @_; - if ($self->{record}) { - push @{$self->{record}}, $command; - } + $self->{record}->($command) + if $self->{record}; $self->logprint ("send: ", $command); $self->send_command ($command); ::status ($command); } -sub start_record { - my ($self) = @_; - - $self->{record} = []; -} +sub record { + my ($self, $cb) = @_; -sub stop_record { - my ($self) = @_; - return delete $self->{record}; + $self->{record} = $cb; } sub map_scroll { @@ -347,7 +377,7 @@ sub feed_map1a { my ($self, $data) = @_; - $self->{map}->map1a_update ($data); + $self->{map}->map1a_update ($data, $self->{setup}{extmap}); $self->{map_widget}->update; } @@ -366,7 +396,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# } @@ -380,20 +410,47 @@ delete $self->{map_widget}{magicmap}; } +sub bg_fetch { + my ($self) = @_; + + my $id; + + do { + $id = pop @{$self->{bg_fetch}} + or return; + } while $self->{texture}[$id]; + + CFPlus::DB::get tilecache => $id, sub { + my ($data) = @_; + + return unless $self->{map}; # stop when destroyed + + $self->set_texture ($id => $data) + if defined $data; + + $self->bg_fetch; + }; +} 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; + my $gen = $self->{map_change_gen}; - $self->set_texture ($id => $data); + CFPlus::DB::get $self->{mapcache} => $hash, sub { + return unless $gen == $self->{map_change_gen}; + + my ($data) = @_; + + if (defined $data) { + $data = Compress::LZF::decompress $data; + #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# + + my $inprogress = @{ $self->{bg_fetch} || [] }; + unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); + $self->bg_fetch unless $inprogress; } - } + }; } # hardcode /world/world_xxx_xxx map names, the savings are enourmous, @@ -467,7 +524,10 @@ if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; } else { + my $gen = $self->{map_change_gen}; $self->send_mapinfo ("spatial $path$tile", sub { + return unless $gen == $self->{map_change_gen}; + my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; return if $mode ne "spatial"; @@ -492,6 +552,8 @@ $self->flush_map; + ++$self->{map_change_gen}; + my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); my $mapmapw = $self->{mapmap}->{w}; @@ -517,71 +579,44 @@ } sub face_find { - my ($self, $facenum, $face) = @_; + my ($self, $facenum, $face, $cb) = @_; my $hash = "$face->{chksum},$face->{name}"; - my $id = $self->{facemap}->get ($hash); + my $id = CFPlus::DB::get_tile_id_sync $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; + $face->{id} = $id; + $self->{faceid}[$facenum] = $id; - goto gotid; - } - } - $txn->txn_abort; - } + $self->{map}->set_tileid ($facenum => $id); - CFPlus::fatal "maximum number of transaction retries reached - database problems?"; - } - -gotid: - $face->{id} = $id; - $self->{map}->set_face ($facenum => $id); - $self->{faceid}[$facenum] = $id;#d# - - 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}); } +sub smooth_update { + my ($self, $facenum, $face) = @_; + + $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); +} + sub set_texture { my ($self, $id, $data) = @_; - $self->{texture}[$id] ||= do { - my $tex = - new_from_image CFPlus::Texture - $data, minify => 1, mipmap => 1; - - $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); - $self->{map_widget}->update; + $self->{texture}[$id] = my $tex = + new_from_image CFPlus::Texture + $data, minify => 1, mipmap => 1; - $tex - }; + $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); + $self->{map_widget}->update; } sub sound_play { @@ -601,44 +636,44 @@ $self->{query}-> ($self, $flags, $prompt); } +our @CF_COLOR = ( + [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], + [1.00, 1.00, 1.00], + [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] + [1.00, 0.00, 0.00], + [1.00, 0.54, 0.00], + [0.11, 0.56, 1.00], + [0.93, 0.46, 0.00], + [0.18, 0.54, 0.34], + [0.56, 0.73, 0.56], + [0.80, 0.80, 0.80], + [0.75, 0.61, 0.20], + [0.99, 0.77, 0.26], + [0.74, 0.65, 0.41], +); + sub drawinfo { my ($self, $color, $text) = @_; - my @color = ( - [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], - [1.00, 1.00, 1.00], - [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] - [1.00, 0.00, 0.00], - [1.00, 0.54, 0.00], - [0.11, 0.56, 1.00], - [0.93, 0.46, 0.00], - [0.18, 0.54, 0.34], - [0.56, 0.73, 0.56], - [0.80, 0.80, 0.80], - [0.75, 0.61, 0.20], - [0.99, 0.77, 0.26], - [0.74, 0.65, 0.41], - ); + my $fg = $CF_COLOR[$color % @CF_COLOR]; $self->logprint ("info: ", $text); - my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; - - # try to create single paragraphs of multiple lines sent by the server - $text =~ s/(?<=\S)\n(?=\w)/ /g; + ## try to create single paragraphs of multiple lines sent by the server + # no longer neecssary with TRT servers + #$text =~ s/(?<=\S)\n(?=\w)/ /g; $text = CFPlus::asxml $text; $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g; $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; - $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) - for map "$time $_", split /\n/, $text; - $self->{logview}->scroll_to_bottom; + ::message ({ fg => $fg, markup => $_ }) + for split /\n/, $text; $self->{statusbox}->add ($text, group => $text, - fg => $color[$color], - timeout => $color >= 2 ? 60 : 10, + fg => $fg, + timeout => $color >= 2 ? 180 : 10, tooltip_font => $::FONT_FIXED, ); } @@ -657,7 +692,7 @@ $spell->{message} =~ s/\n+$//; $spell->{message} ||= "Server did not provide a description for this spell."; - $::SPELL_PAGE->add_spell ($spell); + $::SPELL_LIST->add_spell ($spell); $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); @@ -666,31 +701,33 @@ sub spell_delete { my ($self, $spell) = @_; - $::SPELL_PAGE->remove_spell ($spell); + $::SPELL_LIST->remove_spell ($spell); } -sub addme_success { - my ($self) = @_; +sub setup { + my ($self, $setup) = @_; - my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { - my ($pom) = @_; + $self->{map_widget}->set_tilesize ($self->{tilesize}); + $::MAP->resize ($self->{mapw}, $self->{maph}); +} - my %skill_help; +sub addme_success { + my ($self) = @_; - for my $head2 ($pom->head1->[3]->head2) { - $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; - } + my %skill_help; - \%skill_help + for my $node (CFPlus::Pod::find skill_description => "*") { + my (undef, @par) = CFPlus::Pod::section_of $node; + $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; }; - + for my $skill (values %{$self->{skill_info}}) { $self->{map_widget}->add_command ("ready_skill $skill", (CFPlus::asxml "Ready the skill '$skill'\n\n") - . $skill_help->{$skill}); + . $skill_help{$skill}); $self->{map_widget}->add_command ("use_skill $skill", (CFPlus::asxml "Immediately use the skill '$skill'\n\n") - . $skill_help->{$skill}); + . $skill_help{$skill}); } } @@ -887,40 +924,64 @@ . "protocol version $self->{version}\n" . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" + . "editing support $yesno[!!$self->{editor_support}]\n" + . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" . "cfplus support $yesno[$self->{cfplus_ext} > 0]" . ($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 { my ($self) = @_; - $self->send_ext_req (cfplus_support => "1", sub { - $self->{cfplus_ext} = $_[0]; + $self->send_ext_req (cfplus_support => version => 1, sub { + $self->{cfplus_ext} = $_[0]{version}; $self->update_server_info; + + if ($self->{cfplus_ext} >= 2) { + $self->send_ext_req ("editor_support", sub { + $self->{editor_support} = $_[0]; + $self->update_server_info; + + 0 + }); + } + + 0 }); $self->update_server_info; $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) = @_; if ($self->{cfplus_ext}) { - $self->send_ext_req (lookat => "$x $y", sub { - my %res = split /\x00/, $_[0]; + $self->send_ext_req (lookat => dx => $x, dy => $y, sub { + my ($msg) = @_; - if (exists $res{npc_dialog}) { + if (exists $msg->{npc_dialog}) { # start npc chat dialog $self->{npc_dialog} = new CFPlus::NPCDialog:: dx => $x, dy => $y, - title => "$res{npc_dialog} (NPC)", + title => "$msg->{npc_dialog} (NPC)", conn => $self, ; } @@ -933,7 +994,7 @@ sub destroy { my ($self) = @_; - $self->{npc_dialog}->destroy + (delete $self->{npc_dialog})->destroy if $self->{npc_dialog}; $self->SUPER::destroy; @@ -941,7 +1002,7 @@ package CFPlus::NPCDialog; -our @ISA = 'CFPlus::UI::FancyFrame'; +our @ISA = 'CFPlus::UI::Toplevel'; sub new { my $class = shift; @@ -958,7 +1019,7 @@ @_, ); - Scalar::Util::weaken (my $this = $self); + CFPlus::weaken (my $this = $self); $self->connect (delete => sub { $this->destroy; 1 }); @@ -970,11 +1031,7 @@ $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); $vbox->add ($self->{entry} = new CFPlus::UI::Entry - tooltip => "Enter a message you want to tell the NPC and press return.\n\n" - . "Sometimes you have to tell an NPC something you cannot find out during " - . "a normal conversation (such as a password). In those cases you have to use " - . "this text entry. You can also enter responses manually instead of using the response " - . "buttons below.", + tooltip => "#npc_message_entry", on_activate => sub { my ($entry, $text) = @_; @@ -997,9 +1054,10 @@ $self->update_options; - $self->{token} = $self->{conn}->ext_token; - $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); - $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); + $self->{id} = $self->{conn}->send_ext_req ( + npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, + sub { $this && $this->feed (@_) } + ); $self->{entry}->grab_focus; @@ -1015,7 +1073,7 @@ sub update_options { my ($self) = @_; - Scalar::Util::weaken $self; + CFPlus::weaken $self; $self->{options}->clear; $self->{options}->add ($self->{bye_button}); @@ -1032,23 +1090,18 @@ } sub feed { - my ($self, $data) = @_; - - Scalar::Util::weaken $self; - - my ($type, $msg) = split / /, $data, 2; + my ($self, $msg) = @_; - if ($type eq "msg") { - my ($msg, @kw) = split /\x00/, $msg; + CFPlus::weaken $self; - utf8::decode $_ for ($msg, @kw); - - $self->{kw}{$_} = 1 for @kw; + if ($msg->{msgtype} eq "reply") { + $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; + $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; - $msg = "\n" . CFPlus::UI::asxml $msg; + my $text = "\n" . CFPlus::asxml $msg->{msg}; my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; my @link; - $msg =~ s{ + $text =~ s{ ($match) }{ my $kw = $1; @@ -1063,10 +1116,10 @@ $self->send ($kw); }; - chr 0xfffc + "\x{fffc}" }giex; - $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); + $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); $self->{textview}->scroll_to_bottom; $self->update_options; } else { @@ -1082,8 +1135,7 @@ $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); $self->{textview}->scroll_to_bottom; - utf8::encode $msg; - $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); + $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); } sub destroy { @@ -1091,11 +1143,14 @@ #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 - $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; - delete $self->{conn}{npc_dialog}; - $self->{conn}->disconnect_ext ($self->{token}); + if ($self->{conn}) { + $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; + delete $self->{conn}{npc_dialog}; + $self->{conn}->disconnect_ext ($self->{id}); + } $self->SUPER::destroy; } 1 +