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.68 by elmex, Sun Jul 30 12:51:32 2006 UTC vs.
Revision 1.69 by root, Sun Jul 30 13:16:44 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 CFClient::Pod; 10use CFPlus::Pod;
11 11
12use base 'Crossfire::Protocol::Base'; 12use base 'Crossfire::Protocol::Base';
13 13
14sub new { 14sub new {
15 my $class = shift; 15 my $class = shift;
16 16
17 my $self = $class->SUPER::new (@_); 17 my $self = $class->SUPER::new (@_);
18 18
19 $self->{map_widget}->clr_commands; 19 $self->{map_widget}->clr_commands;
20 20
21 my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
22 my ($pom) = @_; 22 my ($pom) = @_;
23 23
24 my @cmd_help; 24 my @cmd_help;
25 25
26 for my $head2 ($pom->head1->[-2]->head2) { 26 for my $head2 ($pom->head1->[-2]->head2) {
… …
32 @args = (".*") unless @args; 32 @args = (".*") unless @args;
33 33
34 $_ = $_ eq ".*" ? "" : " $_" 34 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 35 for @args;
36 36
37 my $text = CFClient::Pod::as_markup $head2->content; 37 my $text = CFPlus::Pod::as_markup $head2->content;
38 38
39 push @cmd_help, ["$cmd$_", $text] 39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 40 for sort { (length $a) <=> (length $b) }
41 @args; 41 @args;
42 } 42 }
… …
45 }; 45 };
46 46
47 $self->{map_widget}->add_command (@$_) 47 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 48 for @$cmd_help;
49 49
50 $self->{noface} = new_from_file CFClient::Texture 50 $self->{noface} = new_from_file CFPlus::Texture
51 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
52 52
53 $self->{open_container} = 0; 53 $self->{open_container} = 0;
54 54
55 # "global" 55 # "global"
56 $self->{tilecache} = CFClient::db_table "tilecache"; 56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap"; 57 $self->{facemap} = CFPlus::db_table "facemap";
58 58
59 # per server 59 # per server
60 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
61 61
62 $self 62 $self
63} 63}
64 64
65sub logprint { 65sub logprint {
… …
254 my @skills = keys %{ $self->{skill_info} }; 254 my @skills = keys %{ $self->{skill_info} };
255 255
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 257 $sktbl->clear;
258 258
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 259 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 260 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 261 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 262 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 263 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 264 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
265 265
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 267
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 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); 269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
284 if ($ev->{button} == 1) { 284 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 285 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 286 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 287 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 288 } elsif ($ev->{button} == 3) {
289 (new CFClient::UI::Menu 289 (new CFPlus::UI::Menu
290 items => [ 290 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 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"]) }], 292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
293 ], 293 ],
294 )->popup ($ev); 294 )->popup ($ev);
… …
297 } 297 }
298 298
299 1 299 1
300 }; 300 };
301 301
302 $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 CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $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 CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
307 307
308 $x++ and ($x, $y) = (0, $y + 1); 308 $x++ and ($x, $y) = (0, $y + 1);
309 } 309 }
310 } 310 }
311 311
… …
525 525
526 unless ($id) { 526 unless ($id) {
527 # create new id for face 527 # create new id for face
528 # I love transactions 528 # I love transactions
529 for (1..100) { 529 for (1..100) {
530 my $txn = $CFClient::DB_ENV->txn_begin; 530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id); 531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1; 533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0 534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) { 535 && $self->{facemap}->put ($hash => $id) == 0) {
… …
539 } 539 }
540 } 540 }
541 $txn->txn_abort; 541 $txn->txn_abort;
542 } 542 }
543 543
544 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 } 545 }
546 546
547gotid: 547gotid:
548 $face->{id} = $id; 548 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id); 549 $self->{map}->set_face ($facenum => $id);
… …
572sub set_texture { 572sub set_texture {
573 my ($self, $id, $data) = @_; 573 my ($self, $id, $data) = @_;
574 574
575 $self->{texture}[$id] ||= do { 575 $self->{texture}[$id] ||= do {
576 my $tex = 576 my $tex =
577 new_from_image CFClient::Texture 577 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 578 $data, minify => 1, mipmap => 1;
579 579
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 581 $self->{map_widget}->update;
582 582
… …
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626 626
627 # 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
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 628 $text =~ s/(?<=\S)\n(?=\w)/ /g;
629 629
630 $text = CFClient::asxml $text; 630 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 633
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
… …
657 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
659 659
660 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_PAGE->add_spell ($spell);
661 661
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 664}
665 665
666sub spell_delete { 666sub spell_delete {
667 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
668 668
… …
670} 670}
671 671
672sub addme_success { 672sub addme_success {
673 my ($self) = @_; 673 my ($self) = @_;
674 674
675 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub { 675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_; 676 my ($pom) = @_;
677 677
678 my %skill_help; 678 my %skill_help;
679 679
680 for my $head2 ($pom->head1->[3]->head2) { 680 for my $head2 ($pom->head1->[3]->head2) {
681 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
682 } 682 }
683 683
684 \%skill_help 684 \%skill_help
685 }; 685 };
686 686
687 for my $skill (values %{$self->{skill_info}}) { 687 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 688 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFClient::asxml "Ready the skill '$skill'\n\n") 689 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 690 . $skill_help->{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 691 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 693 . $skill_help->{$skill});
694 } 694 }
695} 695}
696 696
697sub eof { 697sub eof {
… …
722 722
723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724 724
725 $self->send ("requestinfo image_sums $face $face"); 725 $self->send ("requestinfo image_sums $face $face");
726 726
727 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 727 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729 } elsif (!exists $self->{num_faces}) { 729 } elsif (!exists $self->{num_faces}) {
730 $self->send ("requestinfo image_info"); 730 $self->send ("requestinfo image_info");
731 731
732 $self->{num_faces} = 0; 732 $self->{num_faces} = 0;
733 733
734 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 734 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736 } 736 }
737} 737}
738 738
739sub update_floorbox { 739sub update_floorbox {
740 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741 return unless $::CONN; 741 return unless $::CONN;
742 742
743 $::FLOORBOX->clear; 743 $::FLOORBOX->clear;
744 744
745 my $row; 745 my $row;
746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 746 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
747 if ($row < 6) { 747 if ($row < 6) {
748 local $_->{face_widget}; # hack to force recreation of widget 748 local $_->{face_widget}; # hack to force recreation of widget
749 local $_->{desc_widget}; # hack to force recreation of widget 749 local $_->{desc_widget}; # hack to force recreation of widget
750 CFClient::Item::update_widgets $_; 750 CFPlus::Item::update_widgets $_;
751 751
752 $::FLOORBOX->add (0, $row, $_->{face_widget}); 752 $::FLOORBOX->add (0, $row, $_->{face_widget});
753 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 753 $::FLOORBOX->add (1, $row, $_->{desc_widget});
754 754
755 $row++; 755 $row++;
756 } else { 756 } else {
757 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
758 text => "More...", 758 text => "More...",
759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760 ); 760 );
761 last; 761 last;
762 } 762 }
763 } 763 }
764 if ($::CONN->{open_container}) { 764 if ($::CONN->{open_container}) {
765 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
766 text => "Close container", 766 text => "Close container",
767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768 ); 768 );
769 } 769 }
770 }); 770 });
… …
776 my ($conn, $tag, $name) = @_; 776 my ($conn, $tag, $name) = @_;
777 $conn->{open_container} = $tag; 777 $conn->{open_container} = $tag;
778 update_floorbox; 778 update_floorbox;
779 779
780 $::INV_RIGHT_HB->clear (); 780 $::INV_RIGHT_HB->clear ();
781 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 781 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
782 782
783 if ($tag != 0) { # Floor isn't closable, is it? 783 if ($tag != 0) { # Floor isn't closable, is it?
784 $::INV_RIGHT_HB->add (new CFClient::UI::Button 784 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
785 text => "Close container", 785 text => "Close container",
786 tooltip => "Close the currently open container (if one is open)", 786 tooltip => "Close the currently open container (if one is open)",
787 on_activate => sub { 787 on_activate => sub {
788 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 788 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
789 if $tag != 0; 789 if $tag != 0;
… …
797} 797}
798 798
799sub update_containers { 799sub update_containers {
800 my ($self) = @_; 800 my ($self) = @_;
801 801
802 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 802 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
803 my $todo = delete $self->{update_container} 803 my $todo = delete $self->{update_container}
804 or return; 804 or return;
805 805
806 for my $tag (keys %$todo) { 806 for my $tag (keys %$todo) {
807 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 807 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
844sub item_update { 844sub item_update {
845 my ($self, $item) = @_; 845 my ($self, $item) = @_;
846 846
847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 847 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
848 848
849 CFClient::Item::update_widgets $item; 849 CFPlus::Item::update_widgets $item;
850 850
851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
852 set_opencont ($::CONN, 0, "Floor"); 852 set_opencont ($::CONN, 0, "Floor");
853 853
854 } elsif ($item->{flags} & F_OPEN) { 854 } elsif ($item->{flags} & F_OPEN) {
855 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 855 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
856 856
857 } else { 857 } else {
858 $self->{update_container}{$item->{container}}++; 858 $self->{update_container}{$item->{container}}++;
859 $self->update_containers; 859 $self->update_containers;
860 } 860 }
… …
915 $self->send_ext_req (lookat => "$x $y", sub { 915 $self->send_ext_req (lookat => "$x $y", sub {
916 my %res = split /\x00/, $_[0]; 916 my %res = split /\x00/, $_[0];
917 917
918 if (exists $res{npc_dialog}) { 918 if (exists $res{npc_dialog}) {
919 # start npc chat dialog 919 # start npc chat dialog
920 $self->{npc_dialog} = new CFClient::NPCDialog:: 920 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 921 dx => $x,
922 dy => $y, 922 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 923 title => "$res{npc_dialog} (NPC)",
924 conn => $self, 924 conn => $self,
925 ; 925 ;
… …
937 if $self->{npc_dialog}; 937 if $self->{npc_dialog};
938 938
939 $self->SUPER::destroy; 939 $self->SUPER::destroy;
940} 940}
941 941
942package CFClient::NPCDialog; 942package CFPlus::NPCDialog;
943 943
944our @ISA = 'CFClient::UI::FancyFrame'; 944our @ISA = 'CFPlus::UI::FancyFrame';
945 945
946sub new { 946sub new {
947 my $class = shift; 947 my $class = shift;
948 948
949 my $self = $class->SUPER::new ( 949 my $self = $class->SUPER::new (
… …
961 Scalar::Util::weaken (my $this = $self); 961 Scalar::Util::weaken (my $this = $self);
962 962
963 $self->connect (delete => sub { $this->destroy; 1 }); 963 $self->connect (delete => sub { $this->destroy; 1 });
964 964
965 # better use a pane... 965 # better use a pane...
966 $self->add (my $hbox = new CFClient::UI::HBox); 966 $self->add (my $hbox = new CFPlus::UI::HBox);
967 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 967 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
968 968
969 $hbox->add (my $vbox = new CFClient::UI::VBox); 969 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 970
971 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFClient::UI::Entry 972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
974 . "Sometimes you have to tell an NPC something you cannot find out during " 974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use " 975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response " 976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.", 977 . "buttons below.",
… …
985 985
986 0 986 0
987 }, 987 },
988 ); 988 );
989 989
990 $vbox->add ($self->{options} = new CFClient::UI::VBox); 990 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
991 991
992 $self->{bye_button} = new CFClient::UI::Button 992 $self->{bye_button} = new CFPlus::UI::Button
993 text => "Bye (close)", 993 text => "Bye (close)",
994 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.",
995 on_activate => sub { $this->destroy; 1 }, 995 on_activate => sub { $this->destroy; 1 },
996 ; 996 ;
997 997
… …
1019 1019
1020 $self->{options}->clear; 1020 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1021 $self->{options}->add ($self->{bye_button});
1022 1022
1023 for my $kw (sort keys %{ $self->{kw} }) { 1023 for my $kw (sort keys %{ $self->{kw} }) {
1024 $self->{options}->add (new CFClient::UI::Button 1024 $self->{options}->add (new CFPlus::UI::Button
1025 text => $kw, 1025 text => $kw,
1026 on_activate => sub { 1026 on_activate => sub {
1027 $self->send ($kw); 1027 $self->send ($kw);
1028 0 1028 0
1029 }, 1029 },
… …
1043 1043
1044 utf8::decode $_ for ($msg, @kw); 1044 utf8::decode $_ for ($msg, @kw);
1045 1045
1046 $self->{kw}{$_} = 1 for @kw; 1046 $self->{kw}{$_} = 1 for @kw;
1047 1047
1048 $msg = "\n" . CFClient::UI::asxml $msg; 1048 $msg = "\n" . CFPlus::UI::asxml $msg;
1049 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} };
1050 my @link; 1050 my @link;
1051 $msg =~ s{ 1051 $msg =~ s{
1052 ($match) 1052 ($match)
1053 }{ 1053 }{
1054 my $kw = $1; 1054 my $kw = $1;
1055 1055
1056 push @link, new CFClient::UI::Label 1056 push @link, new CFPlus::UI::Label
1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058 can_hover => 1, 1058 can_hover => 1,
1059 can_events => 1, 1059 can_events => 1,
1060 padding_x => 0, 1060 padding_x => 0,
1061 padding_y => 0, 1061 padding_y => 0,
… …
1077} 1077}
1078 1078
1079sub send { 1079sub send {
1080 my ($self, $msg) = @_; 1080 my ($self, $msg) = @_;
1081 1081
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1083 $self->{textview}->scroll_to_bottom;
1084 1084
1085 utf8::encode $msg; 1085 utf8::encode $msg;
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1087}

Diff Legend

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