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.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.152 by root, Mon Aug 13 14:15:09 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,#d#
26 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
27 }, 28 },
28 ); 29 );
29 30
30 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
47 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
48 @args 49 @args
49 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
51 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
52 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
53 my ($cap) = @_; 59 my (%cap) = @_;
54 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
55 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 66 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
60 69
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
65 } 74 }
66 } 75 }
67 }); 76 });
68 77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
200
69 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 202 for @cmd_help;
71 203
72 { 204 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88 220
89 $self 221 $self
90} 222}
91 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
92sub logprint { 233sub logprint {
93 my ($self, @a) = @_; 234 my ($self, @a) = @_;
94 235
95 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96 my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98 open my $fh, ">>:utf8", $path
99 or die "Couldn't open logfile $path: $!";
100
101 $fh->autoflush (1);
102
103 $fh;
104 };
105
106 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111 print {$self->{log_fh}} "$ts ", @a, "\n";
112} 237}
113 238
114sub _stat_numdiff { 239sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
116 241
… …
249 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
250 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
251 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255 $rng =~ s/^Range: //; # thank you so much dear server
256 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
257 my $title = $stats->{+CS_STAT_TITLE}; 380 my $title = $stats->{+CS_STAT_TITLE};
258 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
259 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
260 383
261 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
281 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
282 405
283 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
284 $sktbl->clear; 407 $sktbl->clear;
285 408
409 my @add;
410
411 push @add,
286 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
287 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
288 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
289 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
290 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
291 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
292 419
293 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
294 421
295 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
324 } 451 }
325 452
326 1 453 1
327 }; 454 };
328 455
456 push @add,
329 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
331 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
332 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
333 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
334 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
335 464
336 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
337 } 466 }
467
468 $sktbl->add_at (@add);
338 } 469 }
339 470
340 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
375} 506}
376 507
377sub feed_map1a { 508sub feed_map1a {
378 my ($self, $data) = @_; 509 my ($self, $data) = @_;
379 510
380 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
381 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
382} 541}
383 542
384sub magicmap { 543sub magicmap {
385 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
386 545
… …
418 do { 577 do {
419 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
420 or return; 579 or return;
421 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
422 581
423 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
424 my ($data) = @_; 583 my ($exists) = @_;
425 584
426 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
427 586
428 $self->set_texture ($id => $data) 587 if ($exists) {
429 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
430 591
431 $self->bg_fetch; 592 $self->bg_fetch;
432 }; 593 };
433} 594}
434 595
435sub load_map($$$) { 596sub load_map($$$) {
436 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
437 598
438 my $gen = $self->{map_change_gen}; 599 my $gen = $self->{map_change_gen};
439 600
440 CFPlus::DB::get $self->{mapcache} => $hash, sub { 601 my $cb = sub {
441 return unless $gen == $self->{map_change_gen}; 602 return unless $gen == $self->{map_change_gen};
442 603
443 my ($data) = @_; 604 my ($data) = @_;
444 605
445 if (defined $data) { 606 if (defined $data) {
607 $self->{map_cache_new}{$hash} = \$data;
608
446 $data = Compress::LZF::decompress $data; 609 my $data = Compress::LZF::decompress $data;
447 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
448 610
449 my $inprogress = @{ $self->{bg_fetch} || [] }; 611 my $inprogress = @{ $self->{bg_fetch} || [] };
450 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 612 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451 $self->bg_fetch unless $inprogress; 613 $self->bg_fetch unless $inprogress;
452 } 614 }
453 }; 615 };
616
617 if (my $rdata = $self->{map_cache_old}{$hash}) {
618 $cb->($$rdata);
619 } else {
620 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
621 }
454} 622}
455 623
456# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 624# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
457# (server resource,s latency, bandwidth), so this hack is warranted. 625# (server resource,s latency, bandwidth), so this hack is warranted.
458# the right fix is to make real tiled maps with an overview file 626# the right fix is to make real tiled maps with an overview file
… …
551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 719 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
552 720
553 $self->flush_map; 721 $self->flush_map;
554 722
555 ++$self->{map_change_gen}; 723 ++$self->{map_change_gen};
724 $self->{map_cache_old} = delete $self->{map_cache_new};
556 725
557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 726 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
558 727
559 my $mapmapw = $self->{mapmap}->{w}; 728 my $mapmapw = $self->{mapmap}->{w};
560 my $mapmaph = $self->{mapmap}->{h}; 729 my $mapmaph = $self->{mapmap}->{h};
… …
579} 748}
580 749
581sub face_find { 750sub face_find {
582 my ($self, $facenum, $face, $cb) = @_; 751 my ($self, $facenum, $face, $cb) = @_;
583 752
584 my $hash = "$face->{chksum},$face->{name}"; 753 if ($face->{type} == 0) { # FT_FACE
585
586 my $id = CFPlus::DB::get_tile_id_sync $hash; 754 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
587 755
588 $face->{id} = $id; 756 $face->{id} = $id;
589 $self->{faceid}[$facenum] = $id; 757 $self->{faceid}[$facenum] = $id;
590 758
591 $self->{map}->set_tileid ($facenum => $id); 759 $self->{map}->set_tileid ($facenum => $id);
592 760
593 CFPlus::DB::get tilecache => $id, $cb; 761 CFPlus::DB::get tilecache => $id, $cb;
762
763 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb;
765 }
594} 766}
595 767
596sub face_update { 768sub face_update {
597 my ($self, $facenum, $face, $changed) = @_; 769 my ($self, $facenum, $face, $changed) = @_;
598 770
771 if ($face->{type} == 0) { # FT_FACE
599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600 if $changed; 773 if $changed;
601 774
602 $self->set_texture ($face->{id} => delete $face->{image}); 775 $self->have_tile ($face->{id});
776
777 } elsif ($face->{type} & 1) { # split metadata
778 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json);
781
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 }
787
788 ::add_license ($face);
789
790 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed;
795
796 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed;
802
803 &::audio_sound_push ($facenum);
804 }
805
806 }
603} 807}
604 808
605sub smooth_update { 809sub smooth_update {
606 my ($self, $facenum, $face) = @_; 810 my ($self, $facenum, $face) = @_;
607 811
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609} 813}
610 814
611sub set_texture { 815sub have_tile {
816 my ($self, $tile) = @_;
817
818 return unless $self->{map};
819
820 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1;
823
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
825}
826
827sub connect_face_update {
612 my ($self, $id, $data) = @_; 828 my ($self, $id, $cb) = @_;
613 829
614 $self->{texture}[$id] = my $tex = 830 push @{$self->{face_cb}{$id}}, $cb;
615 new_from_image CFPlus::Texture
616 $data, minify => 1, mipmap => 1;
617 831
618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 832 CFPlus::guard {
619 $self->{map_widget}->update; 833 @{$self->{face_cb}{$id}}
834 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}};
836 }
620} 837}
621 838
622sub sound_play { 839sub sound_play {
623 my ($self, $x, $y, $soundnum, $type) = @_; 840 my ($self, $type, $face, $dx, $dy, $vol) = @_;
624 841
625 $self->{sound_play}->($x, $y, $soundnum, $type); 842 &::audio_sound_play ($face, $dx, $dy, $vol)
843 unless $type & 1; # odd types are silent for future expansion
626} 844}
627 845
628my $LAST_QUERY; # server is stupid, stupid, stupid 846my $LAST_QUERY; # server is stupid, stupid, stupid
629 847
630sub query { 848sub query {
… …
633 $prompt = $LAST_QUERY unless length $prompt; 851 $prompt = $LAST_QUERY unless length $prompt;
634 $LAST_QUERY = $prompt; 852 $LAST_QUERY = $prompt;
635 853
636 $self->{query}-> ($self, $flags, $prompt); 854 $self->{query}-> ($self, $flags, $prompt);
637} 855}
856
857sub sanitise_xml($) {
858 local $_ = shift;
859
860 # we now weed out all tags we do not support
861 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
862 # now all entities
863 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
864
865 # handle some elements
866 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
867 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
868
869 $_
870}
871
872our %NAME_TO_COLOR = (
873 black => 0,
874 white => 1,
875 darkblue => 2,
876 red => 3,
877 orange => 4,
878 lightblue => 5,
879 darkorange => 6,
880 green => 7,
881 darkgreen => 8,
882 grey => 9,
883 brown => 10,
884 yellow => 11,
885 tan => 12,
886);
638 887
639our @CF_COLOR = ( 888our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 889 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00], 890 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 891 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
… …
650 [0.75, 0.61, 0.20], 899 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26], 900 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41], 901 [0.74, 0.65, 0.41],
653); 902);
654 903
655sub drawinfo { 904sub msg {
656 my ($self, $color, $text) = @_; 905 my ($self, $color, $type, $text, @extra) = @_;
657 906
658 my $fg = $CF_COLOR[$color % @CF_COLOR]; 907 $text = sanitise_xml $text;
659 908
909 if (my $cb = $self->{cb_msg}{$type}) {
910 $_->($self, $color, $type, $text, @extra) for values %$cb;
911 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
912 $type =~ s/-/_/g;
913 $self->{$type} = $text;
914 } else {
660 $self->logprint ("info: ", $text); 915 $self->logprint ("msg: ", $text);
916 return if $color < 0; # negative color == ignore if not understood
661 917
918 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
919
662 ## try to create single paragraphs of multiple lines sent by the server 920 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers 921 # no longer neecssary with TRT servers
664 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 922 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
665 923
666 $text = CFPlus::asxml $text; 924 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
669
670 ::message ({ fg => $fg, markup => $_ })
671 for split /\n/, $text; 925 for split /\n/, $text;
672 926
673 $self->{statusbox}->add ($text, 927 $self->{statusbox}->add ($text,
674 group => $text, 928 group => $text,
675 fg => $fg, 929 fg => $fg,
676 timeout => $color >= 2 ? 180 : 10, 930 timeout => $color >= 2 ? 180 : 10,
677 tooltip_font => $::FONT_FIXED, 931 tooltip_font => $::FONT_FIXED,
678 ); 932 );
679} 933 }
680
681sub drawextinfo {
682 my ($self, $color, $type, $subtype, $message) = @_;
683
684 $self->drawinfo ($color, $message);
685} 934}
686 935
687sub spell_add { 936sub spell_add {
688 my ($self, $spell) = @_; 937 my ($self, $spell) = @_;
689 938
… …
737 $self->{map_widget}->clr_commands; 986 $self->{map_widget}->clr_commands;
738 987
739 ::stop_game (); 988 ::stop_game ();
740} 989}
741 990
742sub image_info {
743 my ($self, $numfaces) = @_;
744
745 $self->{num_faces} = $numfaces;
746 $self->{face_prefetch} = [1 .. $numfaces];
747 $self->face_prefetch;
748}
749
750sub face_prefetch {
751 my ($self) = @_;
752
753 return unless $::CFG->{face_prefetch};
754
755 if ($self->{num_faces}) {
756 return if @{ $self->{send_queue} || [] };
757 my $todo = @{ $self->{face_prefetch} }
758 or return;
759
760 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762 $self->send ("requestinfo image_sums $face $face");
763
764 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766 } elsif (!exists $self->{num_faces}) {
767 $self->send ("requestinfo image_info");
768
769 $self->{num_faces} = 0;
770
771 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773 }
774}
775
776sub update_floorbox { 991sub update_floorbox {
777 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 992 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778 return unless $::CONN; 993 return unless $::CONN;
779 994
780 $::FLOORBOX->clear; 995 $::FLOORBOX->clear;
996
997 my @add;
781 998
782 my $row; 999 my $row;
783 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1000 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
784 if ($row < 6) { 1001 if ($row < 6) {
785 local $_->{face_widget}; # hack to force recreation of widget 1002 local $_->{face_widget}; # hack to force recreation of widget
786 local $_->{desc_widget}; # hack to force recreation of widget 1003 local $_->{desc_widget}; # hack to force recreation of widget
787 CFPlus::Item::update_widgets $_; 1004 CFPlus::Item::update_widgets $_;
788 1005
1006 push @add,
789 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1007 0, $row, $_->{face_widget},
790 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1008 1, $row, $_->{desc_widget};
791 1009
792 $row++; 1010 $row++;
793 } else { 1011 } else {
794 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1012 push @add, 1, $row, new CFPlus::UI::Button
795 text => "More...", 1013 text => "More...",
796 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1014 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797 ); 1015 ;
798 last; 1016 last;
799 } 1017 }
800 } 1018 }
801 if ($::CONN->{open_container}) { 1019 if ($::CONN->{open_container}) {
802 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1020 push @add, 1, $row++, new CFPlus::UI::Button
803 text => "Close container", 1021 text => "Close container",
804 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1022 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805 ); 1023 ;
806 } 1024 }
807 });
808 1025
1026 $::FLOORBOX->add_at (@add);
1027 });
1028
809 $::WANT_REFRESH++; 1029 $::WANT_REFRESH->start;
810} 1030}
811 1031
812sub set_opencont { 1032sub set_opencont {
813 my ($conn, $tag, $name) = @_; 1033 my ($conn, $tag, $name) = @_;
814 $conn->{open_container} = $tag; 1034 $conn->{open_container} = $tag;
… …
931 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1151 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
932 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1152 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933 . "map size $self->{mapw}×$self->{maph}\n" 1153 . "map size $self->{mapw}×$self->{maph}\n"
934 ); 1154 );
935 1155
936 ::setup_build_button ($self->{editor_support}->{builder_ui});
937} 1156}
938 1157
939sub logged_in { 1158sub logged_in {
940 my ($self) = @_; 1159 my ($self) = @_;
941 1160
942 $self->send_ext_req (cfplus_support => version => 1, sub { 1161 $self->send_ext_req (cfplus_support => version => 2, sub {
1162 my (%msg) = @_;
1163
943 $self->{cfplus_ext} = $_[0]{version}; 1164 $self->{cfplus_ext} = $msg{version};
944 $self->update_server_info; 1165 $self->update_server_info;
945 1166
946 if ($self->{cfplus_ext} >= 2) { 1167 if ($self->{cfplus_ext} >= 2) {
947 $self->send_ext_req ("editor_support", sub { 1168 $self->send_ext_req ("editor_support", sub {
948 $self->{editor_support} = $_[0]; 1169 $self->{editor_support} = { @_ };
949 $self->update_server_info; 1170 $self->update_server_info;
950 1171
951 0 1172 0
952 }); 1173 });
953 } 1174 }
… …
961 $self->send_command ("output-count $::CFG->{output_count}"); 1182 $self->send_command ("output-count $::CFG->{output_count}");
962 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1183 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
963 $self->send_command ("pickup $::CFG->{pickup}"); 1184 $self->send_command ("pickup $::CFG->{pickup}");
964} 1185}
965 1186
966sub buildat {
967 my ($self, $builditem, $x, $y) = @_;
968
969 if ($self->{cfplus_ext}) {
970 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971 }
972}
973
974sub lookat { 1187sub lookat {
975 my ($self, $x, $y) = @_; 1188 my ($self, $x, $y) = @_;
976 1189
977 if ($self->{cfplus_ext}) { 1190 if ($self->{cfplus_ext}) {
978 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1191 $self->send_ext_req (lookat => $x, $y, sub {
979 my ($msg) = @_; 1192 my (%msg) = @_;
980 1193
981 if (exists $msg->{npc_dialog}) { 1194 if (exists $msg{npc_dialog}) {
982 # start npc chat dialog 1195 # start npc chat dialog
983 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1196 $self->{npc_dialog} = new CFPlus::NPCDialog::
984 dx => $x, 1197 token => $msg{npc_dialog},
985 dy => $y,
986 title => "$msg->{npc_dialog} (NPC)", 1198 title => "$msg{npc_dialog}[0] (NPC)",
987 conn => $self, 1199 conn => $self,
988 ; 1200 ;
989 } 1201 }
990 }); 1202 });
991 } 1203 }
… …
998 1210
999 (delete $self->{npc_dialog})->destroy 1211 (delete $self->{npc_dialog})->destroy
1000 if $self->{npc_dialog}; 1212 if $self->{npc_dialog};
1001 1213
1002 $self->SUPER::destroy; 1214 $self->SUPER::destroy;
1215
1216 %$self = ();
1003} 1217}
1004 1218
1005package CFPlus::NPCDialog; 1219package CFPlus::NPCDialog;
1006 1220
1007our @ISA = 'CFPlus::UI::Toplevel'; 1221our @ISA = 'CFPlus::UI::Toplevel';
… …
1054 on_activate => sub { $this->destroy; 1 }, 1268 on_activate => sub { $this->destroy; 1 },
1055 ; 1269 ;
1056 1270
1057 $self->update_options; 1271 $self->update_options;
1058 1272
1059 $self->{id} = $self->{conn}->send_ext_req ( 1273 $self->{id} = "npc-channel-" . $self->{conn}->token;
1060 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1274 $self->{conn}->connect_ext ($self->{id} => sub {
1061 sub { $this && $this->feed (@_) } 1275 $this->feed (@_) if $this;
1062 ); 1276 });
1277
1278 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063 1279
1064 $self->{entry}->grab_focus; 1280 $self->{entry}->grab_focus;
1065 1281
1066 $self->{textview}->add_paragraph ({ 1282 $self->{textview}->add_paragraph ({
1067 fg => [1, 1, 0, 1], 1283 fg => [1, 1, 0, 1],
… …
1090 ); 1306 );
1091 } 1307 }
1092} 1308}
1093 1309
1094sub feed { 1310sub feed {
1095 my ($self, $msg) = @_; 1311 my ($self, $type, @arg) = @_;
1096 1312
1097 CFPlus::weaken $self; 1313 CFPlus::weaken $self;
1098 1314
1099 if ($msg->{msgtype} eq "reply") { 1315 if ($type eq "update") {
1316 my (%info) = @arg;
1317
1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1318 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1319 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1102
1103 my $text = "\n" . CFPlus::asxml $msg->{msg};
1104 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105 my @link;
1106 $text =~ s{
1107 ($match)
1108 }{
1109 my $kw = $1;
1110
1111 push @link, new CFPlus::UI::Label
1112 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1113 can_hover => 1,
1114 can_events => 1,
1115 padding_x => 0,
1116 padding_y => 0,
1117 on_button_up => sub {
1118 $self->send ($kw);
1119 };
1120
1121 "\x{fffc}"
1122 }giex;
1123 1320
1321 if (exists $info{msg}) {
1322 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1323 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1324 my @link;
1325 $text =~ s{
1326 ($match)
1327 }{
1328 my $kw = $1;
1329
1330 push @link, new CFPlus::UI::Label
1331 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1332 can_hover => 1,
1333 can_events => 1,
1334 padding_x => 0,
1335 padding_y => 0,
1336 on_button_up => sub {
1337 $self->send ($kw);
1338 };
1339
1340 "\x{fffc}"
1341 }giex;
1342
1124 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1343 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125 $self->{textview}->scroll_to_bottom; 1344 $self->{textview}->scroll_to_bottom;
1345 }
1346
1126 $self->update_options; 1347 $self->update_options;
1127 } else { 1348 } else {
1128 $self->destroy; 1349 $self->destroy;
1129 } 1350 }
1130 1351
… …
1135 my ($self, $msg) = @_; 1356 my ($self, $msg) = @_;
1136 1357
1137 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1358 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1138 $self->{textview}->scroll_to_bottom; 1359 $self->{textview}->scroll_to_bottom;
1139 1360
1140 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1361 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1141} 1362}
1142 1363
1143sub destroy { 1364sub destroy {
1144 my ($self) = @_; 1365 my ($self) = @_;
1145 1366
1146 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1367 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1147 1368
1148 if ($self->{conn}) { 1369 if ($self->{conn}) {
1149 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1370 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1150 delete $self->{conn}{npc_dialog}; 1371 delete $self->{conn}{npc_dialog};
1151 $self->{conn}->disconnect_ext ($self->{id}); 1372 $self->{conn}->disconnect_ext ($self->{id});
1152 } 1373 }
1153 1374
1154 $self->SUPER::destroy; 1375 $self->SUPER::destroy;

Diff Legend

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