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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.98 by root, Fri Apr 6 19:17:25 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 = shift;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 23
19 $self->{map_widget}->clr_commands; 24 $self->{map_widget}->clr_commands;
20 25
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 26 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 28 or die "unparseable command help: $_->{kw}[0]";
29 29
30 my $cmd = $1; 30 my $cmd = $1;
31 my @args = split /\|/, $2; 31 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 32 @args = (".*") unless @args;
33 33
34 my (undef, @par) = CFPlus::Pod::section_of $_;
35 my $text = CFPlus::Pod::as_label @par;
36
34 $_ = $_ eq ".*" ? "" : " $_" 37 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 38 for @args;
36 39
37 my $text = CFPlus::Pod::as_markup $head2->content; 40 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 41 sort { (length $a) <=> (length $b) }
41 @args; 42 @args
43 } sort { $a->{par} <=> $b->{par} }
44 CFPlus::Pod::find command => "*";
45
46 $self->connect_ext (event_capabilities => sub {
47 my ($cap) = @_;
48
49 if (my $ts = $cap->{tileset}) {
50 if (my ($default) = grep $_->[2] & 1, @$ts) {
51 $self->{tileset} = $default;
52 $self->{tilesize} = $default->[3];
53 $self->setup_req (tileset => $default->[0]);
54
55 my $w = int $self->{mapw} * 32 / $self->{tilesize};
56 my $h = int $self->{maph} * 32 / $self->{tilesize};
57
58 $self->setup_req (mapsize => "${w}x${h}");
59 }
42 } 60 }
43
44 \@cmd_help
45 }; 61 });
46 62
47 $self->{map_widget}->add_command (@$_) 63 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 64 for @cmd_help;
49 65
66 {
67 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
68 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
69 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
70 }
71
72 {
50 $self->{noface} = new_from_file CFPlus::Texture 73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 74 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
75 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76 }
52 77
53 $self->{open_container} = 0; 78 $self->{open_container} = 0;
54 79
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 80 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 82
62 $self 83 $self
63} 84}
64 85
65sub logprint { 86sub logprint {
… …
265 286
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 288
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 291
272 my ($x, $y) = (0, 1); 292 my ($x, $y) = (0, 1);
273 for ( 293 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 294 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 295 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 304 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 305 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 306 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 307 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 308 } elsif ($ev->{button} == 3) {
309 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 310 (new CFPlus::UI::Menu
290 items => [ 311 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 312 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 313 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 314 ],
294 )->popup ($ev); 315 )->popup ($ev);
295 } else { 316 } else {
296 return 0; 317 return 0;
297 } 318 }
… …
301 322
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 329
308 $x++ and ($x, $y) = (0, $y + 1); 330 $x++ and ($x, $y) = (0, $y + 1);
309 } 331 }
310 } 332 }
311 333
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 337 }
316} 338}
317 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
318sub user_send { 348sub user_send {
319 my ($self, $command) = @_; 349 my ($self, $command) = @_;
320 350
351 $self->{record}->($command)
321 if ($self->{record}) { 352 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 353
325 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 355 $self->send_command ($command);
327 ::status ($command); 356 ::status ($command);
328} 357}
329 358
330sub start_record { 359sub record {
331 my ($self) = @_; 360 my ($self, $cb) = @_;
332 361
333 $self->{record} = []; 362 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 363}
340 364
341sub map_scroll { 365sub map_scroll {
342 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
343 367
… …
345} 369}
346 370
347sub feed_map1a { 371sub feed_map1a {
348 my ($self, $data) = @_; 372 my ($self, $data) = @_;
349 373
350 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 375 $self->{map_widget}->update;
352} 376}
353 377
354sub magicmap { 378sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 388 or return;
365 389
366 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
367 391
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 395}
372 396
373sub map_clear { 397sub map_clear {
374 my ($self) = @_; 398 my ($self) = @_;
… …
378 402
379 $self->{map}->clear; 403 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
381} 405}
382 406
407sub bg_fetch {
408 my ($self) = @_;
409
410 my $id;
411
412 do {
413 $id = pop @{$self->{bg_fetch}}
414 or return;
415 } while $self->{texture}[$id];
416
417 CFPlus::DB::get tilecache => $id, sub {
418 my ($data) = @_;
419
420 return unless $self->{map}; # stop when destroyed
421
422 $self->set_texture ($id => $data)
423 if defined $data;
424
425 $self->bg_fetch;
426 };
427}
383 428
384sub load_map($$$) { 429sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 430 my ($self, $hash, $x, $y) = @_;
386 431
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 432 CFPlus::DB::get $self->{mapcache} => $hash, sub {
433 my ($data) = @_;
434
435 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 436 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 438
394 $self->set_texture ($id => $data); 439 my $inprogress = @{ $self->{bg_fetch} || [] };
440 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
441 $self->bg_fetch unless $inprogress;
395 } 442 }
396 } 443 };
397} 444}
398 445
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 446# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 447# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 448# the right fix is to make real tiled maps with an overview file
… …
515 $self->load_map ($hash, $x, $y); 562 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 563 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 564}
518 565
519sub face_find { 566sub face_find {
520 my ($self, $facenum, $face) = @_; 567 my ($self, $facenum, $face, $cb) = @_;
521 568
522 my $hash = "$face->{chksum},$face->{name}"; 569 my $hash = "$face->{chksum},$face->{name}";
523 570
524 my $id = $self->{facemap}->get ($hash); 571 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 572
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 573 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 574 $self->{faceid}[$facenum] = $id;
551 575
552 my $face = $self->{tilecache}->get ($id); 576 $self->{map}->set_tileid ($facenum => $id);
553 577
554 if ($face) { 578 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 579}
563 580
564sub face_update { 581sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 582 my ($self, $facenum, $face, $changed) = @_;
566 583
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 584 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
585 if $changed;
568 586
569 $self->set_texture ($face->{id} => delete $face->{image}); 587 $self->set_texture ($face->{id} => delete $face->{image});
570} 588}
571 589
572sub set_texture { 590sub set_texture {
573 my ($self, $id, $data) = @_; 591 my ($self, $id, $data) = @_;
574 592
575 $self->{texture}[$id] ||= do { 593 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 594 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 595 $data, minify => 1, mipmap => 1;
579 596
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 597 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 598 $self->{map_widget}->update;
582
583 $tex
584 };
585} 599}
586 600
587sub sound_play { 601sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 602 my ($self, $x, $y, $soundnum, $type) = @_;
589 603
… …
618 [0.75, 0.61, 0.20], 632 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 633 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 634 [0.74, 0.65, 0.41],
621 ); 635 );
622 636
637 my $fg = $color[$color % @color];
638
623 $self->logprint ("info: ", $text); 639 $self->logprint ("info: ", $text);
624
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
626 640
627 # try to create single paragraphs of multiple lines sent by the server 641 # try to create single paragraphs of multiple lines sent by the server
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 642 $text =~ s/(?<=\S)\n(?=\w)/ /g;
629 643
630 $text = CFPlus::asxml $text; 644 $text = CFPlus::asxml $text;
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 645 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 646 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 647
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 648 ::message ({ fg => $fg, markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 649 for split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637 650
638 $self->{statusbox}->add ($text, 651 $self->{statusbox}->add ($text,
639 group => $text, 652 group => $text,
640 fg => $color[$color], 653 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 654 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 655 tooltip_font => $::FONT_FIXED,
643 ); 656 );
644} 657}
645 658
646sub drawextinfo { 659sub drawextinfo {
… …
655 # try to create single paragraphs out of the multiple lines sent by the server 668 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 669 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 670 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 671 $spell->{message} ||= "Server did not provide a description for this spell.";
659 672
660 $::SPELL_PAGE->add_spell ($spell); 673 $::SPELL_LIST->add_spell ($spell);
661 674
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 675 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 676 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 677}
665 678
666sub spell_delete { 679sub spell_delete {
667 my ($self, $spell) = @_; 680 my ($self, $spell) = @_;
668 681
669 $::SPELL_PAGE->remove_spell ($spell); 682 $::SPELL_LIST->remove_spell ($spell);
683}
684
685sub setup {
686 my ($self, $setup) = @_;
687
688 $self->{map_widget}->set_tilesize ($self->{tilesize});
689 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 690}
671 691
672sub addme_success { 692sub addme_success {
673 my ($self) = @_; 693 my ($self) = @_;
674 694
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 695 my %skill_help;
679 696
680 for my $head2 ($pom->head1->[3]->head2) { 697 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 698 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 699 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 700 };
686 701
687 for my $skill (values %{$self->{skill_info}}) { 702 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 703 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 704 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 705 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 706 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 707 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 708 . $skill_help{$skill});
694 } 709 }
695} 710}
696 711
697sub eof { 712sub eof {
698 my ($self) = @_; 713 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 900 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 901 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 902 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 904 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
905 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 909 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 910 );
911
912 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 913}
895 914
896sub logged_in { 915sub logged_in {
897 my ($self) = @_; 916 my ($self) = @_;
898 917
899 $self->send_ext_req (cfplus_support => "1", sub { 918 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 919 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 920 $self->update_server_info;
921
922 if ($self->{cfplus_ext} >= 2) {
923 $self->send_ext_req ("editor_support", sub {
924 $self->{editor_support} = $_[0];
925 $self->update_server_info;
926
927 0
928 });
929 }
930
931 0
902 }); 932 });
903 933
904 $self->update_server_info; 934 $self->update_server_info;
905 935
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 936 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 937 $self->send_command ("output-count $::CFG->{output_count}");
938 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 939 $self->send_command ("pickup $::CFG->{pickup}");
940}
941
942sub buildat {
943 my ($self, $builditem, $x, $y) = @_;
944
945 if ($self->{cfplus_ext}) {
946 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
947 }
909} 948}
910 949
911sub lookat { 950sub lookat {
912 my ($self, $x, $y) = @_; 951 my ($self, $x, $y) = @_;
913 952
914 if ($self->{cfplus_ext}) { 953 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 954 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 955 my ($msg) = @_;
917 956
918 if (exists $res{npc_dialog}) { 957 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 958 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 959 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 960 dx => $x,
922 dy => $y, 961 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 962 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 963 conn => $self,
925 ; 964 ;
926 } 965 }
927 }); 966 });
928 } 967 }
… …
931} 970}
932 971
933sub destroy { 972sub destroy {
934 my ($self) = @_; 973 my ($self) = @_;
935 974
936 $self->{npc_dialog}->destroy 975 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 976 if $self->{npc_dialog};
938 977
939 $self->SUPER::destroy; 978 $self->SUPER::destroy;
940} 979}
941 980
942package CFPlus::NPCDialog; 981package CFPlus::NPCDialog;
943 982
944our @ISA = 'CFPlus::UI::FancyFrame'; 983our @ISA = 'CFPlus::UI::Toplevel';
945 984
946sub new { 985sub new {
947 my $class = shift; 986 my $class = shift;
948 987
949 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 995 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 996 has_close_button => 1,
958 @_, 997 @_,
959 ); 998 );
960 999
961 Scalar::Util::weaken (my $this = $self); 1000 CFPlus::weaken (my $this = $self);
962 1001
963 $self->connect (delete => sub { $this->destroy; 1 }); 1002 $self->connect (delete => sub { $this->destroy; 1 });
964 1003
965 # better use a pane... 1004 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1005 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1007
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1008 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1009
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1010 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1011 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1012 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 1013 on_activate => sub {
979 my ($entry, $text) = @_; 1014 my ($entry, $text) = @_;
980 1015
981 return unless $text =~ /\S/; 1016 return unless $text =~ /\S/;
982 1017
… …
995 on_activate => sub { $this->destroy; 1 }, 1030 on_activate => sub { $this->destroy; 1 },
996 ; 1031 ;
997 1032
998 $self->update_options; 1033 $self->update_options;
999 1034
1000 $self->{token} = $self->{conn}->ext_token; 1035 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1036 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1037 sub { $this && $this->feed (@_) }
1038 );
1003 1039
1004 $self->{entry}->grab_focus; 1040 $self->{entry}->grab_focus;
1005 1041
1006 $self->{textview}->add_paragraph ({ 1042 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1043 fg => [1, 1, 0, 1],
… …
1013}; 1049};
1014 1050
1015sub update_options { 1051sub update_options {
1016 my ($self) = @_; 1052 my ($self) = @_;
1017 1053
1018 Scalar::Util::weaken $self; 1054 CFPlus::weaken $self;
1019 1055
1020 $self->{options}->clear; 1056 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1057 $self->{options}->add ($self->{bye_button});
1022 1058
1023 for my $kw (sort keys %{ $self->{kw} }) { 1059 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1066 );
1031 } 1067 }
1032} 1068}
1033 1069
1034sub feed { 1070sub feed {
1035 my ($self, $data) = @_; 1071 my ($self, $msg) = @_;
1036 1072
1037 Scalar::Util::weaken $self; 1073 CFPlus::weaken $self;
1038 1074
1039 my ($type, $msg) = split / /, $data, 2; 1075 if ($msg->{msgtype} eq "reply") {
1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1078
1041 if ($type eq "msg") {
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFPlus::UI::asxml $msg; 1079 my $text = "\n" . CFPlus::asxml $msg->{msg};
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1080 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1081 my @link;
1051 $msg =~ s{ 1082 $text =~ s{
1052 ($match) 1083 ($match)
1053 }{ 1084 }{
1054 my $kw = $1; 1085 my $kw = $1;
1055 1086
1056 push @link, new CFPlus::UI::Label 1087 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1092 padding_y => 0,
1062 on_button_up => sub { 1093 on_button_up => sub {
1063 $self->send ($kw); 1094 $self->send ($kw);
1064 }; 1095 };
1065 1096
1066 chr 0xfffc 1097 "\x{fffc}"
1067 }giex; 1098 }giex;
1068 1099
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1100 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1101 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1102 $self->update_options;
1072 } else { 1103 } else {
1073 $self->destroy; 1104 $self->destroy;
1074 } 1105 }
… …
1080 my ($self, $msg) = @_; 1111 my ($self, $msg) = @_;
1081 1112
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1113 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1114 $self->{textview}->scroll_to_bottom;
1084 1115
1085 utf8::encode $msg; 1116 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1117}
1088 1118
1089sub destroy { 1119sub destroy {
1090 my ($self) = @_; 1120 my ($self) = @_;
1091 1121
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1122 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1123
1124 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1125 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1126 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1127 $self->{conn}->disconnect_ext ($self->{id});
1128 }
1097 1129
1098 $self->SUPER::destroy; 1130 $self->SUPER::destroy;
1099} 1131}
1100 1132
11011 11331
1134

Diff Legend

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