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.39 by root, Mon Jun 19 06:50:45 2006 UTC vs.
Revision 1.48 by root, Wed Jun 28 22:59:58 2006 UTC

… …
105 push @{$self->{record}}, $command; 105 push @{$self->{record}}, $command;
106 } 106 }
107 107
108 $self->logprint ("send: ", $command); 108 $self->logprint ("send: ", $command);
109 $self->send_command ($command); 109 $self->send_command ($command);
110 ::status $command; 110 ::status ($command);
111} 111}
112 112
113sub start_record { 113sub start_record {
114 my ($self) = @_; 114 my ($self) = @_;
115 115
… …
412 412
413 $text = CFClient::UI::Label::escape $text; 413 $text = CFClient::UI::Label::escape $text;
414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 414 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 415 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416 416
417 $self->{logview}->add_paragraph ($color[$color], 417 $self->{logview}->add_paragraph ($color[$color], $_)
418 join "\n", map "$time $_", split /\n/, $text); 418 for map "$time $_", split /\n/, $text;
419 $self->{logview}->scroll_to_bottom;
419 420
420 $self->{statusbox}->add ($text, 421 $self->{statusbox}->add ($text,
421 group => $text, 422 group => $text,
422 fg => $color[$color], 423 fg => $color[$color],
423 timeout => $color >= 2 ? 60 : 10, 424 timeout => $color >= 2 ? 60 : 10,
… …
522 return unless $::CONN; 523 return unless $::CONN;
523 524
524 $::FLOORBOX->clear; 525 $::FLOORBOX->clear;
525 526
526 my $row; 527 my $row;
527 for (@{ $::CONN->{container}{0} }) { 528 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
528 if ($row < 6) { 529 if ($row < 6) {
529 local $_->{face_widget}; # hack to force recreation of widget 530 local $_->{face_widget}; # hack to force recreation of widget
530 local $_->{desc_widget}; # hack to force recreation of widget 531 local $_->{desc_widget}; # hack to force recreation of widget
531 CFClient::Item::update_widgets $_; 532 CFClient::Item::update_widgets $_;
532 533
… …
568 } 569 }
569 570
570 $::INVR->set_items ($conn->{container}{$tag}); 571 $::INVR->set_items ($conn->{container}{$tag});
571} 572}
572 573
573sub update_container { 574sub update_containers {
574 my ($tag) = @_; 575 my ($self) = @_;
575 576
576 $::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}}) 577 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
578 # TODO: scara had a bug where $self->{uipdate_container} was not defined
579 # but this should not possibly happen?
580 for my $tag (keys %{ delete $self->{update_container} }) {
581 if ($tag == 0) {
582 update_floorbox;
583 $::INVR->set_items ($self->{container}{0})
577 if $tag == $::CONN->{open_container}; 584 if $tag == $self->{open_container};
585 } elsif ($tag == $self->{player}{tag}) {
586 $::INV->set_items ($self->{container}{$tag})
587 } else {
588 $::INVR->set_items ($self->{container}{$tag})
589 if $tag == $self->{open_container};
590 }
591 }
592 });
578} 593}
579 594
580sub container_add { 595sub container_add {
581 my ($self, $tag, $items) = @_; 596 my ($self, $tag, $items) = @_;
582 597
583 #d# print "container_add: container $tag ($self->{player}{tag})\n"; 598 $self->{update_container}{$tag}++;
584 599 $self->update_containers;
585 if ($tag == 0) {
586 update_floorbox;
587 update_container (0);
588 } elsif ($tag == $self->{player}{tag}) {
589 $::INV->set_items ($self->{container}{$self->{player}{tag}})
590 } else {
591 update_container ($tag);
592 }
593
594 # $self-<{player}{tag} => player inv
595 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596} 600}
597 601
598sub container_clear { 602sub container_clear {
599 my ($self, $tag) = @_; 603 my ($self, $tag) = @_;
600 604
601 #d# print "container_clear: container $tag ($self->{player}{tag})\n"; 605 $self->{update_container}{$tag}++;
602 606 $self->update_containers;
603 if ($tag == 0) {
604 update_floorbox;
605 update_container (0);
606 } elsif ($tag == $self->{player}{tag}) {
607 $::INV->set_items ($self->{container}{$tag})
608 } else {
609 update_container ($tag);
610 }
611
612# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613} 607}
614 608
615sub item_delete { 609sub item_delete {
616 my ($self, @items) = @_; 610 my ($self, @items) = @_;
617 611
612 $self->{update_container}{$_->{tag}}++
618 for (@items) { 613 for @items;
619 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621 if ($_->{container} == 0) {
622 update_floorbox;
623 update_container ($_->{tag});
624 } elsif ($_->{container} == $self->{player}{tag}) {
625 $::INV->set_items ($self->{container}{$self->{player}{tag}})
626 } else {
627 update_container ($_->{container});
628 }
629 } 614
615 $self->update_containers;
630} 616}
631 617
632sub item_update { 618sub item_update {
633 my ($self, $item) = @_; 619 my ($self, $item) = @_;
634 620
… …
644 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 630 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645 set_opencont ($::CONN, 0, "Floor"); 631 set_opencont ($::CONN, 0, "Floor");
646 632
647 } elsif ($item->{flags} & F_OPEN) { 633 } elsif ($item->{flags} & F_OPEN) {
648 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 634 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
635
649 } else { 636 } else {
637 $self->{update_container}{$item->{container}}++;
638 $self->update_containers;
650 if ($item->{container} == 0) { 639# if ($item->{container} == 0) {
651 update_floorbox; 640# update_floorbox;
652 update_container (0); 641# update_container (0);
653 } elsif ($item->{container} == $self->{player}{tag}) { 642# } elsif ($item->{container} == $self->{player}{tag}) {
654 $::INV->set_items ($self->{container}{$item->{container}}) 643# $::INV->set_items ($self->{container}{$item->{container}})
655 } 644# }
656 } 645 }
657} 646}
658 647
659sub player_update { 648sub player_update {
660 my ($self, $player) = @_; 649 my ($self, $player) = @_;
… …
811} 800}
812 801
813sub feed { 802sub feed {
814 my ($self, $data) = @_; 803 my ($self, $data) = @_;
815 804
805 Scalar::Util::weaken $self;
806
816 my ($type, $msg) = split / /, $data, 2; 807 my ($type, $msg) = split / /, $data, 2;
817 808
818 if ($type eq "msg") { 809 if ($type eq "msg") {
819 my ($msg, @kw) = split /\x00/, $msg; 810 my ($msg, @kw) = split /\x00/, $msg;
820 $self->{kw}{$_} = 1 for @kw; 811 $self->{kw}{$_} = 1 for @kw;
821 812
822 $msg = CFClient::UI::Label::escape $msg; 813 $msg = "\n" . CFClient::UI::Label::escape $msg;
823 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 814 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
824 $msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh. 815 my @link;
816 $msg =~ s{
817 ($match)
818 }{
819 my $kw = $1;
820
821 push @link, new CFClient::UI::Label
822 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
823 can_hover => 1,
824 can_events => 1,
825 padding_x => 0,
826 padding_y => 0,
827 on_button_up => sub {
828 $self->send ($kw);
829 };
830
831 chr 0xfffc
832 }giex;
825 833
826 $self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg"); 834 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
835 $self->{textview}->scroll_to_bottom;
827 $self->update_options; 836 $self->update_options;
828 } else { 837 } else {
829 $self->destroy; 838 $self->destroy;
830 } 839 }
831 840
… …
835sub send { 844sub send {
836 my ($self, $msg) = @_; 845 my ($self, $msg) = @_;
837 846
838 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg"); 847 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
839 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 848 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
849 $self->{textview}->scroll_to_bottom;
840} 850}
841 851
842sub destroy { 852sub destroy {
843 my ($self) = @_; 853 my ($self) = @_;
844 854

Diff Legend

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