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.123 by root, Thu Jul 19 16:44:14 2007 UTC vs.
Revision 1.162 by root, Wed Aug 22 21:14:06 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, 26 xwidget1 => 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 (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123
124 $self->{json_coder} 53 $self->{json_coder}
125 ->convert_blessed 54 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
127 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
128 }); 57 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226 58
227 # destroy widgets on logout 59 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 60 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy 62 $_->destroy
… …
253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
254 86
255 $self 87 $self
256} 88}
257 89
90sub update_fx_want {
91 my ($self) = @_;
92
93 $self->send_exti_msg (fx_want => {
94 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
95 5 => !!$::CFG->{audio_enable}, # FT_SOUND
96 6 => 1, # FT_RSRC
97 });
98}
99
100sub ext_capabilities {
101 my ($self, %cap) = @_;
102
103 #$self->send ("setup sound 0"); # we use a different protocol
104 $self->update_fx_want;
105
106 $self->send_exti_req (resource => "exp_table", sub {
107 my ($exp_table) = @_;
108
109 $self->register_face_handler ($exp_table, sub {
110 my ($face) = @_;
111
112 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
113 $_->() for values %{ $self->{on_exp_update} || {} };
114 });
115
116 ()
117 });
118
119 if (my $ts = $cap{tileset}) {
120 if (my ($default) = grep $_->[2] & 1, @$ts) {
121 $self->{tileset} = $default;
122 $self->{tilesize} = $default->[3];
123 $self->setup_req (tileset => $default->[0]);
124
125 my $w = int $self->{mapw} * 32 / $self->{tilesize};
126 my $h = int $self->{maph} * 32 / $self->{tilesize};
127
128 $self->setup_req (mapsize => "${w}x${h}");
129 }
130 }
131}
132
133sub ext_ambient_music {
134 my ($self, $songs) = @_;
135 &::audio_music_set_ambient ($songs);
136}
137
138#############################################################################
139
140sub widget_associate {
141 my ($self, $ws, $id, $widget) = @_;
142
143 if ($widget) {
144 $widget->{s_id} = $id;
145 $self->{widget}{$id} = $widget;
146
147 if ($ws) {
148 $widget->{s_ws} = $ws;
149 $self->{widgetset}{$ws}{w}{$id} = $widget;
150 }
151
152 $widget->connect (on_destroy => sub {
153 my ($widget) = @_;
154
155 delete $self->{widget}{$widget->{s_id}};
156 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
157 if exists $widget->{s_ws};
158 });
159
160 1
161 } else {
162 $self->send_exti_msg (w_e => $id, undef);
163
164 0
165 }
166}
167
168# widgetset new
169sub ext_ws_n {
170 my ($self, $id) = @_;
171
172 $self->{widgetset}{$id} = {
173 w => {},
174 };
175}
176
177# widgetset destroy
178sub ext_ws_d {
179 my ($self, $id) = @_;
180
181 my $ws = delete $self->{widgetset}{$id}
182 or return;
183
184 $_->destroy
185 for values %{$ws->{w}};
186}
187
188# widgetset create
189sub ext_ws_c {
190 my ($self, $ws, $id, $class, $args) = @_;
191
192 for my $ev (grep /^on_/, keys %$args) {
193 my $rid = $args->{$ev};
194 $args->{$ev} = sub {
195 my $id = shift->{s_id};
196 $self->send_exti_msg (w_e => $id, $rid, @_);
197
198 1
199 };
200 }
201
202 $self->widget_associate (
203 $ws, $id => scalar eval {
204 local $SIG{__DIE__};
205 "CFPlus::UI::$class"->new (%$args)
206 }
207 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
208}
209
210# widgetset associate
211sub ext_ws_a {
212 my ($self, %ass) = @_;
213
214 # everything that has a name, wether conceivably useful or not
215 my %wkw = (
216 root => $CFPlus::UI::ROOT,
217 tooltip => $CFPlus::UI::TOOLTIP,
218
219 mapwidget => $::MAPWIDGET,
220 buttonbar => $::BUTTONBAR,
221 metaserver => $::METASERVER,
222 buttonbar => $::BUTTONBAR,
223 login_button => $::LOGIN_BUTTON,
224 quit_dialog => $::QUIT_DIALOG,
225 host_entry => $::HOST_ENTRY,
226 metaserver => $::METASERVER,
227 server_info => $::SERVER_INFO,
228
229 setup_dialog => $::SETUP_DIALOG,
230 setup_notebook => $::SETUP_NOTEBOOK,
231 setup_server => $::SETUP_SERVER,
232 setup_keyboard => $::SETUP_KEYBOARD,
233
234 pl_notebook => $::PL_NOTEBOOK,
235 pl_window => $::PL_WINDOW,
236 inventory_page => $::INVENTORY_PAGE,
237 stats_page => $::STATS_PAGE,
238 skill_page => $::SKILL_PAGE,
239 spell_page => $::SPELL_PAGE,
240 spell_list => $::SPELL_LIST,
241
242 floorbox => $::FLOORBOX,
243 help_window => $::HELP_WINDOW,
244 message_window => $::MESSAGE_WINDOW,
245 statusbox => $::SDTATUSBOX,
246
247 inv => $::INV,
248 invr => $::INVR,
249 invr_hb => $::INVR_HB,
250 );
251
252 while (my ($id, $name) = each %ass) {
253 $self->widget_associate (undef, $id => $wkw{$name})
254 or warn "server failed to associate non-existent well-known widget $name\n";
255 }
256}
257
258# widget call
259sub ext_w_c {
260 my ($self, $id, $rid, $method, @args) = @_;
261
262 my $w = $self->{widget}{$id}
263 or return;
264
265 if ($rid) {
266 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
267 } else {
268 $w->$method (@args);
269 }
270}
271
272# widget set
273sub ext_w_s {
274 my ($self, $id, $attr) = @_;
275
276 my $w = $self->{widget}{$id}
277 or return;
278
279 for (my $i = 0; $i < $#$attr; $i += 2) {
280 my ($member, $value) = @$attr[$i, $i+1];
281 if (defined $value) {
282 $w->{$member} = $value;
283 } else {
284 delete $w->{$member};
285 }
286 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
287 }
288}
289
290# widget get
291sub ext_w_g {
292 my ($self, $id, $rid, $attr) = @_;
293
294 my $w = $self->{widget}{$id}
295 or return;
296
297 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
298}
299
300# message window
301sub ext_channel_info {
302 my ($self, $info) = @_;
303 $self->{channels}->{$info->{id}} = $info;
304 $::MESSAGE_WINDOW->add_channel ($info);
305}
306
307#############################################################################
308
258sub logprint { 309sub logprint {
259 my ($self, @a) = @_; 310 my ($self, @a) = @_;
260 311
261 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
262 my $path = "$Crossfire::VARDIR/log.$self->{host}";
263
264 open my $fh, ">>:utf8", $path
265 or die "Couldn't open logfile $path: $!";
266
267 $fh->autoflush (1);
268
269 $fh;
270 };
271
272 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
273
274 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
275 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
276
277 print {$self->{log_fh}} "$ts ", @a, "\n";
278} 313}
279 314
280sub _stat_numdiff { 315sub _stat_numdiff {
281 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
282 317
… …
415 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
416 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
417 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 454 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
455 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
421 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
422 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
423 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
424 460
… …
442 for keys %RES_TBL; 478 for keys %RES_TBL;
443 479
444 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
445 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
446 482
447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 483 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
484 map [$_, $self->{skill_info}{$_}],
485 grep exists $stats->{$_},
486 @skills;
487
488 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
489 $self->{stat_order} = join ",", map $_->[0], @order;
490
448 $sktbl->clear; 491 $sktbl->clear;
449 492
493 my $sw = $self->{skillwid}{""} ||= [
450 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
451 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 495 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
496 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
452 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
453 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
454 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 499 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
500 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
455 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 501 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
502 ];
503
504 my @add = @$sw;
456 505
457 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 506 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
458 507
459 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 508 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
460 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 509 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
461 510
462 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
463 for ( 512 for (@order) {
464 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
465 map [$_, $self->{skill_info}{$_}],
466 grep exists $stats->{$_},
467 @skills
468 ) {
469 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
470 514
471 my $spell_cb = sub { 515 my $spell_cb = sub {
472 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
473 517
… …
488 } 532 }
489 533
490 1 534 1
491 }; 535 };
492 536
493 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 537 my $sw = $self->{skillwid}{$idx} ||= [
538 # exp
539 (new CFPlus::UI::Label
494 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 540 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
495 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 541
542 # level
543 (new CFPlus::UI::Label
496 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 544 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
545
546 # progress
547 (new CFPlus::UI::ExperienceProgress),
548
549 # label
497 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 550 (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
498 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 551 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
552 ];
553
554 push @add,
555 $x * 4 + 0, $y, $sw->[0],
556 $x * 4 + 1, $y, $sw->[1],
557 $x * 4 + 2, $y, $sw->[2],
558 $x * 4 + 3, $y, $sw->[3],
559 ;
499 560
500 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
501 } 562 }
563
564 $sktbl->add_at (@add);
502 } 565 }
503 566
504 for (grep exists $stats->{$_}, @skills) { 567 for (grep exists $stats->{$_}, @skills) {
568 next if $prev->{$_} == $stats->{$_};
569
570 my $sw = $self->{skillwid}{$_};
505 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 571 $sw->[0]->set_text (::formsep ($stats->{$_}[1]));
506 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 572 $sw->[1]->set_text ($stats->{$_}[0] * 1);
573 $sw->[2]->set_value (@{$stats->{$_}});
507 } 574 }
508} 575}
509 576
510sub macro_send { 577sub macro_send {
511 my ($self, $macro) = @_; 578 my ($self, $macro) = @_;
… …
539} 606}
540 607
541sub feed_map1a { 608sub feed_map1a {
542 my ($self, $data) = @_; 609 my ($self, $data) = @_;
543 610
544 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 611 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
612 my $delay;
613
614 for my $tile (@$missing) {
615 next if $self->{delay}{$tile};
616
617 $delay = 1;
618
619 if (my $tex = $::CONN->{texture}[$tile]) {
620 $tex->upload;
621 } else {
622 $self->{delay}{$tile} = 1;
623
624 # we assume the face is in-flight and will eventually come
625 push @{$self->{tile_cb}{$tile}}, sub {
626 delete $self->{delay}{$tile};
627 $_[0]->upload;
628 };
629 }
630 }
631
632 if ($delay) {
633 # delay the map drawing a tiny bit in the hope of getting the missing fetched
634 Event->timer (after => 0.03, cb => sub {
635 $_[0]->w->cancel;
636 $self->{map_widget}->update
637 if $self->{map_widget};
638 });
639 } else {
545 $self->{map_widget}->update; 640 $self->{map_widget}->update;
641 }
546} 642}
547 643
548sub magicmap { 644sub magicmap {
549 my ($self, $w, $h, $x, $y, $data) = @_; 645 my ($self, $w, $h, $x, $y, $data) = @_;
550 646
… …
557 my $map_info = delete $self->{map_info} 653 my $map_info = delete $self->{map_info}
558 or return; 654 or return;
559 655
560 my ($hash, $x, $y, $w, $h) = @$map_info; 656 my ($hash, $x, $y, $w, $h) = @$map_info;
561 657
562 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 658 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
659 $self->{map_cache_new}{$hash} = \$data;
563 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 660 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
564 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
565} 661}
566 662
567sub map_clear { 663sub map_clear {
568 my ($self) = @_; 664 my ($self) = @_;
569 665
… …
575} 671}
576 672
577sub bg_fetch { 673sub bg_fetch {
578 my ($self) = @_; 674 my ($self) = @_;
579 675
580 my $id; 676 my $tile;
581 677
582 do { 678 do {
583 $id = pop @{$self->{bg_fetch}} 679 $tile = pop @{$self->{bg_fetch}}
584 or return; 680 or return;
585 } while $self->{texture}[$id]; 681 } while $self->{texture}[$tile];
586 682
587 CFPlus::DB::get tilecache => $id, sub { 683 CFPlus::DB::get tilecache => $tile, sub {
588 my ($data) = @_; 684 my ($data) = @_;
589 685
590 return unless $self->{map}; # stop when destroyed 686 return unless $self->{map}; # stop when destroyed
591 687
592 $self->set_texture ($id => $data)
593 if defined $data; 688 if (defined $data) {
689 $self->have_tile ($tile, $data);
690 $self->{texture}[$tile]->upload;
691 }
594 692
595 $self->bg_fetch; 693 $self->bg_fetch;
596 }; 694 };
597} 695}
598 696
599sub load_map($$$) { 697sub load_map($$$) {
600 my ($self, $hash, $x, $y) = @_; 698 my ($self, $hash, $x, $y) = @_;
601 699
602 my $gen = $self->{map_change_gen}; 700 my $gen = $self->{map_change_gen};
603 701
604 CFPlus::DB::get $self->{mapcache} => $hash, sub { 702 my $cb = sub {
605 return unless $gen == $self->{map_change_gen}; 703 return unless $gen == $self->{map_change_gen};
606 704
607 my ($data) = @_; 705 my ($data) = @_;
608 706
609 if (defined $data) { 707 if (defined $data) {
708 $self->{map_cache_new}{$hash} = \$data;
709
610 $data = Compress::LZF::decompress $data; 710 my $data = Compress::LZF::decompress $data;
611 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
612 711
613 my $inprogress = @{ $self->{bg_fetch} || [] }; 712 my $inprogress = @{ $self->{bg_fetch} || [] };
614 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 713 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
615 $self->bg_fetch unless $inprogress; 714 $self->bg_fetch unless $inprogress;
616 } 715 }
617 }; 716 };
717
718 if (my $rdata = $self->{map_cache_old}{$hash}) {
719 $cb->($$rdata);
720 } else {
721 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
722 }
618} 723}
619 724
620# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 725# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
621# (server resource,s latency, bandwidth), so this hack is warranted. 726# (server resource,s latency, bandwidth), so this hack is warranted.
622# the right fix is to make real tiled maps with an overview file 727# the right fix is to make real tiled maps with an overview file
… …
715 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 820 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
716 821
717 $self->flush_map; 822 $self->flush_map;
718 823
719 ++$self->{map_change_gen}; 824 ++$self->{map_change_gen};
825 $self->{map_cache_old} = delete $self->{map_cache_new};
720 826
721 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 827 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
722 828
723 my $mapmapw = $self->{mapmap}->{w}; 829 my $mapmapw = $self->{mapmap}->{w};
724 my $mapmaph = $self->{mapmap}->{h}; 830 my $mapmaph = $self->{mapmap}->{h};
… …
743} 849}
744 850
745sub face_find { 851sub face_find {
746 my ($self, $facenum, $face, $cb) = @_; 852 my ($self, $facenum, $face, $cb) = @_;
747 853
748 my $hash = "$face->{chksum},$face->{name}"; 854 if ($face->{type} == 0) { # FT_FACE
749
750 my $id = CFPlus::DB::get_tile_id_sync $hash; 855 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
751 856
752 $face->{id} = $id; 857 $face->{id} = $id;
753 $self->{faceid}[$facenum] = $id;
754
755 $self->{map}->set_tileid ($facenum => $id); 858 $self->{map}->set_tileid ($facenum => $id);
756 859
757 CFPlus::DB::get tilecache => $id, $cb; 860 CFPlus::DB::get tilecache => $id, $cb;
861
862 } elsif ($face->{type} & 1) { # with metadata
863 CFPlus::DB::get res_meta => $face->{name}, $cb;
864
865 } else { # no metadata
866 CFPlus::DB::get res_data => $face->{name}, $cb;
867 }
758} 868}
759 869
760sub face_update { 870sub face_update {
761 my ($self, $facenum, $face, $changed) = @_; 871 my ($self, $facenum, $face, $changed) = @_;
762 872
873 if ($face->{type} == 0) {
874 # image, FT_FACE
763 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 875 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
764 if $changed; 876 if $changed;
765 877
766 $self->set_texture ($face->{id} => delete $face->{image}); 878 $self->have_tile ($face->{id}, delete $face->{data});
879
880 } elsif ($face->{type} & 1) {
881 # split metadata case, FT_MUSIC, FT_SOUND
882 if ($changed) { # new data
883 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
884 $face->{data} = $meta;
885
886 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
887 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
888 }
889
890 $face->{data} = $self->{json_coder}->decode ($face->{data});
891
892 ::add_license ($face);
893
894 if ($face->{type} == 3) { # FT_MUSIC
895 ::message ({ markup => "downloaded song #$facenum" })
896 if $changed;
897
898 &::audio_music_push ($facenum);
899 } elsif ($face->{type} == 5) { # FT_SOUND
900 ::message ({ markup => "downloaded sound #$facenum" })
901 if $changed;
902
903 &::audio_sound_push ($facenum);
904 }
905
906 } else {
907 # flat resource case, FT_RSRC
908 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
909 if $changed;
910 }
911
912 if (my $cbs = $self->{face_cb}{$facenum}) {
913 $_->($face, $changed) for @$cbs;
914 }
767} 915}
768 916
769sub smooth_update { 917sub smooth_update {
770 my ($self, $facenum, $face) = @_; 918 my ($self, $facenum, $face) = @_;
771 919
772 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 920 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
773} 921}
774 922
775sub set_texture { 923sub have_tile {
776 my ($self, $id, $data) = @_; 924 my ($self, $tile, $data) = @_;
777 925
778 return unless $self->{map}; 926 return unless $self->{map};
779 927
780 $self->{texture}[$id] = my $tex = 928 my $tex = $self->{texture}[$tile] ||=
781 new_from_image CFPlus::Texture 929 new CFPlus::Texture
930 tile => $tile,
931 image => $data, delete_image => 1,
782 $data, minify => 1, mipmap => 1; 932 minify => 1, mipmap => 1;
783 933
784 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 934 if (my $cbs = delete $self->{tile_cb}{$tile}) {
785 $self->{map_widget}->update; 935 $_->($tex) for @$cbs;
786 936 }
787 $_->() for @{(delete $self->{face_cb}{$id}) || []};
788} 937}
789 938
790sub connect_face_update { 939# call in non-void context registers a temporary
940# hook with handle, otherwise its permanent
941sub on_face_change {
791 my ($self, $id, $cb) = @_; 942 my ($self, $num, $cb) = @_;
792 943
793 push @{$self->{face_cb}{$id}}, $cb; 944 push @{$self->{face_cb}{$num}}, $cb;
794 945
946 defined wantarray
795 CFPlus::guard { 947 ? CFPlus::guard {
796 @{$self->{face_cb}{$id}} 948 @{$self->{face_cb}{$num}}
797 = grep $_ != $cb, 949 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}}; 950 @{$self->{face_cb}{$num}};
799 } 951 }
952 : ()
953}
954
955# call in non-void context registers a temporary
956# hook with handle, otherwise its permanent
957sub register_face_handler {
958 my ($self, $num, $cb) = @_;
959
960 return unless $num;
961
962 # invoke if available right now
963 $cb->($self->{face}[$num], 0)
964 unless exists $self->{face}[$num]{loading};
965
966 # future changes
967 $self->on_face_change ($num => $cb)
800} 968}
801 969
802sub sound_play { 970sub sound_play {
803 my ($self, $x, $y, $soundnum, $type) = @_; 971 my ($self, $type, $face, $dx, $dy, $vol) = @_;
804 972
805 $self->{sound_play}->($x, $y, $soundnum, $type); 973 &::audio_sound_play ($face, $dx, $dy, $vol)
974 unless $type & 1; # odd types are silent for future expansion
806} 975}
807 976
808my $LAST_QUERY; # server is stupid, stupid, stupid 977my $LAST_QUERY; # server is stupid, stupid, stupid
809 978
810sub query { 979sub query {
… …
875 $self->{$type} = $text; 1044 $self->{$type} = $text;
876 } else { 1045 } else {
877 $self->logprint ("msg: ", $text); 1046 $self->logprint ("msg: ", $text);
878 return if $color < 0; # negative color == ignore if not understood 1047 return if $color < 0; # negative color == ignore if not understood
879 1048
880 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1049 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
881 1050
882 ## try to create single paragraphs of multiple lines sent by the server 1051 ## try to create single paragraphs of multiple lines sent by the server
883 # no longer neecssary with TRT servers 1052 # no longer neecssary with TRT servers
884 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1053 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
885 1054
886 ::message ({ fg => $fg, markup => $_ }) 1055 ::message ({
1056 fg => $fg,
1057 markup => $_,
1058 type => $type,
1059 extra => [@extra],
1060 color_flags => $color
887 for split /\n/, $text; 1061 }) for split /\n/, $text;
888 1062
889 $self->{statusbox}->add ($text, 1063 $self->{statusbox}->add ($text,
890 group => $text, 1064 group => $text,
891 fg => $fg, 1065 fg => $fg,
892 timeout => $color >= 2 ? 180 : 10, 1066 timeout => $color >= 2 ? 180 : 10,
… …
948 $self->{map_widget}->clr_commands; 1122 $self->{map_widget}->clr_commands;
949 1123
950 ::stop_game (); 1124 ::stop_game ();
951} 1125}
952 1126
953sub image_info {
954 my ($self, $numfaces) = @_;
955
956 $self->{num_faces} = $numfaces;
957 $self->{face_prefetch} = [1 .. $numfaces];
958 $self->face_prefetch;
959}
960
961sub face_prefetch {
962 my ($self) = @_;
963
964 return unless $::CFG->{face_prefetch};
965
966 if ($self->{num_faces}) {
967 return if @{ $self->{send_queue} || [] };
968 my $todo = @{ $self->{face_prefetch} }
969 or return;
970
971 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
972
973 $self->send ("requestinfo image_sums $face $face");
974
975 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
976 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
977 } elsif (!exists $self->{num_faces}) {
978 $self->send ("requestinfo image_info");
979
980 $self->{num_faces} = 0;
981
982 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
983 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
984 }
985}
986
987sub update_floorbox { 1127sub update_floorbox {
988 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1128 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
989 return unless $::CONN; 1129 return unless $::CONN;
990 1130
991 $::FLOORBOX->clear; 1131 $::FLOORBOX->clear;
1132
1133 my @add;
992 1134
993 my $row; 1135 my $row;
994 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1136 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
995 if ($row < 6) { 1137 if ($row < 6) {
996 local $_->{face_widget}; # hack to force recreation of widget 1138 local $_->{face_widget}; # hack to force recreation of widget
997 local $_->{desc_widget}; # hack to force recreation of widget 1139 local $_->{desc_widget}; # hack to force recreation of widget
998 CFPlus::Item::update_widgets $_; 1140 CFPlus::Item::update_widgets $_;
999 1141
1142 push @add,
1000 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1143 0, $row, $_->{face_widget},
1001 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1144 1, $row, $_->{desc_widget};
1002 1145
1003 $row++; 1146 $row++;
1004 } else { 1147 } else {
1005 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1148 push @add, 1, $row, new CFPlus::UI::Button
1006 text => "More...", 1149 text => "More...",
1007 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1150 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1008 ); 1151 ;
1009 last; 1152 last;
1010 } 1153 }
1011 } 1154 }
1012 if ($::CONN->{open_container}) { 1155 if ($::CONN->{open_container}) {
1013 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1156 push @add, 1, $row++, new CFPlus::UI::Button
1014 text => "Close container", 1157 text => "Close container",
1015 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1158 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1016 ); 1159 ;
1017 } 1160 }
1161
1162 $::FLOORBOX->add_at (@add);
1018 }); 1163 });
1019 1164
1020 $::WANT_REFRESH++; 1165 $::WANT_REFRESH->start;
1021} 1166}
1022 1167
1023sub set_opencont { 1168sub set_opencont {
1024 my ($conn, $tag, $name) = @_; 1169 my ($conn, $tag, $name) = @_;
1025 $conn->{open_container} = $tag; 1170 $conn->{open_container} = $tag;
1026 update_floorbox; 1171 update_floorbox;
1027 1172
1028 $::INV_RIGHT_HB->clear (); 1173 $::INVR_HB->clear ();
1029 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1174 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1030 1175
1031 if ($tag != 0) { # Floor isn't closable, is it? 1176 if ($tag != 0) { # Floor isn't closable, is it?
1032 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1177 $::INVR_HB->add (new CFPlus::UI::Button
1033 text => "Close container", 1178 text => "Close container",
1034 tooltip => "Close the currently open container (if one is open)", 1179 tooltip => "Close the currently open container (if one is open)",
1035 on_activate => sub { 1180 on_activate => sub {
1036 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1181 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1037 if $tag != 0; 1182 if $tag != 0;
1038 #if $CONN->{open_container} != 0;
1039 0 1183 0
1040 }, 1184 },
1041 ); 1185 );
1042 } 1186 }
1043 1187
… …
1142 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1286 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1143 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1287 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1144 . "map size $self->{mapw}×$self->{maph}\n" 1288 . "map size $self->{mapw}×$self->{maph}\n"
1145 ); 1289 );
1146 1290
1147 ::setup_build_button ($self->{editor_support}->{builder_ui});
1148} 1291}
1149 1292
1150sub logged_in { 1293sub logged_in {
1151 my ($self) = @_; 1294 my ($self) = @_;
1152 1295
1153 $self->send_ext_req (cfplus_support => version => 1, sub { 1296 $self->send_ext_req (cfplus_support => version => 2, sub {
1297 my (%msg) = @_;
1298
1154 $self->{cfplus_ext} = $_[0]{version}; 1299 $self->{cfplus_ext} = $msg{version};
1155 $self->update_server_info; 1300 $self->update_server_info;
1156 1301
1157 if ($self->{cfplus_ext} >= 2) { 1302 if ($self->{cfplus_ext} >= 2) {
1158 $self->send_ext_req ("editor_support", sub { 1303 $self->send_ext_req ("editor_support", sub {
1159 $self->{editor_support} = $_[0]; 1304 $self->{editor_support} = { @_ };
1160 $self->update_server_info; 1305 $self->update_server_info;
1161 1306
1162 0 1307 0
1163 }); 1308 });
1164 } 1309 }
… …
1172 $self->send_command ("output-count $::CFG->{output_count}"); 1317 $self->send_command ("output-count $::CFG->{output_count}");
1173 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1318 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1174 $self->send_command ("pickup $::CFG->{pickup}"); 1319 $self->send_command ("pickup $::CFG->{pickup}");
1175} 1320}
1176 1321
1177sub buildat {
1178 my ($self, $builditem, $x, $y) = @_;
1179
1180 if ($self->{cfplus_ext}) {
1181 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1182 }
1183}
1184
1185sub lookat { 1322sub lookat {
1186 my ($self, $x, $y) = @_; 1323 my ($self, $x, $y) = @_;
1187 1324
1188 if ($self->{cfplus_ext}) { 1325 if ($self->{cfplus_ext}) {
1189 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1326 $self->send_ext_req (lookat => $x, $y, sub {
1190 my ($msg) = @_; 1327 my (%msg) = @_;
1191 1328
1192 if (exists $msg->{npc_dialog}) { 1329 if (exists $msg{npc_dialog}) {
1193 # start npc chat dialog 1330 # start npc chat dialog
1194 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1331 $self->{npc_dialog} = new CFPlus::NPCDialog::
1195 dx => $x, 1332 token => $msg{npc_dialog},
1196 dy => $y,
1197 title => "$msg->{npc_dialog} (NPC)", 1333 title => "$msg{npc_dialog}[0] (NPC)",
1198 conn => $self, 1334 conn => $self,
1199 ; 1335 ;
1200 } 1336 }
1201 }); 1337 });
1202 } 1338 }
… …
1267 on_activate => sub { $this->destroy; 1 }, 1403 on_activate => sub { $this->destroy; 1 },
1268 ; 1404 ;
1269 1405
1270 $self->update_options; 1406 $self->update_options;
1271 1407
1272 $self->{id} = $self->{conn}->send_ext_req ( 1408 $self->{id} = "npc-channel-" . $self->{conn}->token;
1273 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1409 $self->{conn}->connect_ext ($self->{id} => sub {
1274 sub { $this && $this->feed (@_) } 1410 $this->feed (@_) if $this;
1275 ); 1411 });
1412
1413 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1276 1414
1277 $self->{entry}->grab_focus; 1415 $self->{entry}->grab_focus;
1278 1416
1279 $self->{textview}->add_paragraph ({ 1417 $self->{textview}->add_paragraph ({
1280 fg => [1, 1, 0, 1], 1418 fg => [1, 1, 0, 1],
… …
1303 ); 1441 );
1304 } 1442 }
1305} 1443}
1306 1444
1307sub feed { 1445sub feed {
1308 my ($self, $msg) = @_; 1446 my ($self, $type, @arg) = @_;
1309 1447
1310 CFPlus::weaken $self; 1448 CFPlus::weaken $self;
1311 1449
1312 if ($msg->{msgtype} eq "reply") { 1450 if ($type eq "update") {
1451 my (%info) = @arg;
1452
1313 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1453 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1314 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1454 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1315
1316 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1317 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1318 my @link;
1319 $text =~ s{
1320 ($match)
1321 }{
1322 my $kw = $1;
1323
1324 push @link, new CFPlus::UI::Label
1325 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1326 can_hover => 1,
1327 can_events => 1,
1328 padding_x => 0,
1329 padding_y => 0,
1330 on_button_up => sub {
1331 $self->send ($kw);
1332 };
1333
1334 "\x{fffc}"
1335 }giex;
1336 1455
1456 if (exists $info{msg}) {
1457 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1458 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1459 my @link;
1460 $text =~ s{
1461 ($match)
1462 }{
1463 my $kw = $1;
1464
1465 push @link, new CFPlus::UI::Label
1466 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1467 can_hover => 1,
1468 can_events => 1,
1469 padding_x => 0,
1470 padding_y => 0,
1471 on_button_up => sub {
1472 $self->send ($kw);
1473 };
1474
1475 "\x{fffc}"
1476 }giex;
1477
1337 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1478 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1338 $self->{textview}->scroll_to_bottom; 1479 $self->{textview}->scroll_to_bottom;
1480 }
1481
1339 $self->update_options; 1482 $self->update_options;
1340 } else { 1483 } else {
1341 $self->destroy; 1484 $self->destroy;
1342 } 1485 }
1343 1486
… …
1348 my ($self, $msg) = @_; 1491 my ($self, $msg) = @_;
1349 1492
1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1493 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1351 $self->{textview}->scroll_to_bottom; 1494 $self->{textview}->scroll_to_bottom;
1352 1495
1353 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1496 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1354} 1497}
1355 1498
1356sub destroy { 1499sub destroy {
1357 my ($self) = @_; 1500 my ($self) = @_;
1358 1501
1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1502 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1360 1503
1361 if ($self->{conn}) { 1504 if ($self->{conn}) {
1362 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1505 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1363 delete $self->{conn}{npc_dialog}; 1506 delete $self->{conn}{npc_dialog};
1364 $self->{conn}->disconnect_ext ($self->{id}); 1507 $self->{conn}->disconnect_ext ($self->{id});
1365 } 1508 }
1366 1509
1367 $self->SUPER::destroy; 1510 $self->SUPER::destroy;

Diff Legend

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