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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.96 by root, Fri Apr 6 07:45:35 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;
10use CFClient::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 = CFClient::Pod::load CFClient::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 = CFClient::Pod::as_xml $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 CFClient::Texture 73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFClient::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} = CFClient::db_table "tilecache";
57 $self->{facemap} = CFClient::db_table "facemap";
58
59 # per server 80 # per server
60 $self->{mapcache} = CFClient::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 {
… …
254 my @skills = keys %{ $self->{skill_info} }; 275 my @skills = keys %{ $self->{skill_info} };
255 276
256 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257 $sktbl->clear; 278 $sktbl->clear;
258 279
259 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
260 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
261 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
262 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
263 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
264 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
286
287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
288
289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the 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);
265 291
266 my ($x, $y) = (0, 1); 292 my ($x, $y) = (0, 1);
267 for ( 293 for (
268 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] }
269 map [$_, $self->{skill_info}{$_}], 295 map [$_, $self->{skill_info}{$_}],
270 grep exists $stats->{$_}, 296 grep exists $stats->{$_},
271 @skills 297 @skills
272 ) { 298 ) {
273 my ($idx, $name) = @$_; 299 my ($idx, $name) = @$_;
274 300
301 my $spell_cb = sub {
302 my ($widget, $ev) = @_;
303
304 if ($ev->{button} == 1) {
305 $::CONN->user_send ("ready_skill $name");
306 } elsif ($ev->{button} == 2) {
307 $::CONN->user_send ("use_skill $name");
308 } elsif ($ev->{button} == 3) {
309 my $shortname = CFPlus::shorten $name, 14;
310 (new CFPlus::UI::Menu
311 items => [
312 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
313 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
314 ],
315 )->popup ($ev);
316 } else {
317 return 0;
318 }
319
320 1
321 };
322
275 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
276 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
277 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
278 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
279 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $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);
280 329
281 $x++ and ($x, $y) = (0, $y + 1); 330 $x++ and ($x, $y) = (0, $y + 1);
282 } 331 }
283 } 332 }
284 333
… …
286 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
287 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
288 } 337 }
289} 338}
290 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
291sub user_send { 348sub user_send {
292 my ($self, $command) = @_; 349 my ($self, $command) = @_;
293 350
351 $self->{record}->($command)
294 if ($self->{record}) { 352 if $self->{record};
295 push @{$self->{record}}, $command;
296 }
297 353
298 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
299 $self->send_command ($command); 355 $self->send_command ($command);
300 ::status ($command); 356 ::status ($command);
301} 357}
302 358
303sub start_record { 359sub record {
304 my ($self) = @_; 360 my ($self, $cb) = @_;
305 361
306 $self->{record} = []; 362 $self->{record} = $cb;
307}
308
309sub stop_record {
310 my ($self) = @_;
311 return delete $self->{record};
312} 363}
313 364
314sub map_scroll { 365sub map_scroll {
315 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
316 367
… …
318} 369}
319 370
320sub feed_map1a { 371sub feed_map1a {
321 my ($self, $data) = @_; 372 my ($self, $data) = @_;
322 373
323 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
324 $self->{map_widget}->update; 375 $self->{map_widget}->update;
325} 376}
326 377
327sub magicmap { 378sub magicmap {
328 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
337 or return; 388 or return;
338 389
339 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
340 391
341 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
342 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
343 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
344} 395}
345 396
346sub map_clear { 397sub map_clear {
347 my ($self) = @_; 398 my ($self) = @_;
… …
355 406
356 407
357sub load_map($$$) { 408sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 409 my ($self, $hash, $x, $y) = @_;
359 410
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 411 CFPlus::DB::get $self->{mapcache} => $hash, sub {
412 my ($data) = @_;
413
414 if (defined $data) {
361 $data = Compress::LZF::decompress $data; 415 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
363 for my $id ($self->{map}->set_rect ($x, $y, $data)) { 417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
364 my $data = $self->{tilecache}->get ($id) 418 CFPlus::DB::get tilecache => $id, sub {
365 or next; 419 my ($data) = @_;
366 420
367 $self->set_texture ($id => $data); 421 $self->set_texture ($id => $data)
422 if defined $data;
423 };
424 }
368 } 425 }
369 } 426 };
370} 427}
371 428
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 429# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 430# (server resource,s latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 431# the right fix is to make real tiled maps with an overview file
… …
488 $self->load_map ($hash, $x, $y); 545 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 546 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 547}
491 548
492sub face_find { 549sub face_find {
493 my ($self, $facenum, $face) = @_; 550 my ($self, $facenum, $face, $cb) = @_;
494 551
495 my $hash = "$face->{chksum},$face->{name}"; 552 my $hash = "$face->{chksum},$face->{name}";
496 553
497 my $id = $self->{facemap}->get ($hash); 554 my $id = CFPlus::DB::get_tile_id_sync $hash;
498 555
499 unless ($id) {
500 # create new id for face
501 # I love transactions
502 for (1..100) {
503 my $txn = $CFClient::DB_ENV->txn_begin;
504 my $status = $self->{facemap}->db_get (id => $id);
505 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
506 $id = ($id || 64) + 1;
507 if ($self->{facemap}->put (id => $id) == 0
508 && $self->{facemap}->put ($hash => $id) == 0) {
509 $txn->txn_commit;
510
511 goto gotid;
512 }
513 }
514 $txn->txn_abort;
515 }
516
517 CFClient::fatal "maximum number of transaction retries reached - database problems?";
518 }
519
520gotid:
521 $face->{id} = $id; 556 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d# 557 $self->{faceid}[$facenum] = $id;
524 558
525 my $face = $self->{tilecache}->get ($id); 559 $self->{map}->set_tileid ($facenum => $id);
526 560
527 if ($face) { 561 CFPlus::DB::get tilecache => $id, $cb;
528 #$self->face_prefetch;
529 $face
530 } else {
531 my $tex = $self->{noface};
532 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
533 undef
534 };
535} 562}
536 563
537sub face_update { 564sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 565 my ($self, $facenum, $face, $changed) = @_;
539 566
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 567 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
568 if $changed;
541 569
542 $self->set_texture ($face->{id} => delete $face->{image}); 570 $self->set_texture ($face->{id} => delete $face->{image});
543} 571}
544 572
545sub set_texture { 573sub set_texture {
546 my ($self, $id, $data) = @_; 574 my ($self, $id, $data) = @_;
547 575
548 $self->{texture}[$id] ||= do { 576 $self->{texture}[$id] ||= do {
549 my $tex = 577 my $tex =
550 new_from_image CFClient::Texture 578 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 579 $data, minify => 1, mipmap => 1;
552 580
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 581 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 582 $self->{map_widget}->update;
555 583
… …
591 [0.75, 0.61, 0.20], 619 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 620 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 621 [0.74, 0.65, 0.41],
594 ); 622 );
595 623
624 my $fg = $color[$color % @color];
625
596 $self->logprint ("info: ", $text); 626 $self->logprint ("info: ", $text);
597
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 627
600 # try to create single paragraphs of multiple lines sent by the server 628 # try to create single paragraphs of multiple lines sent by the server
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 629 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 630
603 $text = CFClient::asxml $text; 631 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 634
607 $self->{logview}->add_paragraph ($color[$color], $_) 635 ::message ({ fg => $fg, markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 636 for split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610 637
611 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
612 group => $text, 639 group => $text,
613 fg => $color[$color], 640 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 641 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 642 tooltip_font => $::FONT_FIXED,
616 ); 643 );
617} 644}
618 645
619sub drawextinfo { 646sub drawextinfo {
… …
623} 650}
624 651
625sub spell_add { 652sub spell_add {
626 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
627 654
628 # try to create single paragraphs of multiple lines sent by the server 655 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
632 659
633 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_LIST->add_spell ($spell);
634 661
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
636 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message}); 663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 664}
638 665
639sub spell_delete { 666sub spell_delete {
640 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
641 668
642 $::SPELL_PAGE->remove_spell ($spell); 669 $::SPELL_LIST->remove_spell ($spell);
670}
671
672sub setup {
673 my ($self, $setup) = @_;
674
675 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 677}
644 678
645sub addme_success { 679sub addme_success {
646 my ($self) = @_; 680 my ($self) = @_;
647 681
648 my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
649 my ($pom) = @_;
650
651 my %skill_help; 682 my %skill_help;
652 683
653 for my $head2 ($pom->head1->[3]->head2) { 684 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content; 685 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 686 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 687 };
659 688
660 for my $skill (values %{$self->{skill_info}}) { 689 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 690 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 691 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 692 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 693 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 694 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 695 . $skill_help{$skill});
667 } 696 }
668} 697}
669 698
670sub eof { 699sub eof {
671 my ($self) = @_; 700 my ($self) = @_;
… …
695 724
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 726
698 $self->send ("requestinfo image_sums $face $face"); 727 $self->send ("requestinfo image_sums $face $face");
699 728
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 731 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 732 $self->send ("requestinfo image_info");
704 733
705 $self->{num_faces} = 0; 734 $self->{num_faces} = 0;
706 735
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 738 }
710} 739}
711 740
712sub update_floorbox { 741sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 743 return unless $::CONN;
715 744
716 $::FLOORBOX->clear; 745 $::FLOORBOX->clear;
717 746
718 my $row; 747 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 749 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 750 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 751 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 752 CFPlus::Item::update_widgets $_;
724 753
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 754 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 755 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 756
728 $row++; 757 $row++;
729 } else { 758 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 760 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 762 );
734 last; 763 last;
735 } 764 }
736 } 765 }
737 if ($::CONN->{open_container}) { 766 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 768 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 770 );
742 } 771 }
743 }); 772 });
… …
749 my ($conn, $tag, $name) = @_; 778 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 779 $conn->{open_container} = $tag;
751 update_floorbox; 780 update_floorbox;
752 781
753 $::INV_RIGHT_HB->clear (); 782 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 784
756 if ($tag != 0) { # Floor isn't closable, is it? 785 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 787 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 788 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 789 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 790 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 791 if $tag != 0;
… …
770} 799}
771 800
772sub update_containers { 801sub update_containers {
773 my ($self) = @_; 802 my ($self) = @_;
774 803
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 804 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 805 my $todo = delete $self->{update_container}
777 or return; 806 or return;
778 807
779 for my $tag (keys %$todo) { 808 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 809 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 846sub item_update {
818 my ($self, $item) = @_; 847 my ($self, $item) = @_;
819 848
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 850
822 CFClient::Item::update_widgets $item; 851 CFPlus::Item::update_widgets $item;
823 852
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 853 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 854 set_opencont ($::CONN, 0, "Floor");
826 855
827 } elsif ($item->{flags} & F_OPEN) { 856 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 857 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 858
830 } else { 859 } else {
831 $self->{update_container}{$item->{container}}++; 860 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 861 $self->update_containers;
833 } 862 }
… …
858 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 897 );
898
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 900}
868 901
869sub logged_in { 902sub logged_in {
870 my ($self) = @_; 903 my ($self) = @_;
871 904
872 $self->send_ext_req (cfplus_support => "1", sub { 905 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 906 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 907 $self->update_server_info;
908
909 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0];
912 $self->update_server_info;
913
914 0
915 });
916 }
917
918 0
875 }); 919 });
876 920
877 $self->update_server_info; 921 $self->update_server_info;
878 922
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 923 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 924 $self->send_command ("output-count $::CFG->{output_count}");
925 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 926 $self->send_command ("pickup $::CFG->{pickup}");
927}
928
929sub buildat {
930 my ($self, $builditem, $x, $y) = @_;
931
932 if ($self->{cfplus_ext}) {
933 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934 }
882} 935}
883 936
884sub lookat { 937sub lookat {
885 my ($self, $x, $y) = @_; 938 my ($self, $x, $y) = @_;
886 939
887 if ($self->{cfplus_ext}) { 940 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 942 my ($msg) = @_;
890 943
891 if (exists $res{npc_dialog}) { 944 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 945 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 946 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 947 dx => $x,
895 dy => $y, 948 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 949 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 950 conn => $self,
898 ; 951 ;
899 } 952 }
900 }); 953 });
901 } 954 }
… …
904} 957}
905 958
906sub destroy { 959sub destroy {
907 my ($self) = @_; 960 my ($self) = @_;
908 961
909 $self->{npc_dialog}->destroy 962 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 963 if $self->{npc_dialog};
911 964
912 $self->SUPER::destroy; 965 $self->SUPER::destroy;
913} 966}
914 967
915package CFClient::NPCDialog; 968package CFPlus::NPCDialog;
916 969
917our @ISA = 'CFClient::UI::FancyFrame'; 970our @ISA = 'CFPlus::UI::Toplevel';
918 971
919sub new { 972sub new {
920 my $class = shift; 973 my $class = shift;
921 974
922 my $self = $class->SUPER::new ( 975 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 982 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 983 has_close_button => 1,
931 @_, 984 @_,
932 ); 985 );
933 986
934 Scalar::Util::weaken (my $this = $self); 987 CFPlus::weaken (my $this = $self);
935 988
936 $self->connect (delete => sub { $this->destroy; 1 }); 989 $self->connect (delete => sub { $this->destroy; 1 });
937 990
938 # better use a pane... 991 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 992 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 993 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 994
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 995 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 996
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 997 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 998 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
946 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 999 tooltip => "#npc_message_entry",
947 . "Sometimes you have to tell an NPC something you cannot find out during "
948 . "a normal conversation (such as a password). In those cases you have to use "
949 . "this text entry. You can also enter responses manually instead of using the response "
950 . "buttons below.",
951 on_activate => sub { 1000 on_activate => sub {
952 my ($entry, $text) = @_; 1001 my ($entry, $text) = @_;
953 1002
954 return unless $text =~ /\S/; 1003 return unless $text =~ /\S/;
955 1004
… …
958 1007
959 0 1008 0
960 }, 1009 },
961 ); 1010 );
962 1011
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1012 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1013
965 $self->{bye_button} = new CFClient::UI::Button 1014 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1015 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1016 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1017 on_activate => sub { $this->destroy; 1 },
969 ; 1018 ;
970 1019
971 $self->update_options; 1020 $self->update_options;
972 1021
973 $self->{token} = $self->{conn}->ext_token; 1022 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1024 sub { $this && $this->feed (@_) }
1025 );
976 1026
977 $self->{entry}->grab_focus; 1027 $self->{entry}->grab_focus;
978 1028
979 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1029 $self->{textview}->add_paragraph ({
1030 fg => [1, 1, 0, 1],
1031 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1032 });
980 1033
981 $self->show; 1034 $self->show;
982 $self 1035 $self
983}; 1036};
984 1037
985sub update_options { 1038sub update_options {
986 my ($self) = @_; 1039 my ($self) = @_;
987 1040
988 Scalar::Util::weaken $self; 1041 CFPlus::weaken $self;
989 1042
990 $self->{options}->clear; 1043 $self->{options}->clear;
991 $self->{options}->add ($self->{bye_button}); 1044 $self->{options}->add ($self->{bye_button});
992 1045
993 for my $kw (sort keys %{ $self->{kw} }) { 1046 for my $kw (sort keys %{ $self->{kw} }) {
994 $self->{options}->add (new CFClient::UI::Button 1047 $self->{options}->add (new CFPlus::UI::Button
995 text => $kw, 1048 text => $kw,
996 on_activate => sub { 1049 on_activate => sub {
997 $self->send ($kw); 1050 $self->send ($kw);
998 0 1051 0
999 }, 1052 },
1000 ); 1053 );
1001 } 1054 }
1002} 1055}
1003 1056
1004sub feed { 1057sub feed {
1005 my ($self, $data) = @_; 1058 my ($self, $msg) = @_;
1006 1059
1007 Scalar::Util::weaken $self; 1060 CFPlus::weaken $self;
1008 1061
1009 my ($type, $msg) = split / /, $data, 2; 1062 if ($msg->{msgtype} eq "reply") {
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1010 1065
1011 if ($type eq "msg") { 1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
1012 my ($msg, @kw) = split /\x00/, $msg;
1013
1014 utf8::decode $_ for ($msg, @kw);
1015
1016 $self->{kw}{$_} = 1 for @kw;
1017
1018 $msg = "\n" . CFClient::UI::asxml $msg;
1019 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1020 my @link; 1068 my @link;
1021 $msg =~ s{ 1069 $text =~ s{
1022 ($match) 1070 ($match)
1023 }{ 1071 }{
1024 my $kw = $1; 1072 my $kw = $1;
1025 1073
1026 push @link, new CFClient::UI::Label 1074 push @link, new CFPlus::UI::Label
1027 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1028 can_hover => 1, 1076 can_hover => 1,
1029 can_events => 1, 1077 can_events => 1,
1030 padding_x => 0, 1078 padding_x => 0,
1031 padding_y => 0, 1079 padding_y => 0,
1032 on_button_up => sub { 1080 on_button_up => sub {
1033 $self->send ($kw); 1081 $self->send ($kw);
1034 }; 1082 };
1035 1083
1036 chr 0xfffc 1084 "\x{fffc}"
1037 }giex; 1085 }giex;
1038 1086
1039 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1040 $self->{textview}->scroll_to_bottom; 1088 $self->{textview}->scroll_to_bottom;
1041 $self->update_options; 1089 $self->update_options;
1042 } else { 1090 } else {
1043 $self->destroy; 1091 $self->destroy;
1044 } 1092 }
… …
1047} 1095}
1048 1096
1049sub send { 1097sub send {
1050 my ($self, $msg) = @_; 1098 my ($self, $msg) = @_;
1051 1099
1052 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg); 1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1053 $self->{textview}->scroll_to_bottom; 1101 $self->{textview}->scroll_to_bottom;
1054 1102
1055 utf8::encode $msg; 1103 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1056 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1057} 1104}
1058 1105
1059sub destroy { 1106sub destroy {
1060 my ($self) = @_; 1107 my ($self) = @_;
1061 1108
1062 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1109 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1063 1110
1111 if ($self->{conn}) {
1064 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1065 delete $self->{conn}{npc_dialog}; 1113 delete $self->{conn}{npc_dialog};
1066 $self->{conn}->disconnect_ext ($self->{token}); 1114 $self->{conn}->disconnect_ext ($self->{id});
1115 }
1067 1116
1068 $self->SUPER::destroy; 1117 $self->SUPER::destroy;
1069} 1118}
1070 1119
10711; 11201
1121

Diff Legend

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