--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/16 23:30:08 1.59 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 12:51:32 1.68 @@ -7,6 +7,7 @@ use CFClient; use CFClient::UI; +use CFClient::Pod; use base 'Crossfire::Protocol::Base'; @@ -17,7 +18,7 @@ $self->{map_widget}->clr_commands; - my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { + my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { my ($pom) = @_; my @cmd_help; @@ -33,7 +34,7 @@ $_ = $_ eq ".*" ? "" : " $_" for @args; - my $text = CFClient::pod_to_pango $head2->content; + my $text = CFClient::Pod::as_markup $head2->content; push @cmd_help, ["$cmd$_", $text] for sort { (length $a) <=> (length $b) } @@ -244,7 +245,7 @@ $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); - $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); + $self->update_weight; $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) for keys %RES_TBL; @@ -262,7 +263,13 @@ $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); - my ($x, $y) = (0, 0); + my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options"; + + 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 ( sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } map [$_, $self->{skill_info}{$_}], @@ -271,11 +278,32 @@ ) { my ($idx, $name) = @$_; + my $spell_cb = sub { + my ($widget, $ev) = @_; + + if ($ev->{button} == 1) { + $::CONN->user_send ("ready_skill $name"); + } elsif ($ev->{button} == 2) { + $::CONN->user_send ("use_skill $name"); + } elsif ($ev->{button} == 3) { + (new CFClient::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"]) }], + ], + )->popup ($ev); + } else { + return 0; + } + + 1 + }; + $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label - text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); + 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 CFClient::UI::Label - text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); - $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); + 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 CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); $x++ and ($x, $y) = (0, $y + 1); } @@ -587,7 +615,7 @@ [0.18, 0.54, 0.34], [0.56, 0.73, 0.56], [0.80, 0.80, 0.80], - [0.55, 0.41, 0.13], + [0.75, 0.61, 0.20], [0.99, 0.77, 0.26], [0.74, 0.65, 0.41], ); @@ -599,12 +627,12 @@ # 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 = CFClient::asxml $text; $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g; $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g; - $self->{logview}->add_paragraph ($color[$color], $_) - for map "$time $_", split /\n/, $text; + $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) + for map "$time $_", split /\n/, $text; $self->{logview}->scroll_to_bottom; $self->{statusbox}->add ($text, @@ -624,15 +652,15 @@ sub spell_add { my ($self, $spell) = @_; - # try to create single paragraphs of multiple lines sent by the server + # try to create single paragraphs out of the 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}); + $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); + $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); } sub spell_delete { @@ -644,13 +672,13 @@ sub addme_success { my ($self) = @_; - my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { + my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { my ($pom) = @_; my %skill_help; for my $head2 ($pom->head1->[3]->head2) { - $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; + $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; } \%skill_help @@ -658,10 +686,10 @@ 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") + (CFClient::asxml "Ready the skill '$skill'\n\n") . $skill_help->{$skill}); $self->{map_widget}->add_command ("use_skill $skill", - (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") + (CFClient::asxml "Immediately use the skill '$skill'\n\n") . $skill_help->{$skill}); } } @@ -696,14 +724,14 @@ $self->send ("requestinfo image_sums $face $face"); - $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", + $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 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", + $self->{statusbox}->add (CFClient::asxml "starting to prefetch", group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); } } @@ -711,11 +739,11 @@ sub update_floorbox { $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { return unless $::CONN; - + $::FLOORBOX->clear; my $row; - for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { + for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { if ($row < 6) { local $_->{face_widget}; # hack to force recreation of widget local $_->{desc_widget}; # hack to force recreation of widget @@ -733,14 +761,21 @@ last; } } + if ($::CONN->{open_container}) { + $::FLOORBOX->add (1, $row++, new CFClient::UI::Button + text => "Close container", + on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } + ); + } }); - + $::WANT_REFRESH++; } sub set_opencont { my ($conn, $tag, $name) = @_; $conn->{open_container} = $tag; + update_floorbox; $::INV_RIGHT_HB->clear (); $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); @@ -769,8 +804,8 @@ or return; for my $tag (keys %$todo) { + update_floorbox if $tag == 0 or $tag == $self->{open_container}; if ($tag == 0) { - update_floorbox; $::INVR->set_items ($self->{container}{0}) if $tag == $self->{open_container}; } elsif ($tag == $self->{player}{tag}) { @@ -827,7 +862,19 @@ sub player_update { my ($self, $player) = @_; - $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); + + $self->update_weight; +} + +sub update_weight { + my ($self) = @_; + + my $weight = .001 * $self->{player}{weight}; + my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; + + $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); + $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); + $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); } sub update_server_info { @@ -907,11 +954,14 @@ force_h => $::HEIGHT * 0.7, title => "NPC Dialog", kw => { hi => 0, yes => 0, no => 0 }, + has_close_button => 1, @_, ); Scalar::Util::weaken (my $this = $self); + $self->connect (delete => sub { $this->destroy; 1 }); + # better use a pane... $self->add (my $hbox = new CFClient::UI::HBox); $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); @@ -942,7 +992,7 @@ $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 }, + on_activate => sub { $this->destroy; 1 }, ; $self->update_options; @@ -953,7 +1003,10 @@ $self->{entry}->grab_focus; - $self->{textview}->add_paragraph ([1, 1, 0, 1], "[starting conversation with $self->{title}]\n\n"); + $self->{textview}->add_paragraph ({ + fg => [1, 1, 0, 1], + markup => "[starting conversation with $self->{title}]\n\n", + }); $self->show; $self @@ -987,9 +1040,12 @@ if ($type eq "msg") { my ($msg, @kw) = split /\x00/, $msg; + + utf8::decode $_ for ($msg, @kw); + $self->{kw}{$_} = 1 for @kw; - $msg = "\n" . CFClient::UI::Label::escape $msg; + $msg = "\n" . CFClient::UI::asxml $msg; my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; my @link; $msg =~ s{ @@ -1010,7 +1066,7 @@ chr 0xfffc }giex; - $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); + $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); $self->{textview}->scroll_to_bottom; $self->update_options; } else { @@ -1023,9 +1079,11 @@ 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}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); $self->{textview}->scroll_to_bottom; + + utf8::encode $msg; + $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); } sub destroy { @@ -1040,4 +1098,4 @@ $self->SUPER::destroy; } -1; +1