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.148 by root, Fri Aug 10 04:02:13 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#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 $self->update_fx_want;
63
49 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default; 66 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
54 69
… …
58 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
59 } 74 }
60 } 75 }
61 }); 76 });
62 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
63 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
64 for @cmd_help; 202 for @cmd_help;
65 203
66 { 204 {
67 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
82 220
83 $self 221 $self
84} 222}
85 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
86sub logprint { 233sub logprint {
87 my ($self, @a) = @_; 234 my ($self, @a) = @_;
88 235
89 $self->{log_fh} ||= do { 236 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} 237}
107 238
108sub _stat_numdiff { 239sub _stat_numdiff {
109 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
110 241
… …
243 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
244 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
245 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
246 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
247 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
248 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::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}; 380 my $title = $stats->{+CS_STAT_TITLE};
252 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
253 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
254 383
255 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
275 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
276 405
277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
278 $sktbl->clear; 407 $sktbl->clear;
279 408
409 my @add;
410
411 push @add,
280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
286 419
287 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>";
288 421
289 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);
290 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);
… …
318 } 451 }
319 452
320 1 453 1
321 }; 454 };
322 455
456 push @add,
323 $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
324 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),
325 $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
326 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),
327 $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,
328 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 ;
329 464
330 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
331 } 466 }
467
468 $sktbl->add_at (@add);
332 } 469 }
333 470
334 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
369} 506}
370 507
371sub feed_map1a { 508sub feed_map1a {
372 my ($self, $data) = @_; 509 my ($self, $data) = @_;
373 510
374 $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 {
375 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
376} 541}
377 542
378sub magicmap { 543sub magicmap {
379 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
380 545
… …
412 do { 577 do {
413 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
414 or return; 579 or return;
415 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
416 581
417 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
418 my ($data) = @_; 583 my ($exists) = @_;
419 584
420 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
421 586
422 $self->set_texture ($id => $data) 587 $self->have_tile ($id)
423 if defined $data; 588 if $exists;
424 589
425 $self->bg_fetch; 590 $self->bg_fetch;
426 }; 591 };
427} 592}
428 593
429sub load_map($$$) { 594sub load_map($$$) {
430 my ($self, $hash, $x, $y) = @_; 595 my ($self, $hash, $x, $y) = @_;
431 596
597 my $gen = $self->{map_change_gen};
598
432 CFPlus::DB::get $self->{mapcache} => $hash, sub { 599 CFPlus::DB::get $self->{mapcache} => $hash, sub {
600 return unless $gen == $self->{map_change_gen};
601
433 my ($data) = @_; 602 my ($data) = @_;
434 603
435 if (defined $data) { 604 if (defined $data) {
436 $data = Compress::LZF::decompress $data; 605 $data = Compress::LZF::decompress $data;
437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 606 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
… …
512 681
513 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 682 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
514 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 683 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
515 684
516 } else { 685 } else {
686 my $gen = $self->{map_change_gen};
517 $self->send_mapinfo ("spatial $path$tile", sub { 687 $self->send_mapinfo ("spatial $path$tile", sub {
688 return unless $gen == $self->{map_change_gen};
689
518 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 690 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
519 691
520 return if $mode ne "spatial"; 692 return if $mode ne "spatial";
521 693
522 $x += $self->{map}->ox; 694 $x += $self->{map}->ox;
… …
536 708
537sub map_change { 709sub map_change {
538 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 710 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
539 711
540 $self->flush_map; 712 $self->flush_map;
713
714 ++$self->{map_change_gen};
541 715
542 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 716 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
543 717
544 my $mapmapw = $self->{mapmap}->{w}; 718 my $mapmapw = $self->{mapmap}->{w};
545 my $mapmaph = $self->{mapmap}->{h}; 719 my $mapmaph = $self->{mapmap}->{h};
… …
564} 738}
565 739
566sub face_find { 740sub face_find {
567 my ($self, $facenum, $face, $cb) = @_; 741 my ($self, $facenum, $face, $cb) = @_;
568 742
569 my $hash = "$face->{chksum},$face->{name}"; 743 if ($face->{type} == 0) { # FT_FACE
570
571 my $id = CFPlus::DB::get_tile_id_sync $hash; 744 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
572 745
573 $face->{id} = $id; 746 $face->{id} = $id;
574 $self->{faceid}[$facenum] = $id; 747 $self->{faceid}[$facenum] = $id;
575 748
576 $self->{map}->set_tileid ($facenum => $id); 749 $self->{map}->set_tileid ($facenum => $id);
577 750
578 CFPlus::DB::get tilecache => $id, $cb; 751 CFPlus::DB::get tilecache => $id, $cb;
752
753 } elsif ($face->{type} & 1) { # with metadata
754 CFPlus::DB::get res_meta => $face->{name}, $cb;
755 }
579} 756}
580 757
581sub face_update { 758sub face_update {
582 my ($self, $facenum, $face, $changed) = @_; 759 my ($self, $facenum, $face, $changed) = @_;
583 760
761 if ($face->{type} == 0) { # FT_FACE
584 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 762 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
585 if $changed; 763 if $changed;
586 764
587 $self->set_texture ($face->{id} => delete $face->{image}); 765 $self->have_tile ($face->{id});
588}
589 766
590sub set_texture { 767 } elsif ($face->{type} & 1) { # split metadata
768 if ($changed) { # new data
769 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
770 $face->{meta} = $self->{json_coder}->decode ($meta_json);
771
772 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
773 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
774 } else {
775 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
776 }
777
778 ::add_license ($face);
779
780 if ($face->{type} == 3) { # FT_MUSIC
781 $self->{music_meta}{$facenum} = $face;
782
783 ::message ({ markup => "downloaded song #$facenum" })
784 if $changed;
785
786 &::audio_music_push ($facenum);
787 } elsif ($face->{type} == 5) { # FT_SOUND
788 $self->{sound_meta}{$facenum} = $face;
789
790 ::message ({ markup => "downloaded sound #$facenum" })
791 if $changed;
792
793 &::audio_sound_push ($facenum);
794 }
795
796 }
797}
798
799sub smooth_update {
800 my ($self, $facenum, $face) = @_;
801
802 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
803}
804
805sub have_tile {
806 my ($self, $tile) = @_;
807
808 return unless $self->{map};
809
810 my $tex = $self->{texture}[$tile] ||=
811 new CFPlus::Texture
812 tile => $tile, minify => 1, mipmap => 1, delay => 1;
813
814 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
815}
816
817sub connect_face_update {
591 my ($self, $id, $data) = @_; 818 my ($self, $id, $cb) = @_;
592 819
593 $self->{texture}[$id] = my $tex = 820 push @{$self->{face_cb}{$id}}, $cb;
594 new_from_image CFPlus::Texture
595 $data, minify => 1, mipmap => 1;
596 821
597 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 822 CFPlus::guard {
598 $self->{map_widget}->update; 823 @{$self->{face_cb}{$id}}
824 = grep $_ != $cb,
825 @{$self->{face_cb}{$id}};
826 }
599} 827}
600 828
601sub sound_play { 829sub sound_play {
602 my ($self, $x, $y, $soundnum, $type) = @_; 830 my ($self, $type, $face, $dx, $dy, $vol) = @_;
603 831
604 $self->{sound_play}->($x, $y, $soundnum, $type); 832 &::audio_sound_play ($face, $dx, $dy, $vol)
833 unless $type & 1; # odd types are silent for future expansion
605} 834}
606 835
607my $LAST_QUERY; # server is stupid, stupid, stupid 836my $LAST_QUERY; # server is stupid, stupid, stupid
608 837
609sub query { 838sub query {
… …
613 $LAST_QUERY = $prompt; 842 $LAST_QUERY = $prompt;
614 843
615 $self->{query}-> ($self, $flags, $prompt); 844 $self->{query}-> ($self, $flags, $prompt);
616} 845}
617 846
618sub drawinfo { 847sub sanitise_xml($) {
619 my ($self, $color, $text) = @_; 848 local $_ = shift;
620 849
621 my @color = ( 850 # we now weed out all tags we do not support
851 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
852 # now all entities
853 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
854
855 # handle some elements
856 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
857 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
858
859 $_
860}
861
862our %NAME_TO_COLOR = (
863 black => 0,
864 white => 1,
865 darkblue => 2,
866 red => 3,
867 orange => 4,
868 lightblue => 5,
869 darkorange => 6,
870 green => 7,
871 darkgreen => 8,
872 grey => 9,
873 brown => 10,
874 yellow => 11,
875 tan => 12,
876);
877
878our @CF_COLOR = (
622 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 879 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
623 [1.00, 1.00, 1.00], 880 [1.00, 1.00, 1.00],
624 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 881 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
625 [1.00, 0.00, 0.00], 882 [1.00, 0.00, 0.00],
626 [1.00, 0.54, 0.00], 883 [1.00, 0.54, 0.00],
627 [0.11, 0.56, 1.00], 884 [0.11, 0.56, 1.00],
628 [0.93, 0.46, 0.00], 885 [0.93, 0.46, 0.00],
629 [0.18, 0.54, 0.34], 886 [0.18, 0.54, 0.34],
630 [0.56, 0.73, 0.56], 887 [0.56, 0.73, 0.56],
631 [0.80, 0.80, 0.80], 888 [0.80, 0.80, 0.80],
632 [0.75, 0.61, 0.20], 889 [0.75, 0.61, 0.20],
633 [0.99, 0.77, 0.26], 890 [0.99, 0.77, 0.26],
634 [0.74, 0.65, 0.41], 891 [0.74, 0.65, 0.41],
635 ); 892);
636 893
637 my $fg = $color[$color % @color]; 894sub msg {
895 my ($self, $color, $type, $text, @extra) = @_;
638 896
897 $text = sanitise_xml $text;
898
899 if (my $cb = $self->{cb_msg}{$type}) {
900 $_->($self, $color, $type, $text, @extra) for values %$cb;
901 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
902 $type =~ s/-/_/g;
903 $self->{$type} = $text;
904 } else {
639 $self->logprint ("info: ", $text); 905 $self->logprint ("msg: ", $text);
906 return if $color < 0; # negative color == ignore if not understood
640 907
908 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
909
641 # try to create single paragraphs of multiple lines sent by the server 910 ## try to create single paragraphs of multiple lines sent by the server
911 # no longer neecssary with TRT servers
642 $text =~ s/(?<=\S)\n(?=\w)/ /g; 912 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
643 913
644 $text = CFPlus::asxml $text; 914 ::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; 915 for split /\n/, $text;
650 916
651 $self->{statusbox}->add ($text, 917 $self->{statusbox}->add ($text,
652 group => $text, 918 group => $text,
653 fg => $fg, 919 fg => $fg,
654 timeout => $color >= 2 ? 180 : 10, 920 timeout => $color >= 2 ? 180 : 10,
655 tooltip_font => $::FONT_FIXED, 921 tooltip_font => $::FONT_FIXED,
656 ); 922 );
657} 923 }
658
659sub drawextinfo {
660 my ($self, $color, $type, $subtype, $message) = @_;
661
662 $self->drawinfo ($color, $message);
663} 924}
664 925
665sub spell_add { 926sub spell_add {
666 my ($self, $spell) = @_; 927 my ($self, $spell) = @_;
667 928
… …
715 $self->{map_widget}->clr_commands; 976 $self->{map_widget}->clr_commands;
716 977
717 ::stop_game (); 978 ::stop_game ();
718} 979}
719 980
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 { 981sub update_floorbox {
755 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 982 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
756 return unless $::CONN; 983 return unless $::CONN;
757 984
758 $::FLOORBOX->clear; 985 $::FLOORBOX->clear;
986
987 my @add;
759 988
760 my $row; 989 my $row;
761 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 990 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
762 if ($row < 6) { 991 if ($row < 6) {
763 local $_->{face_widget}; # hack to force recreation of widget 992 local $_->{face_widget}; # hack to force recreation of widget
764 local $_->{desc_widget}; # hack to force recreation of widget 993 local $_->{desc_widget}; # hack to force recreation of widget
765 CFPlus::Item::update_widgets $_; 994 CFPlus::Item::update_widgets $_;
766 995
996 push @add,
767 $::FLOORBOX->add (0, $row, $_->{face_widget}); 997 0, $row, $_->{face_widget},
768 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 998 1, $row, $_->{desc_widget};
769 999
770 $row++; 1000 $row++;
771 } else { 1001 } else {
772 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1002 push @add, 1, $row, new CFPlus::UI::Button
773 text => "More...", 1003 text => "More...",
774 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1004 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
775 ); 1005 ;
776 last; 1006 last;
777 } 1007 }
778 } 1008 }
779 if ($::CONN->{open_container}) { 1009 if ($::CONN->{open_container}) {
780 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1010 push @add, 1, $row++, new CFPlus::UI::Button
781 text => "Close container", 1011 text => "Close container",
782 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1012 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
783 ); 1013 ;
784 } 1014 }
785 });
786 1015
1016 $::FLOORBOX->add_at (@add);
1017 });
1018
787 $::WANT_REFRESH++; 1019 $::WANT_REFRESH->start;
788} 1020}
789 1021
790sub set_opencont { 1022sub set_opencont {
791 my ($conn, $tag, $name) = @_; 1023 my ($conn, $tag, $name) = @_;
792 $conn->{open_container} = $tag; 1024 $conn->{open_container} = $tag;
… …
900 $::SERVER_INFO->set_markup ( 1132 $::SERVER_INFO->set_markup (
901 "server <tt>$self->{host}:$self->{port}</tt>\n" 1133 "server <tt>$self->{host}:$self->{port}</tt>\n"
902 . "protocol version <tt>$self->{version}</tt>\n" 1134 . "protocol version <tt>$self->{version}</tt>\n"
903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1135 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
904 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1136 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1137 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
905 . "editing support $yesno[!!$self->{editor_support}]\n" 1138 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1139 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1140 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1141 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1142 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
909 . "map size $self->{mapw}×$self->{maph}\n" 1143 . "map size $self->{mapw}×$self->{maph}\n"
910 ); 1144 );
911 1145
912 ::setup_build_button ($self->{editor_support}->{builder_ui});
913} 1146}
914 1147
915sub logged_in { 1148sub logged_in {
916 my ($self) = @_; 1149 my ($self) = @_;
917 1150
918 $self->send_ext_req (cfplus_support => version => 1, sub { 1151 $self->send_ext_req (cfplus_support => version => 2, sub {
1152 my (%msg) = @_;
1153
919 $self->{cfplus_ext} = $_[0]{version}; 1154 $self->{cfplus_ext} = $msg{version};
920 $self->update_server_info; 1155 $self->update_server_info;
921 1156
922 if ($self->{cfplus_ext} >= 2) { 1157 if ($self->{cfplus_ext} >= 2) {
923 $self->send_ext_req ("editor_support", sub { 1158 $self->send_ext_req ("editor_support", sub {
924 $self->{editor_support} = $_[0]; 1159 $self->{editor_support} = { @_ };
925 $self->update_server_info; 1160 $self->update_server_info;
926 1161
927 0 1162 0
928 }); 1163 });
929 } 1164 }
… …
937 $self->send_command ("output-count $::CFG->{output_count}"); 1172 $self->send_command ("output-count $::CFG->{output_count}");
938 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1173 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
939 $self->send_command ("pickup $::CFG->{pickup}"); 1174 $self->send_command ("pickup $::CFG->{pickup}");
940} 1175}
941 1176
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 { 1177sub lookat {
951 my ($self, $x, $y) = @_; 1178 my ($self, $x, $y) = @_;
952 1179
953 if ($self->{cfplus_ext}) { 1180 if ($self->{cfplus_ext}) {
954 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1181 $self->send_ext_req (lookat => $x, $y, sub {
955 my ($msg) = @_; 1182 my (%msg) = @_;
956 1183
957 if (exists $msg->{npc_dialog}) { 1184 if (exists $msg{npc_dialog}) {
958 # start npc chat dialog 1185 # start npc chat dialog
959 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1186 $self->{npc_dialog} = new CFPlus::NPCDialog::
960 dx => $x, 1187 token => $msg{npc_dialog},
961 dy => $y,
962 title => "$msg->{npc_dialog} (NPC)", 1188 title => "$msg{npc_dialog}[0] (NPC)",
963 conn => $self, 1189 conn => $self,
964 ; 1190 ;
965 } 1191 }
966 }); 1192 });
967 } 1193 }
… …
974 1200
975 (delete $self->{npc_dialog})->destroy 1201 (delete $self->{npc_dialog})->destroy
976 if $self->{npc_dialog}; 1202 if $self->{npc_dialog};
977 1203
978 $self->SUPER::destroy; 1204 $self->SUPER::destroy;
1205
1206 %$self = ();
979} 1207}
980 1208
981package CFPlus::NPCDialog; 1209package CFPlus::NPCDialog;
982 1210
983our @ISA = 'CFPlus::UI::Toplevel'; 1211our @ISA = 'CFPlus::UI::Toplevel';
… …
1030 on_activate => sub { $this->destroy; 1 }, 1258 on_activate => sub { $this->destroy; 1 },
1031 ; 1259 ;
1032 1260
1033 $self->update_options; 1261 $self->update_options;
1034 1262
1035 $self->{id} = $self->{conn}->send_ext_req ( 1263 $self->{id} = "npc-channel-" . $self->{conn}->token;
1036 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1264 $self->{conn}->connect_ext ($self->{id} => sub {
1037 sub { $this && $this->feed (@_) } 1265 $this->feed (@_) if $this;
1038 ); 1266 });
1267
1268 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1039 1269
1040 $self->{entry}->grab_focus; 1270 $self->{entry}->grab_focus;
1041 1271
1042 $self->{textview}->add_paragraph ({ 1272 $self->{textview}->add_paragraph ({
1043 fg => [1, 1, 0, 1], 1273 fg => [1, 1, 0, 1],
… …
1066 ); 1296 );
1067 } 1297 }
1068} 1298}
1069 1299
1070sub feed { 1300sub feed {
1071 my ($self, $msg) = @_; 1301 my ($self, $type, @arg) = @_;
1072 1302
1073 CFPlus::weaken $self; 1303 CFPlus::weaken $self;
1074 1304
1075 if ($msg->{msgtype} eq "reply") { 1305 if ($type eq "update") {
1306 my (%info) = @arg;
1307
1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1308 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1309 $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 1310
1311 if (exists $info{msg}) {
1312 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1313 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1314 my @link;
1315 $text =~ s{
1316 ($match)
1317 }{
1318 my $kw = $1;
1319
1320 push @link, new CFPlus::UI::Label
1321 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1322 can_hover => 1,
1323 can_events => 1,
1324 padding_x => 0,
1325 padding_y => 0,
1326 on_button_up => sub {
1327 $self->send ($kw);
1328 };
1329
1330 "\x{fffc}"
1331 }giex;
1332
1100 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1333 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1101 $self->{textview}->scroll_to_bottom; 1334 $self->{textview}->scroll_to_bottom;
1335 }
1336
1102 $self->update_options; 1337 $self->update_options;
1103 } else { 1338 } else {
1104 $self->destroy; 1339 $self->destroy;
1105 } 1340 }
1106 1341
… …
1111 my ($self, $msg) = @_; 1346 my ($self, $msg) = @_;
1112 1347
1113 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1348 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1114 $self->{textview}->scroll_to_bottom; 1349 $self->{textview}->scroll_to_bottom;
1115 1350
1116 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1351 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1117} 1352}
1118 1353
1119sub destroy { 1354sub destroy {
1120 my ($self) = @_; 1355 my ($self) = @_;
1121 1356
1122 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1357 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1123 1358
1124 if ($self->{conn}) { 1359 if ($self->{conn}) {
1125 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1360 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1126 delete $self->{conn}{npc_dialog}; 1361 delete $self->{conn}{npc_dialog};
1127 $self->{conn}->disconnect_ext ($self->{id}); 1362 $self->{conn}->disconnect_ext ($self->{id});
1128 } 1363 }
1129 1364
1130 $self->SUPER::destroy; 1365 $self->SUPER::destroy;

Diff Legend

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