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

Diff Legend

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