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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.135 by elmex, Fri Jul 27 17:24:29 2007 UTC

… …
20 my ($class, %arg) = @_; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d#
25 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
46 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
47 @args 49 @args
48 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
50 52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
51 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
52 my ($cap) = @_; 61 my (%cap) = @_;
53 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
54 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default; 70 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
59 73
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 76
63 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
64 } 78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
65 } 202 }
66 }); 203 });
67 204
68 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 206 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 385 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 386 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 387 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 391 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 392 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 393 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 394
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 395 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
281 416
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 418 $sktbl->clear;
284 419
420 my @add;
421
422 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
291 430
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293 432
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
323 } 462 }
324 463
325 1 464 1
326 }; 465 };
327 466
467 push @add,
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
334 475
335 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
336 } 477 }
478
479 $sktbl->add_at (@add);
337 } 480 }
338 481
339 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
578} 721}
579 722
580sub face_find { 723sub face_find {
581 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
582 725
583 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
584
585 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
586 728
587 $face->{id} = $id; 729 $face->{id} = $id;
588 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
589 731
590 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
591 733
592 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
739 }
593} 740}
594 741
595sub face_update { 742sub face_update {
596 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
597 744
745 if ($face->{type} == 0) { # FT_FACE
598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
599 if $changed; 747 if $changed;
600 748
601 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 };
763 }
764
765 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 }
781 }
602} 782}
603 783
604sub smooth_update { 784sub smooth_update {
605 my ($self, $facenum, $face) = @_; 785 my ($self, $facenum, $face) = @_;
606 786
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
608} 788}
609 789
610sub set_texture { 790sub set_texture {
611 my ($self, $id, $data) = @_; 791 my ($self, $id, $data) = @_;
792
793 return unless $self->{map};
612 794
613 $self->{texture}[$id] = my $tex = 795 $self->{texture}[$id] = my $tex =
614 new_from_image CFPlus::Texture 796 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1; 797 $data, minify => 1, mipmap => 1;
616 798
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
618 $self->{map_widget}->update; 800 $self->{map_widget}->update;
801
802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803}
804
805sub connect_face_update {
806 my ($self, $id, $cb) = @_;
807
808 push @{$self->{face_cb}{$id}}, $cb;
809
810 CFPlus::guard {
811 @{$self->{face_cb}{$id}}
812 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}};
814 }
619} 815}
620 816
621sub sound_play { 817sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 818 my ($self, $x, $y, $soundnum, $type) = @_;
623 819
… …
633 $LAST_QUERY = $prompt; 829 $LAST_QUERY = $prompt;
634 830
635 $self->{query}-> ($self, $flags, $prompt); 831 $self->{query}-> ($self, $flags, $prompt);
636} 832}
637 833
638sub drawinfo { 834sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 835 local $_ = shift;
640 836
641 my @color = ( 837 # we now weed out all tags we do not support
838 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
839 # now all entities
840 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
841
842 # handle some elements
843 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
844 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
845
846 $_
847}
848
849our %NAME_TO_COLOR = (
850 black => 0,
851 white => 1,
852 darkblue => 2,
853 red => 3,
854 orange => 4,
855 lightblue => 5,
856 darkorange => 6,
857 green => 7,
858 darkgreen => 8,
859 grey => 9,
860 brown => 10,
861 yellow => 11,
862 tan => 12,
863);
864
865our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 866 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 867 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 868 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 869 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 870 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 871 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 872 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 873 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 874 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 875 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 876 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 877 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 878 [0.74, 0.65, 0.41],
655 ); 879);
656 880
657 my $fg = $color[$color % @color]; 881sub msg {
882 my ($self, $color, $type, $text, @extra) = @_;
658 883
884 $text = sanitise_xml $text;
885
886 if (my $cb = $self->{cb_msg}{$type}) {
887 $_->($self, $color, $type, $text, @extra) for values %$cb;
888 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
889 $type =~ s/-/_/g;
890 $self->{$type} = $text;
891 } else {
659 $self->logprint ("info: ", $text); 892 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood
660 894
895 my $fg = $CF_COLOR[$color % @CF_COLOR];
896
661 ## try to create single paragraphs of multiple lines sent by the server 897 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers 898 # no longer neecssary with TRT servers
663 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 899 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
664 900
665 $text = CFPlus::asxml $text; 901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
668
669 ::message ({ fg => $fg, markup => $_ })
670 for split /\n/, $text; 902 for split /\n/, $text;
671 903
672 $self->{statusbox}->add ($text, 904 $self->{statusbox}->add ($text,
673 group => $text, 905 group => $text,
674 fg => $fg, 906 fg => $fg,
675 timeout => $color >= 2 ? 180 : 10, 907 timeout => $color >= 2 ? 180 : 10,
676 tooltip_font => $::FONT_FIXED, 908 tooltip_font => $::FONT_FIXED,
677 ); 909 );
678} 910 }
679
680sub drawextinfo {
681 my ($self, $color, $type, $subtype, $message) = @_;
682
683 $self->drawinfo ($color, $message);
684} 911}
685 912
686sub spell_add { 913sub spell_add {
687 my ($self, $spell) = @_; 914 my ($self, $spell) = @_;
688 915
… …
776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
777 return unless $::CONN; 1004 return unless $::CONN;
778 1005
779 $::FLOORBOX->clear; 1006 $::FLOORBOX->clear;
780 1007
1008 my @add;
1009
781 my $row; 1010 my $row;
782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1011 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
783 if ($row < 6) { 1012 if ($row < 6) {
784 local $_->{face_widget}; # hack to force recreation of widget 1013 local $_->{face_widget}; # hack to force recreation of widget
785 local $_->{desc_widget}; # hack to force recreation of widget 1014 local $_->{desc_widget}; # hack to force recreation of widget
786 CFPlus::Item::update_widgets $_; 1015 CFPlus::Item::update_widgets $_;
787 1016
1017 push @add,
788 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1018 0, $row, $_->{face_widget},
789 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1019 1, $row, $_->{desc_widget};
790 1020
791 $row++; 1021 $row++;
792 } else { 1022 } else {
793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1023 push @add, 1, $row, new CFPlus::UI::Button
794 text => "More...", 1024 text => "More...",
795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1025 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
796 ); 1026 ;
797 last; 1027 last;
798 } 1028 }
799 } 1029 }
800 if ($::CONN->{open_container}) { 1030 if ($::CONN->{open_container}) {
801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1031 push @add, 1, $row++, new CFPlus::UI::Button
802 text => "Close container", 1032 text => "Close container",
803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1033 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
804 ); 1034 ;
805 } 1035 }
1036
1037 $::FLOORBOX->add_at (@add);
806 }); 1038 });
807 1039
808 $::WANT_REFRESH++; 1040 $::WANT_REFRESH++;
809} 1041}
810 1042
… …
921 $::SERVER_INFO->set_markup ( 1153 $::SERVER_INFO->set_markup (
922 "server <tt>$self->{host}:$self->{port}</tt>\n" 1154 "server <tt>$self->{host}:$self->{port}</tt>\n"
923 . "protocol version <tt>$self->{version}</tt>\n" 1155 . "protocol version <tt>$self->{version}</tt>\n"
924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1156 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1157 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1158 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n" 1159 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1160 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1161 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930 . "map size $self->{mapw}×$self->{maph}\n" 1164 . "map size $self->{mapw}×$self->{maph}\n"
931 ); 1165 );
932 1166
… …
934} 1168}
935 1169
936sub logged_in { 1170sub logged_in {
937 my ($self) = @_; 1171 my ($self) = @_;
938 1172
939 $self->send_ext_req (cfplus_support => version => 1, sub { 1173 $self->send_ext_req (cfplus_support => version => 2, sub {
1174 my (%msg) = @_;
1175
940 $self->{cfplus_ext} = $_[0]{version}; 1176 $self->{cfplus_ext} = $msg{version};
941 $self->update_server_info; 1177 $self->update_server_info;
942 1178
943 if ($self->{cfplus_ext} >= 2) { 1179 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub { 1180 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0]; 1181 $self->{editor_support} = { @_ };
946 $self->update_server_info; 1182 $self->update_server_info;
947 1183
948 0 1184 0
949 }); 1185 });
950 } 1186 }
… …
970 1206
971sub lookat { 1207sub lookat {
972 my ($self, $x, $y) = @_; 1208 my ($self, $x, $y) = @_;
973 1209
974 if ($self->{cfplus_ext}) { 1210 if ($self->{cfplus_ext}) {
975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1211 $self->send_ext_req (lookat => $x, $y, sub {
976 my ($msg) = @_; 1212 my (%msg) = @_;
977 1213
978 if (exists $msg->{npc_dialog}) { 1214 if (exists $msg{npc_dialog}) {
979 # start npc chat dialog 1215 # start npc chat dialog
980 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1216 $self->{npc_dialog} = new CFPlus::NPCDialog::
981 dx => $x, 1217 token => $msg{npc_dialog},
982 dy => $y,
983 title => "$msg->{npc_dialog} (NPC)", 1218 title => "$msg{npc_dialog}[0] (NPC)",
984 conn => $self, 1219 conn => $self,
985 ; 1220 ;
986 } 1221 }
987 }); 1222 });
988 } 1223 }
… …
995 1230
996 (delete $self->{npc_dialog})->destroy 1231 (delete $self->{npc_dialog})->destroy
997 if $self->{npc_dialog}; 1232 if $self->{npc_dialog};
998 1233
999 $self->SUPER::destroy; 1234 $self->SUPER::destroy;
1235
1236 %$self = ();
1000} 1237}
1001 1238
1002package CFPlus::NPCDialog; 1239package CFPlus::NPCDialog;
1003 1240
1004our @ISA = 'CFPlus::UI::Toplevel'; 1241our @ISA = 'CFPlus::UI::Toplevel';
… …
1051 on_activate => sub { $this->destroy; 1 }, 1288 on_activate => sub { $this->destroy; 1 },
1052 ; 1289 ;
1053 1290
1054 $self->update_options; 1291 $self->update_options;
1055 1292
1056 $self->{id} = $self->{conn}->send_ext_req ( 1293 $self->{id} = "npc-channel-" . $self->{conn}->token;
1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1294 $self->{conn}->connect_ext ($self->{id} => sub {
1058 sub { $this && $this->feed (@_) } 1295 $this->feed (@_) if $this;
1059 ); 1296 });
1297
1298 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1060 1299
1061 $self->{entry}->grab_focus; 1300 $self->{entry}->grab_focus;
1062 1301
1063 $self->{textview}->add_paragraph ({ 1302 $self->{textview}->add_paragraph ({
1064 fg => [1, 1, 0, 1], 1303 fg => [1, 1, 0, 1],
… …
1087 ); 1326 );
1088 } 1327 }
1089} 1328}
1090 1329
1091sub feed { 1330sub feed {
1092 my ($self, $msg) = @_; 1331 my ($self, $type, @arg) = @_;
1093 1332
1094 CFPlus::weaken $self; 1333 CFPlus::weaken $self;
1095 1334
1096 if ($msg->{msgtype} eq "reply") { 1335 if ($type eq "update") {
1336 my (%info) = @arg;
1337
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1338 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1339 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1099
1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102 my @link;
1103 $text =~ s{
1104 ($match)
1105 }{
1106 my $kw = $1;
1107
1108 push @link, new CFPlus::UI::Label
1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1110 can_hover => 1,
1111 can_events => 1,
1112 padding_x => 0,
1113 padding_y => 0,
1114 on_button_up => sub {
1115 $self->send ($kw);
1116 };
1117
1118 "\x{fffc}"
1119 }giex;
1120 1340
1341 if (exists $info{msg}) {
1342 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1343 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1344 my @link;
1345 $text =~ s{
1346 ($match)
1347 }{
1348 my $kw = $1;
1349
1350 push @link, new CFPlus::UI::Label
1351 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1352 can_hover => 1,
1353 can_events => 1,
1354 padding_x => 0,
1355 padding_y => 0,
1356 on_button_up => sub {
1357 $self->send ($kw);
1358 };
1359
1360 "\x{fffc}"
1361 }giex;
1362
1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1363 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1122 $self->{textview}->scroll_to_bottom; 1364 $self->{textview}->scroll_to_bottom;
1365 }
1366
1123 $self->update_options; 1367 $self->update_options;
1124 } else { 1368 } else {
1125 $self->destroy; 1369 $self->destroy;
1126 } 1370 }
1127 1371
… …
1132 my ($self, $msg) = @_; 1376 my ($self, $msg) = @_;
1133 1377
1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1378 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1135 $self->{textview}->scroll_to_bottom; 1379 $self->{textview}->scroll_to_bottom;
1136 1380
1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1381 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1138} 1382}
1139 1383
1140sub destroy { 1384sub destroy {
1141 my ($self) = @_; 1385 my ($self) = @_;
1142 1386
1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1387 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1144 1388
1145 if ($self->{conn}) { 1389 if ($self->{conn}) {
1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1390 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1147 delete $self->{conn}{npc_dialog}; 1391 delete $self->{conn}{npc_dialog};
1148 $self->{conn}->disconnect_ext ($self->{id}); 1392 $self->{conn}->disconnect_ext ($self->{id});
1149 } 1393 }
1150 1394
1151 $self->SUPER::destroy; 1395 $self->SUPER::destroy;

Diff Legend

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