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.99 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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 (@_, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 smoothing => 1, 25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
30 32
… …
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 (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
51 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
52 my ($cap) = @_; 59 my (%cap) = @_;
53 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
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
… …
63 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
64 } 78 }
65 } 79 }
66 }); 80 });
67 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
68 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 206 for @cmd_help;
70 207
71 { 208 {
72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
89} 226}
90 227
91sub logprint { 228sub logprint {
92 my ($self, @a) = @_; 229 my ($self, @a) = @_;
93 230
94 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
95 my $path = "$Crossfire::VARDIR/log.$self->{host}";
96
97 open my $fh, ">>:utf8", $path
98 or die "Couldn't open logfile $path: $!";
99
100 $fh->autoflush (1);
101
102 $fh;
103 };
104
105 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
106
107 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
108 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
109
110 print {$self->{log_fh}} "$ts ", @a, "\n";
111} 232}
112 233
113sub _stat_numdiff { 234sub _stat_numdiff {
114 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
115 236
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 369 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 370 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 371 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 374 $::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}; 375 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 376 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 377 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 378
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 379 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
281 400
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 402 $sktbl->clear;
284 403
404 my @add;
405
406 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
291 414
292 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>";
293 416
294 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);
295 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);
… …
323 } 446 }
324 447
325 1 448 1
326 }; 449 };
327 450
451 push @add,
328 $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
329 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),
330 $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
331 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),
332 $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,
333 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 ;
334 459
335 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
336 } 461 }
462
463 $sktbl->add_at (@add);
337 } 464 }
338 465
339 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
417 do { 544 do {
418 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
419 or return; 546 or return;
420 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
421 548
422 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
423 my ($data) = @_; 550 my ($exists) = @_;
424 551
425 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
426 553
427 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
428 if defined $data; 555 if $exists;
429 556
430 $self->bg_fetch; 557 $self->bg_fetch;
431 }; 558 };
432} 559}
433 560
434sub load_map($$$) { 561sub load_map($$$) {
435 my ($self, $hash, $x, $y) = @_; 562 my ($self, $hash, $x, $y) = @_;
436 563
564 my $gen = $self->{map_change_gen};
565
437 CFPlus::DB::get $self->{mapcache} => $hash, sub { 566 CFPlus::DB::get $self->{mapcache} => $hash, sub {
567 return unless $gen == $self->{map_change_gen};
568
438 my ($data) = @_; 569 my ($data) = @_;
439 570
440 if (defined $data) { 571 if (defined $data) {
441 $data = Compress::LZF::decompress $data; 572 $data = Compress::LZF::decompress $data;
442 #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#
… …
517 648
518 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 649 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
519 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 650 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
520 651
521 } else { 652 } else {
653 my $gen = $self->{map_change_gen};
522 $self->send_mapinfo ("spatial $path$tile", sub { 654 $self->send_mapinfo ("spatial $path$tile", sub {
655 return unless $gen == $self->{map_change_gen};
656
523 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 657 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
524 658
525 return if $mode ne "spatial"; 659 return if $mode ne "spatial";
526 660
527 $x += $self->{map}->ox; 661 $x += $self->{map}->ox;
… …
541 675
542sub map_change { 676sub map_change {
543 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
544 678
545 $self->flush_map; 679 $self->flush_map;
680
681 ++$self->{map_change_gen};
546 682
547 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
548 684
549 my $mapmapw = $self->{mapmap}->{w}; 685 my $mapmapw = $self->{mapmap}->{w};
550 my $mapmaph = $self->{mapmap}->{h}; 686 my $mapmaph = $self->{mapmap}->{h};
… …
569} 705}
570 706
571sub face_find { 707sub face_find {
572 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
573 709
574 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
575
576 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
577 712
578 $face->{id} = $id; 713 $face->{id} = $id;
579 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
580 715
581 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
582 717
583 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 }
584} 724}
585 725
586sub face_update { 726sub face_update {
587 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
588 728
729 if ($face->{type} == 0) { # FT_FACE
589 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
590 if $changed; 731 if $changed;
591 732
592 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
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 }
593} 774}
594 775
595sub smooth_update { 776sub smooth_update {
596 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
597 778
598 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
599} 780}
600 781
601sub set_texture { 782sub have_tile {
602 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
603 784
785 return unless $self->{map};
786
604 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
605 new_from_image CFPlus::Texture 788 new CFPlus::Texture
606 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
607 790
608 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
609 $self->{map_widget}->update; 792}
793
794sub connect_face_update {
795 my ($self, $id, $cb) = @_;
796
797 push @{$self->{face_cb}{$id}}, $cb;
798
799 CFPlus::guard {
800 @{$self->{face_cb}{$id}}
801 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}};
803 }
610} 804}
611 805
612sub sound_play { 806sub sound_play {
613 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
614 808
615 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
616} 811}
617 812
618my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
619 814
620sub query { 815sub query {
… …
624 $LAST_QUERY = $prompt; 819 $LAST_QUERY = $prompt;
625 820
626 $self->{query}-> ($self, $flags, $prompt); 821 $self->{query}-> ($self, $flags, $prompt);
627} 822}
628 823
629sub drawinfo { 824sub sanitise_xml($) {
630 my ($self, $color, $text) = @_; 825 local $_ = shift;
631 826
632 my @color = ( 827 # we now weed out all tags we do not support
828 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
829 # now all entities
830 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
831
832 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
835
836 $_
837}
838
839our %NAME_TO_COLOR = (
840 black => 0,
841 white => 1,
842 darkblue => 2,
843 red => 3,
844 orange => 4,
845 lightblue => 5,
846 darkorange => 6,
847 green => 7,
848 darkgreen => 8,
849 grey => 9,
850 brown => 10,
851 yellow => 11,
852 tan => 12,
853);
854
855our @CF_COLOR = (
633 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 856 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
634 [1.00, 1.00, 1.00], 857 [1.00, 1.00, 1.00],
635 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 858 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
636 [1.00, 0.00, 0.00], 859 [1.00, 0.00, 0.00],
637 [1.00, 0.54, 0.00], 860 [1.00, 0.54, 0.00],
638 [0.11, 0.56, 1.00], 861 [0.11, 0.56, 1.00],
639 [0.93, 0.46, 0.00], 862 [0.93, 0.46, 0.00],
640 [0.18, 0.54, 0.34], 863 [0.18, 0.54, 0.34],
641 [0.56, 0.73, 0.56], 864 [0.56, 0.73, 0.56],
642 [0.80, 0.80, 0.80], 865 [0.80, 0.80, 0.80],
643 [0.75, 0.61, 0.20], 866 [0.75, 0.61, 0.20],
644 [0.99, 0.77, 0.26], 867 [0.99, 0.77, 0.26],
645 [0.74, 0.65, 0.41], 868 [0.74, 0.65, 0.41],
646 ); 869);
647 870
648 my $fg = $color[$color % @color]; 871sub msg {
872 my ($self, $color, $type, $text, @extra) = @_;
649 873
874 $text = sanitise_xml $text;
875
876 if (my $cb = $self->{cb_msg}{$type}) {
877 $_->($self, $color, $type, $text, @extra) for values %$cb;
878 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
879 $type =~ s/-/_/g;
880 $self->{$type} = $text;
881 } else {
650 $self->logprint ("info: ", $text); 882 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood
651 884
885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
886
652 # try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers
653 $text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
654 890
655 $text = CFPlus::asxml $text; 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
656 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
657 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
658
659 ::message ({ fg => $fg, markup => $_ })
660 for split /\n/, $text; 892 for split /\n/, $text;
661 893
662 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
663 group => $text, 895 group => $text,
664 fg => $fg, 896 fg => $fg,
665 timeout => $color >= 2 ? 180 : 10, 897 timeout => $color >= 2 ? 180 : 10,
666 tooltip_font => $::FONT_FIXED, 898 tooltip_font => $::FONT_FIXED,
667 ); 899 );
668} 900 }
669
670sub drawextinfo {
671 my ($self, $color, $type, $subtype, $message) = @_;
672
673 $self->drawinfo ($color, $message);
674} 901}
675 902
676sub spell_add { 903sub spell_add {
677 my ($self, $spell) = @_; 904 my ($self, $spell) = @_;
678 905
… …
726 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
727 954
728 ::stop_game (); 955 ::stop_game ();
729} 956}
730 957
731sub image_info {
732 my ($self, $numfaces) = @_;
733
734 $self->{num_faces} = $numfaces;
735 $self->{face_prefetch} = [1 .. $numfaces];
736 $self->face_prefetch;
737}
738
739sub face_prefetch {
740 my ($self) = @_;
741
742 return unless $::CFG->{face_prefetch};
743
744 if ($self->{num_faces}) {
745 return if @{ $self->{send_queue} || [] };
746 my $todo = @{ $self->{face_prefetch} }
747 or return;
748
749 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
750
751 $self->send ("requestinfo image_sums $face $face");
752
753 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
754 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
755 } elsif (!exists $self->{num_faces}) {
756 $self->send ("requestinfo image_info");
757
758 $self->{num_faces} = 0;
759
760 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
761 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
762 }
763}
764
765sub update_floorbox { 958sub update_floorbox {
766 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
767 return unless $::CONN; 960 return unless $::CONN;
768 961
769 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
770 965
771 my $row; 966 my $row;
772 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
773 if ($row < 6) { 968 if ($row < 6) {
774 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
775 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
776 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
777 972
973 push @add,
778 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
779 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
780 976
781 $row++; 977 $row++;
782 } else { 978 } else {
783 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
784 text => "More...", 980 text => "More...",
785 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
786 ); 982 ;
787 last; 983 last;
788 } 984 }
789 } 985 }
790 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
791 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
792 text => "Close container", 988 text => "Close container",
793 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
794 ); 990 ;
795 } 991 }
992
993 $::FLOORBOX->add_at (@add);
796 }); 994 });
797 995
798 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
799} 997}
800 998
… …
911 $::SERVER_INFO->set_markup ( 1109 $::SERVER_INFO->set_markup (
912 "server <tt>$self->{host}:$self->{port}</tt>\n" 1110 "server <tt>$self->{host}:$self->{port}</tt>\n"
913 . "protocol version <tt>$self->{version}</tt>\n" 1111 . "protocol version <tt>$self->{version}</tt>\n"
914 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1112 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
915 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
916 . "editing support $yesno[!!$self->{editor_support}]\n" 1115 . "editing support $yesno[!!$self->{editor_support}]\n"
917 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
918 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
919 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
920 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
921 ); 1121 );
922 1122
923 ::setup_build_button ($self->{editor_support}->{builder_ui});
924} 1123}
925 1124
926sub logged_in { 1125sub logged_in {
927 my ($self) = @_; 1126 my ($self) = @_;
928 1127
929 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
930 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
931 $self->update_server_info; 1132 $self->update_server_info;
932 1133
933 if ($self->{cfplus_ext} >= 2) { 1134 if ($self->{cfplus_ext} >= 2) {
934 $self->send_ext_req ("editor_support", sub { 1135 $self->send_ext_req ("editor_support", sub {
935 $self->{editor_support} = $_[0]; 1136 $self->{editor_support} = { @_ };
936 $self->update_server_info; 1137 $self->update_server_info;
937 1138
938 0 1139 0
939 }); 1140 });
940 } 1141 }
… …
948 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
949 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
950 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
951} 1152}
952 1153
953sub buildat {
954 my ($self, $builditem, $x, $y) = @_;
955
956 if ($self->{cfplus_ext}) {
957 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
958 }
959}
960
961sub lookat { 1154sub lookat {
962 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
963 1156
964 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
965 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
966 my ($msg) = @_; 1159 my (%msg) = @_;
967 1160
968 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
969 # start npc chat dialog 1162 # start npc chat dialog
970 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
971 dx => $x, 1164 token => $msg{npc_dialog},
972 dy => $y,
973 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
974 conn => $self, 1166 conn => $self,
975 ; 1167 ;
976 } 1168 }
977 }); 1169 });
978 } 1170 }
… …
985 1177
986 (delete $self->{npc_dialog})->destroy 1178 (delete $self->{npc_dialog})->destroy
987 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
988 1180
989 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
990} 1184}
991 1185
992package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
993 1187
994our @ISA = 'CFPlus::UI::Toplevel'; 1188our @ISA = 'CFPlus::UI::Toplevel';
… …
1041 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
1042 ; 1236 ;
1043 1237
1044 $self->update_options; 1238 $self->update_options;
1045 1239
1046 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
1047 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
1048 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
1049 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1050 1246
1051 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
1052 1248
1053 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
1054 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
… …
1077 ); 1273 );
1078 } 1274 }
1079} 1275}
1080 1276
1081sub feed { 1277sub feed {
1082 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1083 1279
1084 CFPlus::weaken $self; 1280 CFPlus::weaken $self;
1085 1281
1086 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1087 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1088 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1089
1090 my $text = "\n" . CFPlus::asxml $msg->{msg};
1091 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1092 my @link;
1093 $text =~ s{
1094 ($match)
1095 }{
1096 my $kw = $1;
1097
1098 push @link, new CFPlus::UI::Label
1099 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1100 can_hover => 1,
1101 can_events => 1,
1102 padding_x => 0,
1103 padding_y => 0,
1104 on_button_up => sub {
1105 $self->send ($kw);
1106 };
1107
1108 "\x{fffc}"
1109 }giex;
1110 1287
1288 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link;
1292 $text =~ s{
1293 ($match)
1294 }{
1295 my $kw = $1;
1296
1297 push @link, new CFPlus::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1,
1300 can_events => 1,
1301 padding_x => 0,
1302 padding_y => 0,
1303 on_button_up => sub {
1304 $self->send ($kw);
1305 };
1306
1307 "\x{fffc}"
1308 }giex;
1309
1111 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1112 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1113 $self->update_options; 1314 $self->update_options;
1114 } else { 1315 } else {
1115 $self->destroy; 1316 $self->destroy;
1116 } 1317 }
1117 1318
… …
1122 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1123 1324
1124 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1125 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1126 1327
1127 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1128} 1329}
1129 1330
1130sub destroy { 1331sub destroy {
1131 my ($self) = @_; 1332 my ($self) = @_;
1132 1333
1133 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1134 1335
1135 if ($self->{conn}) { 1336 if ($self->{conn}) {
1136 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1137 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1138 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1139 } 1340 }
1140 1341
1141 $self->SUPER::destroy; 1342 $self->SUPER::destroy;

Diff Legend

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