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.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 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 resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118
119 $self->{json_coder} 53 $self->{json_coder}
120 ->convert_blessed 54 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 55 ->filter_json_single_key_object (__w_ => sub {
122 $self->{widget}{$_[0]} 56 $self->{widget}{$_[0]}
123 }); 57 });
124 58
125 $self->connect_ext (ws_n => sub { 59 # destroy widgets on logout
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
130 };
131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 61 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 62 $_->destroy
219 for values %{delete $ws->{w} || {}}; 63 for values %{delete $ws->{w} || {}};
220 } 64 }
… …
241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 85 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
242 86
243 $self 87 $self
244} 88}
245 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
246sub logprint { 309sub logprint {
247 my ($self, @a) = @_; 310 my ($self, @a) = @_;
248 311
249 $self->{log_fh} ||= do { 312 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
250 my $path = "$Crossfire::VARDIR/log.$self->{host}";
251
252 open my $fh, ">>:utf8", $path
253 or die "Couldn't open logfile $path: $!";
254
255 $fh->autoflush (1);
256
257 $fh;
258 };
259
260 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
261
262 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
263 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
264
265 print {$self->{log_fh}} "$ts ", @a, "\n";
266} 313}
267 314
268sub _stat_numdiff { 315sub _stat_numdiff {
269 my ($self, $name, $old, $new) = @_; 316 my ($self, $name, $old, $new) = @_;
270 317
… …
354 401
355 if ( 402 if (
356 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 403 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
357 ) { 404 ) {
358 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 405 my $msg = "<b>stat change</b>: " . (join " ", @diffs);
359 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 406 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
360 } 407 }
361 408
362 $self->update_stats_window ($stats, $prev); 409 $self->update_stats_window ($stats, $prev);
363 410
364 $self->{prev_stats} = { %$stats }; 411 $self->{prev_stats} = { %$stats };
… …
403 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 450 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $::GAUGES->{food} ->set_value ($fo, $fo_m); 451 $::GAUGES->{food} ->set_value ($fo, $fo_m);
405 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 452 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 453 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
407 . " (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});
408 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 456 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
409 my $title = $stats->{+CS_STAT_TITLE}; 457 my $title = $stats->{+CS_STAT_TITLE};
410 $title =~ s/^Player: //; 458 $title =~ s/^Player: //;
411 $::STATWIDS->{title} ->set_text ("Title: " . $title); 459 $::STATWIDS->{title} ->set_text ("Title: " . $title);
412 460
… …
430 for keys %RES_TBL; 478 for keys %RES_TBL;
431 479
432 my $sktbl = $::STATWIDS->{skill_tbl}; 480 my $sktbl = $::STATWIDS->{skill_tbl};
433 my @skills = keys %{ $self->{skill_info} }; 481 my @skills = keys %{ $self->{skill_info} };
434 482
435 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
436 $sktbl->clear; 491 $sktbl->clear;
437 492
493 my $sw = $self->{skillwid}{""} ||= [
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 494 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
439 $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),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 497 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 498 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
442 $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),
443 $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;
444 505
445 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>";
446 507
447 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);
448 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);
449 510
450 my ($x, $y) = (0, 1); 511 my ($x, $y) = (0, 1);
451 for ( 512 for (@order) {
452 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
453 map [$_, $self->{skill_info}{$_}],
454 grep exists $stats->{$_},
455 @skills
456 ) {
457 my ($idx, $name) = @$_; 513 my ($idx, $name) = @$_;
458 514
459 my $spell_cb = sub { 515 my $spell_cb = sub {
460 my ($widget, $ev) = @_; 516 my ($widget, $ev) = @_;
461 517
… …
476 } 532 }
477 533
478 1 534 1
479 }; 535 };
480 536
481 $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
482 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),
483 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 541
542 # level
543 (new CFPlus::UI::Label
484 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
485 $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,
486 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 ;
487 560
488 $x++ and ($x, $y) = (0, $y + 1); 561 $x++ and ($x, $y) = (0, $y + 1);
489 } 562 }
490 }
491 563
492 for (grep exists $stats->{$_}, @skills) { 564 $sktbl->add_at (@add);
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
495 } 565 }
496}
497 566
498sub macro_send { 567 for (@order) {
499 my ($self, $macro) = @_; 568 my ($idx, $name) = @$_;
569 my $val = $stats->{$idx};
500 570
501 for my $cmd (@{ $macro->{action} }) { 571 next if $prev->{$idx}[1] eq $val->[1];
502 $self->send_command ($cmd); 572
573 my $sw = $self->{skillwid}{$idx};
574 $sw->[0]->set_text (::formsep ($val->[1]));
575 $sw->[1]->set_text ($val->[0] * 1);
576 $sw->[2]->set_value (@$val);
577
578 $::GAUGES->{sklprg}->set_label ("$name %d%%");
579 $::GAUGES->{sklprg}->set_value (@$val);
503 } 580 }
504} 581}
505 582
506sub user_send { 583sub user_send {
507 my ($self, $command) = @_; 584 my ($self, $command) = @_;
… …
509 $self->{record}->($command) 586 $self->{record}->($command)
510 if $self->{record}; 587 if $self->{record};
511 588
512 $self->logprint ("send: ", $command); 589 $self->logprint ("send: ", $command);
513 $self->send_command ($command); 590 $self->send_command ($command);
514 ::status ($command);
515} 591}
516 592
517sub record { 593sub record {
518 my ($self, $cb) = @_; 594 my ($self, $cb) = @_;
519 595
… …
527} 603}
528 604
529sub feed_map1a { 605sub feed_map1a {
530 my ($self, $data) = @_; 606 my ($self, $data) = @_;
531 607
532 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 608 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
609 my $delay;
610
611 for my $tile (@$missing) {
612 next if $self->{delay}{$tile};
613
614 $delay = 1;
615
616 if (my $tex = $::CONN->{texture}[$tile]) {
617 $tex->upload;
618 } else {
619 $self->{delay}{$tile} = 1;
620
621 # we assume the face is in-flight and will eventually come
622 push @{$self->{tile_cb}{$tile}}, sub {
623 delete $self->{delay}{$tile};
624 $_[0]->upload;
625 };
626 }
627 }
628
629 if ($delay) {
630 # delay the map drawing a tiny bit in the hope of getting the missing fetched
631 Event->timer (after => 0.03, cb => sub {
632 $_[0]->w->cancel;
633 $self->{map_widget}->update
634 if $self->{map_widget};
635 });
636 } else {
533 $self->{map_widget}->update; 637 $self->{map_widget}->update;
638 }
534} 639}
535 640
536sub magicmap { 641sub magicmap {
537 my ($self, $w, $h, $x, $y, $data) = @_; 642 my ($self, $w, $h, $x, $y, $data) = @_;
538 643
… …
545 my $map_info = delete $self->{map_info} 650 my $map_info = delete $self->{map_info}
546 or return; 651 or return;
547 652
548 my ($hash, $x, $y, $w, $h) = @$map_info; 653 my ($hash, $x, $y, $w, $h) = @$map_info;
549 654
550 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 655 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
656 $self->{map_cache_new}{$hash} = \$data;
551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 657 CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
553} 658}
554 659
555sub map_clear { 660sub map_clear {
556 my ($self) = @_; 661 my ($self) = @_;
557 662
… …
563} 668}
564 669
565sub bg_fetch { 670sub bg_fetch {
566 my ($self) = @_; 671 my ($self) = @_;
567 672
568 my $id; 673 my $tile;
569 674
570 do { 675 do {
571 $id = pop @{$self->{bg_fetch}} 676 $tile = pop @{$self->{bg_fetch}}
572 or return; 677 or return;
573 } while $self->{texture}[$id]; 678 } while $self->{texture}[$tile];
574 679
575 CFPlus::DB::get tilecache => $id, sub { 680 CFPlus::DB::get tilecache => $tile, sub {
576 my ($data) = @_; 681 my ($data) = @_;
577 682
578 return unless $self->{map}; # stop when destroyed 683 return unless $self->{map}; # stop when destroyed
579 684
580 $self->set_texture ($id => $data)
581 if defined $data; 685 if (defined $data) {
686 $self->have_tile ($tile, $data);
687 $self->{texture}[$tile]->upload;
688 }
582 689
583 $self->bg_fetch; 690 $self->bg_fetch;
584 }; 691 };
585} 692}
586 693
587sub load_map($$$) { 694sub load_map($$$) {
588 my ($self, $hash, $x, $y) = @_; 695 my ($self, $hash, $x, $y) = @_;
589 696
590 my $gen = $self->{map_change_gen}; 697 my $gen = $self->{map_change_gen};
591 698
592 CFPlus::DB::get $self->{mapcache} => $hash, sub { 699 my $cb = sub {
593 return unless $gen == $self->{map_change_gen}; 700 return unless $gen == $self->{map_change_gen};
594 701
595 my ($data) = @_; 702 my ($data) = @_;
596 703
597 if (defined $data) { 704 if (defined $data) {
705 $self->{map_cache_new}{$hash} = \$data;
706
598 $data = Compress::LZF::decompress $data; 707 my $data = Compress::LZF::decompress $data;
599 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
600 708
601 my $inprogress = @{ $self->{bg_fetch} || [] }; 709 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 710 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
603 $self->bg_fetch unless $inprogress; 711 $self->bg_fetch unless $inprogress;
604 } 712 }
605 }; 713 };
714
715 if (my $rdata = $self->{map_cache_old}{$hash}) {
716 $cb->($$rdata);
717 } else {
718 CFPlus::DB::get $self->{mapcache} => $hash, $cb;
719 }
606} 720}
607 721
608# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 722# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
609# (server resource,s latency, bandwidth), so this hack is warranted. 723# (server resource,s latency, bandwidth), so this hack is warranted.
610# the right fix is to make real tiled maps with an overview file 724# the right fix is to make real tiled maps with an overview file
… …
703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 817 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
704 818
705 $self->flush_map; 819 $self->flush_map;
706 820
707 ++$self->{map_change_gen}; 821 ++$self->{map_change_gen};
822 $self->{map_cache_old} = delete $self->{map_cache_new};
708 823
709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 824 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
710 825
711 my $mapmapw = $self->{mapmap}->{w}; 826 my $mapmapw = $self->{mapmap}->{w};
712 my $mapmaph = $self->{mapmap}->{h}; 827 my $mapmaph = $self->{mapmap}->{h};
… …
731} 846}
732 847
733sub face_find { 848sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 849 my ($self, $facenum, $face, $cb) = @_;
735 850
736 my $hash = "$face->{chksum},$face->{name}"; 851 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 852 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
739 853
740 $face->{id} = $id; 854 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id;
742
743 $self->{map}->set_tileid ($facenum => $id); 855 $self->{map}->set_tileid ($facenum => $id);
744 856
745 CFPlus::DB::get tilecache => $id, $cb; 857 CFPlus::DB::get tilecache => $id, $cb;
858
859 } elsif ($face->{type} & 1) { # with metadata
860 CFPlus::DB::get res_meta => $face->{name}, $cb;
861
862 } else { # no metadata
863 CFPlus::DB::get res_data => $face->{name}, $cb;
864 }
746} 865}
747 866
748sub face_update { 867sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 868 my ($self, $facenum, $face, $changed) = @_;
750 869
870 if ($face->{type} == 0) {
871 # image, FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 872 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 873 if $changed;
753 874
754 $self->set_texture ($face->{id} => delete $face->{image}); 875 $self->have_tile ($face->{id}, delete $face->{data});
876
877 } elsif ($face->{type} & 1) {
878 # split metadata case, FT_MUSIC, FT_SOUND
879 if ($changed) { # new data
880 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
881 $face->{data} = $meta;
882
883 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
884 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
885 }
886
887 $face->{data} = $self->{json_coder}->decode ($face->{data});
888
889 ::add_license ($face);
890
891 if ($face->{type} == 3) { # FT_MUSIC
892 ::message ({ markup => "downloaded song #$facenum" })
893 if $changed;
894
895 &::audio_music_push ($facenum);
896 } elsif ($face->{type} == 5) { # FT_SOUND
897 ::message ({ markup => "downloaded sound #$facenum" })
898 if $changed;
899
900 &::audio_sound_push ($facenum);
901 }
902
903 } else {
904 # flat resource case, FT_RSRC
905 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
906 if $changed;
907 }
908
909 if (my $cbs = $self->{face_cb}{$facenum}) {
910 $_->($face, $changed) for @$cbs;
911 }
755} 912}
756 913
757sub smooth_update { 914sub smooth_update {
758 my ($self, $facenum, $face) = @_; 915 my ($self, $facenum, $face) = @_;
759 916
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 917 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 918}
762 919
763sub set_texture { 920sub have_tile {
764 my ($self, $id, $data) = @_; 921 my ($self, $tile, $data) = @_;
765 922
766 $self->{texture}[$id] = my $tex = 923 return unless $self->{map};
924
925 my $tex = $self->{texture}[$tile] ||=
767 new_from_image CFPlus::Texture 926 new CFPlus::Texture
927 tile => $tile,
928 image => $data, delete_image => 1,
768 $data, minify => 1, mipmap => 1; 929 minify => 1, mipmap => 1;
769 930
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 931 if (my $cbs = delete $self->{tile_cb}{$tile}) {
771 $self->{map_widget}->update; 932 $_->($tex) for @$cbs;
933 }
934}
935
936# call in non-void context registers a temporary
937# hook with handle, otherwise its permanent
938sub on_face_change {
939 my ($self, $num, $cb) = @_;
940
941 push @{$self->{face_cb}{$num}}, $cb;
942
943 defined wantarray
944 ? CFPlus::guard {
945 @{$self->{face_cb}{$num}}
946 = grep $_ != $cb,
947 @{$self->{face_cb}{$num}};
948 }
949 : ()
950}
951
952# call in non-void context registers a temporary
953# hook with handle, otherwise its permanent
954sub register_face_handler {
955 my ($self, $num, $cb) = @_;
956
957 return unless $num;
958
959 # invoke if available right now
960 $cb->($self->{face}[$num], 0)
961 unless exists $self->{face}[$num]{loading};
962
963 # future changes
964 $self->on_face_change ($num => $cb)
772} 965}
773 966
774sub sound_play { 967sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 968 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 969
777 $self->{sound_play}->($x, $y, $soundnum, $type); 970 &::audio_sound_play ($face, $dx, $dy, $vol)
971 unless $type & 1; # odd types are silent for future expansion
778} 972}
779 973
780my $LAST_QUERY; # server is stupid, stupid, stupid 974my $LAST_QUERY; # server is stupid, stupid, stupid
781 975
782sub query { 976sub query {
… …
847 $self->{$type} = $text; 1041 $self->{$type} = $text;
848 } else { 1042 } else {
849 $self->logprint ("msg: ", $text); 1043 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 1044 return if $color < 0; # negative color == ignore if not understood
851 1045
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1046 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
853 1047
854 ## try to create single paragraphs of multiple lines sent by the server 1048 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers 1049 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1050 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 1051
858 ::message ({ fg => $fg, markup => $_ }) 1052 ::message ({
1053 fg => $fg,
1054 markup => $_,
1055 type => $type,
1056 extra => [@extra],
1057 color_flags => $color
859 for split /\n/, $text; 1058 }) for split /\n/, $text;
860 1059
861 $self->{statusbox}->add ($text, 1060 $self->{statusbox}->add ($text,
862 group => $text, 1061 group => $text,
863 fg => $fg, 1062 fg => $fg,
864 timeout => $color >= 2 ? 180 : 10, 1063 timeout => $color >= 2 ? 180 : 10,
… …
920 $self->{map_widget}->clr_commands; 1119 $self->{map_widget}->clr_commands;
921 1120
922 ::stop_game (); 1121 ::stop_game ();
923} 1122}
924 1123
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 1124sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1125 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1126 return unless $::CONN;
962 1127
963 $::FLOORBOX->clear; 1128 $::FLOORBOX->clear;
1129
1130 my @add;
964 1131
965 my $row; 1132 my $row;
966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1133 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
967 if ($row < 6) { 1134 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1135 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1136 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1137 CFPlus::Item::update_widgets $_;
971 1138
1139 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1140 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1141 1, $row, $_->{desc_widget};
974 1142
975 $row++; 1143 $row++;
976 } else { 1144 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1145 push @add, 1, $row, new CFPlus::UI::Button
978 text => "More...", 1146 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1147 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1148 ;
981 last; 1149 last;
982 } 1150 }
983 } 1151 }
984 if ($::CONN->{open_container}) { 1152 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1153 push @add, 1, $row++, new CFPlus::UI::Button
986 text => "Close container", 1154 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1155 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1156 ;
989 } 1157 }
1158
1159 $::FLOORBOX->add_at (@add);
990 }); 1160 });
991 1161
992 $::WANT_REFRESH++; 1162 $::WANT_REFRESH->start;
993} 1163}
994 1164
995sub set_opencont { 1165sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1166 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1167 $conn->{open_container} = $tag;
998 update_floorbox; 1168 update_floorbox;
999 1169
1000 $::INV_RIGHT_HB->clear (); 1170 $::INVR_HB->clear ();
1001 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1171 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1002 1172
1003 if ($tag != 0) { # Floor isn't closable, is it? 1173 if ($tag != 0) { # Floor isn't closable, is it?
1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1174 $::INVR_HB->add (new CFPlus::UI::Button
1005 text => "Close container", 1175 text => "Close container",
1006 tooltip => "Close the currently open container (if one is open)", 1176 tooltip => "Close the currently open container (if one is open)",
1007 on_activate => sub { 1177 on_activate => sub {
1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1178 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1009 if $tag != 0; 1179 if $tag != 0;
1010 #if $CONN->{open_container} != 0;
1011 0 1180 0
1012 }, 1181 },
1013 ); 1182 );
1014 } 1183 }
1015 1184
… …
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1283 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1284 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1285 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1286 );
1118 1287
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1288}
1121 1289
1122sub logged_in { 1290sub logged_in {
1123 my ($self) = @_; 1291 my ($self) = @_;
1124 1292
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1293 $self->send_ext_req (cfplus_support => version => 2, sub {
1294 my (%msg) = @_;
1295
1126 $self->{cfplus_ext} = $_[0]{version}; 1296 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1297 $self->update_server_info;
1128 1298
1129 if ($self->{cfplus_ext} >= 2) { 1299 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1300 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1301 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1302 $self->update_server_info;
1133 1303
1134 0 1304 0
1135 }); 1305 });
1136 } 1306 }
… …
1144 $self->send_command ("output-count $::CFG->{output_count}"); 1314 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1315 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1316 $self->send_command ("pickup $::CFG->{pickup}");
1147} 1317}
1148 1318
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155}
1156
1157sub lookat { 1319sub lookat {
1158 my ($self, $x, $y) = @_; 1320 my ($self, $x, $y) = @_;
1159 1321
1160 if ($self->{cfplus_ext}) { 1322 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1323 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1324 my (%msg) = @_;
1163 1325
1164 if (exists $msg->{npc_dialog}) { 1326 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1327 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1328 $self->{npc_dialog} = new CFPlus::NPCDialog::
1167 dx => $x, 1329 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1330 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1331 conn => $self,
1171 ; 1332 ;
1172 } 1333 }
1173 }); 1334 });
1174 } 1335 }
… …
1239 on_activate => sub { $this->destroy; 1 }, 1400 on_activate => sub { $this->destroy; 1 },
1240 ; 1401 ;
1241 1402
1242 $self->update_options; 1403 $self->update_options;
1243 1404
1244 $self->{id} = $self->{conn}->send_ext_req ( 1405 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1406 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1407 $this->feed (@_) if $this;
1247 ); 1408 });
1409
1410 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1411
1249 $self->{entry}->grab_focus; 1412 $self->{entry}->grab_focus;
1250 1413
1251 $self->{textview}->add_paragraph ({ 1414 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1415 fg => [1, 1, 0, 1],
… …
1275 ); 1438 );
1276 } 1439 }
1277} 1440}
1278 1441
1279sub feed { 1442sub feed {
1280 my ($self, $msg) = @_; 1443 my ($self, $type, @arg) = @_;
1281 1444
1282 CFPlus::weaken $self; 1445 CFPlus::weaken $self;
1283 1446
1284 if ($msg->{msgtype} eq "reply") { 1447 if ($type eq "update") {
1448 my (%info) = @arg;
1449
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1450 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1451 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 1452
1453 if (exists $info{msg}) {
1454 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1455 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1456 my @link;
1457 $text =~ s{
1458 ($match)
1459 }{
1460 my $kw = $1;
1461
1462 push @link, new CFPlus::UI::Label
1463 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1464 can_hover => 1,
1465 can_events => 1,
1466 padding_x => 0,
1467 padding_y => 0,
1468 on_button_up => sub {
1469 $self->send ($kw);
1470 };
1471
1472 "\x{fffc}"
1473 }giex;
1474
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1475 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1476 $self->{textview}->scroll_to_bottom;
1477 }
1478
1311 $self->update_options; 1479 $self->update_options;
1312 } else { 1480 } else {
1313 $self->destroy; 1481 $self->destroy;
1314 } 1482 }
1315 1483
… …
1320 my ($self, $msg) = @_; 1488 my ($self, $msg) = @_;
1321 1489
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1490 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1323 $self->{textview}->scroll_to_bottom; 1491 $self->{textview}->scroll_to_bottom;
1324 1492
1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1493 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1326} 1494}
1327 1495
1328sub destroy { 1496sub destroy {
1329 my ($self) = @_; 1497 my ($self) = @_;
1330 1498
1331 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1499 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1332 1500
1333 if ($self->{conn}) { 1501 if ($self->{conn}) {
1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1502 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1335 delete $self->{conn}{npc_dialog}; 1503 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1504 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1505 }
1338 1506
1339 $self->SUPER::destroy; 1507 $self->SUPER::destroy;

Diff Legend

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