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.89 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.149 by root, Fri Aug 10 04:33:41 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
28 },
29 );
20 30
21 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
22 32
23 my @cmd_help = map { 33 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 45 for @args;
36 46
37 map ["$cmd$_", $text], 47 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
39 @args 49 @args
40 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
42 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
58 $self->connect_ext (capabilities => sub {
59 my (%cap) = @_;
60
61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want;
63
64 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]);
69
70 my $w = int $self->{mapw} * 32 / $self->{tilesize};
71 my $h = int $self->{maph} * 32 / $self->{tilesize};
72
73 $self->setup_req (mapsize => "${w}x${h}");
74 }
75 }
76 });
77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
85 $self->connect_ext (ws_n => sub {
86 my ($id) = @_;
87
88 $self->{widgetset}{$id} = {
89 w => {},
90 };
91 });
92
93 # widgetset destroy
94 $self->connect_ext (ws_d => sub {
95 my ($id) = @_;
96
97 my $ws = delete $self->{widgetset}{$id}
98 or return;
99
100 $_->destroy
101 for values %{$ws->{w}};
102 });
103
104 # widgetset create
105 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_;
107
108 for my $ev (grep /^on_/, keys %$args) {
109 $args->{$ev} = sub {
110 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_);
112
113 1
114 };
115 }
116
117 if (my $widget = eval {
118 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new (
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy");
139 }
140 });
141
142 # widget call
143 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_;
145
146 my $w = $self->{widget}{$id}
147 or return;
148
149 $args ||= [];
150
151 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
153 } else {
154 $w->$method (@$args);
155 }
156 });
157
158 # widget set
159 $self->connect_ext (w_s => sub {
160 my ($id, $attr) = @_;
161
162 my $w = $self->{widget}{$id}
163 or return;
164
165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
174 });
175
176 # widget get
177 $self->connect_ext (w_g => sub {
178 my ($id, $rid, $attr) = @_;
179
180 my $w = $self->{widget}{$id}
181 or return;
182
183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
184 });
185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
195 for my $ws (values %{delete $self->{widgetset} || {}}) {
196 $_->destroy
197 for values %{delete $ws->{w} || {}};
198 }
199 });
200
43 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 202 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 203
49 { 204 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 206 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 207 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 208 }
54 209
210 {
211 $self->{noface} = my $tex = new_from_file CFPlus::Texture
212 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
213 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
214 }
215
55 $self->{open_container} = 0; 216 $self->{open_container} = 0;
56 217
57 # "global"
58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
62
63 # per server 218 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 220
67 $self 221 $self
222}
223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
68} 231}
69 232
70sub logprint { 233sub logprint {
71 my ($self, @a) = @_; 234 my ($self, @a) = @_;
72 235
73 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
74 my $path = "$Crossfire::VARDIR/log.$self->{host}";
75
76 open my $fh, ">>:utf8", $path
77 or die "Couldn't open logfile $path: $!";
78
79 $fh->autoflush (1);
80
81 $fh;
82 };
83
84 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
85
86 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
87 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
88
89 print {$self->{log_fh}} "$ts ", @a, "\n";
90} 237}
91 238
92sub _stat_numdiff { 239sub _stat_numdiff {
93 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
94 241
… …
227 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
228 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
229 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
230 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233 $rng =~ s/^Range: //; # thank you so much dear server
234 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
235 my $title = $stats->{+CS_STAT_TITLE}; 380 my $title = $stats->{+CS_STAT_TITLE};
236 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
237 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
238 383
239 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
259 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
260 405
261 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262 $sktbl->clear; 407 $sktbl->clear;
263 408
409 my @add;
410
411 push @add,
264 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
270 419
271 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
272 421
273 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
274 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
288 if ($ev->{button} == 1) { 437 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 438 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 439 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 440 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 441 } elsif ($ev->{button} == 3) {
442 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 443 (new CFPlus::UI::Menu
294 items => [ 444 items => [
295 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 445 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
296 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 446 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
297 ], 447 ],
298 )->popup ($ev); 448 )->popup ($ev);
299 } else { 449 } else {
300 return 0; 450 return 0;
301 } 451 }
302 452
303 1 453 1
304 }; 454 };
305 455
456 push @add,
306 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
307 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
308 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
309 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
310 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
311 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
312 464
313 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
314 } 466 }
467
468 $sktbl->add_at (@add);
315 } 469 }
316 470
317 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 474 }
321} 475}
322 476
477sub macro_send {
478 my ($self, $macro) = @_;
479
480 for my $cmd (@{ $macro->{action} }) {
481 $self->send_command ($cmd);
482 }
483}
484
323sub user_send { 485sub user_send {
324 my ($self, $command) = @_; 486 my ($self, $command) = @_;
325 487
326 push @{$self->{record}}, $command 488 $self->{record}->($command)
327 if $self->{record}; 489 if $self->{record};
328 490
329 $self->logprint ("send: ", $command); 491 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 492 $self->send_command ($command);
331 ::status ($command); 493 ::status ($command);
332} 494}
333 495
334sub start_record { 496sub record {
335 my ($self) = @_; 497 my ($self, $cb) = @_;
336 498
337 $self->{record} = []; 499 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 500}
344 501
345sub map_scroll { 502sub map_scroll {
346 my ($self, $dx, $dy) = @_; 503 my ($self, $dx, $dy) = @_;
347 504
… …
349} 506}
350 507
351sub feed_map1a { 508sub feed_map1a {
352 my ($self, $data) = @_; 509 my ($self, $data) = @_;
353 510
354 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 511 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
512 my $delay;
513
514 for my $tile (@$missing) {
515 next if $self->{delay}{$tile};
516
517 $delay = 1;
518
519 if (my $tex = $::CONN->{texture}[$tile]) {
520 $tex->upload;
521 } else {
522 $self->{delay}{$tile} = 1;
523
524 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile};
527 $_[0]->upload;
528 };
529 }
530 }
531
532 if ($delay) {
533 # delay the map drawing a tiny bit in the hope of getting the missing fetched
534 Event->timer (after => 0.03, cb => sub {
535 $_[0]->w->cancel;
536 $self->{map_widget}->update;
537 });
538 } else {
355 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
356} 541}
357 542
358sub magicmap { 543sub magicmap {
359 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
360 545
… …
368 or return; 553 or return;
369 554
370 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
371 556
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 558 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 559 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
375} 560}
376 561
377sub map_clear { 562sub map_clear {
378 my ($self) = @_; 563 my ($self) = @_;
… …
382 567
383 $self->{map}->clear; 568 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 569 delete $self->{map_widget}{magicmap};
385} 570}
386 571
572sub bg_fetch {
573 my ($self) = @_;
574
575 my $id;
576
577 do {
578 $id = pop @{$self->{bg_fetch}}
579 or return;
580 } while $self->{texture}[$id];
581
582 CFPlus::DB::exists tilecache => $id, sub {
583 my ($exists) = @_;
584
585 return unless $self->{map}; # stop when destroyed
586
587 $self->have_tile ($id)
588 if $exists;
589
590 $self->{texture}[$id]->upload;
591
592 $self->bg_fetch;
593 };
594}
387 595
388sub load_map($$$) { 596sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
390 598
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 599 my $gen = $self->{map_change_gen};
600
601 CFPlus::DB::get $self->{mapcache} => $hash, sub {
602 return unless $gen == $self->{map_change_gen};
603
604 my ($data) = @_;
605
606 if (defined $data) {
392 $data = Compress::LZF::decompress $data; 607 $data = Compress::LZF::decompress $data;
393 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 608 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
394 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395 my $data = $self->{tilecache}->get ($id)
396 or next;
397 609
398 $self->set_texture ($id => $data); 610 my $inprogress = @{ $self->{bg_fetch} || [] };
611 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
612 $self->bg_fetch unless $inprogress;
399 } 613 }
400 } 614 };
401} 615}
402 616
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 617# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 618# (server resource,s latency, bandwidth), so this hack is warranted.
405# the right fix is to make real tiled maps with an overview file 619# the right fix is to make real tiled maps with an overview file
… …
469 683
470 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 684 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
471 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 685 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
472 686
473 } else { 687 } else {
688 my $gen = $self->{map_change_gen};
474 $self->send_mapinfo ("spatial $path$tile", sub { 689 $self->send_mapinfo ("spatial $path$tile", sub {
690 return unless $gen == $self->{map_change_gen};
691
475 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 692 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
476 693
477 return if $mode ne "spatial"; 694 return if $mode ne "spatial";
478 695
479 $x += $self->{map}->ox; 696 $x += $self->{map}->ox;
… …
493 710
494sub map_change { 711sub map_change {
495 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 712 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
496 713
497 $self->flush_map; 714 $self->flush_map;
715
716 ++$self->{map_change_gen};
498 717
499 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 718 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
500 719
501 my $mapmapw = $self->{mapmap}->{w}; 720 my $mapmapw = $self->{mapmap}->{w};
502 my $mapmaph = $self->{mapmap}->{h}; 721 my $mapmaph = $self->{mapmap}->{h};
… …
519 $self->load_map ($hash, $x, $y); 738 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 739 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 740}
522 741
523sub face_find { 742sub face_find {
524 my ($self, $facenum, $face) = @_; 743 my ($self, $facenum, $face, $cb) = @_;
525 744
526 my $hash = "$face->{chksum},$face->{name}"; 745 if ($face->{type} == 0) { # FT_FACE
746 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
527 747
528 my $id = $self->{facemap}->get ($hash); 748 $face->{id} = $id;
529
530 unless ($id) {
531 # create new id for face
532 # I love transactions
533 for (1..100) {
534 my $txn = $CFPlus::DB_ENV->txn_begin;
535 my $status = $self->{facemap}->db_get (id => $id);
536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
537 $id = ($id || 64) + 1;
538 if ($self->{facemap}->put (id => $id) == 0
539 && $self->{facemap}->put ($hash => $id) == 0) {
540 $txn->txn_commit;
541
542 goto gotid;
543 }
544 }
545 $txn->txn_abort;
546 }
547
548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549 }
550
551gotid:
552 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d# 749 $self->{faceid}[$facenum] = $id;
555 750
556 my $face = $self->{tilecache}->get ($id); 751 $self->{map}->set_tileid ($facenum => $id);
557 752
558 if ($face) { 753 CFPlus::DB::get tilecache => $id, $cb;
559 #$self->face_prefetch; 754
560 $face 755 } elsif ($face->{type} & 1) { # with metadata
561 } else { 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
562 my $tex = $self->{noface};
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 }; 757 }
566} 758}
567 759
568sub face_update { 760sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
570 762
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 763 if ($face->{type} == 0) { # FT_FACE
764 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
765 if $changed;
572 766
573 $self->set_texture ($face->{id} => delete $face->{image}); 767 $self->have_tile ($face->{id});
574}
575 768
576sub set_texture { 769 } elsif ($face->{type} & 1) { # split metadata
770 if ($changed) { # new data
771 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
772 $face->{meta} = $self->{json_coder}->decode ($meta_json);
773
774 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776 } else {
777 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
778 }
779
780 ::add_license ($face);
781
782 if ($face->{type} == 3) { # FT_MUSIC
783 $self->{music_meta}{$facenum} = $face;
784
785 ::message ({ markup => "downloaded song #$facenum" })
786 if $changed;
787
788 &::audio_music_push ($facenum);
789 } elsif ($face->{type} == 5) { # FT_SOUND
790 $self->{sound_meta}{$facenum} = $face;
791
792 ::message ({ markup => "downloaded sound #$facenum" })
793 if $changed;
794
795 &::audio_sound_push ($facenum);
796 }
797
798 }
799}
800
801sub smooth_update {
802 my ($self, $facenum, $face) = @_;
803
804 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
805}
806
807sub have_tile {
808 my ($self, $tile) = @_;
809
810 return unless $self->{map};
811
812 my $tex = $self->{texture}[$tile] ||=
813 new CFPlus::Texture
814 tile => $tile, minify => 1, mipmap => 1, delay => 1;
815
816 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
817}
818
819sub connect_face_update {
577 my ($self, $id, $data) = @_; 820 my ($self, $id, $cb) = @_;
578 821
579 $self->{texture}[$id] ||= do { 822 push @{$self->{face_cb}{$id}}, $cb;
580 my $tex =
581 new_from_image CFPlus::Texture
582 $data, minify => 1, mipmap => 1;
583 823
584 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 824 CFPlus::guard {
585 $self->{map_widget}->update; 825 @{$self->{face_cb}{$id}}
586 826 = grep $_ != $cb,
587 $tex 827 @{$self->{face_cb}{$id}};
588 }; 828 }
589} 829}
590 830
591sub sound_play { 831sub sound_play {
592 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
593 833
594 $self->{sound_play}->($x, $y, $soundnum, $type); 834 &::audio_sound_play ($face, $dx, $dy, $vol)
835 unless $type & 1; # odd types are silent for future expansion
595} 836}
596 837
597my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
598 839
599sub query { 840sub query {
… …
603 $LAST_QUERY = $prompt; 844 $LAST_QUERY = $prompt;
604 845
605 $self->{query}-> ($self, $flags, $prompt); 846 $self->{query}-> ($self, $flags, $prompt);
606} 847}
607 848
608sub drawinfo { 849sub sanitise_xml($) {
609 my ($self, $color, $text) = @_; 850 local $_ = shift;
610 851
611 my @color = ( 852 # we now weed out all tags we do not support
853 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
854 # now all entities
855 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
856
857 # handle some elements
858 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
859 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
860
861 $_
862}
863
864our %NAME_TO_COLOR = (
865 black => 0,
866 white => 1,
867 darkblue => 2,
868 red => 3,
869 orange => 4,
870 lightblue => 5,
871 darkorange => 6,
872 green => 7,
873 darkgreen => 8,
874 grey => 9,
875 brown => 10,
876 yellow => 11,
877 tan => 12,
878);
879
880our @CF_COLOR = (
612 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 881 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
613 [1.00, 1.00, 1.00], 882 [1.00, 1.00, 1.00],
614 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 883 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
615 [1.00, 0.00, 0.00], 884 [1.00, 0.00, 0.00],
616 [1.00, 0.54, 0.00], 885 [1.00, 0.54, 0.00],
617 [0.11, 0.56, 1.00], 886 [0.11, 0.56, 1.00],
618 [0.93, 0.46, 0.00], 887 [0.93, 0.46, 0.00],
619 [0.18, 0.54, 0.34], 888 [0.18, 0.54, 0.34],
620 [0.56, 0.73, 0.56], 889 [0.56, 0.73, 0.56],
621 [0.80, 0.80, 0.80], 890 [0.80, 0.80, 0.80],
622 [0.75, 0.61, 0.20], 891 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 892 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 893 [0.74, 0.65, 0.41],
625 ); 894);
626 895
896sub msg {
897 my ($self, $color, $type, $text, @extra) = @_;
898
899 $text = sanitise_xml $text;
900
901 if (my $cb = $self->{cb_msg}{$type}) {
902 $_->($self, $color, $type, $text, @extra) for values %$cb;
903 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
904 $type =~ s/-/_/g;
905 $self->{$type} = $text;
906 } else {
627 $self->logprint ("info: ", $text); 907 $self->logprint ("msg: ", $text);
908 return if $color < 0; # negative color == ignore if not understood
628 909
910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
911
629 # try to create single paragraphs of multiple lines sent by the server 912 ## try to create single paragraphs of multiple lines sent by the server
913 # no longer neecssary with TRT servers
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
631 915
632 $text = CFPlus::asxml $text; 916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
635
636 ::message ({ fg => $color[$color], markup => $_ })
637 for split /\n/, $text; 917 for split /\n/, $text;
638 918
639 $self->{statusbox}->add ($text, 919 $self->{statusbox}->add ($text,
640 group => $text, 920 group => $text,
641 fg => $color[$color], 921 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 922 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 923 tooltip_font => $::FONT_FIXED,
644 ); 924 );
645} 925 }
646
647sub drawextinfo {
648 my ($self, $color, $type, $subtype, $message) = @_;
649
650 $self->drawinfo ($color, $message);
651} 926}
652 927
653sub spell_add { 928sub spell_add {
654 my ($self, $spell) = @_; 929 my ($self, $spell) = @_;
655 930
… …
671} 946}
672 947
673sub setup { 948sub setup {
674 my ($self, $setup) = @_; 949 my ($self, $setup) = @_;
675 950
951 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 952 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 953}
678 954
679sub addme_success { 955sub addme_success {
680 my ($self) = @_; 956 my ($self) = @_;
… …
702 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
703 979
704 ::stop_game (); 980 ::stop_game ();
705} 981}
706 982
707sub image_info {
708 my ($self, $numfaces) = @_;
709
710 $self->{num_faces} = $numfaces;
711 $self->{face_prefetch} = [1 .. $numfaces];
712 $self->face_prefetch;
713}
714
715sub face_prefetch {
716 my ($self) = @_;
717
718 return unless $::CFG->{face_prefetch};
719
720 if ($self->{num_faces}) {
721 return if @{ $self->{send_queue} || [] };
722 my $todo = @{ $self->{face_prefetch} }
723 or return;
724
725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
726
727 $self->send ("requestinfo image_sums $face $face");
728
729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
731 } elsif (!exists $self->{num_faces}) {
732 $self->send ("requestinfo image_info");
733
734 $self->{num_faces} = 0;
735
736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
738 }
739}
740
741sub update_floorbox { 983sub update_floorbox {
742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
743 return unless $::CONN; 985 return unless $::CONN;
744 986
745 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
988
989 my @add;
746 990
747 my $row; 991 my $row;
748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 992 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
749 if ($row < 6) { 993 if ($row < 6) {
750 local $_->{face_widget}; # hack to force recreation of widget 994 local $_->{face_widget}; # hack to force recreation of widget
751 local $_->{desc_widget}; # hack to force recreation of widget 995 local $_->{desc_widget}; # hack to force recreation of widget
752 CFPlus::Item::update_widgets $_; 996 CFPlus::Item::update_widgets $_;
753 997
998 push @add,
754 $::FLOORBOX->add (0, $row, $_->{face_widget}); 999 0, $row, $_->{face_widget},
755 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1000 1, $row, $_->{desc_widget};
756 1001
757 $row++; 1002 $row++;
758 } else { 1003 } else {
759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1004 push @add, 1, $row, new CFPlus::UI::Button
760 text => "More...", 1005 text => "More...",
761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1006 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
762 ); 1007 ;
763 last; 1008 last;
764 } 1009 }
765 } 1010 }
766 if ($::CONN->{open_container}) { 1011 if ($::CONN->{open_container}) {
767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1012 push @add, 1, $row++, new CFPlus::UI::Button
768 text => "Close container", 1013 text => "Close container",
769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1014 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
770 ); 1015 ;
771 } 1016 }
772 });
773 1017
1018 $::FLOORBOX->add_at (@add);
1019 });
1020
774 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
775} 1022}
776 1023
777sub set_opencont { 1024sub set_opencont {
778 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
779 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;
… …
887 $::SERVER_INFO->set_markup ( 1134 $::SERVER_INFO->set_markup (
888 "server <tt>$self->{host}:$self->{port}</tt>\n" 1135 "server <tt>$self->{host}:$self->{port}</tt>\n"
889 . "protocol version <tt>$self->{version}</tt>\n" 1136 . "protocol version <tt>$self->{version}</tt>\n"
890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1137 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1138 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1139 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n" 1140 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1141 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1142 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1143 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1144 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 1145 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 1146 );
898 1147
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
900} 1148}
901 1149
902sub logged_in { 1150sub logged_in {
903 my ($self) = @_; 1151 my ($self) = @_;
904 1152
905 $self->send_ext_req (cfplus_support => version => 1, sub { 1153 $self->send_ext_req (cfplus_support => version => 2, sub {
1154 my (%msg) = @_;
1155
906 $self->{cfplus_ext} = $_[0]{version}; 1156 $self->{cfplus_ext} = $msg{version};
907 $self->update_server_info; 1157 $self->update_server_info;
908 1158
909 if ($self->{cfplus_ext} >= 2) { 1159 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub { 1160 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0]; 1161 $self->{editor_support} = { @_ };
912 $self->update_server_info; 1162 $self->update_server_info;
913 1163
914 0 1164 0
915 }); 1165 });
916 } 1166 }
… …
920 1170
921 $self->update_server_info; 1171 $self->update_server_info;
922 1172
923 $self->send_command ("output-sync $::CFG->{output_sync}"); 1173 $self->send_command ("output-sync $::CFG->{output_sync}");
924 $self->send_command ("output-count $::CFG->{output_count}"); 1174 $self->send_command ("output-count $::CFG->{output_count}");
1175 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
925 $self->send_command ("pickup $::CFG->{pickup}"); 1176 $self->send_command ("pickup $::CFG->{pickup}");
926}
927
928sub buildat {
929 my ($self, $builditem, $x, $y) = @_;
930
931 if ($self->{cfplus_ext}) {
932 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
933 }
934} 1177}
935 1178
936sub lookat { 1179sub lookat {
937 my ($self, $x, $y) = @_; 1180 my ($self, $x, $y) = @_;
938 1181
939 if ($self->{cfplus_ext}) { 1182 if ($self->{cfplus_ext}) {
940 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1183 $self->send_ext_req (lookat => $x, $y, sub {
941 my ($msg) = @_; 1184 my (%msg) = @_;
942 1185
943 if (exists $msg->{npc_dialog}) { 1186 if (exists $msg{npc_dialog}) {
944 # start npc chat dialog 1187 # start npc chat dialog
945 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1188 $self->{npc_dialog} = new CFPlus::NPCDialog::
946 dx => $x, 1189 token => $msg{npc_dialog},
947 dy => $y,
948 title => "$msg->{npc_dialog} (NPC)", 1190 title => "$msg{npc_dialog}[0] (NPC)",
949 conn => $self, 1191 conn => $self,
950 ; 1192 ;
951 } 1193 }
952 }); 1194 });
953 } 1195 }
… …
960 1202
961 (delete $self->{npc_dialog})->destroy 1203 (delete $self->{npc_dialog})->destroy
962 if $self->{npc_dialog}; 1204 if $self->{npc_dialog};
963 1205
964 $self->SUPER::destroy; 1206 $self->SUPER::destroy;
1207
1208 %$self = ();
965} 1209}
966 1210
967package CFPlus::NPCDialog; 1211package CFPlus::NPCDialog;
968 1212
969our @ISA = 'CFPlus::UI::Toplevel'; 1213our @ISA = 'CFPlus::UI::Toplevel';
… …
981 kw => { hi => 0, yes => 0, no => 0 }, 1225 kw => { hi => 0, yes => 0, no => 0 },
982 has_close_button => 1, 1226 has_close_button => 1,
983 @_, 1227 @_,
984 ); 1228 );
985 1229
986 Scalar::Util::weaken (my $this = $self); 1230 CFPlus::weaken (my $this = $self);
987 1231
988 $self->connect (delete => sub { $this->destroy; 1 }); 1232 $self->connect (delete => sub { $this->destroy; 1 });
989 1233
990 # better use a pane... 1234 # better use a pane...
991 $self->add (my $hbox = new CFPlus::UI::HBox); 1235 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1016 on_activate => sub { $this->destroy; 1 }, 1260 on_activate => sub { $this->destroy; 1 },
1017 ; 1261 ;
1018 1262
1019 $self->update_options; 1263 $self->update_options;
1020 1264
1021 $self->{id} = $self->{conn}->send_ext_req ( 1265 $self->{id} = "npc-channel-" . $self->{conn}->token;
1022 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1266 $self->{conn}->connect_ext ($self->{id} => sub {
1023 sub { $this && $this->feed (@_) } 1267 $this->feed (@_) if $this;
1024 ); 1268 });
1269
1270 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1025 1271
1026 $self->{entry}->grab_focus; 1272 $self->{entry}->grab_focus;
1027 1273
1028 $self->{textview}->add_paragraph ({ 1274 $self->{textview}->add_paragraph ({
1029 fg => [1, 1, 0, 1], 1275 fg => [1, 1, 0, 1],
… …
1035}; 1281};
1036 1282
1037sub update_options { 1283sub update_options {
1038 my ($self) = @_; 1284 my ($self) = @_;
1039 1285
1040 Scalar::Util::weaken $self; 1286 CFPlus::weaken $self;
1041 1287
1042 $self->{options}->clear; 1288 $self->{options}->clear;
1043 $self->{options}->add ($self->{bye_button}); 1289 $self->{options}->add ($self->{bye_button});
1044 1290
1045 for my $kw (sort keys %{ $self->{kw} }) { 1291 for my $kw (sort keys %{ $self->{kw} }) {
… …
1052 ); 1298 );
1053 } 1299 }
1054} 1300}
1055 1301
1056sub feed { 1302sub feed {
1057 my ($self, $msg) = @_; 1303 my ($self, $type, @arg) = @_;
1058 1304
1059 Scalar::Util::weaken $self; 1305 CFPlus::weaken $self;
1060 1306
1061 if ($msg->{msgtype} eq "reply") { 1307 if ($type eq "update") {
1308 my (%info) = @arg;
1309
1062 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1310 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1063 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1311 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1064
1065 my $text = "\n" . CFPlus::asxml $msg->{msg};
1066 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1067 my @link;
1068 $text =~ s{
1069 ($match)
1070 }{
1071 my $kw = $1;
1072
1073 push @link, new CFPlus::UI::Label
1074 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1075 can_hover => 1,
1076 can_events => 1,
1077 padding_x => 0,
1078 padding_y => 0,
1079 on_button_up => sub {
1080 $self->send ($kw);
1081 };
1082
1083 "\x{fffc}"
1084 }giex;
1085 1312
1313 if (exists $info{msg}) {
1314 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1315 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1316 my @link;
1317 $text =~ s{
1318 ($match)
1319 }{
1320 my $kw = $1;
1321
1322 push @link, new CFPlus::UI::Label
1323 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1324 can_hover => 1,
1325 can_events => 1,
1326 padding_x => 0,
1327 padding_y => 0,
1328 on_button_up => sub {
1329 $self->send ($kw);
1330 };
1331
1332 "\x{fffc}"
1333 }giex;
1334
1086 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1335 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1087 $self->{textview}->scroll_to_bottom; 1336 $self->{textview}->scroll_to_bottom;
1337 }
1338
1088 $self->update_options; 1339 $self->update_options;
1089 } else { 1340 } else {
1090 $self->destroy; 1341 $self->destroy;
1091 } 1342 }
1092 1343
… …
1097 my ($self, $msg) = @_; 1348 my ($self, $msg) = @_;
1098 1349
1099 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1100 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1101 1352
1102 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1353 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1103} 1354}
1104 1355
1105sub destroy { 1356sub destroy {
1106 my ($self) = @_; 1357 my ($self) = @_;
1107 1358
1108 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1359 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1109 1360
1110 if ($self->{conn}) { 1361 if ($self->{conn}) {
1111 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1362 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1112 delete $self->{conn}{npc_dialog}; 1363 delete $self->{conn}{npc_dialog};
1113 $self->{conn}->disconnect_ext ($self->{id}); 1364 $self->{conn}->disconnect_ext ($self->{id});
1114 } 1365 }
1115 1366
1116 $self->SUPER::destroy; 1367 $self->SUPER::destroy;

Diff Legend

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