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.96 by root, Fri Apr 6 07:45:35 2007 UTC vs.
Revision 1.129 by root, Mon Jul 23 23:37:57 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
23 30
24 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
25 32
26 my @cmd_help = map { 33 my @cmd_help = map {
27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
41 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
42 @args 49 @args
43 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
45 52
53 $self->connect_ext (music => sub {
54 my (%ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
46 $self->connect_ext (event_capabilities => sub { 107 $self->connect_ext (capabilities => sub {
47 my ($cap) = @_; 108 my (%cap) = @_;
48 109
49 if (my $ts = $cap->{tileset}) { 110 if (my $ts = $cap{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 111 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default; 112 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3]; 113 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]); 114 $self->setup_req (tileset => $default->[0]);
54 115
55 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize}; 117 my $h = int $self->{maph} * 32 / $self->{tilesize};
57 118
58 $self->setup_req (mapsize => "${w}x${h}"); 119 $self->setup_req (mapsize => "${w}x${h}");
59 } 120 }
121 }
122 });
123
124 $self->{json_coder}
125 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub {
127 $self->{widget}{$_[0]}
128 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($id) = @_;
133
134 $self->{widgetset}{$id} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($id) = @_;
142
143 my $ws = delete $self->{widgetset}{$id}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset create
151 $self->connect_ext (ws_c => sub {
152 my ($ws, $id, $class, $args) = @_;
153
154 for my $ev (grep /^on_/, keys %$args) {
155 $args->{$ev} = sub {
156 my $id = shift->{s_id};
157 $self->send_exti_msg (w_e => $id, $ev, \@_);
158
159 1
160 };
161 }
162
163 if (my $widget = eval {
164 local $SIG{__DIE__};
165 "CFPlus::UI::$class"->new (
166 %$args,
167 s_ws => $ws,
168 s_id => $id,
169 )
170 }
171 ) {
172 $self->{widget}{$id}
173 = $self->{widgetset}{$ws}{w}{$id}
174 = $widget;
175
176 $widget->connect (on_destroy => sub {
177 my ($widget) = @_;
178
179 delete $self->{widget}{$widget->{s_id}};
180 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
181 });
182 } else {
183 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
184 $self->send_exti_msg (w_e => $id, "destroy");
185 }
186 });
187
188 # widget call
189 $self->connect_ext (w_c => sub {
190 my ($id, $rid, $method, $args) = @_;
191
192 my $w = $self->{widget}{$id}
193 or return;
194
195 $args ||= [];
196
197 if ($rid) {
198 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
199 } else {
200 $w->$method (@$args);
201 }
202 });
203
204 # widget set
205 $self->connect_ext (w_s => sub {
206 my ($id, $attr) = @_;
207
208 my $w = $self->{widget}{$id}
209 or return;
210
211 for (my $i = 0; $i < $#$attr; $i += 2) {
212 my ($member, $value) = @$attr[$i, $i+1];
213 if (defined $value) {
214 $w->{$member} = $value;
215 } else {
216 delete $w->{$member};
217 }
218 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
219 }
220 });
221
222 # widget get
223 $self->connect_ext (w_g => sub {
224 my ($id, $rid, $attr) = @_;
225
226 my $w = $self->{widget}{$id}
227 or return;
228
229 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
230 });
231
232 # destroy widgets on logout
233 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
234 for my $ws (values %{delete $self->{widgetset} || {}}) {
235 $_->destroy
236 for values %{delete $ws->{w} || {}};
60 } 237 }
61 }); 238 });
62 239
63 $self->{map_widget}->add_command (@$_) 240 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 241 for @cmd_help;
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 420 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 421 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 422 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 423 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 424 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 425 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
249 $rng =~ s/^Range: //; # thank you so much dear server
250 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
251 my $title = $stats->{+CS_STAT_TITLE}; 426 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 427 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 428 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 429
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 430 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 450 my @skills = keys %{ $self->{skill_info} };
276 451
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 452 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 453 $sktbl->clear;
279 454
455 my @add;
456
457 push @add,
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 458 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 459 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 460 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 461 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 462 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 463 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
464 ;
286 465
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 466 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288 467
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 468 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 469 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
318 } 497 }
319 498
320 1 499 1
321 }; 500 };
322 501
502 push @add,
323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 503 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 504 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 505 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 506 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 507 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 508 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
509 ;
329 510
330 $x++ and ($x, $y) = (0, $y + 1); 511 $x++ and ($x, $y) = (0, $y + 1);
331 } 512 }
513
514 $sktbl->add_at (@add);
332 } 515 }
333 516
334 for (grep exists $stats->{$_}, @skills) { 517 for (grep exists $stats->{$_}, @skills) {
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 518 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 519 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
402 585
403 $self->{map}->clear; 586 $self->{map}->clear;
404 delete $self->{map_widget}{magicmap}; 587 delete $self->{map_widget}{magicmap};
405} 588}
406 589
590sub bg_fetch {
591 my ($self) = @_;
592
593 my $id;
594
595 do {
596 $id = pop @{$self->{bg_fetch}}
597 or return;
598 } while $self->{texture}[$id];
599
600 CFPlus::DB::get tilecache => $id, sub {
601 my ($data) = @_;
602
603 return unless $self->{map}; # stop when destroyed
604
605 $self->set_texture ($id => $data)
606 if defined $data;
607
608 $self->bg_fetch;
609 };
610}
407 611
408sub load_map($$$) { 612sub load_map($$$) {
409 my ($self, $hash, $x, $y) = @_; 613 my ($self, $hash, $x, $y) = @_;
410 614
615 my $gen = $self->{map_change_gen};
616
411 CFPlus::DB::get $self->{mapcache} => $hash, sub { 617 CFPlus::DB::get $self->{mapcache} => $hash, sub {
618 return unless $gen == $self->{map_change_gen};
619
412 my ($data) = @_; 620 my ($data) = @_;
413 621
414 if (defined $data) { 622 if (defined $data) {
415 $data = Compress::LZF::decompress $data; 623 $data = Compress::LZF::decompress $data;
416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 624 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
418 CFPlus::DB::get tilecache => $id, sub {
419 my ($data) = @_;
420 625
421 $self->set_texture ($id => $data) 626 my $inprogress = @{ $self->{bg_fetch} || [] };
422 if defined $data; 627 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
423 }; 628 $self->bg_fetch unless $inprogress;
424 }
425 } 629 }
426 }; 630 };
427} 631}
428 632
429# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 633# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
… …
495 699
496 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 700 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
497 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 701 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
498 702
499 } else { 703 } else {
704 my $gen = $self->{map_change_gen};
500 $self->send_mapinfo ("spatial $path$tile", sub { 705 $self->send_mapinfo ("spatial $path$tile", sub {
706 return unless $gen == $self->{map_change_gen};
707
501 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 708 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 709
503 return if $mode ne "spatial"; 710 return if $mode ne "spatial";
504 711
505 $x += $self->{map}->ox; 712 $x += $self->{map}->ox;
… …
519 726
520sub map_change { 727sub map_change {
521 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 728 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
522 729
523 $self->flush_map; 730 $self->flush_map;
731
732 ++$self->{map_change_gen};
524 733
525 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 734 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
526 735
527 my $mapmapw = $self->{mapmap}->{w}; 736 my $mapmapw = $self->{mapmap}->{w};
528 my $mapmaph = $self->{mapmap}->{h}; 737 my $mapmaph = $self->{mapmap}->{h};
… …
568 if $changed; 777 if $changed;
569 778
570 $self->set_texture ($face->{id} => delete $face->{image}); 779 $self->set_texture ($face->{id} => delete $face->{image});
571} 780}
572 781
782sub smooth_update {
783 my ($self, $facenum, $face) = @_;
784
785 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
786}
787
573sub set_texture { 788sub set_texture {
574 my ($self, $id, $data) = @_; 789 my ($self, $id, $data) = @_;
575 790
791 return unless $self->{map};
792
576 $self->{texture}[$id] ||= do { 793 $self->{texture}[$id] = my $tex =
577 my $tex =
578 new_from_image CFPlus::Texture 794 new_from_image CFPlus::Texture
579 $data, minify => 1, mipmap => 1; 795 $data, minify => 1, mipmap => 1;
580 796
581 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 797 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
582 $self->{map_widget}->update; 798 $self->{map_widget}->update;
583 799
584 $tex 800 $_->() for @{(delete $self->{face_cb}{$id}) || []};
801}
802
803sub connect_face_update {
804 my ($self, $id, $cb) = @_;
805
806 push @{$self->{face_cb}{$id}}, $cb;
807
808 CFPlus::guard {
809 @{$self->{face_cb}{$id}}
810 = grep $_ != $cb,
811 @{$self->{face_cb}{$id}};
585 }; 812 }
586} 813}
587 814
588sub sound_play { 815sub sound_play {
589 my ($self, $x, $y, $soundnum, $type) = @_; 816 my ($self, $x, $y, $soundnum, $type) = @_;
590 817
… …
600 $LAST_QUERY = $prompt; 827 $LAST_QUERY = $prompt;
601 828
602 $self->{query}-> ($self, $flags, $prompt); 829 $self->{query}-> ($self, $flags, $prompt);
603} 830}
604 831
605sub drawinfo { 832sub sanitise_xml($) {
606 my ($self, $color, $text) = @_; 833 local $_ = shift;
607 834
608 my @color = ( 835 # we now weed out all tags we do not support
836 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
837 # now all entities
838 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
839
840 # handle some elements
841 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
842 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
843
844 $_
845}
846
847our %NAME_TO_COLOR = (
848 black => 0,
849 white => 1,
850 darkblue => 2,
851 red => 3,
852 orange => 4,
853 lightblue => 5,
854 darkorange => 6,
855 green => 7,
856 darkgreen => 8,
857 grey => 9,
858 brown => 10,
859 yellow => 11,
860 tan => 12,
861);
862
863our @CF_COLOR = (
609 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 864 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
610 [1.00, 1.00, 1.00], 865 [1.00, 1.00, 1.00],
611 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 866 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
612 [1.00, 0.00, 0.00], 867 [1.00, 0.00, 0.00],
613 [1.00, 0.54, 0.00], 868 [1.00, 0.54, 0.00],
614 [0.11, 0.56, 1.00], 869 [0.11, 0.56, 1.00],
615 [0.93, 0.46, 0.00], 870 [0.93, 0.46, 0.00],
616 [0.18, 0.54, 0.34], 871 [0.18, 0.54, 0.34],
617 [0.56, 0.73, 0.56], 872 [0.56, 0.73, 0.56],
618 [0.80, 0.80, 0.80], 873 [0.80, 0.80, 0.80],
619 [0.75, 0.61, 0.20], 874 [0.75, 0.61, 0.20],
620 [0.99, 0.77, 0.26], 875 [0.99, 0.77, 0.26],
621 [0.74, 0.65, 0.41], 876 [0.74, 0.65, 0.41],
622 ); 877);
623 878
624 my $fg = $color[$color % @color]; 879sub msg {
880 my ($self, $color, $type, $text, @extra) = @_;
625 881
882 $text = sanitise_xml $text;
883
884 if (my $cb = $self->{cb_msg}{$type}) {
885 $_->($self, $color, $type, $text, @extra) for values %$cb;
886 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
887 $type =~ s/-/_/g;
888 $self->{$type} = $text;
889 } else {
626 $self->logprint ("info: ", $text); 890 $self->logprint ("msg: ", $text);
891 return if $color < 0; # negative color == ignore if not understood
627 892
893 my $fg = $CF_COLOR[$color % @CF_COLOR];
894
628 # try to create single paragraphs of multiple lines sent by the server 895 ## try to create single paragraphs of multiple lines sent by the server
896 # no longer neecssary with TRT servers
629 $text =~ s/(?<=\S)\n(?=\w)/ /g; 897 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
630 898
631 $text = CFPlus::asxml $text;
632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
634
635 ::message ({ fg => $fg, markup => $_ }) 899 ::message ({ fg => $fg, markup => $_ })
636 for split /\n/, $text; 900 for split /\n/, $text;
637 901
638 $self->{statusbox}->add ($text, 902 $self->{statusbox}->add ($text,
639 group => $text, 903 group => $text,
640 fg => $fg, 904 fg => $fg,
641 timeout => $color >= 2 ? 180 : 10, 905 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 906 tooltip_font => $::FONT_FIXED,
643 ); 907 );
644} 908 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 909}
651 910
652sub spell_add { 911sub spell_add {
653 my ($self, $spell) = @_; 912 my ($self, $spell) = @_;
654 913
… …
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1001 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 1002 return unless $::CONN;
744 1003
745 $::FLOORBOX->clear; 1004 $::FLOORBOX->clear;
746 1005
1006 my @add;
1007
747 my $row; 1008 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1009 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 1010 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 1011 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 1012 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 1013 CFPlus::Item::update_widgets $_;
753 1014
1015 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1016 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1017 1, $row, $_->{desc_widget};
756 1018
757 $row++; 1019 $row++;
758 } else { 1020 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1021 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1022 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1023 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1024 ;
763 last; 1025 last;
764 } 1026 }
765 } 1027 }
766 if ($::CONN->{open_container}) { 1028 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1029 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1030 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1031 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1032 ;
771 } 1033 }
1034
1035 $::FLOORBOX->add_at (@add);
772 }); 1036 });
773 1037
774 $::WANT_REFRESH++; 1038 $::WANT_REFRESH++;
775} 1039}
776 1040
… …
887 $::SERVER_INFO->set_markup ( 1151 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1152 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1153 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1154 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1155 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1156 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1157 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1158 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1159 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1160 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1161 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1162 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1163 );
898 1164
… …
900} 1166}
901 1167
902sub logged_in { 1168sub logged_in {
903 my ($self) = @_; 1169 my ($self) = @_;
904 1170
905 $self->send_ext_req (cfplus_support => version => 1, sub { 1171 $self->send_ext_req (cfplus_support => version => 2, sub {
1172 my (%msg) = @_;
1173
906 $self->{cfplus_ext} = $_[0]{version}; 1174 $self->{cfplus_ext} = $msg{version};
907 $self->update_server_info; 1175 $self->update_server_info;
908 1176
909 if ($self->{cfplus_ext} >= 2) { 1177 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub { 1178 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0]; 1179 $self->{editor_support} = { @_ };
912 $self->update_server_info; 1180 $self->update_server_info;
913 1181
914 0 1182 0
915 }); 1183 });
916 } 1184 }
… …
936 1204
937sub lookat { 1205sub lookat {
938 my ($self, $x, $y) = @_; 1206 my ($self, $x, $y) = @_;
939 1207
940 if ($self->{cfplus_ext}) { 1208 if ($self->{cfplus_ext}) {
941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1209 $self->send_ext_req (lookat => $x, $y, sub {
942 my ($msg) = @_; 1210 my (%msg) = @_;
943 1211
944 if (exists $msg->{npc_dialog}) { 1212 if (exists $msg{npc_dialog}) {
945 # start npc chat dialog 1213 # start npc chat dialog
946 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1214 $self->{npc_dialog} = new CFPlus::NPCDialog::
947 dx => $x, 1215 token => $msg{npc_dialog},
948 dy => $y,
949 title => "$msg->{npc_dialog} (NPC)", 1216 title => "$msg{npc_dialog}[0] (NPC)",
950 conn => $self, 1217 conn => $self,
951 ; 1218 ;
952 } 1219 }
953 }); 1220 });
954 } 1221 }
… …
961 1228
962 (delete $self->{npc_dialog})->destroy 1229 (delete $self->{npc_dialog})->destroy
963 if $self->{npc_dialog}; 1230 if $self->{npc_dialog};
964 1231
965 $self->SUPER::destroy; 1232 $self->SUPER::destroy;
1233
1234 %$self = ();
966} 1235}
967 1236
968package CFPlus::NPCDialog; 1237package CFPlus::NPCDialog;
969 1238
970our @ISA = 'CFPlus::UI::Toplevel'; 1239our @ISA = 'CFPlus::UI::Toplevel';
… …
1017 on_activate => sub { $this->destroy; 1 }, 1286 on_activate => sub { $this->destroy; 1 },
1018 ; 1287 ;
1019 1288
1020 $self->update_options; 1289 $self->update_options;
1021 1290
1022 $self->{id} = $self->{conn}->send_ext_req ( 1291 $self->{id} = "npc-channel-" . $self->{conn}->token;
1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1292 $self->{conn}->connect_ext ($self->{id} => sub {
1024 sub { $this && $this->feed (@_) } 1293 $this->feed (@_) if $this;
1025 ); 1294 });
1295
1296 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1026 1297
1027 $self->{entry}->grab_focus; 1298 $self->{entry}->grab_focus;
1028 1299
1029 $self->{textview}->add_paragraph ({ 1300 $self->{textview}->add_paragraph ({
1030 fg => [1, 1, 0, 1], 1301 fg => [1, 1, 0, 1],
… …
1053 ); 1324 );
1054 } 1325 }
1055} 1326}
1056 1327
1057sub feed { 1328sub feed {
1058 my ($self, $msg) = @_; 1329 my ($self, $type, @arg) = @_;
1059 1330
1060 CFPlus::weaken $self; 1331 CFPlus::weaken $self;
1061 1332
1062 if ($msg->{msgtype} eq "reply") { 1333 if ($type eq "update") {
1334 my (%info) = @arg;
1335
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1336 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1337 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1065
1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1068 my @link;
1069 $text =~ s{
1070 ($match)
1071 }{
1072 my $kw = $1;
1073
1074 push @link, new CFPlus::UI::Label
1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1076 can_hover => 1,
1077 can_events => 1,
1078 padding_x => 0,
1079 padding_y => 0,
1080 on_button_up => sub {
1081 $self->send ($kw);
1082 };
1083
1084 "\x{fffc}"
1085 }giex;
1086 1338
1339 if (exists $info{msg}) {
1340 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1341 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1342 my @link;
1343 $text =~ s{
1344 ($match)
1345 }{
1346 my $kw = $1;
1347
1348 push @link, new CFPlus::UI::Label
1349 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1350 can_hover => 1,
1351 can_events => 1,
1352 padding_x => 0,
1353 padding_y => 0,
1354 on_button_up => sub {
1355 $self->send ($kw);
1356 };
1357
1358 "\x{fffc}"
1359 }giex;
1360
1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1361 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1088 $self->{textview}->scroll_to_bottom; 1362 $self->{textview}->scroll_to_bottom;
1363 }
1364
1089 $self->update_options; 1365 $self->update_options;
1090 } else { 1366 } else {
1091 $self->destroy; 1367 $self->destroy;
1092 } 1368 }
1093 1369
… …
1098 my ($self, $msg) = @_; 1374 my ($self, $msg) = @_;
1099 1375
1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1376 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1101 $self->{textview}->scroll_to_bottom; 1377 $self->{textview}->scroll_to_bottom;
1102 1378
1103 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1379 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1104} 1380}
1105 1381
1106sub destroy { 1382sub destroy {
1107 my ($self) = @_; 1383 my ($self) = @_;
1108 1384
1109 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1385 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1110 1386
1111 if ($self->{conn}) { 1387 if ($self->{conn}) {
1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1388 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1113 delete $self->{conn}{npc_dialog}; 1389 delete $self->{conn}{npc_dialog};
1114 $self->{conn}->disconnect_ext ($self->{id}); 1390 $self->{conn}->disconnect_ext ($self->{id});
1115 } 1391 }
1116 1392
1117 $self->SUPER::destroy; 1393 $self->SUPER::destroy;

Diff Legend

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