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.63 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.106 by root, Sun Apr 29 20:03:08 2007 UTC

1package CFClient::Protocol; 1package CFPlus::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFClient; 8use CFPlus;
9use CFPlus::DB;
9use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
10 16
11use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
12 18
13sub new { 19sub new {
14 my $class = shift; 20 my ($class, %arg) = @_;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
17 29
18 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
19 31
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 32 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 34 or die "unparseable command help: $_->{kw}[0]";
28 35
29 my $cmd = $1; 36 my $cmd = $1;
30 my @args = split /\|/, $2; 37 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 38 @args = (".*") unless @args;
32 39
40 my (undef, @par) = CFPlus::Pod::section_of $_;
41 my $text = CFPlus::Pod::as_label @par;
42
33 $_ = $_ eq ".*" ? "" : " $_" 43 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 44 for @args;
35 45
36 my $text = CFClient::pod_to_pango $head2->content; 46 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
40 @args; 48 @args
49 } sort { $a->{par} <=> $b->{par} }
50 CFPlus::Pod::find command => "*";
51
52 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_;
54
55 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
41 } 66 }
42
43 \@cmd_help
44 }; 67 });
45 68
46 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 70 for @cmd_help;
48 71
72 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76 }
77
78 {
49 $self->{noface} = new_from_file CFClient::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82 }
51 83
52 $self->{open_container} = 0; 84 $self->{open_container} = 0;
53 85
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 86 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 88
61 $self 89 $self
62} 90}
63 91
64sub logprint { 92sub logprint {
… …
221 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 249 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
222 $::GAUGES->{food} ->set_value ($fo, $fo_m); 250 $::GAUGES->{food} ->set_value ($fo, $fo_m);
223 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 251 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
224 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
225 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
226 my $rng = $stats->{+CS_STAT_RANGE}; 254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
227 $rng =~ s/^Range: //; # thank you so much dear server
228 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
229 my $title = $stats->{+CS_STAT_TITLE}; 255 my $title = $stats->{+CS_STAT_TITLE};
230 $title =~ s/^Player: //; 256 $title =~ s/^Player: //;
231 $::STATWIDS->{title} ->set_text ("Title: " . $title); 257 $::STATWIDS->{title} ->set_text ("Title: " . $title);
232 258
233 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 259 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 268 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 269 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 270 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 271 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 272
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 273 $self->update_weight;
248 274
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 275 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 276 for keys %RES_TBL;
251 277
252 my $sktbl = $::STATWIDS->{skill_tbl}; 278 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 279 my @skills = keys %{ $self->{skill_info} };
254 280
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 281 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 282 $sktbl->clear;
257 283
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 284 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 285 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 286 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 287 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 288 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 289 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 290
291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
292
293 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
294 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295
265 my ($x, $y) = (1, 0); 296 my ($x, $y) = (0, 1);
266 for ( 297 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 298 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 299 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 300 grep exists $stats->{$_},
270 @skills 301 @skills
271 ) { 302 ) {
272 my ($idx, $name) = @$_; 303 my ($idx, $name) = @$_;
273 304
305 my $spell_cb = sub {
306 my ($widget, $ev) = @_;
307
308 if ($ev->{button} == 1) {
309 $::CONN->user_send ("ready_skill $name");
310 } elsif ($ev->{button} == 2) {
311 $::CONN->user_send ("use_skill $name");
312 } elsif ($ev->{button} == 3) {
313 my $shortname = CFPlus::shorten $name, 14;
314 (new CFPlus::UI::Menu
315 items => [
316 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
317 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
318 ],
319 )->popup ($ev);
320 } else {
321 return 0;
322 }
323
324 1
325 };
326
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 327 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 328 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 329 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 330 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
279 333
280 $x++ and ($x, $y) = (0, $y + 1); 334 $x++ and ($x, $y) = (0, $y + 1);
281 } 335 }
282 } 336 }
283 337
… …
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 341 }
288} 342}
289 343
344sub macro_send {
345 my ($self, $macro) = @_;
346
347 for my $cmd (@{ $macro->{action} }) {
348 $self->send_command ($cmd);
349 }
350}
351
290sub user_send { 352sub user_send {
291 my ($self, $command) = @_; 353 my ($self, $command) = @_;
292 354
355 $self->{record}->($command)
293 if ($self->{record}) { 356 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 357
297 $self->logprint ("send: ", $command); 358 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 359 $self->send_command ($command);
299 ::status ($command); 360 ::status ($command);
300} 361}
301 362
302sub start_record { 363sub record {
303 my ($self) = @_; 364 my ($self, $cb) = @_;
304 365
305 $self->{record} = []; 366 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 367}
312 368
313sub map_scroll { 369sub map_scroll {
314 my ($self, $dx, $dy) = @_; 370 my ($self, $dx, $dy) = @_;
315 371
… …
317} 373}
318 374
319sub feed_map1a { 375sub feed_map1a {
320 my ($self, $data) = @_; 376 my ($self, $data) = @_;
321 377
322 $self->{map}->map1a_update ($data); 378 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 379 $self->{map_widget}->update;
324} 380}
325 381
326sub magicmap { 382sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 383 my ($self, $w, $h, $x, $y, $data) = @_;
… …
336 or return; 392 or return;
337 393
338 my ($hash, $x, $y, $w, $h) = @$map_info; 394 my ($hash, $x, $y, $w, $h) = @$map_info;
339 395
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 396 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
343} 399}
344 400
345sub map_clear { 401sub map_clear {
346 my ($self) = @_; 402 my ($self) = @_;
… …
350 406
351 $self->{map}->clear; 407 $self->{map}->clear;
352 delete $self->{map_widget}{magicmap}; 408 delete $self->{map_widget}{magicmap};
353} 409}
354 410
411sub bg_fetch {
412 my ($self) = @_;
413
414 my $id;
415
416 do {
417 $id = pop @{$self->{bg_fetch}}
418 or return;
419 } while $self->{texture}[$id];
420
421 CFPlus::DB::get tilecache => $id, sub {
422 my ($data) = @_;
423
424 return unless $self->{map}; # stop when destroyed
425
426 $self->set_texture ($id => $data)
427 if defined $data;
428
429 $self->bg_fetch;
430 };
431}
355 432
356sub load_map($$$) { 433sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 434 my ($self, $hash, $x, $y) = @_;
358 435
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 436 my $gen = $self->{map_change_gen};
437
438 CFPlus::DB::get $self->{mapcache} => $hash, sub {
439 return unless $gen == $self->{map_change_gen};
440
441 my ($data) = @_;
442
443 if (defined $data) {
360 $data = Compress::LZF::decompress $data; 444 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 445 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id)
364 or next;
365 446
366 $self->set_texture ($id => $data); 447 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress;
367 } 450 }
368 } 451 };
369} 452}
370 453
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 454# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 455# (server resource,s latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 456# the right fix is to make real tiled maps with an overview file
… …
437 520
438 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 521 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
439 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 522 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
440 523
441 } else { 524 } else {
525 my $gen = $self->{map_change_gen};
442 $self->send_mapinfo ("spatial $path$tile", sub { 526 $self->send_mapinfo ("spatial $path$tile", sub {
527 return unless $gen == $self->{map_change_gen};
528
443 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 529 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
444 530
445 return if $mode ne "spatial"; 531 return if $mode ne "spatial";
446 532
447 $x += $self->{map}->ox; 533 $x += $self->{map}->ox;
… …
461 547
462sub map_change { 548sub map_change {
463 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
464 550
465 $self->flush_map; 551 $self->flush_map;
552
553 ++$self->{map_change_gen};
466 554
467 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
468 556
469 my $mapmapw = $self->{mapmap}->{w}; 557 my $mapmapw = $self->{mapmap}->{w};
470 my $mapmaph = $self->{mapmap}->{h}; 558 my $mapmaph = $self->{mapmap}->{h};
… …
487 $self->load_map ($hash, $x, $y); 575 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 576 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 577}
490 578
491sub face_find { 579sub face_find {
492 my ($self, $facenum, $face) = @_; 580 my ($self, $facenum, $face, $cb) = @_;
493 581
494 my $hash = "$face->{chksum},$face->{name}"; 582 my $hash = "$face->{chksum},$face->{name}";
495 583
496 my $id = $self->{facemap}->get ($hash); 584 my $id = CFPlus::DB::get_tile_id_sync $hash;
497 585
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 586 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d# 587 $self->{faceid}[$facenum] = $id;
523 588
524 my $face = $self->{tilecache}->get ($id); 589 $self->{map}->set_tileid ($facenum => $id);
525 590
526 if ($face) { 591 CFPlus::DB::get tilecache => $id, $cb;
527 #$self->face_prefetch;
528 $face
529 } else {
530 my $tex = $self->{noface};
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 };
534} 592}
535 593
536sub face_update { 594sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 595 my ($self, $facenum, $face, $changed) = @_;
538 596
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
598 if $changed;
540 599
541 $self->set_texture ($face->{id} => delete $face->{image}); 600 $self->set_texture ($face->{id} => delete $face->{image});
601}
602
603sub smooth_update {
604 my ($self, $facenum, $face) = @_;
605
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
542} 607}
543 608
544sub set_texture { 609sub set_texture {
545 my ($self, $id, $data) = @_; 610 my ($self, $id, $data) = @_;
546 611
547 $self->{texture}[$id] ||= do { 612 $self->{texture}[$id] = my $tex =
548 my $tex =
549 new_from_image CFClient::Texture 613 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 614 $data, minify => 1, mipmap => 1;
551 615
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 617 $self->{map_widget}->update;
554
555 $tex
556 };
557} 618}
558 619
559sub sound_play { 620sub sound_play {
560 my ($self, $x, $y, $soundnum, $type) = @_; 621 my ($self, $x, $y, $soundnum, $type) = @_;
561 622
… …
571 $LAST_QUERY = $prompt; 632 $LAST_QUERY = $prompt;
572 633
573 $self->{query}-> ($self, $flags, $prompt); 634 $self->{query}-> ($self, $flags, $prompt);
574} 635}
575 636
576sub drawinfo { 637our %NAME_TO_COLOR = (
577 my ($self, $color, $text) = @_; 638 black => 0,
639 white => 1,
640 darkblue => 2,
641 red => 3,
642 orange => 4,
643 lightblue => 5,
644 darkorange => 6,
645 green => 7,
646 darkgreen => 8,
647 grey => 9,
648 brown => 10,
649 yellow => 11,
650 tan => 12,
651);
578 652
579 my @color = ( 653our @CF_COLOR = (
580 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 654 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
581 [1.00, 1.00, 1.00], 655 [1.00, 1.00, 1.00],
582 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 656 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
583 [1.00, 0.00, 0.00], 657 [1.00, 0.00, 0.00],
584 [1.00, 0.54, 0.00], 658 [1.00, 0.54, 0.00],
585 [0.11, 0.56, 1.00], 659 [0.11, 0.56, 1.00],
586 [0.93, 0.46, 0.00], 660 [0.93, 0.46, 0.00],
587 [0.18, 0.54, 0.34], 661 [0.18, 0.54, 0.34],
588 [0.56, 0.73, 0.56], 662 [0.56, 0.73, 0.56],
589 [0.80, 0.80, 0.80], 663 [0.80, 0.80, 0.80],
590 [0.75, 0.61, 0.20], 664 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 665 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 666 [0.74, 0.65, 0.41],
593 ); 667);
594 668
669sub msg {
670 my ($self, $color, $type, $text, @extra) = @_;
671
672 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g;
676 $self->{$type} = $text;
677 } else {
595 $self->logprint ("info: ", $text); 678 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood
596 680
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 681 my $fg = $CF_COLOR[$color % @CF_COLOR];
598 682
599 # try to create single paragraphs of multiple lines sent by the server 683 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 685 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
601 686
602 $text = CFClient::UI::Label::escape $text; 687 ::message ({ fg => $fg, markup => $_ })
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 688 for split /\n/, $text;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 689
606 $self->{logview}->add_paragraph ($color[$color], $_)
607 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609
610 $self->{statusbox}->add ($text, 690 $self->{statusbox}->add ($text,
611 group => $text, 691 group => $text,
612 fg => $color[$color], 692 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 693 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 694 tooltip_font => $::FONT_FIXED,
615 ); 695 );
616} 696 }
617
618sub drawextinfo {
619 my ($self, $color, $type, $subtype, $message) = @_;
620
621 $self->drawinfo ($color, $message);
622} 697}
623 698
624sub spell_add { 699sub spell_add {
625 my ($self, $spell) = @_; 700 my ($self, $spell) = @_;
626 701
627 # try to create single paragraphs of multiple lines sent by the server 702 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 703 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 704 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 705 $spell->{message} ||= "Server did not provide a description for this spell.";
631 706
632 $::SPELL_PAGE->add_spell ($spell); 707 $::SPELL_LIST->add_spell ($spell);
633 708
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 709 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 710 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 711}
637 712
638sub spell_delete { 713sub spell_delete {
639 my ($self, $spell) = @_; 714 my ($self, $spell) = @_;
640 715
641 $::SPELL_PAGE->remove_spell ($spell); 716 $::SPELL_LIST->remove_spell ($spell);
717}
718
719sub setup {
720 my ($self, $setup) = @_;
721
722 $self->{map_widget}->set_tilesize ($self->{tilesize});
723 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 724}
643 725
644sub addme_success { 726sub addme_success {
645 my ($self) = @_; 727 my ($self) = @_;
646 728
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 729 my %skill_help;
651 730
652 for my $head2 ($pom->head1->[3]->head2) { 731 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 732 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 733 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 734 };
658 735
659 for my $skill (values %{$self->{skill_info}}) { 736 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 737 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 738 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 739 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 740 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 741 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 742 . $skill_help{$skill});
666 } 743 }
667} 744}
668 745
669sub eof { 746sub eof {
670 my ($self) = @_; 747 my ($self) = @_;
… …
694 771
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 772 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 773
697 $self->send ("requestinfo image_sums $face $face"); 774 $self->send ("requestinfo image_sums $face $face");
698 775
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 776 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 777 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 778 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 779 $self->send ("requestinfo image_info");
703 780
704 $self->{num_faces} = 0; 781 $self->{num_faces} = 0;
705 782
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 783 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 784 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 785 }
709} 786}
710 787
711sub update_floorbox { 788sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 789 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 790 return unless $::CONN;
714 791
715 $::FLOORBOX->clear; 792 $::FLOORBOX->clear;
716 793
717 my $row; 794 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 795 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 796 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 797 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 798 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 799 CFPlus::Item::update_widgets $_;
723 800
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 801 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 802 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 803
727 $row++; 804 $row++;
728 } else { 805 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 806 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 807 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 808 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 809 );
733 last; 810 last;
734 } 811 }
735 } 812 }
736 if ($::CONN->{open_container}) { 813 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 814 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
738 text => "Close container", 815 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 816 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 817 );
741 } 818 }
742 }); 819 });
… …
748 my ($conn, $tag, $name) = @_; 825 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 826 $conn->{open_container} = $tag;
750 update_floorbox; 827 update_floorbox;
751 828
752 $::INV_RIGHT_HB->clear (); 829 $::INV_RIGHT_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 830 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 831
755 if ($tag != 0) { # Floor isn't closable, is it? 832 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 833 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
757 text => "Close container", 834 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 835 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 836 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 837 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 838 if $tag != 0;
… …
769} 846}
770 847
771sub update_containers { 848sub update_containers {
772 my ($self) = @_; 849 my ($self) = @_;
773 850
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 851 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 852 my $todo = delete $self->{update_container}
776 or return; 853 or return;
777 854
778 for my $tag (keys %$todo) { 855 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 856 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 893sub item_update {
817 my ($self, $item) = @_; 894 my ($self, $item) = @_;
818 895
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 896 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 897
821 CFClient::Item::update_widgets $item; 898 CFPlus::Item::update_widgets $item;
822 899
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 900 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 901 set_opencont ($::CONN, 0, "Floor");
825 902
826 } elsif ($item->{flags} & F_OPEN) { 903 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 904 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 905
829 } else { 906 } else {
830 $self->{update_container}{$item->{container}}++; 907 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 908 $self->update_containers;
832 } 909 }
833} 910}
834 911
835sub player_update { 912sub player_update {
836 my ($self, $player) = @_; 913 my ($self, $player) = @_;
914
915 $self->update_weight;
916}
917
918sub update_weight {
919 my ($self) = @_;
920
921 my $weight = .001 * $self->{player}{weight};
922 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
923
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 924 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
925 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
926 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 927}
839 928
840sub update_server_info { 929sub update_server_info {
841 my ($self) = @_; 930 my ($self) = @_;
842 931
… …
845 $::SERVER_INFO->set_markup ( 934 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 935 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 936 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 937 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 938 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
939 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
940 . "editing support $yesno[!!$self->{editor_support}]\n"
941 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
942 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 945 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 946 );
947
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
854} 949}
855 950
856sub logged_in { 951sub logged_in {
857 my ($self) = @_; 952 my ($self) = @_;
858 953
859 $self->send_ext_req (cfplus_support => "1", sub { 954 $self->send_ext_req (cfplus_support => version => 1, sub {
860 $self->{cfplus_ext} = $_[0]; 955 $self->{cfplus_ext} = $_[0]{version};
861 $self->update_server_info; 956 $self->update_server_info;
957
958 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0];
961 $self->update_server_info;
962
963 0
964 });
965 }
966
967 0
862 }); 968 });
863 969
864 $self->update_server_info; 970 $self->update_server_info;
865 971
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 972 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 973 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
868 $self->send_command ("pickup $::CFG->{pickup}"); 975 $self->send_command ("pickup $::CFG->{pickup}");
976}
977
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
869} 984}
870 985
871sub lookat { 986sub lookat {
872 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
873 988
874 if ($self->{cfplus_ext}) { 989 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 990 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
876 my %res = split /\x00/, $_[0]; 991 my ($msg) = @_;
877 992
878 if (exists $res{npc_dialog}) { 993 if (exists $msg->{npc_dialog}) {
879 # start npc chat dialog 994 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 995 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 996 dx => $x,
882 dy => $y, 997 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 998 title => "$msg->{npc_dialog} (NPC)",
884 conn => $self, 999 conn => $self,
885 ; 1000 ;
886 } 1001 }
887 }); 1002 });
888 } 1003 }
… …
891} 1006}
892 1007
893sub destroy { 1008sub destroy {
894 my ($self) = @_; 1009 my ($self) = @_;
895 1010
896 $self->{npc_dialog}->destroy 1011 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 1012 if $self->{npc_dialog};
898 1013
899 $self->SUPER::destroy; 1014 $self->SUPER::destroy;
900} 1015}
901 1016
902package CFClient::NPCDialog; 1017package CFPlus::NPCDialog;
903 1018
904our @ISA = 'CFClient::UI::FancyFrame'; 1019our @ISA = 'CFPlus::UI::Toplevel';
905 1020
906sub new { 1021sub new {
907 my $class = shift; 1022 my $class = shift;
908 1023
909 my $self = $class->SUPER::new ( 1024 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 1027 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 1028 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 1029 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 1030 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 1031 kw => { hi => 0, yes => 0, no => 0 },
1032 has_close_button => 1,
917 @_, 1033 @_,
918 ); 1034 );
919 1035
920 Scalar::Util::weaken (my $this = $self); 1036 CFPlus::weaken (my $this = $self);
1037
1038 $self->connect (delete => sub { $this->destroy; 1 });
921 1039
922 # better use a pane... 1040 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 1041 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1042 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 1043
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1044 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1045
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1046 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1047 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1048 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1049 on_activate => sub {
936 my ($entry, $text) = @_; 1050 my ($entry, $text) = @_;
937 1051
938 return unless $text =~ /\S/; 1052 return unless $text =~ /\S/;
939 1053
… …
942 1056
943 0 1057 0
944 }, 1058 },
945 ); 1059 );
946 1060
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1061 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1062
949 $self->{bye_button} = new CFClient::UI::Button 1063 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1064 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1065 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1066 on_activate => sub { $this->destroy; 1 },
953 ; 1067 ;
954 1068
955 $self->update_options; 1069 $self->update_options;
956 1070
957 $self->{token} = $self->{conn}->ext_token; 1071 $self->{id} = $self->{conn}->send_ext_req (
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1072 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1073 sub { $this && $this->feed (@_) }
1074 );
960 1075
961 $self->{entry}->grab_focus; 1076 $self->{entry}->grab_focus;
962 1077
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1078 $self->{textview}->add_paragraph ({
1079 fg => [1, 1, 0, 1],
1080 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1081 });
964 1082
965 $self->show; 1083 $self->show;
966 $self 1084 $self
967}; 1085};
968 1086
969sub update_options { 1087sub update_options {
970 my ($self) = @_; 1088 my ($self) = @_;
971 1089
972 Scalar::Util::weaken $self; 1090 CFPlus::weaken $self;
973 1091
974 $self->{options}->clear; 1092 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1093 $self->{options}->add ($self->{bye_button});
976 1094
977 for my $kw (sort keys %{ $self->{kw} }) { 1095 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1096 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1097 text => $kw,
980 on_activate => sub { 1098 on_activate => sub {
981 $self->send ($kw); 1099 $self->send ($kw);
982 0 1100 0
983 }, 1101 },
984 ); 1102 );
985 } 1103 }
986} 1104}
987 1105
988sub feed { 1106sub feed {
989 my ($self, $data) = @_; 1107 my ($self, $msg) = @_;
990 1108
991 Scalar::Util::weaken $self; 1109 CFPlus::weaken $self;
992 1110
993 my ($type, $msg) = split / /, $data, 2; 1111 if ($msg->{msgtype} eq "reply") {
1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
994 1114
995 if ($type eq "msg") { 1115 my $text = "\n" . CFPlus::asxml $msg->{msg};
996 my ($msg, @kw) = split /\x00/, $msg;
997
998 utf8::decode $_ for ($msg, @kw);
999
1000 $self->{kw}{$_} = 1 for @kw;
1001
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1116 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1117 my @link;
1005 $msg =~ s{ 1118 $text =~ s{
1006 ($match) 1119 ($match)
1007 }{ 1120 }{
1008 my $kw = $1; 1121 my $kw = $1;
1009 1122
1010 push @link, new CFClient::UI::Label 1123 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1124 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1125 can_hover => 1,
1013 can_events => 1, 1126 can_events => 1,
1014 padding_x => 0, 1127 padding_x => 0,
1015 padding_y => 0, 1128 padding_y => 0,
1016 on_button_up => sub { 1129 on_button_up => sub {
1017 $self->send ($kw); 1130 $self->send ($kw);
1018 }; 1131 };
1019 1132
1020 chr 0xfffc 1133 "\x{fffc}"
1021 }giex; 1134 }giex;
1022 1135
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1136 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1137 $self->{textview}->scroll_to_bottom;
1025 $self->update_options; 1138 $self->update_options;
1026 } else { 1139 } else {
1027 $self->destroy; 1140 $self->destroy;
1028 } 1141 }
… …
1031} 1144}
1032 1145
1033sub send { 1146sub send {
1034 my ($self, $msg) = @_; 1147 my ($self, $msg) = @_;
1035 1148
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1149 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1150 $self->{textview}->scroll_to_bottom;
1038 1151
1039 utf8::encode $msg; 1152 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1041} 1153}
1042 1154
1043sub destroy { 1155sub destroy {
1044 my ($self) = @_; 1156 my ($self) = @_;
1045 1157
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1158 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1159
1160 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1161 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1162 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1163 $self->{conn}->disconnect_ext ($self->{id});
1164 }
1051 1165
1052 $self->SUPER::destroy; 1166 $self->SUPER::destroy;
1053} 1167}
1054 1168
10551; 11691
1170

Diff Legend

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