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.67 by root, Mon Jul 24 08:23:28 2006 UTC vs.
Revision 1.97 by root, Fri Apr 6 08:09:43 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_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 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) = @_;
… …
351 402
352 $self->{map}->clear; 403 $self->{map}->clear;
353 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
354} 405}
355 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 $self->set_texture ($id => $data)
421 if defined $data;
422
423 $self->bg_fetch;
424 };
425}
356 426
357sub load_map($$$) { 427sub load_map($$$) {
358 my ($self, $hash, $x, $y) = @_; 428 my ($self, $hash, $x, $y) = @_;
359 429
360 if (defined (my $data = $self->{mapcache}->get ($hash))) { 430 CFPlus::DB::get $self->{mapcache} => $hash, sub {
431 my ($data) = @_;
432
433 if (defined $data) {
361 $data = Compress::LZF::decompress $data; 434 $data = Compress::LZF::decompress $data;
362 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 435 #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)) {
364 my $data = $self->{tilecache}->get ($id)
365 or next;
366 436
367 $self->set_texture ($id => $data); 437 my $inprogress = @{ $self->{bg_fetch} || [] };
438 push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
439 $self->bg_fetch unless $inprogress;
368 } 440 }
369 } 441 };
370} 442}
371 443
372# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 444# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
373# (server resource,s latency, bandwidth), so this hack is warranted. 445# (server resource,s latency, bandwidth), so this hack is warranted.
374# the right fix is to make real tiled maps with an overview file 446# the right fix is to make real tiled maps with an overview file
… …
488 $self->load_map ($hash, $x, $y); 560 $self->load_map ($hash, $x, $y);
489 $self->flood_fill (0, 0, 0, "", $hash, $flags); 561 $self->flood_fill (0, 0, 0, "", $hash, $flags);
490} 562}
491 563
492sub face_find { 564sub face_find {
493 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $cb) = @_;
494 566
495 my $hash = "$face->{chksum},$face->{name}"; 567 my $hash = "$face->{chksum},$face->{name}";
496 568
497 my $id = $self->{facemap}->get ($hash); 569 my $id = CFPlus::DB::get_tile_id_sync $hash;
498 570
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; 571 $face->{id} = $id;
522 $self->{map}->set_face ($facenum => $id);
523 $self->{faceid}[$facenum] = $id;#d# 572 $self->{faceid}[$facenum] = $id;
524 573
525 my $face = $self->{tilecache}->get ($id); 574 $self->{map}->set_tileid ($facenum => $id);
526 575
527 if ($face) { 576 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} 577}
536 578
537sub face_update { 579sub face_update {
538 my ($self, $facenum, $face, $changed) = @_; 580 my ($self, $facenum, $face, $changed) = @_;
539 581
540 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 582 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
583 if $changed;
541 584
542 $self->set_texture ($face->{id} => delete $face->{image}); 585 $self->set_texture ($face->{id} => delete $face->{image});
543} 586}
544 587
545sub set_texture { 588sub set_texture {
546 my ($self, $id, $data) = @_; 589 my ($self, $id, $data) = @_;
547 590
548 $self->{texture}[$id] ||= do { 591 $self->{texture}[$id] ||= do {
549 my $tex = 592 my $tex =
550 new_from_image CFClient::Texture 593 new_from_image CFPlus::Texture
551 $data, minify => 1, mipmap => 1; 594 $data, minify => 1, mipmap => 1;
552 595
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 596 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 $self->{map_widget}->update; 597 $self->{map_widget}->update;
555 598
… …
591 [0.75, 0.61, 0.20], 634 [0.75, 0.61, 0.20],
592 [0.99, 0.77, 0.26], 635 [0.99, 0.77, 0.26],
593 [0.74, 0.65, 0.41], 636 [0.74, 0.65, 0.41],
594 ); 637 );
595 638
639 my $fg = $color[$color % @color];
640
596 $self->logprint ("info: ", $text); 641 $self->logprint ("info: ", $text);
597
598 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
599 642
600 # try to create single paragraphs of multiple lines sent by the server 643 # try to create single paragraphs of multiple lines sent by the server
601 $text =~ s/(?<=\S)\n(?=\w)/ /g; 644 $text =~ s/(?<=\S)\n(?=\w)/ /g;
602 645
603 $text = CFClient::asxml $text; 646 $text = CFPlus::asxml $text;
604 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
605 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
606 649
607 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 650 ::message ({ fg => $fg, markup => $_ })
608 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 651 for split /\n/, $text;
609 $self->{logview}->scroll_to_bottom;
610 652
611 $self->{statusbox}->add ($text, 653 $self->{statusbox}->add ($text,
612 group => $text, 654 group => $text,
613 fg => $color[$color], 655 fg => $fg,
614 timeout => $color >= 2 ? 60 : 10, 656 timeout => $color >= 2 ? 180 : 10,
615 tooltip_font => $::FONT_FIXED, 657 tooltip_font => $::FONT_FIXED,
616 ); 658 );
617} 659}
618 660
619sub drawextinfo { 661sub drawextinfo {
… …
628 # try to create single paragraphs out of the multiple lines sent by the server 670 # try to create single paragraphs out of the multiple lines sent by the server
629 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 671 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
630 $spell->{message} =~ s/\n+$//; 672 $spell->{message} =~ s/\n+$//;
631 $spell->{message} ||= "Server did not provide a description for this spell."; 673 $spell->{message} ||= "Server did not provide a description for this spell.";
632 674
633 $::SPELL_PAGE->add_spell ($spell); 675 $::SPELL_LIST->add_spell ($spell);
634 676
635 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message}); 677 $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}); 678 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
637} 679}
638 680
639sub spell_delete { 681sub spell_delete {
640 my ($self, $spell) = @_; 682 my ($self, $spell) = @_;
641 683
642 $::SPELL_PAGE->remove_spell ($spell); 684 $::SPELL_LIST->remove_spell ($spell);
685}
686
687sub setup {
688 my ($self, $setup) = @_;
689
690 $self->{map_widget}->set_tilesize ($self->{tilesize});
691 $::MAP->resize ($self->{mapw}, $self->{maph});
643} 692}
644 693
645sub addme_success { 694sub addme_success {
646 my ($self) = @_; 695 my ($self) = @_;
647 696
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; 697 my %skill_help;
652 698
653 for my $head2 ($pom->head1->[3]->head2) { 699 for my $node (CFPlus::Pod::find skill_description => "*") {
654 $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content; 700 my (undef, @par) = CFPlus::Pod::section_of $node;
655 } 701 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
656
657 \%skill_help
658 }; 702 };
659 703
660 for my $skill (values %{$self->{skill_info}}) { 704 for my $skill (values %{$self->{skill_info}}) {
661 $self->{map_widget}->add_command ("ready_skill $skill", 705 $self->{map_widget}->add_command ("ready_skill $skill",
662 (CFClient::asxml "Ready the skill '$skill'\n\n") 706 (CFPlus::asxml "Ready the skill '$skill'\n\n")
663 . $skill_help->{$skill}); 707 . $skill_help{$skill});
664 $self->{map_widget}->add_command ("use_skill $skill", 708 $self->{map_widget}->add_command ("use_skill $skill",
665 (CFClient::asxml "Immediately use the skill '$skill'\n\n") 709 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
666 . $skill_help->{$skill}); 710 . $skill_help{$skill});
667 } 711 }
668} 712}
669 713
670sub eof { 714sub eof {
671 my ($self) = @_; 715 my ($self) = @_;
… …
695 739
696 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 740 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
697 741
698 $self->send ("requestinfo image_sums $face $face"); 742 $self->send ("requestinfo image_sums $face $face");
699 743
700 $self->{statusbox}->add (CFClient::asxml "prefetching $todo", 744 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
701 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 745 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
702 } elsif (!exists $self->{num_faces}) { 746 } elsif (!exists $self->{num_faces}) {
703 $self->send ("requestinfo image_info"); 747 $self->send ("requestinfo image_info");
704 748
705 $self->{num_faces} = 0; 749 $self->{num_faces} = 0;
706 750
707 $self->{statusbox}->add (CFClient::asxml "starting to prefetch", 751 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
708 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 752 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
709 } 753 }
710} 754}
711 755
712sub update_floorbox { 756sub update_floorbox {
713 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 757 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
714 return unless $::CONN; 758 return unless $::CONN;
715 759
716 $::FLOORBOX->clear; 760 $::FLOORBOX->clear;
717 761
718 my $row; 762 my $row;
719 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 763 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
720 if ($row < 6) { 764 if ($row < 6) {
721 local $_->{face_widget}; # hack to force recreation of widget 765 local $_->{face_widget}; # hack to force recreation of widget
722 local $_->{desc_widget}; # hack to force recreation of widget 766 local $_->{desc_widget}; # hack to force recreation of widget
723 CFClient::Item::update_widgets $_; 767 CFPlus::Item::update_widgets $_;
724 768
725 $::FLOORBOX->add (0, $row, $_->{face_widget}); 769 $::FLOORBOX->add (0, $row, $_->{face_widget});
726 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 770 $::FLOORBOX->add (1, $row, $_->{desc_widget});
727 771
728 $row++; 772 $row++;
729 } else { 773 } else {
730 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 774 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
731 text => "More...", 775 text => "More...",
732 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 776 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
733 ); 777 );
734 last; 778 last;
735 } 779 }
736 } 780 }
737 if ($::CONN->{open_container}) { 781 if ($::CONN->{open_container}) {
738 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 782 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
739 text => "Close container", 783 text => "Close container",
740 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 784 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
741 ); 785 );
742 } 786 }
743 }); 787 });
… …
749 my ($conn, $tag, $name) = @_; 793 my ($conn, $tag, $name) = @_;
750 $conn->{open_container} = $tag; 794 $conn->{open_container} = $tag;
751 update_floorbox; 795 update_floorbox;
752 796
753 $::INV_RIGHT_HB->clear (); 797 $::INV_RIGHT_HB->clear ();
754 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 798 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
755 799
756 if ($tag != 0) { # Floor isn't closable, is it? 800 if ($tag != 0) { # Floor isn't closable, is it?
757 $::INV_RIGHT_HB->add (new CFClient::UI::Button 801 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
758 text => "Close container", 802 text => "Close container",
759 tooltip => "Close the currently open container (if one is open)", 803 tooltip => "Close the currently open container (if one is open)",
760 on_activate => sub { 804 on_activate => sub {
761 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 805 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
762 if $tag != 0; 806 if $tag != 0;
… …
770} 814}
771 815
772sub update_containers { 816sub update_containers {
773 my ($self) = @_; 817 my ($self) = @_;
774 818
775 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 819 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
776 my $todo = delete $self->{update_container} 820 my $todo = delete $self->{update_container}
777 or return; 821 or return;
778 822
779 for my $tag (keys %$todo) { 823 for my $tag (keys %$todo) {
780 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 824 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
817sub item_update { 861sub item_update {
818 my ($self, $item) = @_; 862 my ($self, $item) = @_;
819 863
820 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 864 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
821 865
822 CFClient::Item::update_widgets $item; 866 CFPlus::Item::update_widgets $item;
823 867
824 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 868 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
825 set_opencont ($::CONN, 0, "Floor"); 869 set_opencont ($::CONN, 0, "Floor");
826 870
827 } elsif ($item->{flags} & F_OPEN) { 871 } elsif ($item->{flags} & F_OPEN) {
828 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 872 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
829 873
830 } else { 874 } else {
831 $self->{update_container}{$item->{container}}++; 875 $self->{update_container}{$item->{container}}++;
832 $self->update_containers; 876 $self->update_containers;
833 } 877 }
… …
858 $::SERVER_INFO->set_markup ( 902 $::SERVER_INFO->set_markup (
859 "server <tt>$self->{host}:$self->{port}</tt>\n" 903 "server <tt>$self->{host}:$self->{port}</tt>\n"
860 . "protocol version <tt>$self->{version}</tt>\n" 904 . "protocol version <tt>$self->{version}</tt>\n"
861 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 905 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
862 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 906 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
907 . "editing support $yesno[!!$self->{editor_support}]\n"
908 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
863 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
864 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
865 . "map size $self->{mapw}×$self->{maph}\n" 911 . "map size $self->{mapw}×$self->{maph}\n"
866 ); 912 );
913
914 ::setup_build_button ($self->{editor_support}->{builder_ui});
867} 915}
868 916
869sub logged_in { 917sub logged_in {
870 my ($self) = @_; 918 my ($self) = @_;
871 919
872 $self->send_ext_req (cfplus_support => "1", sub { 920 $self->send_ext_req (cfplus_support => version => 1, sub {
873 $self->{cfplus_ext} = $_[0]; 921 $self->{cfplus_ext} = $_[0]{version};
874 $self->update_server_info; 922 $self->update_server_info;
923
924 if ($self->{cfplus_ext} >= 2) {
925 $self->send_ext_req ("editor_support", sub {
926 $self->{editor_support} = $_[0];
927 $self->update_server_info;
928
929 0
930 });
931 }
932
933 0
875 }); 934 });
876 935
877 $self->update_server_info; 936 $self->update_server_info;
878 937
879 $self->send_command ("output-sync $::CFG->{output_sync}"); 938 $self->send_command ("output-sync $::CFG->{output_sync}");
880 $self->send_command ("output-count $::CFG->{output_count}"); 939 $self->send_command ("output-count $::CFG->{output_count}");
940 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
881 $self->send_command ("pickup $::CFG->{pickup}"); 941 $self->send_command ("pickup $::CFG->{pickup}");
942}
943
944sub buildat {
945 my ($self, $builditem, $x, $y) = @_;
946
947 if ($self->{cfplus_ext}) {
948 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
949 }
882} 950}
883 951
884sub lookat { 952sub lookat {
885 my ($self, $x, $y) = @_; 953 my ($self, $x, $y) = @_;
886 954
887 if ($self->{cfplus_ext}) { 955 if ($self->{cfplus_ext}) {
888 $self->send_ext_req (lookat => "$x $y", sub { 956 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
889 my %res = split /\x00/, $_[0]; 957 my ($msg) = @_;
890 958
891 if (exists $res{npc_dialog}) { 959 if (exists $msg->{npc_dialog}) {
892 # start npc chat dialog 960 # start npc chat dialog
893 $self->{npc_dialog} = new CFClient::NPCDialog:: 961 $self->{npc_dialog} = new CFPlus::NPCDialog::
894 dx => $x, 962 dx => $x,
895 dy => $y, 963 dy => $y,
896 title => "$res{npc_dialog} (NPC)", 964 title => "$msg->{npc_dialog} (NPC)",
897 conn => $self, 965 conn => $self,
898 ; 966 ;
899 } 967 }
900 }); 968 });
901 } 969 }
… …
904} 972}
905 973
906sub destroy { 974sub destroy {
907 my ($self) = @_; 975 my ($self) = @_;
908 976
909 $self->{npc_dialog}->destroy 977 (delete $self->{npc_dialog})->destroy
910 if $self->{npc_dialog}; 978 if $self->{npc_dialog};
911 979
912 $self->SUPER::destroy; 980 $self->SUPER::destroy;
913} 981}
914 982
915package CFClient::NPCDialog; 983package CFPlus::NPCDialog;
916 984
917our @ISA = 'CFClient::UI::FancyFrame'; 985our @ISA = 'CFPlus::UI::Toplevel';
918 986
919sub new { 987sub new {
920 my $class = shift; 988 my $class = shift;
921 989
922 my $self = $class->SUPER::new ( 990 my $self = $class->SUPER::new (
… …
929 kw => { hi => 0, yes => 0, no => 0 }, 997 kw => { hi => 0, yes => 0, no => 0 },
930 has_close_button => 1, 998 has_close_button => 1,
931 @_, 999 @_,
932 ); 1000 );
933 1001
934 Scalar::Util::weaken (my $this = $self); 1002 CFPlus::weaken (my $this = $self);
935 1003
936 $self->connect (delete => sub { $this->destroy; 1 }); 1004 $self->connect (delete => sub { $this->destroy; 1 });
937 1005
938 # better use a pane... 1006 # better use a pane...
939 $self->add (my $hbox = new CFClient::UI::HBox); 1007 $self->add (my $hbox = new CFPlus::UI::HBox);
940 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 1008 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
941 1009
942 $hbox->add (my $vbox = new CFClient::UI::VBox); 1010 $hbox->add (my $vbox = new CFPlus::UI::VBox);
943 1011
944 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1012 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
945 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1013 $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" 1014 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 { 1015 on_activate => sub {
952 my ($entry, $text) = @_; 1016 my ($entry, $text) = @_;
953 1017
954 return unless $text =~ /\S/; 1018 return unless $text =~ /\S/;
955 1019
… …
958 1022
959 0 1023 0
960 }, 1024 },
961 ); 1025 );
962 1026
963 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1027 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
964 1028
965 $self->{bye_button} = new CFClient::UI::Button 1029 $self->{bye_button} = new CFPlus::UI::Button
966 text => "Bye (close)", 1030 text => "Bye (close)",
967 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1031 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
968 on_activate => sub { $this->destroy; 1 }, 1032 on_activate => sub { $this->destroy; 1 },
969 ; 1033 ;
970 1034
971 $self->update_options; 1035 $self->update_options;
972 1036
973 $self->{token} = $self->{conn}->ext_token; 1037 $self->{id} = $self->{conn}->send_ext_req (
974 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1038 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
975 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1039 sub { $this && $this->feed (@_) }
1040 );
976 1041
977 $self->{entry}->grab_focus; 1042 $self->{entry}->grab_focus;
978 1043
979 $self->{textview}->add_paragraph ({ 1044 $self->{textview}->add_paragraph ({
980 fg => [1, 1, 0, 1], 1045 fg => [1, 1, 0, 1],
… …
986}; 1051};
987 1052
988sub update_options { 1053sub update_options {
989 my ($self) = @_; 1054 my ($self) = @_;
990 1055
991 Scalar::Util::weaken $self; 1056 CFPlus::weaken $self;
992 1057
993 $self->{options}->clear; 1058 $self->{options}->clear;
994 $self->{options}->add ($self->{bye_button}); 1059 $self->{options}->add ($self->{bye_button});
995 1060
996 for my $kw (sort keys %{ $self->{kw} }) { 1061 for my $kw (sort keys %{ $self->{kw} }) {
997 $self->{options}->add (new CFClient::UI::Button 1062 $self->{options}->add (new CFPlus::UI::Button
998 text => $kw, 1063 text => $kw,
999 on_activate => sub { 1064 on_activate => sub {
1000 $self->send ($kw); 1065 $self->send ($kw);
1001 0 1066 0
1002 }, 1067 },
1003 ); 1068 );
1004 } 1069 }
1005} 1070}
1006 1071
1007sub feed { 1072sub feed {
1008 my ($self, $data) = @_; 1073 my ($self, $msg) = @_;
1009 1074
1010 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1011 1076
1012 my ($type, $msg) = split / /, $data, 2; 1077 if ($msg->{msgtype} eq "reply") {
1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1013 1080
1014 if ($type eq "msg") { 1081 my $text = "\n" . CFPlus::asxml $msg->{msg};
1015 my ($msg, @kw) = split /\x00/, $msg;
1016
1017 utf8::decode $_ for ($msg, @kw);
1018
1019 $self->{kw}{$_} = 1 for @kw;
1020
1021 $msg = "\n" . CFClient::UI::asxml $msg;
1022 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1082 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1023 my @link; 1083 my @link;
1024 $msg =~ s{ 1084 $text =~ s{
1025 ($match) 1085 ($match)
1026 }{ 1086 }{
1027 my $kw = $1; 1087 my $kw = $1;
1028 1088
1029 push @link, new CFClient::UI::Label 1089 push @link, new CFPlus::UI::Label
1030 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1090 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1031 can_hover => 1, 1091 can_hover => 1,
1032 can_events => 1, 1092 can_events => 1,
1033 padding_x => 0, 1093 padding_x => 0,
1034 padding_y => 0, 1094 padding_y => 0,
1035 on_button_up => sub { 1095 on_button_up => sub {
1036 $self->send ($kw); 1096 $self->send ($kw);
1037 }; 1097 };
1038 1098
1039 chr 0xfffc 1099 "\x{fffc}"
1040 }giex; 1100 }giex;
1041 1101
1042 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1102 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1043 $self->{textview}->scroll_to_bottom; 1103 $self->{textview}->scroll_to_bottom;
1044 $self->update_options; 1104 $self->update_options;
1045 } else { 1105 } else {
1046 $self->destroy; 1106 $self->destroy;
1047 } 1107 }
… …
1050} 1110}
1051 1111
1052sub send { 1112sub send {
1053 my ($self, $msg) = @_; 1113 my ($self, $msg) = @_;
1054 1114
1055 $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg }); 1115 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1056 $self->{textview}->scroll_to_bottom; 1116 $self->{textview}->scroll_to_bottom;
1057 1117
1058 utf8::encode $msg; 1118 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1059 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1060} 1119}
1061 1120
1062sub destroy { 1121sub destroy {
1063 my ($self) = @_; 1122 my ($self) = @_;
1064 1123
1065 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1124 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1066 1125
1126 if ($self->{conn}) {
1067 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1127 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1068 delete $self->{conn}{npc_dialog}; 1128 delete $self->{conn}{npc_dialog};
1069 $self->{conn}->disconnect_ext ($self->{token}); 1129 $self->{conn}->disconnect_ext ($self->{id});
1130 }
1070 1131
1071 $self->SUPER::destroy; 1132 $self->SUPER::destroy;
1072} 1133}
1073 1134
10741 11351
1136

Diff Legend

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