--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/05/26 19:34:30 1.3 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/02 21:07:26 1.51 @@ -5,10 +5,13 @@ use Crossfire::Protocol::Constants; +use CFClient; use CFClient::UI; use base 'Crossfire::Protocol::Base'; +our %open_logs; + sub new { my $class = shift; @@ -16,25 +19,34 @@ $self->{map_widget}->clr_commands; - my $parser = new Pod::POM; - my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod"); + my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { + my ($pom) = @_; - for my $head2 ($pod->head1->[-2]->head2) { - $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x - or next; + my @cmd_help; - my $cmd = $1; - my @args = split /\|/, $2; - @args = (".*") unless @args; + for my $head2 ($pom->head1->[-2]->head2) { + $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x + or next; - my $text = CFClient::pod_to_pango $head2->content; + my $cmd = $1; + my @args = split /\|/, $2; + @args = (".*") unless @args; + + $_ = $_ eq ".*" ? "" : " $_" + for @args; + + my $text = CFClient::pod_to_pango $head2->content; + + push @cmd_help, ["$cmd$_", $text] + for sort { (length $a) <=> (length $b) } + @args; + } - for my $arg (@args) { - $arg = $arg eq ".*" ? "" : " $arg"; + \@cmd_help + }; - $self->{map_widget}->add_command ("$cmd$arg", $text); - } - } + $self->{map_widget}->add_command (@$_) + for @$cmd_help; $self->{noface} = new_from_file CFClient::Texture CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; @@ -51,10 +63,32 @@ $self } +sub logprint { + my ($self, @a) = @_; + my $filename = "$Crossfire::VARDIR/log.$self->{host}"; + + my $fh = $open_logs{$filename}; + unless ($fh) { + # FIXME: handle this more gracefully? + open $fh, ">>", $filename + or die "Couldn't open logfile: log.$self->{host}: $!"; + + $open_logs{$filename} = $fh; + } + + my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time); + + my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", + $year + 1900, $mon + 1, $mday, $hour, $min, $sec; + + print $fh "$ts ", @a, "\n"; + $fh->flush; +} + sub stats_update { my ($self, $stats) = @_; - if (my $exp = $stats->{CS_STAT_EXP64}) { + if (my $exp = $stats->{+CS_STAT_EXP64}) { my $diff = $exp - $self->{prev_exp}; $self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5) if exists $self->{prev_exp} && $diff; @@ -67,8 +101,24 @@ sub user_send { my ($self, $command) = @_; + if ($self->{record}) { + push @{$self->{record}}, $command; + } + + $self->logprint ("send: ", $command); $self->send_command ($command); - ::status $command; + ::status ($command); +} + +sub start_record { + my ($self) = @_; + + $self->{record} = []; +} + +sub stop_record { + my ($self) = @_; + return delete $self->{record}; } sub map_scroll { @@ -84,6 +134,12 @@ $self->{map_widget}->update; } +sub magicmap { + my ($self, $w, $h, $x, $y, $data) = @_; + + $self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data); +} + sub flush_map { my ($self) = @_; @@ -104,6 +160,7 @@ delete $self->{neigh_map}; $self->{map}->clear; + delete $self->{map_widget}{magicmap}; } @@ -254,9 +311,9 @@ # I love transactions for (1..100) { my $txn = $CFClient::DB_ENV->txn_begin; - my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW); + my $status = $self->{facemap}->db_get (id => $id); if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { - $id = ($id || 16) + 1; + $id = ($id || 64) + 1; if ($self->{facemap}->put (id => $id) == 0 && $self->{facemap}->put ($hash => $id) == 0) { $txn->txn_commit; @@ -264,7 +321,7 @@ goto gotid; } } - $txn->abort; + $txn->txn_abort; } CFClient::fatal "maximum number of transaction retries reached - database problems?"; @@ -324,61 +381,7 @@ $prompt = $LAST_QUERY unless length $prompt; $LAST_QUERY = $prompt; - my $dialog = new CFClient::UI::FancyFrame - title => "Query", - child => my $vbox = new CFClient::UI::VBox; - - $vbox->add (new CFClient::UI::Label - max_w => $::WIDTH * 0.4, - ellipsise => 0, - text => $prompt); - - if ($flags & CS_QUERY_YESNO) { - $vbox->add (my $hbox = new CFClient::UI::HBox); - $hbox->add (new CFClient::UI::Button - text => "No", - connect_activate => sub { - $self->send ("reply n"); - $dialog->destroy; - $self->{map_widget}->focus_in; - } - ); - $hbox->add (new CFClient::UI::Button - text => "Yes", - connect_activate => sub { - $self->send ("reply y"); - $dialog->destroy; - }, - ); - - $dialog->focus_in; - - } elsif ($flags & CS_QUERY_SINGLECHAR) { - $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)"; - $vbox->add (my $entry = new CFClient::UI::Entry - connect_changed => sub { - $self->send ("reply $_[1]"); - $dialog->destroy; - }, - ); - - $entry->focus_in; - - } else { - $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; - - $vbox->add (my $entry = new CFClient::UI::Entry - $flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (), - connect_activate => sub { - $self->send ("reply $_[1]"); - $dialog->destroy; - }, - ); - - $entry->focus_in; - } - - $dialog->show_centered; + $self->{query}-> ($self, $flags, $prompt); } sub drawinfo { @@ -400,19 +403,25 @@ [0.74, 0.65, 0.41], ); + $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; + $text = CFClient::UI::Label::escape $text; $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g; $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; - $self->{logview}->add_paragraph ($color[$color], - join "\n", map "$time $_", split /\n/, $text); + $self->{logview}->add_paragraph ($color[$color], $_) + for map "$time $_", split /\n/, $text; + $self->{logview}->scroll_to_bottom; $self->{statusbox}->add ($text, group => $text, fg => $color[$color], - timeout => 10, + timeout => $color >= 2 ? 60 : 10, tooltip_font => $::FONT_FIXED, ); } @@ -426,38 +435,45 @@ sub spell_add { my ($self, $spell) = @_; - # TODO - # create a widget dynamically, using spell face (CF::Protocol downloads them) + # try to create single paragraphs of multiple lines sent by the server + $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; + $spell->{message} =~ s/\n+$//; + $spell->{message} ||= "Server did not provide a description for this spell."; + + $::SPELL_PAGE->add_spell ($spell); + $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); } sub spell_delete { my ($self, $spell) = @_; + + $::SPELL_PAGE->remove_spell ($spell); } sub addme_success { my ($self) = @_; - $self->send ("command output-sync $::CFG->{output_sync}"); - $self->send ("command output-count $::CFG->{output_count}"); + my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { + my ($pom) = @_; - my $parser = new Pod::POM; - my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod"); + my %skill_help; - my %skill_tooltip; + for my $head2 ($pom->head1->[3]->head2) { + $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; + } - for my $head2 ($pod->head1->[-2]->head2) { - $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content; - } + \%skill_help + }; for my $skill (values %{$self->{skill_info}}) { $self->{map_widget}->add_command ("ready_skill $skill", (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") - . $skill_tooltip{$skill}); + . $skill_help->{$skill}); $self->{map_widget}->add_command ("use_skill $skill", (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") - . $skill_tooltip{$skill}); + . $skill_help->{$skill}); } } @@ -492,14 +508,14 @@ $self->send ("requestinfo image_sums $face $face"); $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", - group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); + group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); } elsif (!exists $self->{num_faces}) { $self->send ("requestinfo image_info"); $self->{num_faces} = 0; $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", - group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]); + group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); } } @@ -510,8 +526,8 @@ $::FLOORBOX->clear; my $row; - for (@{ $::CONN->{container}{0} }) { - if ($row < 7) { + for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { + if ($row < 6) { local $_->{face_widget}; # hack to force recreation of widget local $_->{desc_widget}; # hack to force recreation of widget CFClient::Item::update_widgets $_; @@ -521,7 +537,10 @@ $row++; } else { - $::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More..."); + $::FLOORBOX->add (1, $row, new CFClient::UI::Button + text => "More...", + on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, + ); last; } } @@ -533,65 +552,66 @@ sub set_opencont { my ($conn, $tag, $name) = @_; $conn->{open_container} = $tag; - $::INVR_LBL->set_text ($name); + + $::INV_RIGHT_HB->clear (); + $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); + + if ($tag != 0) { # Floor isn't closable, is it? + $::INV_RIGHT_HB->add (new CFClient::UI::Button + text => "Close container", + tooltip => "Close the currently open container (if one is open)", + on_activate => sub { + $::CONN->send ("apply $tag") # $::CONN->{open_container}") + if $tag != 0; + #if $CONN->{open_container} != 0; + 0 + }, + ); + } + $::INVR->set_items ($conn->{container}{$tag}); } -sub update_container { - my ($tag) = @_; +sub update_containers { + my ($self) = @_; - $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) - if $tag == $::CONN->{open_container}; + $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { + for my $tag (keys %{ delete $self->{update_container} }) { + if ($tag == 0) { + update_floorbox; + $::INVR->set_items ($self->{container}{0}) + if $tag == $self->{open_container}; + } elsif ($tag == $self->{player}{tag}) { + $::INV->set_items ($self->{container}{$tag}) + } else { + $::INVR->set_items ($self->{container}{$tag}) + if $tag == $self->{open_container}; + } + } + }); } sub container_add { my ($self, $tag, $items) = @_; - #d# print "container_add: container $tag ($self->{player}{tag})\n"; - - if ($tag == 0) { - update_floorbox; - update_container (0); - } elsif ($tag == $self->{player}{tag}) { - $::INV->set_items ($self->{container}{$self->{player}{tag}}) - } else { - update_container ($tag); - } - - # $self-<{player}{tag} => player inv - #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; + $self->{update_container}{$tag}++; + $self->update_containers; } sub container_clear { my ($self, $tag) = @_; - #d# print "container_clear: container $tag ($self->{player}{tag})\n"; - - if ($tag == 0) { - update_floorbox; - update_container (0); - } elsif ($tag == $self->{player}{tag}) { - $::INV->set_items ($self->{container}{$tag}) - } - -# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; + $self->{update_container}{$tag}++; + $self->update_containers; } sub item_delete { my ($self, @items) = @_; - for (@items) { - #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n"; - - if ($_->{container} == 0) { - update_floorbox; - update_container ($_->{tag}); - } elsif ($_->{container} == $self->{player}{tag}) { - $::INV->set_items ($self->{container}{$self->{player}{tag}}) - } else { - update_container ($_->{tag}); - } - } + $self->{update_container}{$_->{container}}++ + for @items; + + $self->update_containers; } sub item_update { @@ -599,11 +619,6 @@ #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; - if ($item->{tag} == $self->{player}{tag}) { - $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000); - return; - } - CFClient::Item::update_widgets $item; if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { @@ -611,13 +626,16 @@ } elsif ($item->{flags} & F_OPEN) { set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); + } else { - if ($item->{container} == 0) { - update_floorbox; - update_container (0); - } elsif ($item->{container} == $self->{player}{tag}) { - $::INV->set_items ($self->{container}{$item->{container}}) - } + $self->{update_container}{$item->{container}}++; + $self->update_containers; +# if ($item->{container} == 0) { +# update_floorbox; +# update_container (0); +# } elsif ($item->{container} == $self->{player}{tag}) { +# $::INV->set_items ($self->{container}{$item->{container}}) +# } } } @@ -626,4 +644,213 @@ $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); } +sub update_server_info { + my ($self) = @_; + + my @yesno = ("no", "yes"); + + $::SERVER_INFO->set_markup ( + "server $self->{host}:$self->{port}\n" + . "protocol version $self->{version}\n" + . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" + . "extended command support $yesno[$self->{setup}{extcmd} > 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" + ); +} + +sub logged_in { + my ($self) = @_; + + $self->send_ext_req (cfplus_support => "1", sub { + $self->{cfplus_ext} = $_[0]; + $self->update_server_info; + }); + + $self->update_server_info; + + $self->send_command ("output-sync $::CFG->{output_sync}"); + $self->send_command ("output-count $::CFG->{output_count}"); + $self->send_command ("pickup $::CFG->{pickup}"); +} + +sub lookat { + my ($self, $x, $y) = @_; + + if ($self->{cfplus_ext}) { + $self->send_ext_req (lookat => "$x $y", sub { + my %res = split /\x00/, $_[0]; + + if (exists $res{npc_dialog}) { + # start npc chat dialog + $self->{npc_dialog} = new CFClient::NPCDialog:: + dx => $x, + dy => $y, + title => "$res{npc_dialog} (NPC)", + conn => $self, + ; + } + }); + } + + $self->send ("lookat $x $y"); +} + +sub destroy { + my ($self) = @_; + + $self->{npc_dialog}->destroy + if $self->{npc_dialog}; + + $self->SUPER::destroy; +} + +package CFClient::NPCDialog; + +our @ISA = 'CFClient::UI::FancyFrame'; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + x => 'center', + y => 'center', + name => "npc_dialog", + force_w => $::WIDTH * 0.7, + force_h => $::HEIGHT * 0.7, + title => "NPC Dialog", + kw => { hi => 0, yes => 0, no => 0 }, + @_, + ); + + Scalar::Util::weaken (my $this = $self); + + # better use a pane... + $self->add (my $hbox = new CFClient::UI::HBox); + $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); + + $hbox->add (my $vbox = new CFClient::UI::VBox); + + $vbox->add (new CFClient::UI::Label text => "Message Entry:"); + $vbox->add ($self->{entry} = new CFClient::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.", + on_activate => sub { + my ($entry, $text) = @_; + + return unless $text =~ /\S/; + + $entry->set_text (""); + $this->send ($text); + + 0 + }, + ); + + $vbox->add ($self->{options} = new CFClient::UI::VBox); + + $self->{bye_button} = new CFClient::UI::Button + text => "Bye (close)", + tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", + on_activate => sub { $this->destroy; 0 }, + ; + + $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->{entry}->grab_focus; + + $self->{textview}->add_paragraph ([1, 1, 0, 1], "[starting conversation with $self->{title}]\n\n"); + + $self->show; + $self +}; + +sub update_options { + my ($self) = @_; + + Scalar::Util::weaken $self; + + $self->{options}->clear; + $self->{options}->add ($self->{bye_button}); + + for my $kw (sort keys %{ $self->{kw} }) { + $self->{options}->add (new CFClient::UI::Button + text => $kw, + on_activate => sub { + $self->send ($kw); + 0 + }, + ); + } +} + +sub feed { + my ($self, $data) = @_; + + Scalar::Util::weaken $self; + + my ($type, $msg) = split / /, $data, 2; + + if ($type eq "msg") { + my ($msg, @kw) = split /\x00/, $msg; + $self->{kw}{$_} = 1 for @kw; + + $msg = "\n" . CFClient::UI::Label::escape $msg; + my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; + my @link; + $msg =~ s{ + ($match) + }{ + my $kw = $1; + + push @link, new CFClient::UI::Label + markup => "$kw", + can_hover => 1, + can_events => 1, + padding_x => 0, + padding_y => 0, + on_button_up => sub { + $self->send ($kw); + }; + + chr 0xfffc + }giex; + + $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); + $self->{textview}->scroll_to_bottom; + $self->update_options; + } else { + $self->destroy; + } + + 1 +} + +sub send { + my ($self, $msg) = @_; + + $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); + $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); + $self->{textview}->scroll_to_bottom; +} + +sub destroy { + my ($self) = @_; + + #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 + + delete $self->{conn}{npc_dialog}; + $self->{conn}->disconnect_ext ($self->{token}); + + $self->SUPER::destroy; +} + 1;