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.72 by root, Sun Aug 13 02:43:22 2006 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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 (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
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
68 if (my $ts = $cap{tileset}) {
69 if (my ($default) = grep $_->[2] & 1, @$ts) {
70 $self->{tileset} = $default;
71 $self->{tilesize} = $default->[3];
72 $self->setup_req (tileset => $default->[0]);
73
74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
75 my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77 $self->setup_req (mapsize => "${w}x${h}");
78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
202 }
203 });
204
40 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 206 for @cmd_help;
42 207
208 {
209 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
210 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212 }
213
214 {
43 $self->{noface} = new_from_file CFPlus::Texture 215 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 216 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218 }
45 219
46 $self->{open_container} = 0; 220 $self->{open_container} = 0;
47 221
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 222 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 223 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 224
55 $self 225 $self
56} 226}
57 227
58sub logprint { 228sub logprint {
59 my ($self, @a) = @_; 229 my ($self, @a) = @_;
60 230
61 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
62 my $path = "$Crossfire::VARDIR/log.$self->{host}";
63
64 open my $fh, ">>:utf8", $path
65 or die "Couldn't open logfile $path: $!";
66
67 $fh->autoflush (1);
68
69 $fh;
70 };
71
72 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
73
74 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
75 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
76
77 print {$self->{log_fh}} "$ts ", @a, "\n";
78} 232}
79 233
80sub _stat_numdiff { 234sub _stat_numdiff {
81 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
82 236
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 369 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 370 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 371 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 372 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 373 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 374 $::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}; 375 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 376 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 377 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 378
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 379 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
247 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
248 400
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear; 402 $sktbl->clear;
251 403
404 my @add;
405
406 push @add,
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
258 414
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 416
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 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); 418 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 419
265 my ($x, $y) = (0, 1); 420 my ($x, $y) = (0, 1);
266 for ( 421 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 422 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 423 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 432 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 433 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 434 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 435 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 436 } elsif ($ev->{button} == 3) {
437 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 438 (new CFPlus::UI::Menu
283 items => [ 439 items => [
284 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 440 ["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"]) }], 441 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286 ], 442 ],
287 )->popup ($ev); 443 )->popup ($ev);
288 } else { 444 } else {
289 return 0; 445 return 0;
290 } 446 }
291 447
292 1 448 1
293 }; 449 };
294 450
451 push @add,
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $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); 453 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 454 $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); 455 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); 456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
300 459
301 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
302 } 461 }
462
463 $sktbl->add_at (@add);
303 } 464 }
304 465
305 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 469 }
309} 470}
310 471
472sub macro_send {
473 my ($self, $macro) = @_;
474
475 for my $cmd (@{ $macro->{action} }) {
476 $self->send_command ($cmd);
477 }
478}
479
311sub user_send { 480sub user_send {
312 my ($self, $command) = @_; 481 my ($self, $command) = @_;
313 482
483 $self->{record}->($command)
314 if ($self->{record}) { 484 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 485
318 $self->logprint ("send: ", $command); 486 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 487 $self->send_command ($command);
320 ::status ($command); 488 ::status ($command);
321} 489}
322 490
323sub start_record { 491sub record {
324 my ($self) = @_; 492 my ($self, $cb) = @_;
325 493
326 $self->{record} = []; 494 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 495}
333 496
334sub map_scroll { 497sub map_scroll {
335 my ($self, $dx, $dy) = @_; 498 my ($self, $dx, $dy) = @_;
336 499
… …
338} 501}
339 502
340sub feed_map1a { 503sub feed_map1a {
341 my ($self, $data) = @_; 504 my ($self, $data) = @_;
342 505
343 $self->{map}->map1a_update ($data); 506 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 507 $self->{map_widget}->update;
345} 508}
346 509
347sub magicmap { 510sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 511 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 520 or return;
358 521
359 my ($hash, $x, $y, $w, $h) = @$map_info; 522 my ($hash, $x, $y, $w, $h) = @$map_info;
360 523
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 524 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 525 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 526 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 527}
365 528
366sub map_clear { 529sub map_clear {
367 my ($self) = @_; 530 my ($self) = @_;
… …
371 534
372 $self->{map}->clear; 535 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 536 delete $self->{map_widget}{magicmap};
374} 537}
375 538
539sub bg_fetch {
540 my ($self) = @_;
541
542 my $id;
543
544 do {
545 $id = pop @{$self->{bg_fetch}}
546 or return;
547 } while $self->{texture}[$id];
548
549 CFPlus::DB::exists tilecache => $id, sub {
550 my ($exists) = @_;
551
552 return unless $self->{map}; # stop when destroyed
553
554 $self->have_tile ($id)
555 if $exists;
556
557 $self->bg_fetch;
558 };
559}
376 560
377sub load_map($$$) { 561sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 562 my ($self, $hash, $x, $y) = @_;
379 563
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 564 my $gen = $self->{map_change_gen};
565
566 CFPlus::DB::get $self->{mapcache} => $hash, sub {
567 return unless $gen == $self->{map_change_gen};
568
569 my ($data) = @_;
570
571 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 572 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 573 #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 574
387 $self->set_texture ($id => $data); 575 my $inprogress = @{ $self->{bg_fetch} || [] };
576 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
577 $self->bg_fetch unless $inprogress;
388 } 578 }
389 } 579 };
390} 580}
391 581
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 582# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 583# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 584# the right fix is to make real tiled maps with an overview file
… …
458 648
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 649 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 650 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 651
462 } else { 652 } else {
653 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 654 $self->send_mapinfo ("spatial $path$tile", sub {
655 return unless $gen == $self->{map_change_gen};
656
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 657 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 658
466 return if $mode ne "spatial"; 659 return if $mode ne "spatial";
467 660
468 $x += $self->{map}->ox; 661 $x += $self->{map}->ox;
… …
482 675
483sub map_change { 676sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 677 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 678
486 $self->flush_map; 679 $self->flush_map;
680
681 ++$self->{map_change_gen};
487 682
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 683 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 684
490 my $mapmapw = $self->{mapmap}->{w}; 685 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 686 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 703 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 704 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 705}
511 706
512sub face_find { 707sub face_find {
513 my ($self, $facenum, $face) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
514 709
515 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
516 712
517 my $id = $self->{facemap}->get ($hash); 713 $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# 714 $self->{faceid}[$facenum] = $id;
544 715
545 my $face = $self->{tilecache}->get ($id); 716 $self->{map}->set_tileid ($facenum => $id);
546 717
547 if ($face) { 718 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch; 719
549 $face 720 } elsif ($face->{type} & 1) { # with metadata
550 } else { 721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
551 my $tex = $self->{noface}; 722 CFPlus::DB::get res_meta => $face->{name}, $cb;
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 }; 723 }
555} 724}
556 725
557sub face_update { 726sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
559 728
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 729 if ($face->{type} == 0) { # FT_FACE
730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731 if $changed;
561 732
562 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
563}
564 734
565sub set_texture { 735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
774}
775
776sub smooth_update {
777 my ($self, $facenum, $face) = @_;
778
779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780}
781
782sub have_tile {
783 my ($self, $tile) = @_;
784
785 return unless $self->{map};
786
787 $self->{texture}[$tile] ||= my $tex =
788 new CFPlus::Texture
789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
790
791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
792}
793
794sub connect_face_update {
566 my ($self, $id, $data) = @_; 795 my ($self, $id, $cb) = @_;
567 796
568 $self->{texture}[$id] ||= do { 797 push @{$self->{face_cb}{$id}}, $cb;
569 my $tex =
570 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1;
572 798
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 CFPlus::guard {
574 $self->{map_widget}->update; 800 @{$self->{face_cb}{$id}}
575 801 = grep $_ != $cb,
576 $tex 802 @{$self->{face_cb}{$id}};
577 }; 803 }
578} 804}
579 805
580sub sound_play { 806sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
582 808
583 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
584} 811}
585 812
586my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
587 814
588sub query { 815sub query {
… …
592 $LAST_QUERY = $prompt; 819 $LAST_QUERY = $prompt;
593 820
594 $self->{query}-> ($self, $flags, $prompt); 821 $self->{query}-> ($self, $flags, $prompt);
595} 822}
596 823
597sub drawinfo { 824sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 825 local $_ = shift;
599 826
600 my @color = ( 827 # we now weed out all tags we do not support
828 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
829 # now all entities
830 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
831
832 # handle some elements
833 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
835
836 $_
837}
838
839our %NAME_TO_COLOR = (
840 black => 0,
841 white => 1,
842 darkblue => 2,
843 red => 3,
844 orange => 4,
845 lightblue => 5,
846 darkorange => 6,
847 green => 7,
848 darkgreen => 8,
849 grey => 9,
850 brown => 10,
851 yellow => 11,
852 tan => 12,
853);
854
855our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 856 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 857 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 858 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 859 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 860 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 861 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 862 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 863 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 864 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 865 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 866 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 867 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 868 [0.74, 0.65, 0.41],
614 ); 869);
615 870
871sub msg {
872 my ($self, $color, $type, $text, @extra) = @_;
873
874 $text = sanitise_xml $text;
875
876 if (my $cb = $self->{cb_msg}{$type}) {
877 $_->($self, $color, $type, $text, @extra) for values %$cb;
878 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
879 $type =~ s/-/_/g;
880 $self->{$type} = $text;
881 } else {
616 $self->logprint ("info: ", $text); 882 $self->logprint ("msg: ", $text);
883 return if $color < 0; # negative color == ignore if not understood
617 884
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
619 886
620 # try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
888 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 890
623 $text = CFPlus::asxml $text; 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 892 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 893
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, 894 $self->{statusbox}->add ($text,
632 group => $text, 895 group => $text,
633 fg => $color[$color], 896 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 897 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 898 tooltip_font => $::FONT_FIXED,
636 ); 899 );
637} 900 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 901}
644 902
645sub spell_add { 903sub spell_add {
646 my ($self, $spell) = @_; 904 my ($self, $spell) = @_;
647 905
648 # try to create single paragraphs out of the multiple lines sent by the server 906 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 907 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 908 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 909 $spell->{message} ||= "Server did not provide a description for this spell.";
652 910
653 $::SPELL_PAGE->add_spell ($spell); 911 $::SPELL_LIST->add_spell ($spell);
654 912
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 913 $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}); 914 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 915}
658 916
659sub spell_delete { 917sub spell_delete {
660 my ($self, $spell) = @_; 918 my ($self, $spell) = @_;
661 919
662 $::SPELL_PAGE->remove_spell ($spell); 920 $::SPELL_LIST->remove_spell ($spell);
921}
922
923sub setup {
924 my ($self, $setup) = @_;
925
926 $self->{map_widget}->set_tilesize ($self->{tilesize});
927 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 928}
664 929
665sub addme_success { 930sub addme_success {
666 my ($self) = @_; 931 my ($self) = @_;
667 932
… …
688 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
689 954
690 ::stop_game (); 955 ::stop_game ();
691} 956}
692 957
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 { 958sub update_floorbox {
728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
729 return unless $::CONN; 960 return unless $::CONN;
730 961
731 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
732 965
733 my $row; 966 my $row;
734 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
735 if ($row < 6) { 968 if ($row < 6) {
736 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
737 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
738 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
739 972
973 push @add,
740 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
741 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
742 976
743 $row++; 977 $row++;
744 } else { 978 } else {
745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
746 text => "More...", 980 text => "More...",
747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
748 ); 982 ;
749 last; 983 last;
750 } 984 }
751 } 985 }
752 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
754 text => "Close container", 988 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 ); 990 ;
757 } 991 }
992
993 $::FLOORBOX->add_at (@add);
758 }); 994 });
759 995
760 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
761} 997}
762 998
… …
873 $::SERVER_INFO->set_markup ( 1109 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1110 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1111 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1112 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1113 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1115 . "editing support $yesno[!!$self->{editor_support}]\n"
1116 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1121 );
1122
882} 1123}
883 1124
884sub logged_in { 1125sub logged_in {
885 my ($self) = @_; 1126 my ($self) = @_;
886 1127
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
888 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
889 $self->update_server_info; 1132 $self->update_server_info;
1133
1134 if ($self->{cfplus_ext} >= 2) {
1135 $self->send_ext_req ("editor_support", sub {
1136 $self->{editor_support} = { @_ };
1137 $self->update_server_info;
1138
1139 0
1140 });
1141 }
890 1142
891 0 1143 0
892 }); 1144 });
893 1145
894 $self->update_server_info; 1146 $self->update_server_info;
895 1147
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1148 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
899} 1152}
900 1153
901sub lookat { 1154sub lookat {
902 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
903 1156
904 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
906 my ($msg) = @_; 1159 my (%msg) = @_;
907 1160
908 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
909 # start npc chat dialog 1162 # start npc chat dialog
910 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
911 dx => $x, 1164 token => $msg{npc_dialog},
912 dy => $y,
913 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
914 conn => $self, 1166 conn => $self,
915 ; 1167 ;
916 } 1168 }
917 }); 1169 });
918 } 1170 }
… …
921} 1173}
922 1174
923sub destroy { 1175sub destroy {
924 my ($self) = @_; 1176 my ($self) = @_;
925 1177
926 $self->{npc_dialog}->destroy 1178 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
928 1180
929 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
930} 1184}
931 1185
932package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
933 1187
934our @ISA = 'CFPlus::UI::FancyFrame'; 1188our @ISA = 'CFPlus::UI::Toplevel';
935 1189
936sub new { 1190sub new {
937 my $class = shift; 1191 my $class = shift;
938 1192
939 my $self = $class->SUPER::new ( 1193 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1200 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1201 has_close_button => 1,
948 @_, 1202 @_,
949 ); 1203 );
950 1204
951 Scalar::Util::weaken (my $this = $self); 1205 CFPlus::weaken (my $this = $self);
952 1206
953 $self->connect (delete => sub { $this->destroy; 1 }); 1207 $self->connect (delete => sub { $this->destroy; 1 });
954 1208
955 # better use a pane... 1209 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1210 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1212
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1213 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1214
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1215 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1216 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
963 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1217 tooltip => "#npc_message_entry",
964 . "Sometimes you have to tell an NPC something you cannot find out during "
965 . "a normal conversation (such as a password). In those cases you have to use "
966 . "this text entry. You can also enter responses manually instead of using the response "
967 . "buttons below.",
968 on_activate => sub { 1218 on_activate => sub {
969 my ($entry, $text) = @_; 1219 my ($entry, $text) = @_;
970 1220
971 return unless $text =~ /\S/; 1221 return unless $text =~ /\S/;
972 1222
… …
985 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
986 ; 1236 ;
987 1237
988 $self->update_options; 1238 $self->update_options;
989 1239
990 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
991 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
992 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
993 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
994 1246
995 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
996 1248
997 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
998 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
… …
1004}; 1256};
1005 1257
1006sub update_options { 1258sub update_options {
1007 my ($self) = @_; 1259 my ($self) = @_;
1008 1260
1009 Scalar::Util::weaken $self; 1261 CFPlus::weaken $self;
1010 1262
1011 $self->{options}->clear; 1263 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1264 $self->{options}->add ($self->{bye_button});
1013 1265
1014 for my $kw (sort keys %{ $self->{kw} }) { 1266 for my $kw (sort keys %{ $self->{kw} }) {
… …
1021 ); 1273 );
1022 } 1274 }
1023} 1275}
1024 1276
1025sub feed { 1277sub feed {
1026 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1027 1279
1028 Scalar::Util::weaken $self; 1280 CFPlus::weaken $self;
1029 1281
1030 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1033
1034 my $text = "\n" . CFPlus::asxml $msg->{msg};
1035 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1036 my @link;
1037 $text =~ s{
1038 ($match)
1039 }{
1040 my $kw = $1;
1041
1042 push @link, new CFPlus::UI::Label
1043 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1044 can_hover => 1,
1045 can_events => 1,
1046 padding_x => 0,
1047 padding_y => 0,
1048 on_button_up => sub {
1049 $self->send ($kw);
1050 };
1051
1052 chr 0xfffc
1053 }giex;
1054 1287
1288 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link;
1292 $text =~ s{
1293 ($match)
1294 }{
1295 my $kw = $1;
1296
1297 push @link, new CFPlus::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1,
1300 can_events => 1,
1301 padding_x => 0,
1302 padding_y => 0,
1303 on_button_up => sub {
1304 $self->send ($kw);
1305 };
1306
1307 "\x{fffc}"
1308 }giex;
1309
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1057 $self->update_options; 1314 $self->update_options;
1058 } else { 1315 } else {
1059 $self->destroy; 1316 $self->destroy;
1060 } 1317 }
1061 1318
… …
1066 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1067 1324
1068 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1069 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1070 1327
1071 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1072} 1329}
1073 1330
1074sub destroy { 1331sub destroy {
1075 my ($self) = @_; 1332 my ($self) = @_;
1076 1333
1077 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1078 1335
1079 if ($self->{conn}) { 1336 if ($self->{conn}) {
1080 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1081 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1082 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1083 } 1340 }
1084 1341
1085 $self->SUPER::destroy; 1342 $self->SUPER::destroy;
1086} 1343}
1087 1344
10881 13451
1346

Diff Legend

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