ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.62 by elmex, Sat Jul 22 12:18:02 2006 UTC vs.
Revision 1.68 by elmex, Sun Jul 30 12:51:32 2006 UTC

… …
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFClient;
9use CFClient::UI; 9use CFClient::UI;
10use CFClient::Pod;
10 11
11use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
12 13
13sub new { 14sub new {
14 my $class = shift; 15 my $class = shift;
15 16
16 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
17 18
18 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
19 20
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
21 my ($pom) = @_; 22 my ($pom) = @_;
22 23
23 my @cmd_help; 24 my @cmd_help;
24 25
25 for my $head2 ($pom->head1->[-2]->head2) { 26 for my $head2 ($pom->head1->[-2]->head2) {
… …
31 @args = (".*") unless @args; 32 @args = (".*") unless @args;
32 33
33 $_ = $_ eq ".*" ? "" : " $_" 34 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 35 for @args;
35 36
36 my $text = CFClient::pod_to_pango $head2->content; 37 my $text = CFClient::Pod::as_markup $head2->content;
37 38
38 push @cmd_help, ["$cmd$_", $text] 39 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 40 for sort { (length $a) <=> (length $b) }
40 @args; 41 @args;
41 } 42 }
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 243 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 244 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 245 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 246 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 247
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 248 $self->update_weight;
248 249
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 250 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 251 for keys %RES_TBL;
251 252
252 my $sktbl = $::STATWIDS->{skill_tbl}; 253 my $sktbl = $::STATWIDS->{skill_tbl};
… …
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
264 265
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271
265 my ($x, $y) = (1, 0); 272 my ($x, $y) = (0, 1);
266 for ( 273 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 275 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 276 grep exists $stats->{$_},
270 @skills 277 @skills
271 ) { 278 ) {
272 my ($idx, $name) = @$_; 279 my ($idx, $name) = @$_;
273 280
281 my $spell_cb = sub {
282 my ($widget, $ev) = @_;
283
284 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) {
289 (new CFClient::UI::Menu
290 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
293 ],
294 )->popup ($ev);
295 } else {
296 return 0;
297 }
298
299 1
300 };
301
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 306 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
279 307
280 $x++ and ($x, $y) = (0, $y + 1); 308 $x++ and ($x, $y) = (0, $y + 1);
281 } 309 }
282 } 310 }
283 311
… …
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598 626
599 # try to create single paragraphs of multiple lines sent by the server 627 # try to create single paragraphs of multiple lines sent by the server
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 628 $text =~ s/(?<=\S)\n(?=\w)/ /g;
601 629
602 $text = CFClient::UI::Label::escape $text; 630 $text = CFClient::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 633
606 $self->{logview}->add_paragraph ($color[$color], $_) 634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
607 for map "$time $_", split /\n/, $text; 635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom; 636 $self->{logview}->scroll_to_bottom;
609 637
610 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
611 group => $text, 639 group => $text,
612 fg => $color[$color], 640 fg => $color[$color],
… …
622} 650}
623 651
624sub spell_add { 652sub spell_add {
625 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
626 654
627 # try to create single paragraphs of multiple lines sent by the server 655 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
631 659
632 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_PAGE->add_spell ($spell);
633 661
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 663 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
636} 664}
637 665
638sub spell_delete { 666sub spell_delete {
639 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
640 668
… …
642} 670}
643 671
644sub addme_success { 672sub addme_success {
645 my ($self) = @_; 673 my ($self) = @_;
646 674
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { 675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_; 676 my ($pom) = @_;
649 677
650 my %skill_help; 678 my %skill_help;
651 679
652 for my $head2 ($pom->head1->[3]->head2) { 680 for my $head2 ($pom->head1->[3]->head2) {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
654 } 682 }
655 683
656 \%skill_help 684 \%skill_help
657 }; 685 };
658 686
659 for my $skill (values %{$self->{skill_info}}) { 687 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 688 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 689 (CFClient::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 690 . $skill_help->{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 691 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 692 (CFClient::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 693 . $skill_help->{$skill});
666 } 694 }
667} 695}
668 696
669sub eof { 697sub eof {
… …
694 722
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 724
697 $self->send ("requestinfo image_sums $face $face"); 725 $self->send ("requestinfo image_sums $face $face");
698 726
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 729 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 730 $self->send ("requestinfo image_info");
703 731
704 $self->{num_faces} = 0; 732 $self->{num_faces} = 0;
705 733
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 736 }
709} 737}
710 738
711sub update_floorbox { 739sub update_floorbox {
… …
832 } 860 }
833} 861}
834 862
835sub player_update { 863sub player_update {
836 my ($self, $player) = @_; 864 my ($self, $player) = @_;
865
866 $self->update_weight;
867}
868
869sub update_weight {
870 my ($self) = @_;
871
872 my $weight = .001 * $self->{player}{weight};
873 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
874
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 875 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
876 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
877 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 878}
839 879
840sub update_server_info { 880sub update_server_info {
841 my ($self) = @_; 881 my ($self) = @_;
842 882
… …
912 name => "npc_dialog", 952 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 953 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 954 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 955 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 956 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1,
917 @_, 958 @_,
918 ); 959 );
919 960
920 Scalar::Util::weaken (my $this = $self); 961 Scalar::Util::weaken (my $this = $self);
962
963 $self->connect (delete => sub { $this->destroy; 1 });
921 964
922 # better use a pane... 965 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 966 $self->add (my $hbox = new CFClient::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
925 968
… …
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 990 $vbox->add ($self->{options} = new CFClient::UI::VBox);
948 991
949 $self->{bye_button} = new CFClient::UI::Button 992 $self->{bye_button} = new CFClient::UI::Button
950 text => "Bye (close)", 993 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 994 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 995 on_activate => sub { $this->destroy; 1 },
953 ; 996 ;
954 997
955 $self->update_options; 998 $self->update_options;
956 999
957 $self->{token} = $self->{conn}->ext_token; 1000 $self->{token} = $self->{conn}->ext_token;
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
960 1003
961 $self->{entry}->grab_focus; 1004 $self->{entry}->grab_focus;
962 1005
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1006 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1],
1008 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1009 });
964 1010
965 $self->show; 1011 $self->show;
966 $self 1012 $self
967}; 1013};
968 1014
… …
997 1043
998 utf8::decode $_ for ($msg, @kw); 1044 utf8::decode $_ for ($msg, @kw);
999 1045
1000 $self->{kw}{$_} = 1 for @kw; 1046 $self->{kw}{$_} = 1 for @kw;
1001 1047
1002 $msg = "\n" . CFClient::UI::Label::escape $msg; 1048 $msg = "\n" . CFClient::UI::asxml $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1050 my @link;
1005 $msg =~ s{ 1051 $msg =~ s{
1006 ($match) 1052 ($match)
1007 }{ 1053 }{
… …
1018 }; 1064 };
1019 1065
1020 chr 0xfffc 1066 chr 0xfffc
1021 }giex; 1067 }giex;
1022 1068
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1070 $self->{textview}->scroll_to_bottom;
1025 $self->update_options; 1071 $self->update_options;
1026 } else { 1072 } else {
1027 $self->destroy; 1073 $self->destroy;
1028 } 1074 }
… …
1031} 1077}
1032 1078
1033sub send { 1079sub send {
1034 my ($self, $msg) = @_; 1080 my ($self, $msg) = @_;
1035 1081
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1083 $self->{textview}->scroll_to_bottom;
1038 1084
1039 utf8::encode $msg; 1085 utf8::encode $msg;
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1041} 1087}
… …
1050 $self->{conn}->disconnect_ext ($self->{token}); 1096 $self->{conn}->disconnect_ext ($self->{token});
1051 1097
1052 $self->SUPER::destroy; 1098 $self->SUPER::destroy;
1053} 1099}
1054 1100
10551; 11011

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines