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.98 by root, Fri Apr 6 19:17:25 2007 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11:45 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 xwidget => 1,#d#
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 (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
46 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
47 my ($cap) = @_; 59 my (%cap) = @_;
48 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
49 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default; 70 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
54 73
… …
58 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
59 } 78 }
60 } 79 }
61 }); 80 });
62 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} || {}};
202 }
203 });
204
63 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 206 for @cmd_help;
65 207
66 { 208 {
67 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
84} 226}
85 227
86sub logprint { 228sub logprint {
87 my ($self, @a) = @_; 229 my ($self, @a) = @_;
88 230
89 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
90 my $path = "$Crossfire::VARDIR/log.$self->{host}";
91
92 open my $fh, ">>:utf8", $path
93 or die "Couldn't open logfile $path: $!";
94
95 $fh->autoflush (1);
96
97 $fh;
98 };
99
100 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
101
102 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
103 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
104
105 print {$self->{log_fh}} "$ts ", @a, "\n";
106} 232}
107 233
108sub _stat_numdiff { 234sub _stat_numdiff {
109 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
110 236
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 369 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 370 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 371 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 374 $::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}; 375 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 376 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 377 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 378
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 379 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
276 400
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 402 $sktbl->clear;
279 403
404 my @add;
405
406 push @add,
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
286 414
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288 416
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 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); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
318 } 446 }
319 447
320 1 448 1
321 }; 449 };
322 450
451 push @add,
323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $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); 453 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 454 $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); 455 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, 456 $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); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
329 459
330 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
331 } 461 }
462
463 $sktbl->add_at (@add);
332 } 464 }
333 465
334 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
427} 559}
428 560
429sub load_map($$$) { 561sub load_map($$$) {
430 my ($self, $hash, $x, $y) = @_; 562 my ($self, $hash, $x, $y) = @_;
431 563
564 my $gen = $self->{map_change_gen};
565
432 CFPlus::DB::get $self->{mapcache} => $hash, sub { 566 CFPlus::DB::get $self->{mapcache} => $hash, sub {
567 return unless $gen == $self->{map_change_gen};
568
433 my ($data) = @_; 569 my ($data) = @_;
434 570
435 if (defined $data) { 571 if (defined $data) {
436 $data = Compress::LZF::decompress $data; 572 $data = Compress::LZF::decompress $data;
437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 573 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
… …
512 648
513 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 649 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
514 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 650 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
515 651
516 } else { 652 } else {
653 my $gen = $self->{map_change_gen};
517 $self->send_mapinfo ("spatial $path$tile", sub { 654 $self->send_mapinfo ("spatial $path$tile", sub {
655 return unless $gen == $self->{map_change_gen};
656
518 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 657 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 658
520 return if $mode ne "spatial"; 659 return if $mode ne "spatial";
521 660
522 $x += $self->{map}->ox; 661 $x += $self->{map}->ox;
… …
536 675
537sub map_change { 676sub map_change {
538 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
539 678
540 $self->flush_map; 679 $self->flush_map;
680
681 ++$self->{map_change_gen};
541 682
542 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
543 684
544 my $mapmapw = $self->{mapmap}->{w}; 685 my $mapmapw = $self->{mapmap}->{w};
545 my $mapmaph = $self->{mapmap}->{h}; 686 my $mapmaph = $self->{mapmap}->{h};
… …
564} 705}
565 706
566sub face_find { 707sub face_find {
567 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
568 709
569 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
570
571 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
572 712
573 $face->{id} = $id; 713 $face->{id} = $id;
574 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
575 715
576 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
577 717
578 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb;
723 }
579} 724}
580 725
581sub face_update { 726sub face_update {
582 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
583 728
729 if ($face->{type} == 0) { # FT_FACE
584 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
585 if $changed; 731 if $changed;
586 732
587 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->set_texture ($face->{id} => delete $face->{data});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
774}
775
776sub smooth_update {
777 my ($self, $facenum, $face) = @_;
778
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
588} 780}
589 781
590sub set_texture { 782sub set_texture {
591 my ($self, $id, $data) = @_; 783 my ($self, $id, $data) = @_;
784
785 return unless $self->{map};
592 786
593 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$id] = my $tex =
594 new_from_image CFPlus::Texture 788 new_from_image CFPlus::Texture
595 $data, minify => 1, mipmap => 1; 789 $data, minify => 1, mipmap => 1;
596 790
597 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
598 $self->{map_widget}->update; 792 $self->{map_widget}->update;
793
794 $_->() for @{(delete $self->{face_cb}{$id}) || []};
795}
796
797sub connect_face_update {
798 my ($self, $id, $cb) = @_;
799
800 push @{$self->{face_cb}{$id}}, $cb;
801
802 CFPlus::guard {
803 @{$self->{face_cb}{$id}}
804 = grep $_ != $cb,
805 @{$self->{face_cb}{$id}};
806 }
599} 807}
600 808
601sub sound_play { 809sub sound_play {
602 my ($self, $x, $y, $soundnum, $type) = @_; 810 my ($self, $type, $face, $dx, $dy, $vol) = @_;
603 811
604 $self->{sound_play}->($x, $y, $soundnum, $type); 812 &::audio_sound_play ($face, $dx, $dy, $vol)
813 unless $type & 1; # odd types are silent for future expansion
605} 814}
606 815
607my $LAST_QUERY; # server is stupid, stupid, stupid 816my $LAST_QUERY; # server is stupid, stupid, stupid
608 817
609sub query { 818sub query {
… …
613 $LAST_QUERY = $prompt; 822 $LAST_QUERY = $prompt;
614 823
615 $self->{query}-> ($self, $flags, $prompt); 824 $self->{query}-> ($self, $flags, $prompt);
616} 825}
617 826
618sub drawinfo { 827sub sanitise_xml($) {
619 my ($self, $color, $text) = @_; 828 local $_ = shift;
620 829
621 my @color = ( 830 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
832 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834
835 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
838
839 $_
840}
841
842our %NAME_TO_COLOR = (
843 black => 0,
844 white => 1,
845 darkblue => 2,
846 red => 3,
847 orange => 4,
848 lightblue => 5,
849 darkorange => 6,
850 green => 7,
851 darkgreen => 8,
852 grey => 9,
853 brown => 10,
854 yellow => 11,
855 tan => 12,
856);
857
858our @CF_COLOR = (
622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 859 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
623 [1.00, 1.00, 1.00], 860 [1.00, 1.00, 1.00],
624 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 861 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
625 [1.00, 0.00, 0.00], 862 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 863 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 864 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 865 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 866 [0.18, 0.54, 0.34],
630 [0.56, 0.73, 0.56], 867 [0.56, 0.73, 0.56],
631 [0.80, 0.80, 0.80], 868 [0.80, 0.80, 0.80],
632 [0.75, 0.61, 0.20], 869 [0.75, 0.61, 0.20],
633 [0.99, 0.77, 0.26], 870 [0.99, 0.77, 0.26],
634 [0.74, 0.65, 0.41], 871 [0.74, 0.65, 0.41],
635 ); 872);
636 873
637 my $fg = $color[$color % @color]; 874sub msg {
875 my ($self, $color, $type, $text, @extra) = @_;
638 876
877 $text = sanitise_xml $text;
878
879 if (my $cb = $self->{cb_msg}{$type}) {
880 $_->($self, $color, $type, $text, @extra) for values %$cb;
881 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
882 $type =~ s/-/_/g;
883 $self->{$type} = $text;
884 } else {
639 $self->logprint ("info: ", $text); 885 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood
640 887
888 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
889
641 # try to create single paragraphs of multiple lines sent by the server 890 ## try to create single paragraphs of multiple lines sent by the server
891 # no longer neecssary with TRT servers
642 $text =~ s/(?<=\S)\n(?=\w)/ /g; 892 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
643 893
644 $text = CFPlus::asxml $text; 894 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
645 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
646 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
647
648 ::message ({ fg => $fg, markup => $_ })
649 for split /\n/, $text; 895 for split /\n/, $text;
650 896
651 $self->{statusbox}->add ($text, 897 $self->{statusbox}->add ($text,
652 group => $text, 898 group => $text,
653 fg => $fg, 899 fg => $fg,
654 timeout => $color >= 2 ? 180 : 10, 900 timeout => $color >= 2 ? 180 : 10,
655 tooltip_font => $::FONT_FIXED, 901 tooltip_font => $::FONT_FIXED,
656 ); 902 );
657} 903 }
658
659sub drawextinfo {
660 my ($self, $color, $type, $subtype, $message) = @_;
661
662 $self->drawinfo ($color, $message);
663} 904}
664 905
665sub spell_add { 906sub spell_add {
666 my ($self, $spell) = @_; 907 my ($self, $spell) = @_;
667 908
… …
715 $self->{map_widget}->clr_commands; 956 $self->{map_widget}->clr_commands;
716 957
717 ::stop_game (); 958 ::stop_game ();
718} 959}
719 960
720sub image_info {
721 my ($self, $numfaces) = @_;
722
723 $self->{num_faces} = $numfaces;
724 $self->{face_prefetch} = [1 .. $numfaces];
725 $self->face_prefetch;
726}
727
728sub face_prefetch {
729 my ($self) = @_;
730
731 return unless $::CFG->{face_prefetch};
732
733 if ($self->{num_faces}) {
734 return if @{ $self->{send_queue} || [] };
735 my $todo = @{ $self->{face_prefetch} }
736 or return;
737
738 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
739
740 $self->send ("requestinfo image_sums $face $face");
741
742 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
743 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
744 } elsif (!exists $self->{num_faces}) {
745 $self->send ("requestinfo image_info");
746
747 $self->{num_faces} = 0;
748
749 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
750 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
751 }
752}
753
754sub update_floorbox { 961sub update_floorbox {
755 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 962 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
756 return unless $::CONN; 963 return unless $::CONN;
757 964
758 $::FLOORBOX->clear; 965 $::FLOORBOX->clear;
966
967 my @add;
759 968
760 my $row; 969 my $row;
761 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 970 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
762 if ($row < 6) { 971 if ($row < 6) {
763 local $_->{face_widget}; # hack to force recreation of widget 972 local $_->{face_widget}; # hack to force recreation of widget
764 local $_->{desc_widget}; # hack to force recreation of widget 973 local $_->{desc_widget}; # hack to force recreation of widget
765 CFPlus::Item::update_widgets $_; 974 CFPlus::Item::update_widgets $_;
766 975
976 push @add,
767 $::FLOORBOX->add (0, $row, $_->{face_widget}); 977 0, $row, $_->{face_widget},
768 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 978 1, $row, $_->{desc_widget};
769 979
770 $row++; 980 $row++;
771 } else { 981 } else {
772 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 982 push @add, 1, $row, new CFPlus::UI::Button
773 text => "More...", 983 text => "More...",
774 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 984 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
775 ); 985 ;
776 last; 986 last;
777 } 987 }
778 } 988 }
779 if ($::CONN->{open_container}) { 989 if ($::CONN->{open_container}) {
780 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 990 push @add, 1, $row++, new CFPlus::UI::Button
781 text => "Close container", 991 text => "Close container",
782 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 992 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
783 ); 993 ;
784 } 994 }
995
996 $::FLOORBOX->add_at (@add);
785 }); 997 });
786 998
787 $::WANT_REFRESH++; 999 $::WANT_REFRESH++;
788} 1000}
789 1001
… …
900 $::SERVER_INFO->set_markup ( 1112 $::SERVER_INFO->set_markup (
901 "server <tt>$self->{host}:$self->{port}</tt>\n" 1113 "server <tt>$self->{host}:$self->{port}</tt>\n"
902 . "protocol version <tt>$self->{version}</tt>\n" 1114 . "protocol version <tt>$self->{version}</tt>\n"
903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1115 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
904 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1116 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1117 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
905 . "editing support $yesno[!!$self->{editor_support}]\n" 1118 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1119 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1120 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1121 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1122 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
909 . "map size $self->{mapw}×$self->{maph}\n" 1123 . "map size $self->{mapw}×$self->{maph}\n"
910 ); 1124 );
911 1125
912 ::setup_build_button ($self->{editor_support}->{builder_ui});
913} 1126}
914 1127
915sub logged_in { 1128sub logged_in {
916 my ($self) = @_; 1129 my ($self) = @_;
917 1130
918 $self->send_ext_req (cfplus_support => version => 1, sub { 1131 $self->send_ext_req (cfplus_support => version => 2, sub {
1132 my (%msg) = @_;
1133
919 $self->{cfplus_ext} = $_[0]{version}; 1134 $self->{cfplus_ext} = $msg{version};
920 $self->update_server_info; 1135 $self->update_server_info;
921 1136
922 if ($self->{cfplus_ext} >= 2) { 1137 if ($self->{cfplus_ext} >= 2) {
923 $self->send_ext_req ("editor_support", sub { 1138 $self->send_ext_req ("editor_support", sub {
924 $self->{editor_support} = $_[0]; 1139 $self->{editor_support} = { @_ };
925 $self->update_server_info; 1140 $self->update_server_info;
926 1141
927 0 1142 0
928 }); 1143 });
929 } 1144 }
… …
937 $self->send_command ("output-count $::CFG->{output_count}"); 1152 $self->send_command ("output-count $::CFG->{output_count}");
938 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1153 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
939 $self->send_command ("pickup $::CFG->{pickup}"); 1154 $self->send_command ("pickup $::CFG->{pickup}");
940} 1155}
941 1156
942sub buildat {
943 my ($self, $builditem, $x, $y) = @_;
944
945 if ($self->{cfplus_ext}) {
946 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
947 }
948}
949
950sub lookat { 1157sub lookat {
951 my ($self, $x, $y) = @_; 1158 my ($self, $x, $y) = @_;
952 1159
953 if ($self->{cfplus_ext}) { 1160 if ($self->{cfplus_ext}) {
954 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1161 $self->send_ext_req (lookat => $x, $y, sub {
955 my ($msg) = @_; 1162 my (%msg) = @_;
956 1163
957 if (exists $msg->{npc_dialog}) { 1164 if (exists $msg{npc_dialog}) {
958 # start npc chat dialog 1165 # start npc chat dialog
959 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1166 $self->{npc_dialog} = new CFPlus::NPCDialog::
960 dx => $x, 1167 token => $msg{npc_dialog},
961 dy => $y,
962 title => "$msg->{npc_dialog} (NPC)", 1168 title => "$msg{npc_dialog}[0] (NPC)",
963 conn => $self, 1169 conn => $self,
964 ; 1170 ;
965 } 1171 }
966 }); 1172 });
967 } 1173 }
… …
974 1180
975 (delete $self->{npc_dialog})->destroy 1181 (delete $self->{npc_dialog})->destroy
976 if $self->{npc_dialog}; 1182 if $self->{npc_dialog};
977 1183
978 $self->SUPER::destroy; 1184 $self->SUPER::destroy;
1185
1186 %$self = ();
979} 1187}
980 1188
981package CFPlus::NPCDialog; 1189package CFPlus::NPCDialog;
982 1190
983our @ISA = 'CFPlus::UI::Toplevel'; 1191our @ISA = 'CFPlus::UI::Toplevel';
… …
1030 on_activate => sub { $this->destroy; 1 }, 1238 on_activate => sub { $this->destroy; 1 },
1031 ; 1239 ;
1032 1240
1033 $self->update_options; 1241 $self->update_options;
1034 1242
1035 $self->{id} = $self->{conn}->send_ext_req ( 1243 $self->{id} = "npc-channel-" . $self->{conn}->token;
1036 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1244 $self->{conn}->connect_ext ($self->{id} => sub {
1037 sub { $this && $this->feed (@_) } 1245 $this->feed (@_) if $this;
1038 ); 1246 });
1247
1248 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1039 1249
1040 $self->{entry}->grab_focus; 1250 $self->{entry}->grab_focus;
1041 1251
1042 $self->{textview}->add_paragraph ({ 1252 $self->{textview}->add_paragraph ({
1043 fg => [1, 1, 0, 1], 1253 fg => [1, 1, 0, 1],
… …
1066 ); 1276 );
1067 } 1277 }
1068} 1278}
1069 1279
1070sub feed { 1280sub feed {
1071 my ($self, $msg) = @_; 1281 my ($self, $type, @arg) = @_;
1072 1282
1073 CFPlus::weaken $self; 1283 CFPlus::weaken $self;
1074 1284
1075 if ($msg->{msgtype} eq "reply") { 1285 if ($type eq "update") {
1286 my (%info) = @arg;
1287
1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1288 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1289 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1078
1079 my $text = "\n" . CFPlus::asxml $msg->{msg};
1080 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1081 my @link;
1082 $text =~ s{
1083 ($match)
1084 }{
1085 my $kw = $1;
1086
1087 push @link, new CFPlus::UI::Label
1088 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1089 can_hover => 1,
1090 can_events => 1,
1091 padding_x => 0,
1092 padding_y => 0,
1093 on_button_up => sub {
1094 $self->send ($kw);
1095 };
1096
1097 "\x{fffc}"
1098 }giex;
1099 1290
1291 if (exists $info{msg}) {
1292 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1293 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1294 my @link;
1295 $text =~ s{
1296 ($match)
1297 }{
1298 my $kw = $1;
1299
1300 push @link, new CFPlus::UI::Label
1301 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1302 can_hover => 1,
1303 can_events => 1,
1304 padding_x => 0,
1305 padding_y => 0,
1306 on_button_up => sub {
1307 $self->send ($kw);
1308 };
1309
1310 "\x{fffc}"
1311 }giex;
1312
1100 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1313 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1101 $self->{textview}->scroll_to_bottom; 1314 $self->{textview}->scroll_to_bottom;
1315 }
1316
1102 $self->update_options; 1317 $self->update_options;
1103 } else { 1318 } else {
1104 $self->destroy; 1319 $self->destroy;
1105 } 1320 }
1106 1321
… …
1111 my ($self, $msg) = @_; 1326 my ($self, $msg) = @_;
1112 1327
1113 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1328 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1114 $self->{textview}->scroll_to_bottom; 1329 $self->{textview}->scroll_to_bottom;
1115 1330
1116 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1331 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1117} 1332}
1118 1333
1119sub destroy { 1334sub destroy {
1120 my ($self) = @_; 1335 my ($self) = @_;
1121 1336
1122 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1337 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1123 1338
1124 if ($self->{conn}) { 1339 if ($self->{conn}) {
1125 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1340 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1126 delete $self->{conn}{npc_dialog}; 1341 delete $self->{conn}{npc_dialog};
1127 $self->{conn}->disconnect_ext ($self->{id}); 1342 $self->{conn}->disconnect_ext ($self->{id});
1128 } 1343 }
1129 1344
1130 $self->SUPER::destroy; 1345 $self->SUPER::destroy;

Diff Legend

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