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.132 by root, Tue Jul 24 05:13:23 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_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 # destroy widgets on logout
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 191 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 192 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 193 $_->destroy
168 for values %{delete $ws->{w} || {}}; 194 for values %{delete $ws->{w} || {}};
169 } 195 }
… …
382 my @skills = keys %{ $self->{skill_info} }; 408 my @skills = keys %{ $self->{skill_info} };
383 409
384 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 410 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
385 $sktbl->clear; 411 $sktbl->clear;
386 412
413 my @add;
414
415 push @add,
387 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 416 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 417 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
389 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 418 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 419 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 420 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
392 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 421 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
422 ;
393 423
394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 424 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395 425
396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 426 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); 427 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
425 } 455 }
426 456
427 1 457 1
428 }; 458 };
429 459
460 push @add,
430 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 461 $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); 462 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 463 $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); 464 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, 465 $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); 466 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
467 ;
436 468
437 $x++ and ($x, $y) = (0, $y + 1); 469 $x++ and ($x, $y) = (0, $y + 1);
438 } 470 }
471
472 $sktbl->add_at (@add);
439 } 473 }
440 474
441 for (grep exists $stats->{$_}, @skills) { 475 for (grep exists $stats->{$_}, @skills) {
442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 476 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 477 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
680} 714}
681 715
682sub face_find { 716sub face_find {
683 my ($self, $facenum, $face, $cb) = @_; 717 my ($self, $facenum, $face, $cb) = @_;
684 718
685 my $hash = "$face->{chksum},$face->{name}"; 719 if ($face->{type} == 0) { # FT_FACE
686
687 my $id = CFPlus::DB::get_tile_id_sync $hash; 720 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688 721
689 $face->{id} = $id; 722 $face->{id} = $id;
690 $self->{faceid}[$facenum] = $id; 723 $self->{faceid}[$facenum] = $id;
691 724
692 $self->{map}->set_tileid ($facenum => $id); 725 $self->{map}->set_tileid ($facenum => $id);
693 726
694 CFPlus::DB::get tilecache => $id, $cb; 727 CFPlus::DB::get tilecache => $id, $cb;
728
729 } elsif ($face->{type} & 1) { # with metadata
730 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
731 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
732 }
695} 733}
696 734
697sub face_update { 735sub face_update {
698 my ($self, $facenum, $face, $changed) = @_; 736 my ($self, $facenum, $face, $changed) = @_;
699 737
738 if ($face->{type} == 0) { # FT_FACE
700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 739 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701 if $changed; 740 if $changed;
702 741
703 $self->set_texture ($face->{id} => delete $face->{image}); 742 $self->set_texture ($face->{id} => delete $face->{data});
743
744 } elsif ($face->{type} & 1) { # split metadata
745 my $cb = sub { };
746
747 if ($face->{type} == 3) { # FT_MUSIC
748 $cb = sub {
749 $self->{music_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded song #$facenum" })
752 if $changed;
753
754 &::audio_music_set ($self->{songs});
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760 my $path = CFPlus::DB::path_of_res $face->{name};
761
762 CFPlus::DB::write_file $path, $data, sub {
763 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764 $face->{meta} = $self->{json_coder}->decode ($meta_json);
765 $face->{path} = $path;
766
767 $cb->();
768 };
769 };
770 } else {
771 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
772 $cb->();
773 }
774 }
704} 775}
705 776
706sub smooth_update { 777sub smooth_update {
707 my ($self, $facenum, $face) = @_; 778 my ($self, $facenum, $face) = @_;
708 779
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710} 781}
711 782
712sub set_texture { 783sub set_texture {
713 my ($self, $id, $data) = @_; 784 my ($self, $id, $data) = @_;
785
786 return unless $self->{map};
714 787
715 $self->{texture}[$id] = my $tex = 788 $self->{texture}[$id] = my $tex =
716 new_from_image CFPlus::Texture 789 new_from_image CFPlus::Texture
717 $data, minify => 1, mipmap => 1; 790 $data, minify => 1, mipmap => 1;
718 791
719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
720 $self->{map_widget}->update; 793 $self->{map_widget}->update;
794
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796}
797
798sub connect_face_update {
799 my ($self, $id, $cb) = @_;
800
801 push @{$self->{face_cb}{$id}}, $cb;
802
803 CFPlus::guard {
804 @{$self->{face_cb}{$id}}
805 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}};
807 }
721} 808}
722 809
723sub sound_play { 810sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 811 my ($self, $x, $y, $soundnum, $type) = @_;
725 812
… …
909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910 return unless $::CONN; 997 return unless $::CONN;
911 998
912 $::FLOORBOX->clear; 999 $::FLOORBOX->clear;
913 1000
1001 my @add;
1002
914 my $row; 1003 my $row;
915 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
916 if ($row < 6) { 1005 if ($row < 6) {
917 local $_->{face_widget}; # hack to force recreation of widget 1006 local $_->{face_widget}; # hack to force recreation of widget
918 local $_->{desc_widget}; # hack to force recreation of widget 1007 local $_->{desc_widget}; # hack to force recreation of widget
919 CFPlus::Item::update_widgets $_; 1008 CFPlus::Item::update_widgets $_;
920 1009
1010 push @add,
921 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1011 0, $row, $_->{face_widget},
922 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1012 1, $row, $_->{desc_widget};
923 1013
924 $row++; 1014 $row++;
925 } else { 1015 } else {
926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1016 push @add, 1, $row, new CFPlus::UI::Button
927 text => "More...", 1017 text => "More...",
928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929 ); 1019 ;
930 last; 1020 last;
931 } 1021 }
932 } 1022 }
933 if ($::CONN->{open_container}) { 1023 if ($::CONN->{open_container}) {
934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1024 push @add, 1, $row++, new CFPlus::UI::Button
935 text => "Close container", 1025 text => "Close container",
936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937 ); 1027 ;
938 } 1028 }
1029
1030 $::FLOORBOX->add_at (@add);
939 }); 1031 });
940 1032
941 $::WANT_REFRESH++; 1033 $::WANT_REFRESH++;
942} 1034}
943 1035
… …
1069} 1161}
1070 1162
1071sub logged_in { 1163sub logged_in {
1072 my ($self) = @_; 1164 my ($self) = @_;
1073 1165
1074 $self->send_ext_req (cfplus_support => version => 1, sub { 1166 $self->send_ext_req (cfplus_support => version => 2, sub {
1167 my (%msg) = @_;
1168
1075 $self->{cfplus_ext} = $_[0]{version}; 1169 $self->{cfplus_ext} = $msg{version};
1076 $self->update_server_info; 1170 $self->update_server_info;
1077 1171
1078 if ($self->{cfplus_ext} >= 2) { 1172 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub { 1173 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0]; 1174 $self->{editor_support} = { @_ };
1081 $self->update_server_info; 1175 $self->update_server_info;
1082 1176
1083 0 1177 0
1084 }); 1178 });
1085 } 1179 }
… …
1105 1199
1106sub lookat { 1200sub lookat {
1107 my ($self, $x, $y) = @_; 1201 my ($self, $x, $y) = @_;
1108 1202
1109 if ($self->{cfplus_ext}) { 1203 if ($self->{cfplus_ext}) {
1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1204 $self->send_ext_req (lookat => $x, $y, sub {
1111 my ($msg) = @_; 1205 my (%msg) = @_;
1112 1206
1113 if (exists $msg->{npc_dialog}) { 1207 if (exists $msg{npc_dialog}) {
1114 # start npc chat dialog 1208 # start npc chat dialog
1115 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1209 $self->{npc_dialog} = new CFPlus::NPCDialog::
1116 dx => $x, 1210 token => $msg{npc_dialog},
1117 dy => $y,
1118 title => "$msg->{npc_dialog} (NPC)", 1211 title => "$msg{npc_dialog}[0] (NPC)",
1119 conn => $self, 1212 conn => $self,
1120 ; 1213 ;
1121 } 1214 }
1122 }); 1215 });
1123 } 1216 }
… …
1130 1223
1131 (delete $self->{npc_dialog})->destroy 1224 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1225 if $self->{npc_dialog};
1133 1226
1134 $self->SUPER::destroy; 1227 $self->SUPER::destroy;
1228
1229 %$self = ();
1135} 1230}
1136 1231
1137package CFPlus::NPCDialog; 1232package CFPlus::NPCDialog;
1138 1233
1139our @ISA = 'CFPlus::UI::Toplevel'; 1234our @ISA = 'CFPlus::UI::Toplevel';
… …
1186 on_activate => sub { $this->destroy; 1 }, 1281 on_activate => sub { $this->destroy; 1 },
1187 ; 1282 ;
1188 1283
1189 $self->update_options; 1284 $self->update_options;
1190 1285
1191 $self->{id} = $self->{conn}->send_ext_req ( 1286 $self->{id} = "npc-channel-" . $self->{conn}->token;
1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1287 $self->{conn}->connect_ext ($self->{id} => sub {
1193 sub { $this && $this->feed (@_) } 1288 $this->feed (@_) if $this;
1194 ); 1289 });
1290
1291 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195 1292
1196 $self->{entry}->grab_focus; 1293 $self->{entry}->grab_focus;
1197 1294
1198 $self->{textview}->add_paragraph ({ 1295 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1], 1296 fg => [1, 1, 0, 1],
… …
1222 ); 1319 );
1223 } 1320 }
1224} 1321}
1225 1322
1226sub feed { 1323sub feed {
1227 my ($self, $msg) = @_; 1324 my ($self, $type, @arg) = @_;
1228 1325
1229 CFPlus::weaken $self; 1326 CFPlus::weaken $self;
1230 1327
1231 if ($msg->{msgtype} eq "reply") { 1328 if ($type eq "update") {
1329 my (%info) = @arg;
1330
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1331 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1332 $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 1333
1334 if (exists $info{msg}) {
1335 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1336 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1337 my @link;
1338 $text =~ s{
1339 ($match)
1340 }{
1341 my $kw = $1;
1342
1343 push @link, new CFPlus::UI::Label
1344 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1345 can_hover => 1,
1346 can_events => 1,
1347 padding_x => 0,
1348 padding_y => 0,
1349 on_button_up => sub {
1350 $self->send ($kw);
1351 };
1352
1353 "\x{fffc}"
1354 }giex;
1355
1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1356 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257 $self->{textview}->scroll_to_bottom; 1357 $self->{textview}->scroll_to_bottom;
1358 }
1359
1258 $self->update_options; 1360 $self->update_options;
1259 } else { 1361 } else {
1260 $self->destroy; 1362 $self->destroy;
1261 } 1363 }
1262 1364
… …
1267 my ($self, $msg) = @_; 1369 my ($self, $msg) = @_;
1268 1370
1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1371 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270 $self->{textview}->scroll_to_bottom; 1372 $self->{textview}->scroll_to_bottom;
1271 1373
1272 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1374 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273} 1375}
1274 1376
1275sub destroy { 1377sub destroy {
1276 my ($self) = @_; 1378 my ($self) = @_;
1277 1379
1278 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1380 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279 1381
1280 if ($self->{conn}) { 1382 if ($self->{conn}) {
1281 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1383 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282 delete $self->{conn}{npc_dialog}; 1384 delete $self->{conn}{npc_dialog};
1283 $self->{conn}->disconnect_ext ($self->{id}); 1385 $self->{conn}->disconnect_ext ($self->{id});
1284 } 1386 }
1285 1387
1286 $self->SUPER::destroy; 1388 $self->SUPER::destroy;

Diff Legend

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