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.108 by root, Sun Jun 24 04:11:22 2007 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
55 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default; 70 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
60 73
… …
64 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
65 } 78 }
66 } 79 }
67 }); 80 });
68 81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
202 }
203 });
204
69 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
70 for @cmd_help; 206 for @cmd_help;
71 207
72 { 208 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
… …
90} 226}
91 227
92sub logprint { 228sub logprint {
93 my ($self, @a) = @_; 229 my ($self, @a) = @_;
94 230
95 $self->{log_fh} ||= do { 231 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} 232}
113 233
114sub _stat_numdiff { 234sub _stat_numdiff {
115 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
116 236
… …
279 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
280 400
281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
282 $sktbl->clear; 402 $sktbl->clear;
283 403
404 my @add;
405
406 push @add,
284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
290 414
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292 416
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
322 } 446 }
323 447
324 1 448 1
325 }; 449 };
326 450
451 push @add,
327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
333 459
334 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
335 } 461 }
462
463 $sktbl->add_at (@add);
336 } 464 }
337 465
338 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
416 do { 544 do {
417 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
418 or return; 546 or return;
419 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
420 548
421 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
422 my ($data) = @_; 550 my ($exists) = @_;
423 551
424 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
425 553
426 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
427 if defined $data; 555 if $exists;
428 556
429 $self->bg_fetch; 557 $self->bg_fetch;
430 }; 558 };
431} 559}
432 560
… …
577} 705}
578 706
579sub face_find { 707sub face_find {
580 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
581 709
582 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
583
584 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
585 712
586 $face->{id} = $id; 713 $face->{id} = $id;
587 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
588 715
589 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
590 717
591 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb;
723 }
592} 724}
593 725
594sub face_update { 726sub face_update {
595 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
596 728
729 if ($face->{type} == 0) { # FT_FACE
597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
598 if $changed; 731 if $changed;
599 732
600 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
601} 774}
602 775
603sub smooth_update { 776sub smooth_update {
604 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
605 778
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
607} 780}
608 781
609sub set_texture { 782sub have_tile {
610 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
611 784
785 return unless $self->{map};
786
612 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
613 new_from_image CFPlus::Texture 788 new CFPlus::Texture
614 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
615 790
616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
617 $self->{map_widget}->update; 792}
793
794sub connect_face_update {
795 my ($self, $id, $cb) = @_;
796
797 push @{$self->{face_cb}{$id}}, $cb;
798
799 CFPlus::guard {
800 @{$self->{face_cb}{$id}}
801 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}};
803 }
618} 804}
619 805
620sub sound_play { 806sub sound_play {
621 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
622 808
623 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
624} 811}
625 812
626my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
627 814
628sub query { 815sub query {
… …
693 $self->{$type} = $text; 880 $self->{$type} = $text;
694 } else { 881 } else {
695 $self->logprint ("msg: ", $text); 882 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood 883 return if $color < 0; # negative color == ignore if not understood
697 884
698 my $fg = $CF_COLOR[$color % @CF_COLOR]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
699 886
700 ## try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers 888 # no longer neecssary with TRT servers
702 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
703 890
704 ::message ({ fg => $fg, markup => $_ }) 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
705 for split /\n/, $text; 892 for split /\n/, $text;
706 893
707 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
708 group => $text, 895 group => $text,
709 fg => $fg, 896 fg => $fg,
… …
766 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
767 954
768 ::stop_game (); 955 ::stop_game ();
769} 956}
770 957
771sub image_info {
772 my ($self, $numfaces) = @_;
773
774 $self->{num_faces} = $numfaces;
775 $self->{face_prefetch} = [1 .. $numfaces];
776 $self->face_prefetch;
777}
778
779sub face_prefetch {
780 my ($self) = @_;
781
782 return unless $::CFG->{face_prefetch};
783
784 if ($self->{num_faces}) {
785 return if @{ $self->{send_queue} || [] };
786 my $todo = @{ $self->{face_prefetch} }
787 or return;
788
789 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
790
791 $self->send ("requestinfo image_sums $face $face");
792
793 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
794 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
795 } elsif (!exists $self->{num_faces}) {
796 $self->send ("requestinfo image_info");
797
798 $self->{num_faces} = 0;
799
800 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
801 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
802 }
803}
804
805sub update_floorbox { 958sub update_floorbox {
806 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
807 return unless $::CONN; 960 return unless $::CONN;
808 961
809 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
810 965
811 my $row; 966 my $row;
812 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
813 if ($row < 6) { 968 if ($row < 6) {
814 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
815 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
816 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
817 972
973 push @add,
818 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
819 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
820 976
821 $row++; 977 $row++;
822 } else { 978 } else {
823 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
824 text => "More...", 980 text => "More...",
825 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
826 ); 982 ;
827 last; 983 last;
828 } 984 }
829 } 985 }
830 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
831 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
832 text => "Close container", 988 text => "Close container",
833 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
834 ); 990 ;
835 } 991 }
992
993 $::FLOORBOX->add_at (@add);
836 }); 994 });
837 995
838 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
839} 997}
840 998
… …
960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
962 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
963 ); 1121 );
964 1122
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
966} 1123}
967 1124
968sub logged_in { 1125sub logged_in {
969 my ($self) = @_; 1126 my ($self) = @_;
970 1127
971 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
972 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
973 $self->update_server_info; 1132 $self->update_server_info;
974 1133
975 if ($self->{cfplus_ext} >= 2) { 1134 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub { 1135 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0]; 1136 $self->{editor_support} = { @_ };
978 $self->update_server_info; 1137 $self->update_server_info;
979 1138
980 0 1139 0
981 }); 1140 });
982 } 1141 }
… …
990 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
992 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
993} 1152}
994 1153
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
1001}
1002
1003sub lookat { 1154sub lookat {
1004 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
1005 1156
1006 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
1007 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
1008 my ($msg) = @_; 1159 my (%msg) = @_;
1009 1160
1010 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
1011 # start npc chat dialog 1162 # start npc chat dialog
1012 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
1013 dx => $x, 1164 token => $msg{npc_dialog},
1014 dy => $y,
1015 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
1016 conn => $self, 1166 conn => $self,
1017 ; 1167 ;
1018 } 1168 }
1019 }); 1169 });
1020 } 1170 }
… …
1027 1177
1028 (delete $self->{npc_dialog})->destroy 1178 (delete $self->{npc_dialog})->destroy
1029 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
1030 1180
1031 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
1032} 1184}
1033 1185
1034package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
1035 1187
1036our @ISA = 'CFPlus::UI::Toplevel'; 1188our @ISA = 'CFPlus::UI::Toplevel';
… …
1083 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
1084 ; 1236 ;
1085 1237
1086 $self->update_options; 1238 $self->update_options;
1087 1239
1088 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
1089 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
1090 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
1091 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1092 1246
1093 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
1094 1248
1095 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
1096 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
… …
1119 ); 1273 );
1120 } 1274 }
1121} 1275}
1122 1276
1123sub feed { 1277sub feed {
1124 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1125 1279
1126 CFPlus::weaken $self; 1280 CFPlus::weaken $self;
1127 1281
1128 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1131
1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1134 my @link;
1135 $text =~ s{
1136 ($match)
1137 }{
1138 my $kw = $1;
1139
1140 push @link, new CFPlus::UI::Label
1141 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1142 can_hover => 1,
1143 can_events => 1,
1144 padding_x => 0,
1145 padding_y => 0,
1146 on_button_up => sub {
1147 $self->send ($kw);
1148 };
1149
1150 "\x{fffc}"
1151 }giex;
1152 1287
1288 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link;
1292 $text =~ s{
1293 ($match)
1294 }{
1295 my $kw = $1;
1296
1297 push @link, new CFPlus::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1,
1300 can_events => 1,
1301 padding_x => 0,
1302 padding_y => 0,
1303 on_button_up => sub {
1304 $self->send ($kw);
1305 };
1306
1307 "\x{fffc}"
1308 }giex;
1309
1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1154 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1155 $self->update_options; 1314 $self->update_options;
1156 } else { 1315 } else {
1157 $self->destroy; 1316 $self->destroy;
1158 } 1317 }
1159 1318
… …
1164 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1165 1324
1166 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1167 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1168 1327
1169 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1170} 1329}
1171 1330
1172sub destroy { 1331sub destroy {
1173 my ($self) = @_; 1332 my ($self) = @_;
1174 1333
1175 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1176 1335
1177 if ($self->{conn}) { 1336 if ($self->{conn}) {
1178 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1179 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1180 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1181 } 1340 }
1182 1341
1183 $self->SUPER::destroy; 1342 $self->SUPER::destroy;

Diff Legend

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