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.61 by root, Wed Jul 19 23:00:07 2006 UTC vs.
Revision 1.88 by root, Sun Nov 19 20:31:29 2006 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFClient::UI; 9use CFPlus::UI;
10use CFPlus::Pod;
11
12use Crossfire::Protocol::Base 0.95;
10 13
11use base 'Crossfire::Protocol::Base'; 14use base 'Crossfire::Protocol::Base';
12 15
13sub new { 16sub new {
14 my $class = shift; 17 my $class = shift;
15 18
16 my $self = $class->SUPER::new (@_); 19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
17 20
18 $self->{map_widget}->clr_commands; 21 $self->{map_widget}->clr_commands;
19 22
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 23 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 25 or die "unparseable command help: $_->{kw}[0]";
28 26
29 my $cmd = $1; 27 my $cmd = $1;
30 my @args = split /\|/, $2; 28 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 29 @args = (".*") unless @args;
32 30
31 my (undef, @par) = CFPlus::Pod::section_of $_;
32 my $text = CFPlus::Pod::as_label @par;
33
33 $_ = $_ eq ".*" ? "" : " $_" 34 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 35 for @args;
35 36
36 my $text = CFClient::pod_to_pango $head2->content; 37 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 38 sort { (length $a) <=> (length $b) }
40 @args; 39 @args
41 } 40 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*";
42 42
43 \@cmd_help
44 };
45
46 $self->{map_widget}->add_command (@$_) 43 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 44 for @cmd_help;
48 45
49 $self->{noface} = new_from_file CFClient::Texture 46 $self->{noface} = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48
49 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 }
51 54
52 $self->{open_container} = 0; 55 $self->{open_container} = 0;
53 56
54 # "global" 57 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache"; 58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
56 $self->{facemap} = CFClient::db_table "facemap"; 60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
57 62
58 # per server 63 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
60 66
61 $self 67 $self
62} 68}
63 69
64sub logprint { 70sub logprint {
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 248 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 249 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 250 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 251 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 252
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 253 $self->update_weight;
248 254
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 255 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 256 for keys %RES_TBL;
251 257
252 my $sktbl = $::STATWIDS->{skill_tbl}; 258 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 259 my @skills = keys %{ $self->{skill_info} };
254 260
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 262 $sktbl->clear;
257 263
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 270
271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272
273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
275
265 my ($x, $y) = (1, 0); 276 my ($x, $y) = (0, 1);
266 for ( 277 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 278 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 279 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 280 grep exists $stats->{$_},
270 @skills 281 @skills
271 ) { 282 ) {
272 my ($idx, $name) = @$_; 283 my ($idx, $name) = @$_;
273 284
285 my $spell_cb = sub {
286 my ($widget, $ev) = @_;
287
288 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) {
293 (new CFPlus::UI::Menu
294 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
297 ],
298 )->popup ($ev);
299 } else {
300 return 0;
301 }
302
303 1
304 };
305
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 307 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 308 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 309 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); 310 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
279 312
280 $x++ and ($x, $y) = (0, $y + 1); 313 $x++ and ($x, $y) = (0, $y + 1);
281 } 314 }
282 } 315 }
283 316
… …
288} 321}
289 322
290sub user_send { 323sub user_send {
291 my ($self, $command) = @_; 324 my ($self, $command) = @_;
292 325
293 if ($self->{record}) {
294 push @{$self->{record}}, $command; 326 push @{$self->{record}}, $command
295 } 327 if $self->{record};
296 328
297 $self->logprint ("send: ", $command); 329 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 330 $self->send_command ($command);
299 ::status ($command); 331 ::status ($command);
300} 332}
… …
317} 349}
318 350
319sub feed_map1a { 351sub feed_map1a {
320 my ($self, $data) = @_; 352 my ($self, $data) = @_;
321 353
322 $self->{map}->map1a_update ($data); 354 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 355 $self->{map_widget}->update;
324} 356}
325 357
326sub magicmap { 358sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 359 my ($self, $w, $h, $x, $y, $data) = @_;
… …
497 529
498 unless ($id) { 530 unless ($id) {
499 # create new id for face 531 # create new id for face
500 # I love transactions 532 # I love transactions
501 for (1..100) { 533 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin; 534 my $txn = $CFPlus::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id); 535 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1; 537 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0 538 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) { 539 && $self->{facemap}->put ($hash => $id) == 0) {
… …
511 } 543 }
512 } 544 }
513 $txn->txn_abort; 545 $txn->txn_abort;
514 } 546 }
515 547
516 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
517 } 549 }
518 550
519gotid: 551gotid:
520 $face->{id} = $id; 552 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 553 $self->{map}->set_face ($facenum => $id);
… …
544sub set_texture { 576sub set_texture {
545 my ($self, $id, $data) = @_; 577 my ($self, $id, $data) = @_;
546 578
547 $self->{texture}[$id] ||= do { 579 $self->{texture}[$id] ||= do {
548 my $tex = 580 my $tex =
549 new_from_image CFClient::Texture 581 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 582 $data, minify => 1, mipmap => 1;
551 583
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 585 $self->{map_widget}->update;
554 586
… …
592 [0.74, 0.65, 0.41], 624 [0.74, 0.65, 0.41],
593 ); 625 );
594 626
595 $self->logprint ("info: ", $text); 627 $self->logprint ("info: ", $text);
596 628
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598
599 # try to create single paragraphs of multiple lines sent by the server 629 # try to create single paragraphs of multiple lines sent by the server
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 630 $text =~ s/(?<=\S)\n(?=\w)/ /g;
601 631
602 $text = CFClient::UI::Label::escape $text; 632 $text = CFPlus::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 635
606 $self->{logview}->add_paragraph ($color[$color], $_) 636 ::message ({ fg => $color[$color], markup => $_ })
607 for map "$time $_", split /\n/, $text; 637 for split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609 638
610 $self->{statusbox}->add ($text, 639 $self->{statusbox}->add ($text,
611 group => $text, 640 group => $text,
612 fg => $color[$color], 641 fg => $color[$color],
613 timeout => $color >= 2 ? 60 : 10, 642 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 643 tooltip_font => $::FONT_FIXED,
615 ); 644 );
616} 645}
617 646
618sub drawextinfo { 647sub drawextinfo {
… …
622} 651}
623 652
624sub spell_add { 653sub spell_add {
625 my ($self, $spell) = @_; 654 my ($self, $spell) = @_;
626 655
627 # try to create single paragraphs of multiple lines sent by the server 656 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 657 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 658 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 659 $spell->{message} ||= "Server did not provide a description for this spell.";
631 660
632 $::SPELL_PAGE->add_spell ($spell); 661 $::SPELL_LIST->add_spell ($spell);
633 662
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 663 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 664 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 665}
637 666
638sub spell_delete { 667sub spell_delete {
639 my ($self, $spell) = @_; 668 my ($self, $spell) = @_;
640 669
641 $::SPELL_PAGE->remove_spell ($spell); 670 $::SPELL_LIST->remove_spell ($spell);
671}
672
673sub setup {
674 my ($self, $setup) = @_;
675
676 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 677}
643 678
644sub addme_success { 679sub addme_success {
645 my ($self) = @_; 680 my ($self) = @_;
646 681
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 682 my %skill_help;
651 683
652 for my $head2 ($pom->head1->[3]->head2) { 684 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 685 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 686 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 687 };
658 688
659 for my $skill (values %{$self->{skill_info}}) { 689 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 690 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 691 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 692 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 693 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 694 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 695 . $skill_help{$skill});
666 } 696 }
667} 697}
668 698
669sub eof { 699sub eof {
670 my ($self) = @_; 700 my ($self) = @_;
… …
694 724
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 726
697 $self->send ("requestinfo image_sums $face $face"); 727 $self->send ("requestinfo image_sums $face $face");
698 728
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 731 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 732 $self->send ("requestinfo image_info");
703 733
704 $self->{num_faces} = 0; 734 $self->{num_faces} = 0;
705 735
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 738 }
709} 739}
710 740
711sub update_floorbox { 741sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 743 return unless $::CONN;
714 744
715 $::FLOORBOX->clear; 745 $::FLOORBOX->clear;
716 746
717 my $row; 747 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) { 748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 749 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 750 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 751 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 752 CFPlus::Item::update_widgets $_;
723 753
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 754 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 755 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 756
727 $row++; 757 $row++;
728 } else { 758 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 760 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 762 );
733 last; 763 last;
734 } 764 }
735 } 765 }
766 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
768 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 );
771 }
736 }); 772 });
737 773
738 $::WANT_REFRESH++; 774 $::WANT_REFRESH++;
739} 775}
740 776
741sub set_opencont { 777sub set_opencont {
742 my ($conn, $tag, $name) = @_; 778 my ($conn, $tag, $name) = @_;
743 $conn->{open_container} = $tag; 779 $conn->{open_container} = $tag;
780 update_floorbox;
744 781
745 $::INV_RIGHT_HB->clear (); 782 $::INV_RIGHT_HB->clear ();
746 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
747 784
748 if ($tag != 0) { # Floor isn't closable, is it? 785 if ($tag != 0) { # Floor isn't closable, is it?
749 $::INV_RIGHT_HB->add (new CFClient::UI::Button 786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
750 text => "Close container", 787 text => "Close container",
751 tooltip => "Close the currently open container (if one is open)", 788 tooltip => "Close the currently open container (if one is open)",
752 on_activate => sub { 789 on_activate => sub {
753 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 790 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
754 if $tag != 0; 791 if $tag != 0;
… …
762} 799}
763 800
764sub update_containers { 801sub update_containers {
765 my ($self) = @_; 802 my ($self) = @_;
766 803
767 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 804 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
768 my $todo = delete $self->{update_container} 805 my $todo = delete $self->{update_container}
769 or return; 806 or return;
770 807
771 for my $tag (keys %$todo) { 808 for my $tag (keys %$todo) {
809 update_floorbox if $tag == 0 or $tag == $self->{open_container};
772 if ($tag == 0) { 810 if ($tag == 0) {
773 update_floorbox;
774 $::INVR->set_items ($self->{container}{0}) 811 $::INVR->set_items ($self->{container}{0})
775 if $tag == $self->{open_container}; 812 if $tag == $self->{open_container};
776 } elsif ($tag == $self->{player}{tag}) { 813 } elsif ($tag == $self->{player}{tag}) {
777 $::INV->set_items ($self->{container}{$tag}) 814 $::INV->set_items ($self->{container}{$tag})
778 } else { 815 } else {
… …
809sub item_update { 846sub item_update {
810 my ($self, $item) = @_; 847 my ($self, $item) = @_;
811 848
812 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
813 850
814 CFClient::Item::update_widgets $item; 851 CFPlus::Item::update_widgets $item;
815 852
816 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 853 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
817 set_opencont ($::CONN, 0, "Floor"); 854 set_opencont ($::CONN, 0, "Floor");
818 855
819 } elsif ($item->{flags} & F_OPEN) { 856 } elsif ($item->{flags} & F_OPEN) {
820 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 857 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
821 858
822 } else { 859 } else {
823 $self->{update_container}{$item->{container}}++; 860 $self->{update_container}{$item->{container}}++;
824 $self->update_containers; 861 $self->update_containers;
825 } 862 }
826} 863}
827 864
828sub player_update { 865sub player_update {
829 my ($self, $player) = @_; 866 my ($self, $player) = @_;
867
868 $self->update_weight;
869}
870
871sub update_weight {
872 my ($self) = @_;
873
874 my $weight = .001 * $self->{player}{weight};
875 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
876
830 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 877 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
878 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
879 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
831} 880}
832 881
833sub update_server_info { 882sub update_server_info {
834 my ($self) = @_; 883 my ($self) = @_;
835 884
… …
838 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
839 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
840 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
841 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
842 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
843 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
844 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
845 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
846 ); 897 );
847} 898}
848 899
849sub logged_in { 900sub logged_in {
850 my ($self) = @_; 901 my ($self) = @_;
851 902
852 $self->send_ext_req (cfplus_support => "1", sub { 903 $self->send_ext_req (cfplus_support => version => 1, sub {
853 $self->{cfplus_ext} = $_[0]; 904 $self->{cfplus_ext} = $_[0]{version};
854 $self->update_server_info; 905 $self->update_server_info;
906
907 if ($self->{cfplus_ext} >= 2) {
908 $self->send_ext_req ("editor_support", sub {
909 $self->{editor_support} = $_[0];
910 $self->update_server_info;
911
912 0
913 });
914 }
915
916 0
855 }); 917 });
856 918
857 $self->update_server_info; 919 $self->update_server_info;
858 920
859 $self->send_command ("output-sync $::CFG->{output_sync}"); 921 $self->send_command ("output-sync $::CFG->{output_sync}");
… …
863 925
864sub lookat { 926sub lookat {
865 my ($self, $x, $y) = @_; 927 my ($self, $x, $y) = @_;
866 928
867 if ($self->{cfplus_ext}) { 929 if ($self->{cfplus_ext}) {
868 $self->send_ext_req (lookat => "$x $y", sub { 930 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
869 my %res = split /\x00/, $_[0]; 931 my ($msg) = @_;
870 932
871 if (exists $res{npc_dialog}) { 933 if (exists $msg->{npc_dialog}) {
872 # start npc chat dialog 934 # start npc chat dialog
873 $self->{npc_dialog} = new CFClient::NPCDialog:: 935 $self->{npc_dialog} = new CFPlus::NPCDialog::
874 dx => $x, 936 dx => $x,
875 dy => $y, 937 dy => $y,
876 title => "$res{npc_dialog} (NPC)", 938 title => "$msg->{npc_dialog} (NPC)",
877 conn => $self, 939 conn => $self,
878 ; 940 ;
879 } 941 }
880 }); 942 });
881 } 943 }
… …
884} 946}
885 947
886sub destroy { 948sub destroy {
887 my ($self) = @_; 949 my ($self) = @_;
888 950
889 $self->{npc_dialog}->destroy 951 (delete $self->{npc_dialog})->destroy
890 if $self->{npc_dialog}; 952 if $self->{npc_dialog};
891 953
892 $self->SUPER::destroy; 954 $self->SUPER::destroy;
893} 955}
894 956
895package CFClient::NPCDialog; 957package CFPlus::NPCDialog;
896 958
897our @ISA = 'CFClient::UI::FancyFrame'; 959our @ISA = 'CFPlus::UI::Toplevel';
898 960
899sub new { 961sub new {
900 my $class = shift; 962 my $class = shift;
901 963
902 my $self = $class->SUPER::new ( 964 my $self = $class->SUPER::new (
… …
905 name => "npc_dialog", 967 name => "npc_dialog",
906 force_w => $::WIDTH * 0.7, 968 force_w => $::WIDTH * 0.7,
907 force_h => $::HEIGHT * 0.7, 969 force_h => $::HEIGHT * 0.7,
908 title => "NPC Dialog", 970 title => "NPC Dialog",
909 kw => { hi => 0, yes => 0, no => 0 }, 971 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1,
910 @_, 973 @_,
911 ); 974 );
912 975
913 Scalar::Util::weaken (my $this = $self); 976 Scalar::Util::weaken (my $this = $self);
914 977
978 $self->connect (delete => sub { $this->destroy; 1 });
979
915 # better use a pane... 980 # better use a pane...
916 $self->add (my $hbox = new CFClient::UI::HBox); 981 $self->add (my $hbox = new CFPlus::UI::HBox);
917 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 982 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
918 983
919 $hbox->add (my $vbox = new CFClient::UI::VBox); 984 $hbox->add (my $vbox = new CFPlus::UI::VBox);
920 985
921 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 986 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
922 $vbox->add ($self->{entry} = new CFClient::UI::Entry 987 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
923 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 988 tooltip => "#npc_message_entry",
924 . "Sometimes you have to tell an NPC something you cannot find out during "
925 . "a normal conversation (such as a password). In those cases you have to use "
926 . "this text entry. You can also enter responses manually instead of using the response "
927 . "buttons below.",
928 on_activate => sub { 989 on_activate => sub {
929 my ($entry, $text) = @_; 990 my ($entry, $text) = @_;
930 991
931 return unless $text =~ /\S/; 992 return unless $text =~ /\S/;
932 993
… …
935 996
936 0 997 0
937 }, 998 },
938 ); 999 );
939 1000
940 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1001 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
941 1002
942 $self->{bye_button} = new CFClient::UI::Button 1003 $self->{bye_button} = new CFPlus::UI::Button
943 text => "Bye (close)", 1004 text => "Bye (close)",
944 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1005 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
945 on_activate => sub { $this->destroy; 0 }, 1006 on_activate => sub { $this->destroy; 1 },
946 ; 1007 ;
947 1008
948 $self->update_options; 1009 $self->update_options;
949 1010
950 $self->{token} = $self->{conn}->ext_token; 1011 $self->{id} = $self->{conn}->send_ext_req (
951 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1012 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
952 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1013 sub { $this && $this->feed (@_) }
1014 );
953 1015
954 $self->{entry}->grab_focus; 1016 $self->{entry}->grab_focus;
955 1017
956 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1018 $self->{textview}->add_paragraph ({
1019 fg => [1, 1, 0, 1],
1020 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1021 });
957 1022
958 $self->show; 1023 $self->show;
959 $self 1024 $self
960}; 1025};
961 1026
… …
966 1031
967 $self->{options}->clear; 1032 $self->{options}->clear;
968 $self->{options}->add ($self->{bye_button}); 1033 $self->{options}->add ($self->{bye_button});
969 1034
970 for my $kw (sort keys %{ $self->{kw} }) { 1035 for my $kw (sort keys %{ $self->{kw} }) {
971 $self->{options}->add (new CFClient::UI::Button 1036 $self->{options}->add (new CFPlus::UI::Button
972 text => $kw, 1037 text => $kw,
973 on_activate => sub { 1038 on_activate => sub {
974 $self->send ($kw); 1039 $self->send ($kw);
975 0 1040 0
976 }, 1041 },
977 ); 1042 );
978 } 1043 }
979} 1044}
980 1045
981sub feed { 1046sub feed {
982 my ($self, $data) = @_; 1047 my ($self, $msg) = @_;
983 1048
984 Scalar::Util::weaken $self; 1049 Scalar::Util::weaken $self;
985 1050
986 my ($type, $msg) = split / /, $data, 2; 1051 if ($msg->{msgtype} eq "reply") {
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
987 1054
988 if ($type eq "msg") { 1055 my $text = "\n" . CFPlus::asxml $msg->{msg};
989 my ($msg, @kw) = split /\x00/, $msg;
990
991 utf8::decode $_ for ($msg, @kw);
992
993 $self->{kw}{$_} = 1 for @kw;
994
995 $msg = "\n" . CFClient::UI::Label::escape $msg;
996 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1056 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
997 my @link; 1057 my @link;
998 $msg =~ s{ 1058 $text =~ s{
999 ($match) 1059 ($match)
1000 }{ 1060 }{
1001 my $kw = $1; 1061 my $kw = $1;
1002 1062
1003 push @link, new CFClient::UI::Label 1063 push @link, new CFPlus::UI::Label
1004 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1064 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1005 can_hover => 1, 1065 can_hover => 1,
1006 can_events => 1, 1066 can_events => 1,
1007 padding_x => 0, 1067 padding_x => 0,
1008 padding_y => 0, 1068 padding_y => 0,
1009 on_button_up => sub { 1069 on_button_up => sub {
1010 $self->send ($kw); 1070 $self->send ($kw);
1011 }; 1071 };
1012 1072
1013 chr 0xfffc 1073 "\x{fffc}"
1014 }giex; 1074 }giex;
1015 1075
1016 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1076 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1017 $self->{textview}->scroll_to_bottom; 1077 $self->{textview}->scroll_to_bottom;
1018 $self->update_options; 1078 $self->update_options;
1019 } else { 1079 } else {
1020 $self->destroy; 1080 $self->destroy;
1021 } 1081 }
… …
1024} 1084}
1025 1085
1026sub send { 1086sub send {
1027 my ($self, $msg) = @_; 1087 my ($self, $msg) = @_;
1028 1088
1029 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1089 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1030 $self->{textview}->scroll_to_bottom; 1090 $self->{textview}->scroll_to_bottom;
1031 1091
1032 utf8::encode $msg; 1092 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1033 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1034} 1093}
1035 1094
1036sub destroy { 1095sub destroy {
1037 my ($self) = @_; 1096 my ($self) = @_;
1038 1097
1039 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1098 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1040 1099
1100 if ($self->{conn}) {
1041 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1101 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1042 delete $self->{conn}{npc_dialog}; 1102 delete $self->{conn}{npc_dialog};
1043 $self->{conn}->disconnect_ext ($self->{token}); 1103 $self->{conn}->disconnect_ext ($self->{id});
1104 }
1044 1105
1045 $self->SUPER::destroy; 1106 $self->SUPER::destroy;
1046} 1107}
1047 1108
10481; 11091
1110

Diff Legend

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