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.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 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 xwidget => 1, 26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
53 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 59 my (%cap) = @_;
55 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
56 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 70 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
61 73
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
66 } 78 }
67 } 79 }
68 }); 80 });
69 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
70 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 90 my ($id) = @_;
72 91
73 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
74 w => {}, 93 w => {},
75 }; 94 };
76 }); 95 });
77 96
97 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 99 my ($id) = @_;
80 100
81 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
82 or return; 102 or return;
83 103
84 $_->destroy 104 $_->destroy
85 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
86 }); 106 });
87 107
108 # widgetset create
88 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
90
91 my $args = $arg->{args} || {};
92 111
93 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub { 113 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
97 116
98 1 117 1
99 }; 118 };
100 } 119 }
101 120
102 if (my $widget = eval { 121 if (my $widget = eval {
103 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
105 %$args, 124 %$args,
106 s_ws => $arg->{ws}, 125 s_ws => $ws,
107 s_id => $arg->{id}, 126 s_id => $id,
108 ) 127 )
109 } 128 }
110 ) { 129 ) {
111 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
113 = $widget; 132 = $widget;
114 133
115 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
116 my ($widget) = @_; 135 my ($widget) = @_;
117 136
118 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 }); 139 });
121 } else { 140 } else {
122 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
124 } 143 }
125 }); 144 });
126 145
146 # widget call
127 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
128 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
129 149
130 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
131 or return; 151 or return;
132 my $m = $arg->{name};
133 152
134 my @a = map { 153 $args ||= [];
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139 154
140 if (exists $arg->{rid}) { 155 if ($rid) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
142 } else { 157 } else {
143 $w->$m (@a); 158 $w->$method (@$args);
144 } 159 }
145 }); 160 });
146 161
162 # widget set
147 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
148 my ($arg) = @_; 164 my ($id, $attr) = @_;
149 165
150 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
151 or return; 167 or return;
152 168
153 $w->{$arg->{name}} = $arg->{value}; 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 }
154 }); 178 });
155 179
180 # widget get
156 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
157 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
158 183
159 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
160 or return; 185 or return;
161 186
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
163 }); 188 });
164 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
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 200 $_->destroy
168 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
169 } 202 }
… …
382 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
383 416
384 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
385 $sktbl->clear; 418 $sktbl->clear;
386 419
420 my @add;
421
422 push @add,
387 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
389 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
392 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
393 430
394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395 432
396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
425 } 462 }
426 463
427 1 464 1
428 }; 465 };
429 466
467 push @add,
430 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
431 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
432 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
436 475
437 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
438 } 477 }
478
479 $sktbl->add_at (@add);
439 } 480 }
440 481
441 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
680} 721}
681 722
682sub face_find { 723sub face_find {
683 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
684 725
685 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
686
687 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688 728
689 $face->{id} = $id; 729 $face->{id} = $id;
690 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
691 731
692 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
693 733
694 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get res_meta => $face->{name}, $cb;
739 }
695} 740}
696 741
697sub face_update { 742sub face_update {
698 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
699 744
745 if ($face->{type} == 0) { # FT_FACE
700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701 if $changed; 747 if $changed;
702 748
703 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
776
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 ::add_license ($face);
781 $cb->();
782 };
783
784 } else {
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
786 ::add_license ($face);
787 $cb->();
788 }
789 }
704} 790}
705 791
706sub smooth_update { 792sub smooth_update {
707 my ($self, $facenum, $face) = @_; 793 my ($self, $facenum, $face) = @_;
708 794
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 795 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710} 796}
711 797
712sub set_texture { 798sub set_texture {
713 my ($self, $id, $data) = @_; 799 my ($self, $id, $data) = @_;
800
801 return unless $self->{map};
714 802
715 $self->{texture}[$id] = my $tex = 803 $self->{texture}[$id] = my $tex =
716 new_from_image CFPlus::Texture 804 new_from_image CFPlus::Texture
717 $data, minify => 1, mipmap => 1; 805 $data, minify => 1, mipmap => 1;
718 806
719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 807 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
720 $self->{map_widget}->update; 808 $self->{map_widget}->update;
809
810 $_->() for @{(delete $self->{face_cb}{$id}) || []};
811}
812
813sub connect_face_update {
814 my ($self, $id, $cb) = @_;
815
816 push @{$self->{face_cb}{$id}}, $cb;
817
818 CFPlus::guard {
819 @{$self->{face_cb}{$id}}
820 = grep $_ != $cb,
821 @{$self->{face_cb}{$id}};
822 }
721} 823}
722 824
723sub sound_play { 825sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 826 my ($self, $type, $face, $dx, $dy, $vol) = @_;
725 827
726 $self->{sound_play}->($x, $y, $soundnum, $type); 828 &::audio_sound_play ($face, $dx, $dy, $vol)
829 unless $type & 1; # odd types are silent for future expansion
727} 830}
728 831
729my $LAST_QUERY; # server is stupid, stupid, stupid 832my $LAST_QUERY; # server is stupid, stupid, stupid
730 833
731sub query { 834sub query {
… …
796 $self->{$type} = $text; 899 $self->{$type} = $text;
797 } else { 900 } else {
798 $self->logprint ("msg: ", $text); 901 $self->logprint ("msg: ", $text);
799 return if $color < 0; # negative color == ignore if not understood 902 return if $color < 0; # negative color == ignore if not understood
800 903
801 my $fg = $CF_COLOR[$color % @CF_COLOR]; 904 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
802 905
803 ## try to create single paragraphs of multiple lines sent by the server 906 ## try to create single paragraphs of multiple lines sent by the server
804 # no longer neecssary with TRT servers 907 # no longer neecssary with TRT servers
805 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 908 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
806 909
807 ::message ({ fg => $fg, markup => $_ }) 910 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
808 for split /\n/, $text; 911 for split /\n/, $text;
809 912
810 $self->{statusbox}->add ($text, 913 $self->{statusbox}->add ($text,
811 group => $text, 914 group => $text,
812 fg => $fg, 915 fg => $fg,
… …
869 $self->{map_widget}->clr_commands; 972 $self->{map_widget}->clr_commands;
870 973
871 ::stop_game (); 974 ::stop_game ();
872} 975}
873 976
874sub image_info {
875 my ($self, $numfaces) = @_;
876
877 $self->{num_faces} = $numfaces;
878 $self->{face_prefetch} = [1 .. $numfaces];
879 $self->face_prefetch;
880}
881
882sub face_prefetch {
883 my ($self) = @_;
884
885 return unless $::CFG->{face_prefetch};
886
887 if ($self->{num_faces}) {
888 return if @{ $self->{send_queue} || [] };
889 my $todo = @{ $self->{face_prefetch} }
890 or return;
891
892 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
893
894 $self->send ("requestinfo image_sums $face $face");
895
896 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
897 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
898 } elsif (!exists $self->{num_faces}) {
899 $self->send ("requestinfo image_info");
900
901 $self->{num_faces} = 0;
902
903 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
904 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
905 }
906}
907
908sub update_floorbox { 977sub update_floorbox {
909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 978 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910 return unless $::CONN; 979 return unless $::CONN;
911 980
912 $::FLOORBOX->clear; 981 $::FLOORBOX->clear;
982
983 my @add;
913 984
914 my $row; 985 my $row;
915 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 986 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
916 if ($row < 6) { 987 if ($row < 6) {
917 local $_->{face_widget}; # hack to force recreation of widget 988 local $_->{face_widget}; # hack to force recreation of widget
918 local $_->{desc_widget}; # hack to force recreation of widget 989 local $_->{desc_widget}; # hack to force recreation of widget
919 CFPlus::Item::update_widgets $_; 990 CFPlus::Item::update_widgets $_;
920 991
992 push @add,
921 $::FLOORBOX->add (0, $row, $_->{face_widget}); 993 0, $row, $_->{face_widget},
922 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 994 1, $row, $_->{desc_widget};
923 995
924 $row++; 996 $row++;
925 } else { 997 } else {
926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 998 push @add, 1, $row, new CFPlus::UI::Button
927 text => "More...", 999 text => "More...",
928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1000 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929 ); 1001 ;
930 last; 1002 last;
931 } 1003 }
932 } 1004 }
933 if ($::CONN->{open_container}) { 1005 if ($::CONN->{open_container}) {
934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1006 push @add, 1, $row++, new CFPlus::UI::Button
935 text => "Close container", 1007 text => "Close container",
936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1008 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937 ); 1009 ;
938 } 1010 }
1011
1012 $::FLOORBOX->add_at (@add);
939 }); 1013 });
940 1014
941 $::WANT_REFRESH++; 1015 $::WANT_REFRESH++;
942} 1016}
943 1017
… …
1063 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1137 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1138 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065 . "map size $self->{mapw}×$self->{maph}\n" 1139 . "map size $self->{mapw}×$self->{maph}\n"
1066 ); 1140 );
1067 1141
1068 ::setup_build_button ($self->{editor_support}->{builder_ui});
1069} 1142}
1070 1143
1071sub logged_in { 1144sub logged_in {
1072 my ($self) = @_; 1145 my ($self) = @_;
1073 1146
1074 $self->send_ext_req (cfplus_support => version => 1, sub { 1147 $self->send_ext_req (cfplus_support => version => 2, sub {
1148 my (%msg) = @_;
1149
1075 $self->{cfplus_ext} = $_[0]{version}; 1150 $self->{cfplus_ext} = $msg{version};
1076 $self->update_server_info; 1151 $self->update_server_info;
1077 1152
1078 if ($self->{cfplus_ext} >= 2) { 1153 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub { 1154 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0]; 1155 $self->{editor_support} = { @_ };
1081 $self->update_server_info; 1156 $self->update_server_info;
1082 1157
1083 0 1158 0
1084 }); 1159 });
1085 } 1160 }
… …
1093 $self->send_command ("output-count $::CFG->{output_count}"); 1168 $self->send_command ("output-count $::CFG->{output_count}");
1094 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1169 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095 $self->send_command ("pickup $::CFG->{pickup}"); 1170 $self->send_command ("pickup $::CFG->{pickup}");
1096} 1171}
1097 1172
1098sub buildat {
1099 my ($self, $builditem, $x, $y) = @_;
1100
1101 if ($self->{cfplus_ext}) {
1102 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103 }
1104}
1105
1106sub lookat { 1173sub lookat {
1107 my ($self, $x, $y) = @_; 1174 my ($self, $x, $y) = @_;
1108 1175
1109 if ($self->{cfplus_ext}) { 1176 if ($self->{cfplus_ext}) {
1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1177 $self->send_ext_req (lookat => $x, $y, sub {
1111 my ($msg) = @_; 1178 my (%msg) = @_;
1112 1179
1113 if (exists $msg->{npc_dialog}) { 1180 if (exists $msg{npc_dialog}) {
1114 # start npc chat dialog 1181 # start npc chat dialog
1115 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1182 $self->{npc_dialog} = new CFPlus::NPCDialog::
1116 dx => $x, 1183 token => $msg{npc_dialog},
1117 dy => $y,
1118 title => "$msg->{npc_dialog} (NPC)", 1184 title => "$msg{npc_dialog}[0] (NPC)",
1119 conn => $self, 1185 conn => $self,
1120 ; 1186 ;
1121 } 1187 }
1122 }); 1188 });
1123 } 1189 }
… …
1130 1196
1131 (delete $self->{npc_dialog})->destroy 1197 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1198 if $self->{npc_dialog};
1133 1199
1134 $self->SUPER::destroy; 1200 $self->SUPER::destroy;
1201
1202 %$self = ();
1135} 1203}
1136 1204
1137package CFPlus::NPCDialog; 1205package CFPlus::NPCDialog;
1138 1206
1139our @ISA = 'CFPlus::UI::Toplevel'; 1207our @ISA = 'CFPlus::UI::Toplevel';
… …
1186 on_activate => sub { $this->destroy; 1 }, 1254 on_activate => sub { $this->destroy; 1 },
1187 ; 1255 ;
1188 1256
1189 $self->update_options; 1257 $self->update_options;
1190 1258
1191 $self->{id} = $self->{conn}->send_ext_req ( 1259 $self->{id} = "npc-channel-" . $self->{conn}->token;
1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1260 $self->{conn}->connect_ext ($self->{id} => sub {
1193 sub { $this && $this->feed (@_) } 1261 $this->feed (@_) if $this;
1194 ); 1262 });
1263
1264 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195 1265
1196 $self->{entry}->grab_focus; 1266 $self->{entry}->grab_focus;
1197 1267
1198 $self->{textview}->add_paragraph ({ 1268 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1], 1269 fg => [1, 1, 0, 1],
… …
1222 ); 1292 );
1223 } 1293 }
1224} 1294}
1225 1295
1226sub feed { 1296sub feed {
1227 my ($self, $msg) = @_; 1297 my ($self, $type, @arg) = @_;
1228 1298
1229 CFPlus::weaken $self; 1299 CFPlus::weaken $self;
1230 1300
1231 if ($msg->{msgtype} eq "reply") { 1301 if ($type eq "update") {
1302 my (%info) = @arg;
1303
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1304 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1305 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1234
1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237 my @link;
1238 $text =~ s{
1239 ($match)
1240 }{
1241 my $kw = $1;
1242
1243 push @link, new CFPlus::UI::Label
1244 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245 can_hover => 1,
1246 can_events => 1,
1247 padding_x => 0,
1248 padding_y => 0,
1249 on_button_up => sub {
1250 $self->send ($kw);
1251 };
1252
1253 "\x{fffc}"
1254 }giex;
1255 1306
1307 if (exists $info{msg}) {
1308 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1309 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1310 my @link;
1311 $text =~ s{
1312 ($match)
1313 }{
1314 my $kw = $1;
1315
1316 push @link, new CFPlus::UI::Label
1317 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1318 can_hover => 1,
1319 can_events => 1,
1320 padding_x => 0,
1321 padding_y => 0,
1322 on_button_up => sub {
1323 $self->send ($kw);
1324 };
1325
1326 "\x{fffc}"
1327 }giex;
1328
1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1329 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257 $self->{textview}->scroll_to_bottom; 1330 $self->{textview}->scroll_to_bottom;
1331 }
1332
1258 $self->update_options; 1333 $self->update_options;
1259 } else { 1334 } else {
1260 $self->destroy; 1335 $self->destroy;
1261 } 1336 }
1262 1337
… …
1267 my ($self, $msg) = @_; 1342 my ($self, $msg) = @_;
1268 1343
1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1344 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270 $self->{textview}->scroll_to_bottom; 1345 $self->{textview}->scroll_to_bottom;
1271 1346
1272 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1347 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273} 1348}
1274 1349
1275sub destroy { 1350sub destroy {
1276 my ($self) = @_; 1351 my ($self) = @_;
1277 1352
1278 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1353 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279 1354
1280 if ($self->{conn}) { 1355 if ($self->{conn}) {
1281 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1356 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282 delete $self->{conn}{npc_dialog}; 1357 delete $self->{conn}{npc_dialog};
1283 $self->{conn}->disconnect_ext ($self->{id}); 1358 $self->{conn}->disconnect_ext ($self->{id});
1284 } 1359 }
1285 1360
1286 $self->SUPER::destroy; 1361 $self->SUPER::destroy;

Diff Legend

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