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.111 by root, Mon Jul 2 02:58:51 2007 UTC vs.
Revision 1.138 by root, Sat Jul 28 16:48:45 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 (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
53 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 61 my (%cap) = @_;
55 62
63 #$self->send ("setup sound 0"); # we use a different protocol
64
65 $self->send_exti_msg (fx_want => {
66 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
67 #5 => !!$::CFG->{audio_enable}, # FT_SOUND
68 });
69
56 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 72 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
61 75
… …
67 } 81 }
68 }); 82 });
69 83
70 $self->{json_coder} 84 $self->{json_coder}
71 ->convert_blessed 85 ->convert_blessed
72 ->filter_json_single_key_object (__widget_ref__ => sub { 86 ->filter_json_single_key_object (__w_ => sub {
73 $self->{widget}{$_[0]} 87 $self->{widget}{$_[0]}
74 }); 88 });
75 89
90 # widgetset new
76 $self->connect_ext (ws_n => sub { 91 $self->connect_ext (ws_n => sub {
77 my ($arg) = @_; 92 my ($id) = @_;
78 93
79 $self->{widgetset}{$arg{id}} = { 94 $self->{widgetset}{$id} = {
80 w => {}, 95 w => {},
81 }; 96 };
82 }); 97 });
83 98
99 # widgetset destroy
84 $self->connect_ext (ws_d => sub { 100 $self->connect_ext (ws_d => sub {
85 my ($arg) = @_; 101 my ($id) = @_;
86 102
87 my $ws = delete $self->{widgetset}{$arg{id}} 103 my $ws = delete $self->{widgetset}{$id}
88 or return; 104 or return;
89 105
90 $_->destroy 106 $_->destroy
91 for values %{$ws->{w}}; 107 for values %{$ws->{w}};
92 }); 108 });
93 109
110 # widgetset create
94 $self->connect_ext (ws_c => sub { 111 $self->connect_ext (ws_c => sub {
95 my ($arg) = @_; 112 my ($ws, $id, $class, $args) = @_;
96
97 my $args = $arg->{args} || {};
98 113
99 for my $ev (grep /^on_/, keys %$args) { 114 for my $ev (grep /^on_/, keys %$args) {
100 $args->{$ev} = sub { 115 $args->{$ev} = sub {
101 my $id = shift->{s_id}; 116 my $id = shift->{s_id};
102 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 117 $self->send_exti_msg (w_e => $id, $ev, \@_);
103 118
104 1 119 1
105 }; 120 };
106 } 121 }
107 122
108 if (my $widget = eval { 123 if (my $widget = eval {
109 local $SIG{__DIE__}; 124 local $SIG{__DIE__};
110 "CFPlus::UI::$arg->{class}"->new ( 125 "CFPlus::UI::$class"->new (
111 %$args, 126 %$args,
112 s_ws => $arg->{ws}, 127 s_ws => $ws,
113 s_id => $arg->{id}, 128 s_id => $id,
114 ) 129 )
115 } 130 }
116 ) { 131 ) {
117 $self->{widget}{$arg->{id}} 132 $self->{widget}{$id}
118 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 133 = $self->{widgetset}{$ws}{w}{$id}
119 = $widget; 134 = $widget;
120 135
121 $widget->connect (on_destroy => sub { 136 $widget->connect (on_destroy => sub {
122 my ($widget) = @_; 137 my ($widget) = @_;
123 138
124 delete $self->{widget}{$widget->{s_id}}; 139 delete $self->{widget}{$widget->{s_id}};
125 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
126 }); 141 });
127 } else { 142 } else {
128 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
129 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 144 $self->send_exti_msg (w_e => $id, "destroy");
130 } 145 }
131 }); 146 });
132 147
148 # widget call
133 $self->connect_ext (w_c => sub { 149 $self->connect_ext (w_c => sub {
134 my ($arg) = @_; 150 my ($id, $rid, $method, $args) = @_;
135 151
136 my $w = $self->{widget}{$arg->{id}} 152 my $w = $self->{widget}{$id}
137 or return; 153 or return;
138 my $m = $arg->{name};
139 154
140 my $a = $arg->{args} || []; 155 $args ||= [];
141 156
142 if (exists $arg->{rid}) { 157 if ($rid) {
143 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]); 158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
144 } else { 159 } else {
145 $w->$m (@$a); 160 $w->$method (@$args);
146 } 161 }
147 }); 162 });
148 163
164 # widget set
149 $self->connect_ext (w_s => sub { 165 $self->connect_ext (w_s => sub {
150 my ($arg) = @_; 166 my ($id, $attr) = @_;
151 167
152 my $w = $self->{widget}{$arg->{id}} 168 my $w = $self->{widget}{$id}
153 or return; 169 or return;
154 170
155 $w->{$arg->{name}} = $arg->{value}; 171 for (my $i = 0; $i < $#$attr; $i += 2) {
172 my ($member, $value) = @$attr[$i, $i+1];
173 if (defined $value) {
174 $w->{$member} = $value;
175 } else {
176 delete $w->{$member};
177 }
178 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
179 }
156 }); 180 });
157 181
182 # widget get
158 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
159 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
160 185
161 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
162 or return; 187 or return;
163 188
164 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
165 }); 190 });
166 191
192 # message window
193 $self->connect_ext (channel_info => sub {
194 my ($info) = @_;
195 $self->{channels}->{$info->{id}} = $info;
196 $::MESSAGE_WINDOW->add_channel ($info);
197 });
198
199 # destroy widgets on logout
167 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
168 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
169 $_->destroy 202 $_->destroy
170 for values %{delete $ws->{w} || {}}; 203 for values %{delete $ws->{w} || {}};
171 } 204 }
… …
384 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
385 418
386 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
387 $sktbl->clear; 420 $sktbl->clear;
388 421
422 my @add;
423
424 push @add,
389 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
392 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
393 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
394 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
395 432
396 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 433 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
397 434
398 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 435 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
399 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 436 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
427 } 464 }
428 465
429 1 466 1
430 }; 467 };
431 468
469 push @add,
432 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 471 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
434 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 472 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
435 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 473 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
436 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 474 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
437 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 475 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
476 ;
438 477
439 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
440 } 479 }
480
481 $sktbl->add_at (@add);
441 } 482 }
442 483
443 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
444 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
445 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
682} 723}
683 724
684sub face_find { 725sub face_find {
685 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
686 727
687 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
688
689 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
690 730
691 $face->{id} = $id; 731 $face->{id} = $id;
692 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
693 733
694 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
695 735
696 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737
738 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
741 }
697} 742}
698 743
699sub face_update { 744sub face_update {
700 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
701 746
747 if ($face->{type} == 0) { # FT_FACE
702 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
703 if $changed; 749 if $changed;
704 750
705 $self->set_texture ($face->{id} => delete $face->{image}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752
753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { };
755
756 if ($face->{type} == 3) { # FT_MUSIC
757 $cb = sub {
758 $self->{music_meta}{$facenum} = $face;
759
760 ::message ({ markup => "downloaded song #$facenum" })
761 if $changed;
762
763 &::audio_music_set ($self->{songs});
764 };
765 }
766
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 if ($changed) { # new data
770 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
771
772 CFPlus::DB::write_file $path, $data, sub {
773 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
774 $face->{meta} = $self->{json_coder}->decode ($meta_json);
775 $face->{path} = $path;
776
777 $cb->();
778 };
779 };
780 } else {
781 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
782 $face->{path} = $path;
783 $cb->();
784 }
785 }
706} 786}
707 787
708sub smooth_update { 788sub smooth_update {
709 my ($self, $facenum, $face) = @_; 789 my ($self, $facenum, $face) = @_;
710 790
711 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 791 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
712} 792}
713 793
714sub set_texture { 794sub set_texture {
715 my ($self, $id, $data) = @_; 795 my ($self, $id, $data) = @_;
796
797 return unless $self->{map};
716 798
717 $self->{texture}[$id] = my $tex = 799 $self->{texture}[$id] = my $tex =
718 new_from_image CFPlus::Texture 800 new_from_image CFPlus::Texture
719 $data, minify => 1, mipmap => 1; 801 $data, minify => 1, mipmap => 1;
720 802
721 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 803 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
722 $self->{map_widget}->update; 804 $self->{map_widget}->update;
805
806 $_->() for @{(delete $self->{face_cb}{$id}) || []};
807}
808
809sub connect_face_update {
810 my ($self, $id, $cb) = @_;
811
812 push @{$self->{face_cb}{$id}}, $cb;
813
814 CFPlus::guard {
815 @{$self->{face_cb}{$id}}
816 = grep $_ != $cb,
817 @{$self->{face_cb}{$id}};
818 }
723} 819}
724 820
725sub sound_play { 821sub sound_play {
726 my ($self, $x, $y, $soundnum, $type) = @_; 822 my ($self, $x, $y, $soundnum, $type) = @_;
823 warn "sound play <@_>\n";#d#
727 824
728 $self->{sound_play}->($x, $y, $soundnum, $type); 825 #$self->{sound_play}->($x, $y, $soundnum, $type);
729} 826}
730 827
731my $LAST_QUERY; # server is stupid, stupid, stupid 828my $LAST_QUERY; # server is stupid, stupid, stupid
732 829
733sub query { 830sub query {
… …
798 $self->{$type} = $text; 895 $self->{$type} = $text;
799 } else { 896 } else {
800 $self->logprint ("msg: ", $text); 897 $self->logprint ("msg: ", $text);
801 return if $color < 0; # negative color == ignore if not understood 898 return if $color < 0; # negative color == ignore if not understood
802 899
803 my $fg = $CF_COLOR[$color % @CF_COLOR]; 900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
804 901
805 ## try to create single paragraphs of multiple lines sent by the server 902 ## try to create single paragraphs of multiple lines sent by the server
806 # no longer neecssary with TRT servers 903 # no longer neecssary with TRT servers
807 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 904 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
808 905
809 ::message ({ fg => $fg, markup => $_ }) 906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
810 for split /\n/, $text; 907 for split /\n/, $text;
811 908
812 $self->{statusbox}->add ($text, 909 $self->{statusbox}->add ($text,
813 group => $text, 910 group => $text,
814 fg => $fg, 911 fg => $fg,
… …
911 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
912 return unless $::CONN; 1009 return unless $::CONN;
913 1010
914 $::FLOORBOX->clear; 1011 $::FLOORBOX->clear;
915 1012
1013 my @add;
1014
916 my $row; 1015 my $row;
917 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1016 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
918 if ($row < 6) { 1017 if ($row < 6) {
919 local $_->{face_widget}; # hack to force recreation of widget 1018 local $_->{face_widget}; # hack to force recreation of widget
920 local $_->{desc_widget}; # hack to force recreation of widget 1019 local $_->{desc_widget}; # hack to force recreation of widget
921 CFPlus::Item::update_widgets $_; 1020 CFPlus::Item::update_widgets $_;
922 1021
1022 push @add,
923 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1023 0, $row, $_->{face_widget},
924 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1024 1, $row, $_->{desc_widget};
925 1025
926 $row++; 1026 $row++;
927 } else { 1027 } else {
928 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1028 push @add, 1, $row, new CFPlus::UI::Button
929 text => "More...", 1029 text => "More...",
930 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1030 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
931 ); 1031 ;
932 last; 1032 last;
933 } 1033 }
934 } 1034 }
935 if ($::CONN->{open_container}) { 1035 if ($::CONN->{open_container}) {
936 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1036 push @add, 1, $row++, new CFPlus::UI::Button
937 text => "Close container", 1037 text => "Close container",
938 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1038 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
939 ); 1039 ;
940 } 1040 }
1041
1042 $::FLOORBOX->add_at (@add);
941 }); 1043 });
942 1044
943 $::WANT_REFRESH++; 1045 $::WANT_REFRESH++;
944} 1046}
945 1047
… …
1065 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1167 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1066 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1168 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1067 . "map size $self->{mapw}×$self->{maph}\n" 1169 . "map size $self->{mapw}×$self->{maph}\n"
1068 ); 1170 );
1069 1171
1070 ::setup_build_button ($self->{editor_support}->{builder_ui});
1071} 1172}
1072 1173
1073sub logged_in { 1174sub logged_in {
1074 my ($self) = @_; 1175 my ($self) = @_;
1075 1176
1076 $self->send_ext_req (cfplus_support => version => 1, sub { 1177 $self->send_ext_req (cfplus_support => version => 2, sub {
1178 my (%msg) = @_;
1179
1077 $self->{cfplus_ext} = $_[0]{version}; 1180 $self->{cfplus_ext} = $msg{version};
1078 $self->update_server_info; 1181 $self->update_server_info;
1079 1182
1080 if ($self->{cfplus_ext} >= 2) { 1183 if ($self->{cfplus_ext} >= 2) {
1081 $self->send_ext_req ("editor_support", sub { 1184 $self->send_ext_req ("editor_support", sub {
1082 $self->{editor_support} = $_[0]; 1185 $self->{editor_support} = { @_ };
1083 $self->update_server_info; 1186 $self->update_server_info;
1084 1187
1085 0 1188 0
1086 }); 1189 });
1087 } 1190 }
… …
1095 $self->send_command ("output-count $::CFG->{output_count}"); 1198 $self->send_command ("output-count $::CFG->{output_count}");
1096 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1199 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1097 $self->send_command ("pickup $::CFG->{pickup}"); 1200 $self->send_command ("pickup $::CFG->{pickup}");
1098} 1201}
1099 1202
1100sub buildat {
1101 my ($self, $builditem, $x, $y) = @_;
1102
1103 if ($self->{cfplus_ext}) {
1104 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1105 }
1106}
1107
1108sub lookat { 1203sub lookat {
1109 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
1110 1205
1111 if ($self->{cfplus_ext}) { 1206 if ($self->{cfplus_ext}) {
1112 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1207 $self->send_ext_req (lookat => $x, $y, sub {
1113 my ($msg) = @_; 1208 my (%msg) = @_;
1114 1209
1115 if (exists $msg->{npc_dialog}) { 1210 if (exists $msg{npc_dialog}) {
1116 # start npc chat dialog 1211 # start npc chat dialog
1117 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1212 $self->{npc_dialog} = new CFPlus::NPCDialog::
1118 dx => $x, 1213 token => $msg{npc_dialog},
1119 dy => $y,
1120 title => "$msg->{npc_dialog} (NPC)", 1214 title => "$msg{npc_dialog}[0] (NPC)",
1121 conn => $self, 1215 conn => $self,
1122 ; 1216 ;
1123 } 1217 }
1124 }); 1218 });
1125 } 1219 }
… …
1190 on_activate => sub { $this->destroy; 1 }, 1284 on_activate => sub { $this->destroy; 1 },
1191 ; 1285 ;
1192 1286
1193 $self->update_options; 1287 $self->update_options;
1194 1288
1195 $self->{id} = $self->{conn}->send_ext_req ( 1289 $self->{id} = "npc-channel-" . $self->{conn}->token;
1196 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1290 $self->{conn}->connect_ext ($self->{id} => sub {
1197 sub { $this && $this->feed (@_) } 1291 $this->feed (@_) if $this;
1198 ); 1292 });
1293
1294 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1199 1295
1200 $self->{entry}->grab_focus; 1296 $self->{entry}->grab_focus;
1201 1297
1202 $self->{textview}->add_paragraph ({ 1298 $self->{textview}->add_paragraph ({
1203 fg => [1, 1, 0, 1], 1299 fg => [1, 1, 0, 1],
… …
1226 ); 1322 );
1227 } 1323 }
1228} 1324}
1229 1325
1230sub feed { 1326sub feed {
1231 my ($self, $msg) = @_; 1327 my ($self, $type, @arg) = @_;
1232 1328
1233 CFPlus::weaken $self; 1329 CFPlus::weaken $self;
1234 1330
1235 if ($msg->{msgtype} eq "reply") { 1331 if ($type eq "update") {
1332 my (%info) = @arg;
1333
1236 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1334 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1237 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1335 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1238
1239 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1240 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1241 my @link;
1242 $text =~ s{
1243 ($match)
1244 }{
1245 my $kw = $1;
1246
1247 push @link, new CFPlus::UI::Label
1248 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1249 can_hover => 1,
1250 can_events => 1,
1251 padding_x => 0,
1252 padding_y => 0,
1253 on_button_up => sub {
1254 $self->send ($kw);
1255 };
1256
1257 "\x{fffc}"
1258 }giex;
1259 1336
1337 if (exists $info{msg}) {
1338 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1339 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1340 my @link;
1341 $text =~ s{
1342 ($match)
1343 }{
1344 my $kw = $1;
1345
1346 push @link, new CFPlus::UI::Label
1347 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1348 can_hover => 1,
1349 can_events => 1,
1350 padding_x => 0,
1351 padding_y => 0,
1352 on_button_up => sub {
1353 $self->send ($kw);
1354 };
1355
1356 "\x{fffc}"
1357 }giex;
1358
1260 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1359 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1261 $self->{textview}->scroll_to_bottom; 1360 $self->{textview}->scroll_to_bottom;
1361 }
1362
1262 $self->update_options; 1363 $self->update_options;
1263 } else { 1364 } else {
1264 $self->destroy; 1365 $self->destroy;
1265 } 1366 }
1266 1367
… …
1271 my ($self, $msg) = @_; 1372 my ($self, $msg) = @_;
1272 1373
1273 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1374 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1274 $self->{textview}->scroll_to_bottom; 1375 $self->{textview}->scroll_to_bottom;
1275 1376
1276 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1377 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1277} 1378}
1278 1379
1279sub destroy { 1380sub destroy {
1280 my ($self) = @_; 1381 my ($self) = @_;
1281 1382
1282 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1383 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1283 1384
1284 if ($self->{conn}) { 1385 if ($self->{conn}) {
1285 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1386 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1286 delete $self->{conn}{npc_dialog}; 1387 delete $self->{conn}{npc_dialog};
1287 $self->{conn}->disconnect_ext ($self->{id}); 1388 $self->{conn}->disconnect_ext ($self->{id});
1288 } 1389 }
1289 1390
1290 $self->SUPER::destroy; 1391 $self->SUPER::destroy;

Diff Legend

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