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.65 by root, Sun Jul 23 16:11:12 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_xml $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
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);
265 271
266 my ($x, $y) = (0, 1); 272 my ($x, $y) = (0, 1);
267 for ( 273 for (
268 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] }
269 map [$_, $self->{skill_info}{$_}], 275 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 276 grep exists $stats->{$_},
271 @skills 277 @skills
272 ) { 278 ) {
273 my ($idx, $name) = @$_; 279 my ($idx, $name) = @$_;
274 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 CFPlus::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
275 $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
276 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);
277 $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
278 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);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
280 307
281 $x++ and ($x, $y) = (0, $y + 1); 308 $x++ and ($x, $y) = (0, $y + 1);
282 } 309 }
283 } 310 }
284 311
… …
498 525
499 unless ($id) { 526 unless ($id) {
500 # create new id for face 527 # create new id for face
501 # I love transactions 528 # I love transactions
502 for (1..100) { 529 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin; 530 my $txn = $CFPlus::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id); 531 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1; 533 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0 534 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) { 535 && $self->{facemap}->put ($hash => $id) == 0) {
… …
512 } 539 }
513 } 540 }
514 $txn->txn_abort; 541 $txn->txn_abort;
515 } 542 }
516 543
517 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
518 } 545 }
519 546
520gotid: 547gotid:
521 $face->{id} = $id; 548 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id); 549 $self->{map}->set_face ($facenum => $id);
… …
545sub set_texture { 572sub set_texture {
546 my ($self, $id, $data) = @_; 573 my ($self, $id, $data) = @_;
547 574
548 $self->{texture}[$id] ||= do { 575 $self->{texture}[$id] ||= do {
549 my $tex = 576 my $tex =
550 new_from_image CFClient::Texture 577 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 578 $data, minify => 1, mipmap => 1;
552 579
553 $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}});
554 $self->{map_widget}->update; 581 $self->{map_widget}->update;
555 582
… …
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 626
600 # 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
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 628 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 629
603 $text = CFClient::asxml $text; 630 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 633
607 $self->{logview}->add_paragraph ($color[$color], $_) 634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
609 $self->{logview}->scroll_to_bottom; 636 $self->{logview}->scroll_to_bottom;
610 637
611 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
612 group => $text, 639 group => $text,
… …
623} 650}
624 651
625sub spell_add { 652sub spell_add {
626 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
627 654
628 # 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
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
632 659
633 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_PAGE->add_spell ($spell);
634 661
635 $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});
636 $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});
637} 664}
638 665
639sub spell_delete { 666sub spell_delete {
640 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
641 668
… …
643} 670}
644 671
645sub addme_success { 672sub addme_success {
646 my ($self) = @_; 673 my ($self) = @_;
647 674
648 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 {
649 my ($pom) = @_; 676 my ($pom) = @_;
650 677
651 my %skill_help; 678 my %skill_help;
652 679
653 for my $head2 ($pom->head1->[3]->head2) { 680 for my $head2 ($pom->head1->[3]->head2) {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
655 } 682 }
656 683
657 \%skill_help 684 \%skill_help
658 }; 685 };
659 686
660 for my $skill (values %{$self->{skill_info}}) { 687 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 688 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 689 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 690 . $skill_help->{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 691 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 693 . $skill_help->{$skill});
667 } 694 }
668} 695}
669 696
670sub eof { 697sub eof {
… …
695 722
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 723 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 724
698 $self->send ("requestinfo image_sums $face $face"); 725 $self->send ("requestinfo image_sums $face $face");
699 726
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 727 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 728 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 729 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 730 $self->send ("requestinfo image_info");
704 731
705 $self->{num_faces} = 0; 732 $self->{num_faces} = 0;
706 733
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 734 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 735 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 736 }
710} 737}
711 738
712sub update_floorbox { 739sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 740 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 741 return unless $::CONN;
715 742
716 $::FLOORBOX->clear; 743 $::FLOORBOX->clear;
717 744
718 my $row; 745 my $row;
719 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} }) {
720 if ($row < 6) { 747 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 748 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 749 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 750 CFPlus::Item::update_widgets $_;
724 751
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 752 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 753 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 754
728 $row++; 755 $row++;
729 } else { 756 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 757 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 758 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 759 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 760 );
734 last; 761 last;
735 } 762 }
736 } 763 }
737 if ($::CONN->{open_container}) { 764 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 765 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 766 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 767 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 768 );
742 } 769 }
743 }); 770 });
… …
749 my ($conn, $tag, $name) = @_; 776 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 777 $conn->{open_container} = $tag;
751 update_floorbox; 778 update_floorbox;
752 779
753 $::INV_RIGHT_HB->clear (); 780 $::INV_RIGHT_HB->clear ();
754 $::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);
755 782
756 if ($tag != 0) { # Floor isn't closable, is it? 783 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 784 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 785 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 786 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 787 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 788 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 789 if $tag != 0;
… …
770} 797}
771 798
772sub update_containers { 799sub update_containers {
773 my ($self) = @_; 800 my ($self) = @_;
774 801
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 802 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 803 my $todo = delete $self->{update_container}
777 or return; 804 or return;
778 805
779 for my $tag (keys %$todo) { 806 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 807 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 844sub item_update {
818 my ($self, $item) = @_; 845 my ($self, $item) = @_;
819 846
820 #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";
821 848
822 CFClient::Item::update_widgets $item; 849 CFPlus::Item::update_widgets $item;
823 850
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 851 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 852 set_opencont ($::CONN, 0, "Floor");
826 853
827 } elsif ($item->{flags} & F_OPEN) { 854 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 855 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 856
830 } else { 857 } else {
831 $self->{update_container}{$item->{container}}++; 858 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 859 $self->update_containers;
833 } 860 }
… …
888 $self->send_ext_req (lookat => "$x $y", sub { 915 $self->send_ext_req (lookat => "$x $y", sub {
889 my %res = split /\x00/, $_[0]; 916 my %res = split /\x00/, $_[0];
890 917
891 if (exists $res{npc_dialog}) { 918 if (exists $res{npc_dialog}) {
892 # start npc chat dialog 919 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 920 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 921 dx => $x,
895 dy => $y, 922 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 923 title => "$res{npc_dialog} (NPC)",
897 conn => $self, 924 conn => $self,
898 ; 925 ;
… …
910 if $self->{npc_dialog}; 937 if $self->{npc_dialog};
911 938
912 $self->SUPER::destroy; 939 $self->SUPER::destroy;
913} 940}
914 941
915package CFClient::NPCDialog; 942package CFPlus::NPCDialog;
916 943
917our @ISA = 'CFClient::UI::FancyFrame'; 944our @ISA = 'CFPlus::UI::FancyFrame';
918 945
919sub new { 946sub new {
920 my $class = shift; 947 my $class = shift;
921 948
922 my $self = $class->SUPER::new ( 949 my $self = $class->SUPER::new (
… …
934 Scalar::Util::weaken (my $this = $self); 961 Scalar::Util::weaken (my $this = $self);
935 962
936 $self->connect (delete => sub { $this->destroy; 1 }); 963 $self->connect (delete => sub { $this->destroy; 1 });
937 964
938 # better use a pane... 965 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 966 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 967 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 968
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 969 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 970
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 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"
947 . "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 "
948 . "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 "
949 . "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 "
950 . "buttons below.", 977 . "buttons below.",
… …
958 985
959 0 986 0
960 }, 987 },
961 ); 988 );
962 989
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 990 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 991
965 $self->{bye_button} = new CFClient::UI::Button 992 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 993 text => "Bye (close)",
967 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.",
968 on_activate => sub { $this->destroy; 1 }, 995 on_activate => sub { $this->destroy; 1 },
969 ; 996 ;
970 997
… …
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
975 $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}");
976 1003
977 $self->{entry}->grab_focus; 1004 $self->{entry}->grab_focus;
978 1005
979 $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 });
980 1010
981 $self->show; 1011 $self->show;
982 $self 1012 $self
983}; 1013};
984 1014
… …
989 1019
990 $self->{options}->clear; 1020 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1021 $self->{options}->add ($self->{bye_button});
992 1022
993 for my $kw (sort keys %{ $self->{kw} }) { 1023 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1024 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1025 text => $kw,
996 on_activate => sub { 1026 on_activate => sub {
997 $self->send ($kw); 1027 $self->send ($kw);
998 0 1028 0
999 }, 1029 },
… …
1013 1043
1014 utf8::decode $_ for ($msg, @kw); 1044 utf8::decode $_ for ($msg, @kw);
1015 1045
1016 $self->{kw}{$_} = 1 for @kw; 1046 $self->{kw}{$_} = 1 for @kw;
1017 1047
1018 $msg = "\n" . CFClient::UI::asxml $msg; 1048 $msg = "\n" . CFPlus::UI::asxml $msg;
1019 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} };
1020 my @link; 1050 my @link;
1021 $msg =~ s{ 1051 $msg =~ s{
1022 ($match) 1052 ($match)
1023 }{ 1053 }{
1024 my $kw = $1; 1054 my $kw = $1;
1025 1055
1026 push @link, new CFClient::UI::Label 1056 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1057 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1058 can_hover => 1,
1029 can_events => 1, 1059 can_events => 1,
1030 padding_x => 0, 1060 padding_x => 0,
1031 padding_y => 0, 1061 padding_y => 0,
… …
1034 }; 1064 };
1035 1065
1036 chr 0xfffc 1066 chr 0xfffc
1037 }giex; 1067 }giex;
1038 1068
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1070 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1071 $self->update_options;
1042 } else { 1072 } else {
1043 $self->destroy; 1073 $self->destroy;
1044 } 1074 }
… …
1047} 1077}
1048 1078
1049sub send { 1079sub send {
1050 my ($self, $msg) = @_; 1080 my ($self, $msg) = @_;
1051 1081
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1083 $self->{textview}->scroll_to_bottom;
1054 1084
1055 utf8::encode $msg; 1085 utf8::encode $msg;
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1057} 1087}
… …
1066 $self->{conn}->disconnect_ext ($self->{token}); 1096 $self->{conn}->disconnect_ext ($self->{token});
1067 1097
1068 $self->SUPER::destroy; 1098 $self->SUPER::destroy;
1069} 1099}
1070 1100
10711; 11011

Diff Legend

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