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.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;
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 $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
40 $self->{map_widget}->add_command (@$_) 201 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 202 for @cmd_help;
42 203
204 {
205 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
206 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
207 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
208 }
209
210 {
43 $self->{noface} = new_from_file CFPlus::Texture 211 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 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 }
45 215
46 $self->{open_container} = 0; 216 $self->{open_container} = 0;
47 217
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 218 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 220
55 $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 });
56} 231}
57 232
58sub logprint { 233sub logprint {
59 my ($self, @a) = @_; 234 my ($self, @a) = @_;
60 235
61 $self->{log_fh} ||= do { 236 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} 237}
79 238
80sub _stat_numdiff { 239sub _stat_numdiff {
81 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
82 241
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 374 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 375 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 376 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 379 $::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}; 380 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 381 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 382 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 383
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 384 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
247 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
248 405
249 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
250 $sktbl->clear; 407 $sktbl->clear;
251 408
409 my @add;
410
411 push @add,
252 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
253 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
254 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
255 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
256 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
257 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
258 419
259 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>";
260 421
261 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);
262 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);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 424
265 my ($x, $y) = (0, 1); 425 my ($x, $y) = (0, 1);
266 for ( 426 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 427 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 428 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 437 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 438 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 439 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 440 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 441 } elsif ($ev->{button} == 3) {
442 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 443 (new CFPlus::UI::Menu
283 items => [ 444 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 447 ],
287 )->popup ($ev); 448 )->popup ($ev);
288 } else { 449 } else {
289 return 0; 450 return 0;
290 } 451 }
291 452
292 1 453 1
293 }; 454 };
294 455
456 push @add,
295 $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
296 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),
297 $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
298 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),
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
300 464
301 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
302 } 466 }
467
468 $sktbl->add_at (@add);
303 } 469 }
304 470
305 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 474 }
309} 475}
310 476
477sub macro_send {
478 my ($self, $macro) = @_;
479
480 for my $cmd (@{ $macro->{action} }) {
481 $self->send_command ($cmd);
482 }
483}
484
311sub user_send { 485sub user_send {
312 my ($self, $command) = @_; 486 my ($self, $command) = @_;
313 487
488 $self->{record}->($command)
314 if ($self->{record}) { 489 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 490
318 $self->logprint ("send: ", $command); 491 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 492 $self->send_command ($command);
320 ::status ($command); 493 ::status ($command);
321} 494}
322 495
323sub start_record { 496sub record {
324 my ($self) = @_; 497 my ($self, $cb) = @_;
325 498
326 $self->{record} = []; 499 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 500}
333 501
334sub map_scroll { 502sub map_scroll {
335 my ($self, $dx, $dy) = @_; 503 my ($self, $dx, $dy) = @_;
336 504
… …
338} 506}
339 507
340sub feed_map1a { 508sub feed_map1a {
341 my ($self, $data) = @_; 509 my ($self, $data) = @_;
342 510
343 $self->{map}->map1a_update ($data); 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 {
344 $self->{map_widget}->update; 539 $self->{map_widget}->update;
540 }
345} 541}
346 542
347sub magicmap { 543sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 544 my ($self, $w, $h, $x, $y, $data) = @_;
349 545
… …
357 or return; 553 or return;
358 554
359 my ($hash, $x, $y, $w, $h) = @$map_info; 555 my ($hash, $x, $y, $w, $h) = @$map_info;
360 556
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 557 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 558 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 559 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 560}
365 561
366sub map_clear { 562sub map_clear {
367 my ($self) = @_; 563 my ($self) = @_;
… …
371 567
372 $self->{map}->clear; 568 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 569 delete $self->{map_widget}{magicmap};
374} 570}
375 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}
376 595
377sub load_map($$$) { 596sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 597 my ($self, $hash, $x, $y) = @_;
379 598
380 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) {
381 $data = Compress::LZF::decompress $data; 607 $data = Compress::LZF::decompress $data;
382 #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#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 609
387 $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;
388 } 613 }
389 } 614 };
390} 615}
391 616
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 617# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 618# (server resource,s latency, bandwidth), so this hack is warranted.
394# 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
… …
458 683
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 684 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 685 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 686
462 } else { 687 } else {
688 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 689 $self->send_mapinfo ("spatial $path$tile", sub {
690 return unless $gen == $self->{map_change_gen};
691
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 692 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 693
466 return if $mode ne "spatial"; 694 return if $mode ne "spatial";
467 695
468 $x += $self->{map}->ox; 696 $x += $self->{map}->ox;
… …
482 710
483sub map_change { 711sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 712 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 713
486 $self->flush_map; 714 $self->flush_map;
715
716 ++$self->{map_change_gen};
487 717
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 718 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 719
490 my $mapmapw = $self->{mapmap}->{w}; 720 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 721 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 738 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 739 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 740}
511 741
512sub face_find { 742sub face_find {
513 my ($self, $facenum, $face) = @_; 743 my ($self, $facenum, $face, $cb) = @_;
514 744
515 my $hash = "$face->{chksum},$face->{name}"; 745 if ($face->{type} == 0) { # FT_FACE
746 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
516 747
517 my $id = $self->{facemap}->get ($hash); 748 $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# 749 $self->{faceid}[$facenum] = $id;
544 750
545 my $face = $self->{tilecache}->get ($id); 751 $self->{map}->set_tileid ($facenum => $id);
546 752
547 if ($face) { 753 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch; 754
549 $face 755 } elsif ($face->{type} & 1) { # with metadata
550 } else { 756 CFPlus::DB::get res_meta => $face->{name}, $cb;
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 }; 757 }
555} 758}
556 759
557sub face_update { 760sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 761 my ($self, $facenum, $face, $changed) = @_;
559 762
560 $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;
561 766
562 $self->set_texture ($face->{id} => delete $face->{image}); 767 $self->have_tile ($face->{id});
563}
564 768
565sub 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 {
566 my ($self, $id, $data) = @_; 820 my ($self, $id, $cb) = @_;
567 821
568 $self->{texture}[$id] ||= do { 822 push @{$self->{face_cb}{$id}}, $cb;
569 my $tex =
570 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1;
572 823
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 824 CFPlus::guard {
574 $self->{map_widget}->update; 825 @{$self->{face_cb}{$id}}
575 826 = grep $_ != $cb,
576 $tex 827 @{$self->{face_cb}{$id}};
577 }; 828 }
578} 829}
579 830
580sub sound_play { 831sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 832 my ($self, $type, $face, $dx, $dy, $vol) = @_;
582 833
583 $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
584} 836}
585 837
586my $LAST_QUERY; # server is stupid, stupid, stupid 838my $LAST_QUERY; # server is stupid, stupid, stupid
587 839
588sub query { 840sub query {
… …
592 $LAST_QUERY = $prompt; 844 $LAST_QUERY = $prompt;
593 845
594 $self->{query}-> ($self, $flags, $prompt); 846 $self->{query}-> ($self, $flags, $prompt);
595} 847}
596 848
597sub drawinfo { 849sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 850 local $_ = shift;
599 851
600 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 = (
601 [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],
602 [1.00, 1.00, 1.00], 882 [1.00, 1.00, 1.00],
603 [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]
604 [1.00, 0.00, 0.00], 884 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 885 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 886 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 887 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 888 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 889 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 890 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 891 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 892 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 893 [0.74, 0.65, 0.41],
614 ); 894);
615 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 {
616 $self->logprint ("info: ", $text); 907 $self->logprint ("msg: ", $text);
908 return if $color < 0; # negative color == ignore if not understood
617 909
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 910 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
619 911
620 # 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
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 914 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 915
623 $text = CFPlus::asxml $text; 916 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 917 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 918
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, 919 $self->{statusbox}->add ($text,
632 group => $text, 920 group => $text,
633 fg => $color[$color], 921 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 922 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 923 tooltip_font => $::FONT_FIXED,
636 ); 924 );
637} 925 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 926}
644 927
645sub spell_add { 928sub spell_add {
646 my ($self, $spell) = @_; 929 my ($self, $spell) = @_;
647 930
648 # try to create single paragraphs out of the multiple lines sent by the server 931 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 932 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 933 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 934 $spell->{message} ||= "Server did not provide a description for this spell.";
652 935
653 $::SPELL_PAGE->add_spell ($spell); 936 $::SPELL_LIST->add_spell ($spell);
654 937
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 938 $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}); 939 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 940}
658 941
659sub spell_delete { 942sub spell_delete {
660 my ($self, $spell) = @_; 943 my ($self, $spell) = @_;
661 944
662 $::SPELL_PAGE->remove_spell ($spell); 945 $::SPELL_LIST->remove_spell ($spell);
946}
947
948sub setup {
949 my ($self, $setup) = @_;
950
951 $self->{map_widget}->set_tilesize ($self->{tilesize});
952 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 953}
664 954
665sub addme_success { 955sub addme_success {
666 my ($self) = @_; 956 my ($self) = @_;
667 957
… …
688 $self->{map_widget}->clr_commands; 978 $self->{map_widget}->clr_commands;
689 979
690 ::stop_game (); 980 ::stop_game ();
691} 981}
692 982
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 { 983sub update_floorbox {
728 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 984 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
729 return unless $::CONN; 985 return unless $::CONN;
730 986
731 $::FLOORBOX->clear; 987 $::FLOORBOX->clear;
988
989 my @add;
732 990
733 my $row; 991 my $row;
734 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} }) {
735 if ($row < 6) { 993 if ($row < 6) {
736 local $_->{face_widget}; # hack to force recreation of widget 994 local $_->{face_widget}; # hack to force recreation of widget
737 local $_->{desc_widget}; # hack to force recreation of widget 995 local $_->{desc_widget}; # hack to force recreation of widget
738 CFPlus::Item::update_widgets $_; 996 CFPlus::Item::update_widgets $_;
739 997
998 push @add,
740 $::FLOORBOX->add (0, $row, $_->{face_widget}); 999 0, $row, $_->{face_widget},
741 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1000 1, $row, $_->{desc_widget};
742 1001
743 $row++; 1002 $row++;
744 } else { 1003 } else {
745 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1004 push @add, 1, $row, new CFPlus::UI::Button
746 text => "More...", 1005 text => "More...",
747 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1006 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
748 ); 1007 ;
749 last; 1008 last;
750 } 1009 }
751 } 1010 }
752 if ($::CONN->{open_container}) { 1011 if ($::CONN->{open_container}) {
753 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1012 push @add, 1, $row++, new CFPlus::UI::Button
754 text => "Close container", 1013 text => "Close container",
755 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1014 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
756 ); 1015 ;
757 } 1016 }
758 });
759 1017
1018 $::FLOORBOX->add_at (@add);
1019 });
1020
760 $::WANT_REFRESH++; 1021 $::WANT_REFRESH->start;
761} 1022}
762 1023
763sub set_opencont { 1024sub set_opencont {
764 my ($conn, $tag, $name) = @_; 1025 my ($conn, $tag, $name) = @_;
765 $conn->{open_container} = $tag; 1026 $conn->{open_container} = $tag;
… …
873 $::SERVER_INFO->set_markup ( 1134 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 1135 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 1136 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1137 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "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"
1140 . "editing support $yesno[!!$self->{editor_support}]\n"
1141 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1142 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1143 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1144 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 1145 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 1146 );
1147
882} 1148}
883 1149
884sub logged_in { 1150sub logged_in {
885 my ($self) = @_; 1151 my ($self) = @_;
886 1152
887 $self->send_ext_req (cfplus_support => version => 1, sub { 1153 $self->send_ext_req (cfplus_support => version => 2, sub {
1154 my (%msg) = @_;
1155
888 $self->{cfplus_ext} = $_[0]{version}; 1156 $self->{cfplus_ext} = $msg{version};
889 $self->update_server_info; 1157 $self->update_server_info;
1158
1159 if ($self->{cfplus_ext} >= 2) {
1160 $self->send_ext_req ("editor_support", sub {
1161 $self->{editor_support} = { @_ };
1162 $self->update_server_info;
1163
1164 0
1165 });
1166 }
890 1167
891 0 1168 0
892 }); 1169 });
893 1170
894 $self->update_server_info; 1171 $self->update_server_info;
895 1172
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 1173 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $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;
898 $self->send_command ("pickup $::CFG->{pickup}"); 1176 $self->send_command ("pickup $::CFG->{pickup}");
899} 1177}
900 1178
901sub lookat { 1179sub lookat {
902 my ($self, $x, $y) = @_; 1180 my ($self, $x, $y) = @_;
903 1181
904 if ($self->{cfplus_ext}) { 1182 if ($self->{cfplus_ext}) {
905 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1183 $self->send_ext_req (lookat => $x, $y, sub {
906 my ($msg) = @_; 1184 my (%msg) = @_;
907 1185
908 if (exists $msg->{npc_dialog}) { 1186 if (exists $msg{npc_dialog}) {
909 # start npc chat dialog 1187 # start npc chat dialog
910 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1188 $self->{npc_dialog} = new CFPlus::NPCDialog::
911 dx => $x, 1189 token => $msg{npc_dialog},
912 dy => $y,
913 title => "$msg->{npc_dialog} (NPC)", 1190 title => "$msg{npc_dialog}[0] (NPC)",
914 conn => $self, 1191 conn => $self,
915 ; 1192 ;
916 } 1193 }
917 }); 1194 });
918 } 1195 }
… …
921} 1198}
922 1199
923sub destroy { 1200sub destroy {
924 my ($self) = @_; 1201 my ($self) = @_;
925 1202
926 $self->{npc_dialog}->destroy 1203 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1204 if $self->{npc_dialog};
928 1205
929 $self->SUPER::destroy; 1206 $self->SUPER::destroy;
1207
1208 %$self = ();
930} 1209}
931 1210
932package CFPlus::NPCDialog; 1211package CFPlus::NPCDialog;
933 1212
934our @ISA = 'CFPlus::UI::FancyFrame'; 1213our @ISA = 'CFPlus::UI::Toplevel';
935 1214
936sub new { 1215sub new {
937 my $class = shift; 1216 my $class = shift;
938 1217
939 my $self = $class->SUPER::new ( 1218 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1225 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1226 has_close_button => 1,
948 @_, 1227 @_,
949 ); 1228 );
950 1229
951 Scalar::Util::weaken (my $this = $self); 1230 CFPlus::weaken (my $this = $self);
952 1231
953 $self->connect (delete => sub { $this->destroy; 1 }); 1232 $self->connect (delete => sub { $this->destroy; 1 });
954 1233
955 # better use a pane... 1234 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1235 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
958 1237
959 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1238 $hbox->add (my $vbox = new CFPlus::UI::VBox);
960 1239
961 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1240 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
962 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1241 $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" 1242 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 { 1243 on_activate => sub {
969 my ($entry, $text) = @_; 1244 my ($entry, $text) = @_;
970 1245
971 return unless $text =~ /\S/; 1246 return unless $text =~ /\S/;
972 1247
… …
985 on_activate => sub { $this->destroy; 1 }, 1260 on_activate => sub { $this->destroy; 1 },
986 ; 1261 ;
987 1262
988 $self->update_options; 1263 $self->update_options;
989 1264
990 $self->{id} = $self->{conn}->send_ext_req ( 1265 $self->{id} = "npc-channel-" . $self->{conn}->token;
991 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1266 $self->{conn}->connect_ext ($self->{id} => sub {
992 sub { $this && $this->feed (@_) } 1267 $this->feed (@_) if $this;
993 ); 1268 });
1269
1270 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
994 1271
995 $self->{entry}->grab_focus; 1272 $self->{entry}->grab_focus;
996 1273
997 $self->{textview}->add_paragraph ({ 1274 $self->{textview}->add_paragraph ({
998 fg => [1, 1, 0, 1], 1275 fg => [1, 1, 0, 1],
… …
1004}; 1281};
1005 1282
1006sub update_options { 1283sub update_options {
1007 my ($self) = @_; 1284 my ($self) = @_;
1008 1285
1009 Scalar::Util::weaken $self; 1286 CFPlus::weaken $self;
1010 1287
1011 $self->{options}->clear; 1288 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1289 $self->{options}->add ($self->{bye_button});
1013 1290
1014 for my $kw (sort keys %{ $self->{kw} }) { 1291 for my $kw (sort keys %{ $self->{kw} }) {
… …
1021 ); 1298 );
1022 } 1299 }
1023} 1300}
1024 1301
1025sub feed { 1302sub feed {
1026 my ($self, $msg) = @_; 1303 my ($self, $type, @arg) = @_;
1027 1304
1028 Scalar::Util::weaken $self; 1305 CFPlus::weaken $self;
1029 1306
1030 if ($msg->{msgtype} eq "reply") { 1307 if ($type eq "update") {
1308 my (%info) = @arg;
1309
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1310 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1311 $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 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
1055 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1335 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1056 $self->{textview}->scroll_to_bottom; 1336 $self->{textview}->scroll_to_bottom;
1337 }
1338
1057 $self->update_options; 1339 $self->update_options;
1058 } else { 1340 } else {
1059 $self->destroy; 1341 $self->destroy;
1060 } 1342 }
1061 1343
… …
1066 my ($self, $msg) = @_; 1348 my ($self, $msg) = @_;
1067 1349
1068 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1350 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1069 $self->{textview}->scroll_to_bottom; 1351 $self->{textview}->scroll_to_bottom;
1070 1352
1071 $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);
1072} 1354}
1073 1355
1074sub destroy { 1356sub destroy {
1075 my ($self) = @_; 1357 my ($self) = @_;
1076 1358
1077 #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
1078 1360
1079 if ($self->{conn}) { 1361 if ($self->{conn}) {
1080 $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};
1081 delete $self->{conn}{npc_dialog}; 1363 delete $self->{conn}{npc_dialog};
1082 $self->{conn}->disconnect_ext ($self->{id}); 1364 $self->{conn}->disconnect_ext ($self->{id});
1083 } 1365 }
1084 1366
1085 $self->SUPER::destroy; 1367 $self->SUPER::destroy;
1086} 1368}
1087 1369
10881 13701
1371

Diff Legend

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