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.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.151 by root, Sun Aug 12 09:39:49 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
… …
279 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
280 405
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 407 $sktbl->clear;
283 408
409 my @add;
410
411 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
290 419
291 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>";
292 421
293 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);
294 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);
… …
322 } 451 }
323 452
324 1 453 1
325 }; 454 };
326 455
456 push @add,
327 $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
328 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),
329 $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
330 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),
331 $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,
332 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 ;
333 464
334 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
335 } 466 }
467
468 $sktbl->add_at (@add);
336 } 469 }
337 470
338 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
373} 506}
374 507
375sub feed_map1a { 508sub feed_map1a {
376 my ($self, $data) = @_; 509 my ($self, $data) = @_;
377 510
378 $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 {
379 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
380} 541}
381 542
382sub magicmap { 543sub magicmap {
383 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
384 545
… …
416 do { 577 do {
417 $id = pop @{$self->{bg_fetch}} 578 $id = pop @{$self->{bg_fetch}}
418 or return; 579 or return;
419 } while $self->{texture}[$id]; 580 } while $self->{texture}[$id];
420 581
421 CFPlus::DB::get tilecache => $id, sub { 582 CFPlus::DB::exists tilecache => $id, sub {
422 my ($data) = @_; 583 my ($exists) = @_;
423 584
424 return unless $self->{map}; # stop when destroyed 585 return unless $self->{map}; # stop when destroyed
425 586
426 $self->set_texture ($id => $data) 587 if ($exists) {
427 if defined $data; 588 $self->have_tile ($id);
589 $self->{texture}[$id]->upload;
590 }
428 591
429 $self->bg_fetch; 592 $self->bg_fetch;
430 }; 593 };
431} 594}
432 595
… …
577} 740}
578 741
579sub face_find { 742sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 743 my ($self, $facenum, $face, $cb) = @_;
581 744
582 my $hash = "$face->{chksum},$face->{name}"; 745 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 746 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 747
586 $face->{id} = $id; 748 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 749 $self->{faceid}[$facenum] = $id;
588 750
589 $self->{map}->set_tileid ($facenum => $id); 751 $self->{map}->set_tileid ($facenum => $id);
590 752
591 CFPlus::DB::get tilecache => $id, $cb; 753 CFPlus::DB::get tilecache => $id, $cb;
754
755 } elsif ($face->{type} & 1) { # with metadata
756 CFPlus::DB::get res_meta => $face->{name}, $cb;
757 }
592} 758}
593 759
594sub face_update { 760sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
596 762
763 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 765 if $changed;
599 766
600 $self->set_texture ($face->{id} => delete $face->{image}); 767 $self->have_tile ($face->{id});
768
769 } elsif ($face->{type} & 1) { # split metadata
770 if ($changed) { # new data
771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
773
774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 } else {
777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
778 }
779
780 ::add_license ($face);
781
782 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed;
787
788 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed;
794
795 &::audio_sound_push ($facenum);
796 }
797
798 }
601} 799}
602 800
603sub smooth_update { 801sub smooth_update {
604 my ($self, $facenum, $face) = @_; 802 my ($self, $facenum, $face) = @_;
605 803
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 805}
608 806
609sub set_texture { 807sub have_tile {
808 my ($self, $tile) = @_;
809
810 return unless $self->{map};
811
812 my $tex = $self->{texture}[$tile] ||=
813 new CFPlus::Texture
814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
815
816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
817}
818
819sub connect_face_update {
610 my ($self, $id, $data) = @_; 820 my ($self, $id, $cb) = @_;
611 821
612 $self->{texture}[$id] = my $tex = 822 push @{$self->{face_cb}{$id}}, $cb;
613 new_from_image CFPlus::Texture
614 $data, minify => 1, mipmap => 1;
615 823
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 824 CFPlus::guard {
617 $self->{map_widget}->update; 825 @{$self->{face_cb}{$id}}
826 = grep $_ != $cb,
827 @{$self->{face_cb}{$id}};
828 }
618} 829}
619 830
620sub sound_play { 831sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 833
623 $self->{sound_play}->($x, $y, $soundnum, $type); 834 &::audio_sound_play ($face, $dx, $dy, $vol)
835 unless $type & 1; # odd types are silent for future expansion
624} 836}
625 837
626my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
627 839
628sub query { 840sub query {
… …
630 842
631 $prompt = $LAST_QUERY unless length $prompt; 843 $prompt = $LAST_QUERY unless length $prompt;
632 $LAST_QUERY = $prompt; 844 $LAST_QUERY = $prompt;
633 845
634 $self->{query}-> ($self, $flags, $prompt); 846 $self->{query}-> ($self, $flags, $prompt);
847}
848
849sub sanitise_xml($) {
850 local $_ = shift;
851
852 # we now weed out all tags we do not support
853 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
854 # now all entities
855 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
856
857 # handle some elements
858 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
859 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
860
861 $_
635} 862}
636 863
637our %NAME_TO_COLOR = ( 864our %NAME_TO_COLOR = (
638 black => 0, 865 black => 0,
639 white => 1, 866 white => 1,
… …
667); 894);
668 895
669sub msg { 896sub msg {
670 my ($self, $color, $type, $text, @extra) = @_; 897 my ($self, $color, $type, $text, @extra) = @_;
671 898
899 $text = sanitise_xml $text;
900
672 if (my $cb = $self->{cb_msg}{$type}) { 901 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb; 902 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) { 903 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g; 904 $type =~ s/-/_/g;
676 $self->{$type} = $text; 905 $self->{$type} = $text;
677 } else { 906 } else {
678 $self->logprint ("msg: ", $text); 907 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood 908 return if $color < 0; # negative color == ignore if not understood
680 909
681 my $fg = $CF_COLOR[$color % @CF_COLOR]; 910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
682 911
683 ## try to create single paragraphs of multiple lines sent by the server 912 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers 913 # no longer neecssary with TRT servers
685 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
686 915
687 ::message ({ fg => $fg, markup => $_ }) 916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
688 for split /\n/, $text; 917 for split /\n/, $text;
689 918
690 $self->{statusbox}->add ($text, 919 $self->{statusbox}->add ($text,
691 group => $text, 920 group => $text,
692 fg => $fg, 921 fg => $fg,
… …
749 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
750 979
751 ::stop_game (); 980 ::stop_game ();
752} 981}
753 982
754sub image_info {
755 my ($self, $numfaces) = @_;
756
757 $self->{num_faces} = $numfaces;
758 $self->{face_prefetch} = [1 .. $numfaces];
759 $self->face_prefetch;
760}
761
762sub face_prefetch {
763 my ($self) = @_;
764
765 return unless $::CFG->{face_prefetch};
766
767 if ($self->{num_faces}) {
768 return if @{ $self->{send_queue} || [] };
769 my $todo = @{ $self->{face_prefetch} }
770 or return;
771
772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
773
774 $self->send ("requestinfo image_sums $face $face");
775
776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
778 } elsif (!exists $self->{num_faces}) {
779 $self->send ("requestinfo image_info");
780
781 $self->{num_faces} = 0;
782
783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
785 }
786}
787
788sub update_floorbox { 983sub update_floorbox {
789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
790 return unless $::CONN; 985 return unless $::CONN;
791 986
792 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
988
989 my @add;
793 990
794 my $row; 991 my $row;
795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 992 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
796 if ($row < 6) { 993 if ($row < 6) {
797 local $_->{face_widget}; # hack to force recreation of widget 994 local $_->{face_widget}; # hack to force recreation of widget
798 local $_->{desc_widget}; # hack to force recreation of widget 995 local $_->{desc_widget}; # hack to force recreation of widget
799 CFPlus::Item::update_widgets $_; 996 CFPlus::Item::update_widgets $_;
800 997
998 push @add,
801 $::FLOORBOX->add (0, $row, $_->{face_widget}); 999 0, $row, $_->{face_widget},
802 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1000 1, $row, $_->{desc_widget};
803 1001
804 $row++; 1002 $row++;
805 } else { 1003 } else {
806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1004 push @add, 1, $row, new CFPlus::UI::Button
807 text => "More...", 1005 text => "More...",
808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1006 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
809 ); 1007 ;
810 last; 1008 last;
811 } 1009 }
812 } 1010 }
813 if ($::CONN->{open_container}) { 1011 if ($::CONN->{open_container}) {
814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1012 push @add, 1, $row++, new CFPlus::UI::Button
815 text => "Close container", 1013 text => "Close container",
816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1014 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
817 ); 1015 ;
818 } 1016 }
819 });
820 1017
1018 $::FLOORBOX->add_at (@add);
1019 });
1020
821 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
822} 1022}
823 1023
824sub set_opencont { 1024sub set_opencont {
825 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
826 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;
… …
943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1143 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1144 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
945 . "map size $self->{mapw}×$self->{maph}\n" 1145 . "map size $self->{mapw}×$self->{maph}\n"
946 ); 1146 );
947 1147
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
949} 1148}
950 1149
951sub logged_in { 1150sub logged_in {
952 my ($self) = @_; 1151 my ($self) = @_;
953 1152
954 $self->send_ext_req (cfplus_support => version => 1, sub { 1153 $self->send_ext_req (cfplus_support => version => 2, sub {
1154 my (%msg) = @_;
1155
955 $self->{cfplus_ext} = $_[0]{version}; 1156 $self->{cfplus_ext} = $msg{version};
956 $self->update_server_info; 1157 $self->update_server_info;
957 1158
958 if ($self->{cfplus_ext} >= 2) { 1159 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub { 1160 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0]; 1161 $self->{editor_support} = { @_ };
961 $self->update_server_info; 1162 $self->update_server_info;
962 1163
963 0 1164 0
964 }); 1165 });
965 } 1166 }
… …
973 $self->send_command ("output-count $::CFG->{output_count}"); 1174 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1175 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
975 $self->send_command ("pickup $::CFG->{pickup}"); 1176 $self->send_command ("pickup $::CFG->{pickup}");
976} 1177}
977 1178
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
984}
985
986sub lookat { 1179sub lookat {
987 my ($self, $x, $y) = @_; 1180 my ($self, $x, $y) = @_;
988 1181
989 if ($self->{cfplus_ext}) { 1182 if ($self->{cfplus_ext}) {
990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1183 $self->send_ext_req (lookat => $x, $y, sub {
991 my ($msg) = @_; 1184 my (%msg) = @_;
992 1185
993 if (exists $msg->{npc_dialog}) { 1186 if (exists $msg{npc_dialog}) {
994 # start npc chat dialog 1187 # start npc chat dialog
995 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1188 $self->{npc_dialog} = new CFPlus::NPCDialog::
996 dx => $x, 1189 token => $msg{npc_dialog},
997 dy => $y,
998 title => "$msg->{npc_dialog} (NPC)", 1190 title => "$msg{npc_dialog}[0] (NPC)",
999 conn => $self, 1191 conn => $self,
1000 ; 1192 ;
1001 } 1193 }
1002 }); 1194 });
1003 } 1195 }
… …
1010 1202
1011 (delete $self->{npc_dialog})->destroy 1203 (delete $self->{npc_dialog})->destroy
1012 if $self->{npc_dialog}; 1204 if $self->{npc_dialog};
1013 1205
1014 $self->SUPER::destroy; 1206 $self->SUPER::destroy;
1207
1208 %$self = ();
1015} 1209}
1016 1210
1017package CFPlus::NPCDialog; 1211package CFPlus::NPCDialog;
1018 1212
1019our @ISA = 'CFPlus::UI::Toplevel'; 1213our @ISA = 'CFPlus::UI::Toplevel';
… …
1066 on_activate => sub { $this->destroy; 1 }, 1260 on_activate => sub { $this->destroy; 1 },
1067 ; 1261 ;
1068 1262
1069 $self->update_options; 1263 $self->update_options;
1070 1264
1071 $self->{id} = $self->{conn}->send_ext_req ( 1265 $self->{id} = "npc-channel-" . $self->{conn}->token;
1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1266 $self->{conn}->connect_ext ($self->{id} => sub {
1073 sub { $this && $this->feed (@_) } 1267 $this->feed (@_) if $this;
1074 ); 1268 });
1269
1270 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1075 1271
1076 $self->{entry}->grab_focus; 1272 $self->{entry}->grab_focus;
1077 1273
1078 $self->{textview}->add_paragraph ({ 1274 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1], 1275 fg => [1, 1, 0, 1],
… …
1102 ); 1298 );
1103 } 1299 }
1104} 1300}
1105 1301
1106sub feed { 1302sub feed {
1107 my ($self, $msg) = @_; 1303 my ($self, $type, @arg) = @_;
1108 1304
1109 CFPlus::weaken $self; 1305 CFPlus::weaken $self;
1110 1306
1111 if ($msg->{msgtype} eq "reply") { 1307 if ($type eq "update") {
1308 my (%info) = @arg;
1309
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1310 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1311 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1114
1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1117 my @link;
1118 $text =~ s{
1119 ($match)
1120 }{
1121 my $kw = $1;
1122
1123 push @link, new CFPlus::UI::Label
1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1125 can_hover => 1,
1126 can_events => 1,
1127 padding_x => 0,
1128 padding_y => 0,
1129 on_button_up => sub {
1130 $self->send ($kw);
1131 };
1132
1133 "\x{fffc}"
1134 }giex;
1135 1312
1313 if (exists $info{msg}) {
1314 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1315 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1316 my @link;
1317 $text =~ s{
1318 ($match)
1319 }{
1320 my $kw = $1;
1321
1322 push @link, new CFPlus::UI::Label
1323 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1324 can_hover => 1,
1325 can_events => 1,
1326 padding_x => 0,
1327 padding_y => 0,
1328 on_button_up => sub {
1329 $self->send ($kw);
1330 };
1331
1332 "\x{fffc}"
1333 }giex;
1334
1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1335 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1137 $self->{textview}->scroll_to_bottom; 1336 $self->{textview}->scroll_to_bottom;
1337 }
1338
1138 $self->update_options; 1339 $self->update_options;
1139 } else { 1340 } else {
1140 $self->destroy; 1341 $self->destroy;
1141 } 1342 }
1142 1343
… …
1147 my ($self, $msg) = @_; 1348 my ($self, $msg) = @_;
1148 1349
1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1150 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1151 1352
1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1353 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1153} 1354}
1154 1355
1155sub destroy { 1356sub destroy {
1156 my ($self) = @_; 1357 my ($self) = @_;
1157 1358
1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1159 1360
1160 if ($self->{conn}) { 1361 if ($self->{conn}) {
1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1362 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1162 delete $self->{conn}{npc_dialog}; 1363 delete $self->{conn}{npc_dialog};
1163 $self->{conn}->disconnect_ext ($self->{id}); 1364 $self->{conn}->disconnect_ext ($self->{id});
1164 } 1365 }
1165 1366
1166 $self->SUPER::destroy; 1367 $self->SUPER::destroy;

Diff Legend

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