ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.63 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.92 by root, Sat Dec 9 21:26:46 2006 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 CFClient::UI; 9use CFPlus::UI;
10use CFPlus::Pod;
11use CFPlus::Macro;
12use CFPlus::Item;
13
14use Crossfire::Protocol::Base 0.95;
10 15
11use base 'Crossfire::Protocol::Base'; 16use base 'Crossfire::Protocol::Base';
12 17
13sub new { 18sub new {
14 my $class = shift; 19 my $class = shift;
15 20
16 my $self = $class->SUPER::new (@_); 21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
17 22
18 $self->{map_widget}->clr_commands; 23 $self->{map_widget}->clr_commands;
19 24
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 25 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 27 or die "unparseable command help: $_->{kw}[0]";
28 28
29 my $cmd = $1; 29 my $cmd = $1;
30 my @args = split /\|/, $2; 30 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 31 @args = (".*") unless @args;
32 32
33 my (undef, @par) = CFPlus::Pod::section_of $_;
34 my $text = CFPlus::Pod::as_label @par;
35
33 $_ = $_ eq ".*" ? "" : " $_" 36 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 37 for @args;
35 38
36 my $text = CFClient::pod_to_pango $head2->content; 39 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 40 sort { (length $a) <=> (length $b) }
40 @args; 41 @args
41 } 42 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*";
42 44
43 \@cmd_help
44 };
45
46 $self->{map_widget}->add_command (@$_) 45 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 46 for @cmd_help;
48 47
49 $self->{noface} = new_from_file CFClient::Texture 48 $self->{noface} = new_from_file CFPlus::Texture
50 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1; 49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50
51 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 }
51 56
52 $self->{open_container} = 0; 57 $self->{open_container} = 0;
53 58
54 # "global" 59 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache"; 60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
56 $self->{facemap} = CFClient::db_table "facemap"; 62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
57 64
58 # per server 65 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
60 68
61 $self 69 $self
62} 70}
63 71
64sub logprint { 72sub logprint {
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 250 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 251 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 252 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 253 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 254
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 255 $self->update_weight;
248 256
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 257 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 258 for keys %RES_TBL;
251 259
252 my $sktbl = $::STATWIDS->{skill_tbl}; 260 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 261 my @skills = keys %{ $self->{skill_info} };
254 262
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 263 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 264 $sktbl->clear;
257 265
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 266 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 267 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 268 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 269 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 270 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 271 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 272
273 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274
275 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
277
265 my ($x, $y) = (1, 0); 278 my ($x, $y) = (0, 1);
266 for ( 279 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 280 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 281 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 282 grep exists $stats->{$_},
270 @skills 283 @skills
271 ) { 284 ) {
272 my ($idx, $name) = @$_; 285 my ($idx, $name) = @$_;
273 286
287 my $spell_cb = sub {
288 my ($widget, $ev) = @_;
289
290 if ($ev->{button} == 1) {
291 $::CONN->user_send ("ready_skill $name");
292 } elsif ($ev->{button} == 2) {
293 $::CONN->user_send ("use_skill $name");
294 } elsif ($ev->{button} == 3) {
295 my $shortname = CFPlus::shorten $name, 14;
296 (new CFPlus::UI::Menu
297 items => [
298 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
299 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
300 ],
301 )->popup ($ev);
302 } else {
303 return 0;
304 }
305
306 1
307 };
308
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 309 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 310 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 311 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 312 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 313 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
279 315
280 $x++ and ($x, $y) = (0, $y + 1); 316 $x++ and ($x, $y) = (0, $y + 1);
281 } 317 }
282 } 318 }
283 319
… …
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 321 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 322 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 323 }
288} 324}
289 325
326sub macro_send {
327 my ($self, $macro) = @_;
328
329 for my $cmd (@{ $macro->{action} }) {
330 $self->send_command ($cmd);
331 }
332}
333
290sub user_send { 334sub user_send {
291 my ($self, $command) = @_; 335 my ($self, $command) = @_;
292 336
337 $self->{record}->($command)
293 if ($self->{record}) { 338 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 339
297 $self->logprint ("send: ", $command); 340 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 341 $self->send_command ($command);
299 ::status ($command); 342 ::status ($command);
300} 343}
301 344
302sub start_record { 345sub record {
303 my ($self) = @_; 346 my ($self, $cb) = @_;
304 347
305 $self->{record} = []; 348 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 349}
312 350
313sub map_scroll { 351sub map_scroll {
314 my ($self, $dx, $dy) = @_; 352 my ($self, $dx, $dy) = @_;
315 353
… …
317} 355}
318 356
319sub feed_map1a { 357sub feed_map1a {
320 my ($self, $data) = @_; 358 my ($self, $data) = @_;
321 359
322 $self->{map}->map1a_update ($data); 360 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 361 $self->{map_widget}->update;
324} 362}
325 363
326sub magicmap { 364sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 365 my ($self, $w, $h, $x, $y, $data) = @_;
… …
497 535
498 unless ($id) { 536 unless ($id) {
499 # create new id for face 537 # create new id for face
500 # I love transactions 538 # I love transactions
501 for (1..100) { 539 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin; 540 my $txn = $CFPlus::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id); 541 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) { 542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1; 543 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0 544 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) { 545 && $self->{facemap}->put ($hash => $id) == 0) {
… …
511 } 549 }
512 } 550 }
513 $txn->txn_abort; 551 $txn->txn_abort;
514 } 552 }
515 553
516 CFClient::fatal "maximum number of transaction retries reached - database problems?"; 554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
517 } 555 }
518 556
519gotid: 557gotid:
520 $face->{id} = $id; 558 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id); 559 $self->{map}->set_face ($facenum => $id);
… …
544sub set_texture { 582sub set_texture {
545 my ($self, $id, $data) = @_; 583 my ($self, $id, $data) = @_;
546 584
547 $self->{texture}[$id] ||= do { 585 $self->{texture}[$id] ||= do {
548 my $tex = 586 my $tex =
549 new_from_image CFClient::Texture 587 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 588 $data, minify => 1, mipmap => 1;
551 589
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 591 $self->{map_widget}->update;
554 592
… …
592 [0.74, 0.65, 0.41], 630 [0.74, 0.65, 0.41],
593 ); 631 );
594 632
595 $self->logprint ("info: ", $text); 633 $self->logprint ("info: ", $text);
596 634
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598
599 # try to create single paragraphs of multiple lines sent by the server 635 # try to create single paragraphs of multiple lines sent by the server
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 636 $text =~ s/(?<=\S)\n(?=\w)/ /g;
601 637
602 $text = CFClient::UI::Label::escape $text; 638 $text = CFPlus::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 639 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 640 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 641
606 $self->{logview}->add_paragraph ($color[$color], $_) 642 ::message ({ fg => $color[$color], markup => $_ })
607 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 643 for split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609 644
610 $self->{statusbox}->add ($text, 645 $self->{statusbox}->add ($text,
611 group => $text, 646 group => $text,
612 fg => $color[$color], 647 fg => $color[$color],
613 timeout => $color >= 2 ? 60 : 10, 648 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 649 tooltip_font => $::FONT_FIXED,
615 ); 650 );
616} 651}
617 652
618sub drawextinfo { 653sub drawextinfo {
… …
622} 657}
623 658
624sub spell_add { 659sub spell_add {
625 my ($self, $spell) = @_; 660 my ($self, $spell) = @_;
626 661
627 # try to create single paragraphs of multiple lines sent by the server 662 # try to create single paragraphs out of the multiple lines sent by the server
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 663 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 664 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 665 $spell->{message} ||= "Server did not provide a description for this spell.";
631 666
632 $::SPELL_PAGE->add_spell ($spell); 667 $::SPELL_LIST->add_spell ($spell);
633 668
634 $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 669 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
635 $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message}); 670 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
636} 671}
637 672
638sub spell_delete { 673sub spell_delete {
639 my ($self, $spell) = @_; 674 my ($self, $spell) = @_;
640 675
641 $::SPELL_PAGE->remove_spell ($spell); 676 $::SPELL_LIST->remove_spell ($spell);
677}
678
679sub setup {
680 my ($self, $setup) = @_;
681
682 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 683}
643 684
644sub addme_success { 685sub addme_success {
645 my ($self) = @_; 686 my ($self) = @_;
646 687
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 688 my %skill_help;
651 689
652 for my $head2 ($pom->head1->[3]->head2) { 690 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 691 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 692 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 693 };
658 694
659 for my $skill (values %{$self->{skill_info}}) { 695 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 696 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 697 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 698 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 699 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 700 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 701 . $skill_help{$skill});
666 } 702 }
667} 703}
668 704
669sub eof { 705sub eof {
670 my ($self) = @_; 706 my ($self) = @_;
… …
694 730
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 731 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 732
697 $self->send ("requestinfo image_sums $face $face"); 733 $self->send ("requestinfo image_sums $face $face");
698 734
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 735 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 736 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 737 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 738 $self->send ("requestinfo image_info");
703 739
704 $self->{num_faces} = 0; 740 $self->{num_faces} = 0;
705 741
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 742 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 743 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 744 }
709} 745}
710 746
711sub update_floorbox { 747sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 748 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 749 return unless $::CONN;
714 750
715 $::FLOORBOX->clear; 751 $::FLOORBOX->clear;
716 752
717 my $row; 753 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 754 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 755 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 756 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 757 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 758 CFPlus::Item::update_widgets $_;
723 759
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 760 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 761 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 762
727 $row++; 763 $row++;
728 } else { 764 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 765 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 766 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 767 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 768 );
733 last; 769 last;
734 } 770 }
735 } 771 }
736 if ($::CONN->{open_container}) { 772 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 773 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
738 text => "Close container", 774 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 775 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 776 );
741 } 777 }
742 }); 778 });
… …
748 my ($conn, $tag, $name) = @_; 784 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 785 $conn->{open_container} = $tag;
750 update_floorbox; 786 update_floorbox;
751 787
752 $::INV_RIGHT_HB->clear (); 788 $::INV_RIGHT_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 789 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 790
755 if ($tag != 0) { # Floor isn't closable, is it? 791 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 792 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
757 text => "Close container", 793 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 794 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 795 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 796 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 797 if $tag != 0;
… …
769} 805}
770 806
771sub update_containers { 807sub update_containers {
772 my ($self) = @_; 808 my ($self) = @_;
773 809
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 810 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 811 my $todo = delete $self->{update_container}
776 or return; 812 or return;
777 813
778 for my $tag (keys %$todo) { 814 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 815 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 852sub item_update {
817 my ($self, $item) = @_; 853 my ($self, $item) = @_;
818 854
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 855 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 856
821 CFClient::Item::update_widgets $item; 857 CFPlus::Item::update_widgets $item;
822 858
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 859 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 860 set_opencont ($::CONN, 0, "Floor");
825 861
826 } elsif ($item->{flags} & F_OPEN) { 862 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 863 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 864
829 } else { 865 } else {
830 $self->{update_container}{$item->{container}}++; 866 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 867 $self->update_containers;
832 } 868 }
833} 869}
834 870
835sub player_update { 871sub player_update {
836 my ($self, $player) = @_; 872 my ($self, $player) = @_;
873
874 $self->update_weight;
875}
876
877sub update_weight {
878 my ($self) = @_;
879
880 my $weight = .001 * $self->{player}{weight};
881 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
882
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 883 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
884 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
885 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 886}
839 887
840sub update_server_info { 888sub update_server_info {
841 my ($self) = @_; 889 my ($self) = @_;
842 890
… …
845 $::SERVER_INFO->set_markup ( 893 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 894 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 895 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 896 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 897 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
898 . "editing support $yesno[!!$self->{editor_support}]\n"
899 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 900 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 901 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 902 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 903 );
904
905 ::setup_build_button ($self->{editor_support}->{builder_ui});
854} 906}
855 907
856sub logged_in { 908sub logged_in {
857 my ($self) = @_; 909 my ($self) = @_;
858 910
859 $self->send_ext_req (cfplus_support => "1", sub { 911 $self->send_ext_req (cfplus_support => version => 1, sub {
860 $self->{cfplus_ext} = $_[0]; 912 $self->{cfplus_ext} = $_[0]{version};
861 $self->update_server_info; 913 $self->update_server_info;
914
915 if ($self->{cfplus_ext} >= 2) {
916 $self->send_ext_req ("editor_support", sub {
917 $self->{editor_support} = $_[0];
918 $self->update_server_info;
919
920 0
921 });
922 }
923
924 0
862 }); 925 });
863 926
864 $self->update_server_info; 927 $self->update_server_info;
865 928
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 929 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 930 $self->send_command ("output-count $::CFG->{output_count}");
868 $self->send_command ("pickup $::CFG->{pickup}"); 931 $self->send_command ("pickup $::CFG->{pickup}");
869} 932}
870 933
934sub buildat {
935 my ($self, $builditem, $x, $y) = @_;
936
937 if ($self->{cfplus_ext}) {
938 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
939 }
940}
941
871sub lookat { 942sub lookat {
872 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
873 944
874 if ($self->{cfplus_ext}) { 945 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 946 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
876 my %res = split /\x00/, $_[0]; 947 my ($msg) = @_;
877 948
878 if (exists $res{npc_dialog}) { 949 if (exists $msg->{npc_dialog}) {
879 # start npc chat dialog 950 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 951 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 952 dx => $x,
882 dy => $y, 953 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 954 title => "$msg->{npc_dialog} (NPC)",
884 conn => $self, 955 conn => $self,
885 ; 956 ;
886 } 957 }
887 }); 958 });
888 } 959 }
… …
891} 962}
892 963
893sub destroy { 964sub destroy {
894 my ($self) = @_; 965 my ($self) = @_;
895 966
896 $self->{npc_dialog}->destroy 967 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 968 if $self->{npc_dialog};
898 969
899 $self->SUPER::destroy; 970 $self->SUPER::destroy;
900} 971}
901 972
902package CFClient::NPCDialog; 973package CFPlus::NPCDialog;
903 974
904our @ISA = 'CFClient::UI::FancyFrame'; 975our @ISA = 'CFPlus::UI::Toplevel';
905 976
906sub new { 977sub new {
907 my $class = shift; 978 my $class = shift;
908 979
909 my $self = $class->SUPER::new ( 980 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 983 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 984 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 985 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 986 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 987 kw => { hi => 0, yes => 0, no => 0 },
988 has_close_button => 1,
917 @_, 989 @_,
918 ); 990 );
919 991
920 Scalar::Util::weaken (my $this = $self); 992 CFPlus::weaken (my $this = $self);
993
994 $self->connect (delete => sub { $this->destroy; 1 });
921 995
922 # better use a pane... 996 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 997 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 998 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 999
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 1000 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 1001
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 1002 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 1003 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1004 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1005 on_activate => sub {
936 my ($entry, $text) = @_; 1006 my ($entry, $text) = @_;
937 1007
938 return unless $text =~ /\S/; 1008 return unless $text =~ /\S/;
939 1009
… …
942 1012
943 0 1013 0
944 }, 1014 },
945 ); 1015 );
946 1016
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1017 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1018
949 $self->{bye_button} = new CFClient::UI::Button 1019 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1020 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1021 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1022 on_activate => sub { $this->destroy; 1 },
953 ; 1023 ;
954 1024
955 $self->update_options; 1025 $self->update_options;
956 1026
957 $self->{token} = $self->{conn}->ext_token; 1027 $self->{id} = $self->{conn}->send_ext_req (
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1028 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1029 sub { $this && $this->feed (@_) }
1030 );
960 1031
961 $self->{entry}->grab_focus; 1032 $self->{entry}->grab_focus;
962 1033
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1034 $self->{textview}->add_paragraph ({
1035 fg => [1, 1, 0, 1],
1036 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1037 });
964 1038
965 $self->show; 1039 $self->show;
966 $self 1040 $self
967}; 1041};
968 1042
969sub update_options { 1043sub update_options {
970 my ($self) = @_; 1044 my ($self) = @_;
971 1045
972 Scalar::Util::weaken $self; 1046 CFPlus::weaken $self;
973 1047
974 $self->{options}->clear; 1048 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1049 $self->{options}->add ($self->{bye_button});
976 1050
977 for my $kw (sort keys %{ $self->{kw} }) { 1051 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1052 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1053 text => $kw,
980 on_activate => sub { 1054 on_activate => sub {
981 $self->send ($kw); 1055 $self->send ($kw);
982 0 1056 0
983 }, 1057 },
984 ); 1058 );
985 } 1059 }
986} 1060}
987 1061
988sub feed { 1062sub feed {
989 my ($self, $data) = @_; 1063 my ($self, $msg) = @_;
990 1064
991 Scalar::Util::weaken $self; 1065 CFPlus::weaken $self;
992 1066
993 my ($type, $msg) = split / /, $data, 2; 1067 if ($msg->{msgtype} eq "reply") {
1068 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1069 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
994 1070
995 if ($type eq "msg") { 1071 my $text = "\n" . CFPlus::asxml $msg->{msg};
996 my ($msg, @kw) = split /\x00/, $msg;
997
998 utf8::decode $_ for ($msg, @kw);
999
1000 $self->{kw}{$_} = 1 for @kw;
1001
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1072 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1073 my @link;
1005 $msg =~ s{ 1074 $text =~ s{
1006 ($match) 1075 ($match)
1007 }{ 1076 }{
1008 my $kw = $1; 1077 my $kw = $1;
1009 1078
1010 push @link, new CFClient::UI::Label 1079 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1080 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1081 can_hover => 1,
1013 can_events => 1, 1082 can_events => 1,
1014 padding_x => 0, 1083 padding_x => 0,
1015 padding_y => 0, 1084 padding_y => 0,
1016 on_button_up => sub { 1085 on_button_up => sub {
1017 $self->send ($kw); 1086 $self->send ($kw);
1018 }; 1087 };
1019 1088
1020 chr 0xfffc 1089 "\x{fffc}"
1021 }giex; 1090 }giex;
1022 1091
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1092 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1093 $self->{textview}->scroll_to_bottom;
1025 $self->update_options; 1094 $self->update_options;
1026 } else { 1095 } else {
1027 $self->destroy; 1096 $self->destroy;
1028 } 1097 }
… …
1031} 1100}
1032 1101
1033sub send { 1102sub send {
1034 my ($self, $msg) = @_; 1103 my ($self, $msg) = @_;
1035 1104
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1105 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1106 $self->{textview}->scroll_to_bottom;
1038 1107
1039 utf8::encode $msg; 1108 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1041} 1109}
1042 1110
1043sub destroy { 1111sub destroy {
1044 my ($self) = @_; 1112 my ($self) = @_;
1045 1113
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1114 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1115
1116 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1117 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1118 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1119 $self->{conn}->disconnect_ext ($self->{id});
1120 }
1051 1121
1052 $self->SUPER::destroy; 1122 $self->SUPER::destroy;
1053} 1123}
1054 1124
10551; 11251
1126

Diff Legend

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