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.186 by root, Thu Dec 27 19:35:09 2007 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5
6use Guard ();
5 7
6use Deliantra::Protocol::Constants; 8use Deliantra::Protocol::Constants;
7 9
8use DC; 10use DC;
9use DC::DB; 11use DC::DB;
11use DC::Pod; 13use DC::Pod;
12use DC::Macro; 14use DC::Macro;
13use DC::Item; 15use DC::Item;
14 16
15use base 'Deliantra::Protocol::Base'; 17use base 'Deliantra::Protocol::Base';
18
19our $TEX_DIALOGUE = new_from_resource DC::Texture
20 "dialogue.png", minify => 1, mipmap => 1;
21
22our $TEX_NOFACE = new_from_resource DC::Texture
23 "noface.png", minify => 1, mipmap => 1;
24
25our $TEX_HIDDEN = new_from_resource DC::Texture
26 "hidden.png", minify => 1, mipmap => 1;
27
28sub MIN_TEXTURE_UNUSED() { 1 }#d#
16 29
17sub new { 30sub new {
18 my ($class, %arg) = @_; 31 my ($class, %arg) = @_;
19 32
20 my $self = $class->SUPER::new (%arg, 33 my $self = $class->SUPER::new (%arg,
27 ); 40 );
28 41
29 $self->{map_widget}->clr_commands; 42 $self->{map_widget}->clr_commands;
30 43
31 my @cmd_help = map { 44 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 45 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 46 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 47
35 my $cmd = $1; 48 my $cmd = $1;
36 my @args = split /\|/, $2; 49 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 50 @args = (".*") unless @args;
38 51
43 for @args; 56 for @args;
44 57
45 map ["$cmd$_", $text], 58 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 59 sort { (length $a) <=> (length $b) }
47 @args 60 @args
48 } sort { $a->{par} <=> $b->{par} } 61 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 DC::Pod::find command => "*"; 62 DC::Pod::find command => "*";
50 63
51 $self->{json_coder} 64 $self->{json_coder}
52 ->convert_blessed 65 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 66 ->filter_json_single_key_object ("\fw" => sub {
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 77 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 78 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 79 $_->destroy
67 for values %{delete $ws->{w} || {}}; 80 for values %{delete $ws->{w} || {}};
68 } 81 }
82
83 delete $self->{items};
84 $::INV->clear;
85 $::INVR->clear;
86 $::INVR_HB->clear;
87 $::FLOORBOX->clear;
69 }); 88 });
70 89
71 $self->{map_widget}->add_command (@$_) 90 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 91 for @cmd_help;
73 92
74 { 93 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture 94 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
76 DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
77 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 95 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 } 96 }
79 97
80 { 98 {
81 $self->{noface} = my $tex = new_from_file DC::Texture 99 $self->{noface} = my $tex = $TEX_NOFACE;
82 DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
83 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 100 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 } 101 }
102
103 {
104 $self->{hidden} = my $tex = $TEX_HIDDEN;
105 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
106 }
107
108# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
109# $self->{expire_w} = EV::timer 1, 1, sub {
110# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
111#
112# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
113# warn DC::SvREFCNT $self->{texture}[$_];
114# $self->{texture}[$_]->unload;
115# warn "expire texture $_\n";#d#
116# }
117#
118# ($self->{expire_count} += $count) < @{ $self->{texture} }
119# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
120# warn "count is $count\n";#d#
121# };
85 122
86 $self->{open_container} = 0; 123 $self->{open_container} = 0;
87 124
88 # per server 125 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 126 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
250 my %wkw = ( 287 my %wkw = (
251 root => $DC::UI::ROOT, 288 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP, 289 tooltip => $DC::UI::TOOLTIP,
253 290
254 mapwidget => $::MAPWIDGET, 291 mapwidget => $::MAPWIDGET,
292 menubar => $::MENUBAR,
293 menupopup => $::MENUPOPUP,
294 pickup_enable => $::PICKUP_ENABLE,
255 buttonbar => $::BUTTONBAR, 295 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER, 296 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR, 297 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON, 298 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG, 299 quit_dialog => $::QUIT_DIALOG,
275 spell_list => $::SPELL_LIST, 315 spell_list => $::SPELL_LIST,
276 316
277 floorbox => $::FLOORBOX, 317 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW, 318 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW, 319 message_window => $::MESSAGE_WINDOW,
320 message_dist => $::MESSAGE_DIST,
280 statusbox => $::SDTATUSBOX, 321 statusbox => $::STATUSBOX,
281 322
282 inv => $::INV, 323 inv => $::INV,
283 invr => $::INVR, 324 invr => $::INVR,
284 invr_hb => $::INVR_HB, 325 invr_hb => $::INVR_HB,
285 ); 326 );
333 374
334# message window 375# message window
335sub ext_channel_info { 376sub ext_channel_info {
336 my ($self, $info) = @_; 377 my ($self, $info) = @_;
337 $self->{channels}->{$info->{id}} = $info; 378 $self->{channels}->{$info->{id}} = $info;
338 $::MESSAGE_WINDOW->add_channel ($info); 379 $::MESSAGE_DIST->add_channel ($info);
339} 380}
340 381
341############################################################################# 382#############################################################################
342 383
343sub logprint { 384sub logprint {
482 523
483 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 524 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
484 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 525 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
485 $::GAUGES->{food} ->set_value ($fo, $fo_m); 526 $::GAUGES->{food} ->set_value ($fo, $fo_m);
486 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 527 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
487 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 528 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
488 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 529 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
489 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 530 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
490 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 531 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
491 my $title = $stats->{+CS_STAT_TITLE}; 532 my $title = $stats->{+CS_STAT_TITLE};
492 $title =~ s/^Player: //; 533 $title =~ s/^Player: //;
493 $::STATWIDS->{title} ->set_text ("Title: " . $title); 534 $::STATWIDS->{title} ->set_text ("Title: " . $title);
494 535
525 $sktbl->clear; 566 $sktbl->clear;
526 567
527 my $sw = $self->{skillwid}{""} ||= [ 568 my $sw = $self->{skillwid}{""} ||= [
528 0, 0, (new DC::UI::Label text => "Experience", align => 1), 569 0, 0, (new DC::UI::Label text => "Experience", align => 1),
529 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), 570 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
530 2, 0, (new DC::UI::Label text => "Progress", align => 0), 571 2, 0, (new DC::UI::Label text => "Progress"),
531 3, 0, (new DC::UI::Label text => "Skill", expand => 1), 572 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
532 4, 0, (new DC::UI::Label text => "Experience", align => 1), 573 4, 0, (new DC::UI::Label text => "Experience", align => 1),
533 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), 574 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
534 6, 0, (new DC::UI::Label text => "Progress", align => 0), 575 6, 0, (new DC::UI::Label text => "Progress"),
535 7, 0, (new DC::UI::Label text => "Skill", expand => 1), 576 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
536 ]; 577 ];
537 578
538 my @add = @$sw; 579 my @add = @$sw;
539 580
540 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 581 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
541 582
542 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 583 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
543 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 584 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
544 585
545 my ($x, $y) = (0, 1); 586 my ($x, $y) = (0, 1);
579 620
580 # progress 621 # progress
581 (new DC::UI::ExperienceProgress), 622 (new DC::UI::ExperienceProgress),
582 623
583 # label 624 # label
584 (new DC::UI::Label text => $name, on_button_down => $spell_cb, 625 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
585 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 626 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
586 ]; 627 ];
587 628
588 push @add, 629 push @add,
589 $x * 4 + 0, $y, $sw->[0], 630 $x * 4 + 0, $y, $sw->[0],
607 my $sw = $self->{skillwid}{$idx}; 648 my $sw = $self->{skillwid}{$idx};
608 $sw->[0]->set_text (::formsep ($val->[1])); 649 $sw->[0]->set_text (::formsep ($val->[1]));
609 $sw->[1]->set_text ($val->[0] * 1); 650 $sw->[1]->set_text ($val->[0] * 1);
610 $sw->[2]->set_value (@$val); 651 $sw->[2]->set_value (@$val);
611 652
612 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 653 $::GAUGES->{skillexp}->set_label ("$name %d%%");
613 $::GAUGES->{sklprg}->set_value (@$val); 654 $::GAUGES->{skillexp}->set_value (@$val);
614 } 655 }
615} 656}
616 657
617sub user_send { 658sub user_send {
618 my ($self, $command) = @_; 659 my ($self, $command) = @_;
631} 672}
632 673
633sub map_scroll { 674sub map_scroll {
634 my ($self, $dx, $dy) = @_; 675 my ($self, $dx, $dy) = @_;
635 676
636 $self->{map}->scroll ($dx, $dy); 677 $self->{map_widget}->scroll ($dx, $dy);
637} 678}
638 679
639sub feed_map1a { 680sub feed_map1a {
640 my ($self, $data) = @_; 681 my ($self, $data) = @_;
641 682
645 for my $tile (@$missing) { 686 for my $tile (@$missing) {
646 next if $self->{delay}{$tile}; 687 next if $self->{delay}{$tile};
647 688
648 $delay = 1; 689 $delay = 1;
649 690
650 if (my $tex = $::CONN->{texture}[$tile]) { 691 if (my $tex = $self->{texture}[$tile]) {
651 $tex->upload; 692 $tex->upload;
652 } else { 693 } else {
653 $self->{delay}{$tile} = 1; 694 $self->{delay}{$tile} = 1;
654 695
655 # we assume the face is in-flight and will eventually come 696 # we assume the face is in-flight and will eventually arrive
656 push @{$self->{tile_cb}{$tile}}, sub { 697 push @{$self->{tile_cb}{$tile}}, sub {
657 delete $self->{delay}{$tile}; 698 delete $self->{delay}{$tile};
658 $_[0]->upload; 699 $_[0]->upload;
659 }; 700 };
660 } 701 }
661 } 702 }
662 703
663 if ($delay) { 704 if ($delay) {
664 # delay the map drawing a tiny bit in the hope of getting the missing fetched 705 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
665 EV::once undef, 0, 0.03, sub { 706 EV::once undef, 0, 0.03, sub {
666 $self->{map_widget}->update 707 $self->{map_widget}->update
667 if $self->{map_widget}; 708 if $self->{map_widget};
668 }; 709 };
669 } else { 710 } else {
678} 719}
679 720
680sub flush_map { 721sub flush_map {
681 my ($self) = @_; 722 my ($self) = @_;
682 723
683 my $map_info = delete $self->{map_info} 724 return unless $self->{map_info};
684 or return;
685 725
726 for my $map_info (values %{ $self->{map_cache} || {} }) {
686 my ($hash, $x, $y, $w, $h) = @$map_info; 727 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
687 728
688 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 729 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
689 $self->{map_cache_new}{$hash} = \$data; 730
731 if ($data ne $$rdata) {
732 $map_info->[1] = \$data;
733 my $cdata = Compress::LZF::compress $data;
690 DC::DB::put $self->{mapcache} => $hash => $data, sub { }; 734 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
735 }
736 }
691} 737}
692 738
693sub map_clear { 739sub map_clear {
694 my ($self) = @_; 740 my ($self) = @_;
695 741
696 $self->flush_map; 742 $self->flush_map;
743 delete $self->{map_info};
697 delete $self->{neigh_map}; 744 delete $self->{neigh_map};
698 745
699 $self->{map}->clear; 746 $self->{map}->clear;
700 delete $self->{map_widget}{magicmap}; 747 delete $self->{map_widget}{magicmap};
701} 748}
722 769
723 $self->bg_fetch; 770 $self->bg_fetch;
724 }; 771 };
725} 772}
726 773
727sub load_map($$$) { 774sub load_map($$$$$$) {
728 my ($self, $hash, $x, $y) = @_; 775 my ($self, $hash, $x, $y, $w, $h) = @_;
729 776
730 my $gen = $self->{map_change_gen}; 777 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
731 778
732 my $cb = sub { 779 my $cb = sub {
733 return unless $gen == $self->{map_change_gen}; 780 $map_info->[1] = \$_[0];
734 781
735 my ($data) = @_;
736
737 if (defined $data) {
738 $self->{map_cache_new}{$hash} = \$data;
739
740 my $data = Compress::LZF::decompress $data;
741
742 my $inprogress = @{ $self->{bg_fetch} || [] }; 782 my $inprogress = @{ $self->{bg_fetch} || [] };
743 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 783 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
744 $self->bg_fetch unless $inprogress; 784 $self->bg_fetch unless $inprogress;
745 }
746 }; 785 };
747 786
748 if (my $rdata = $self->{map_cache_old}{$hash}) { 787 if (my $map_info = $self->{map_cache_old}{$hash}) {
749 $cb->($$rdata); 788 $cb->(${ $map_info->[1] });
750 } else { 789 } else {
790 my $gen = $self->{map_change_gen};
791
751 DC::DB::get $self->{mapcache} => $hash, $cb; 792 DC::DB::get $self->{mapcache} => $hash, sub {
793 return unless $gen == $self->{map_change_gen};
794 return unless defined $_[0];
795 $cb->(Compress::LZF::decompress $_[0]);
796 };
752 } 797 }
753} 798}
754 799
755# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 800# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
756# (server resource,s latency, bandwidth), so this hack is warranted. 801# (server resources, latency, bandwidth), so this hack is warranted.
757# the right fix is to make real tiled maps with an overview file 802# the right fix is to make real tiled maps with an overview file
758sub send_mapinfo { 803sub send_mapinfo {
759 my ($self, $data, $cb) = @_; 804 my ($self, $data, $cb) = @_;
760 805
761 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 806 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
786} 831}
787 832
788# this method does a "flood fill" into every tile direction 833# this method does a "flood fill" into every tile direction
789# it assumes that tiles are arranged in a rectangular grid, 834# it assumes that tiles are arranged in a rectangular grid,
790# i.e. a map is the same as the left of the right map etc. 835# i.e. a map is the same as the left of the right map etc.
791# failure to comply are harmless and result in display errors 836# failure to comply is harmless and results in display errors
792# at worst. 837# at worst.
793sub flood_fill { 838sub flood_fill {
794 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 839 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
795 840
796 # the server does not allow map paths > 6 841 # the server does not allow map paths > 6
832 return if $mode ne "spatial"; 877 return if $mode ne "spatial";
833 878
834 $x += $self->{map}->ox; 879 $x += $self->{map}->ox;
835 $y += $self->{map}->oy; 880 $y += $self->{map}->oy;
836 881
837 $self->load_map ($hash, $x, $y) 882 $self->load_map ($hash, $x, $y, $w, $h)
838 unless $self->{neigh_map}{$hash}[5]++;#d# 883 unless $self->{neigh_map}{$hash}[5]++;#d#
839 884
840 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 885 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
841 886
842 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 887 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
850 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 895 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
851 896
852 $self->flush_map; 897 $self->flush_map;
853 898
854 ++$self->{map_change_gen}; 899 ++$self->{map_change_gen};
855 $self->{map_cache_old} = delete $self->{map_cache_new}; 900 $self->{map_cache_old} = delete $self->{map_cache};
856 901
857 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 902 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
858 903
859 my $mapmapw = $self->{mapmap}->{w}; 904 my $mapmapw = $self->{mapmap}->{w};
860 my $mapmaph = $self->{mapmap}->{h}; 905 my $mapmaph = $self->{mapmap}->{h};
872 $self->{map_info} = [$hash, $x, $y, $w, $h]; 917 $self->{map_info} = [$hash, $x, $y, $w, $h];
873 918
874 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 919 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
875 $::STATWIDS->{map}->set_text ("Map: " . $map); 920 $::STATWIDS->{map}->set_text ("Map: " . $map);
876 921
877 $self->load_map ($hash, $x, $y); 922 $self->load_map ($hash, $x, $y, $w, $h);
878 $self->flood_fill (0, 0, 0, "", $hash, $flags); 923 $self->flood_fill (0, 0, 0, "", $hash, $flags);
879} 924}
880 925
881sub face_find { 926sub face_find {
882 my ($self, $facenum, $face, $cb) = @_; 927 my ($self, $facenum, $face, $cb) = @_;
968 my ($self, $num, $cb) = @_; 1013 my ($self, $num, $cb) = @_;
969 1014
970 push @{$self->{face_cb}{$num}}, $cb; 1015 push @{$self->{face_cb}{$num}}, $cb;
971 1016
972 defined wantarray 1017 defined wantarray
973 ? DC::guard { 1018 ? Guard::guard {
974 @{$self->{face_cb}{$num}} 1019 @{$self->{face_cb}{$num}}
975 = grep $_ != $cb, 1020 = grep $_ != $cb,
976 @{$self->{face_cb}{$num}}; 1021 @{$self->{face_cb}{$num}};
977 } 1022 }
978 : () 1023 : ()
1024 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1069 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
1025 1070
1026 # handle some elements 1071 # handle some elements
1027 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1072 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
1028 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1073 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1074
1075 s/\s+$//;
1029 1076
1030 $_ 1077 $_
1031} 1078}
1032 1079
1033our %NAME_TO_COLOR = ( 1080our %NAME_TO_COLOR = (
1080 1127
1081 ## try to create single paragraphs of multiple lines sent by the server 1128 ## try to create single paragraphs of multiple lines sent by the server
1082 # no longer neecssary with TRT servers 1129 # no longer neecssary with TRT servers
1083 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1130 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1084 1131
1085 for (split /\n/, $text) {
1086 ::message ({ 1132 ::message ({
1087 fg => $fg, 1133 fg => $fg,
1088 markup => $_, 1134 markup => $text,
1089 type => $type, 1135 type => $type,
1090 extra => [@extra], 1136 extra => [@extra],
1091 color_flags => $color, #d# ugly, kill 1137 color_flags => $color, #d# ugly, kill
1092 }); 1138 });
1093 1139
1094 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1140# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1095 # actually, this is an ugly design. _we_ should control the channels, 1141# # actually, this is an ugly design. _we_ should control the channels,
1096 # not some random other widget, as the channels are clearly protocol-specific. 1142# # not some random other widget, as the channels are clearly protocol-specific.
1097 # then we could also react to flags such as CLEAR without resorting to 1143# # then we could also react to flags such as CLEAR without resorting to
1098 # hacks such as color_flags, above. 1144# # hacks such as color_flags, above.
1099 }
1100 1145
1101 $self->{statusbox}->add ($text, 1146 $self->{statusbox}->add ($text,
1102 group => $text, 1147 group => $text,
1103 fg => $fg, 1148 fg => $fg,
1104 timeout => $color >= 2 ? 180 : 10, 1149 timeout => $color >= 2 ? 180 : 10,
1139 1184
1140 my %skill_help; 1185 my %skill_help;
1141 1186
1142 for my $node (DC::Pod::find skill_description => "*") { 1187 for my $node (DC::Pod::find skill_description => "*") {
1143 my (undef, @par) = DC::Pod::section_of $node; 1188 my (undef, @par) = DC::Pod::section_of $node;
1144 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; 1189 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1145 }; 1190 };
1146 1191
1147 for my $skill (values %{$self->{skill_info}}) { 1192 for my $skill (values %{$self->{skill_info}}) {
1148 $self->{map_widget}->add_command ("ready_skill $skill", 1193 $self->{map_widget}->add_command ("ready_skill $skill",
1149 (DC::asxml "Ready the skill '$skill'\n\n") 1194 (DC::asxml "Ready the skill '$skill'\n\n")
1169 $::FLOORBOX->clear; 1214 $::FLOORBOX->clear;
1170 1215
1171 my @add; 1216 my @add;
1172 1217
1173 my $row; 1218 my $row;
1174 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1219 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1220 next if $_->{tag} & 0x80000000;
1175 if ($row < 6) { 1221 if ($row < 6) {
1176 local $_->{face_widget}; # hack to force recreation of widget 1222 local $_->{face_widget}; # hack to force recreation of widget
1177 local $_->{desc_widget}; # hack to force recreation of widget 1223 local $_->{desc_widget}; # hack to force recreation of widget
1178 DC::Item::update_widgets $_; 1224 DC::Item::update_widgets $_;
1179 1225
1206sub set_opencont { 1252sub set_opencont {
1207 my ($conn, $tag, $name) = @_; 1253 my ($conn, $tag, $name) = @_;
1208 $conn->{open_container} = $tag; 1254 $conn->{open_container} = $tag;
1209 update_floorbox; 1255 update_floorbox;
1210 1256
1211 $::INVR_HB->clear (); 1257 $::INVR_HB->clear;
1212 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); 1258 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1213 1259
1214 if ($tag != 0) { # Floor isn't closable, is it? 1260 if ($tag != 0) { # Floor isn't closable, is it?
1215 $::INVR_HB->add (new DC::UI::Button 1261 $::INVR_HB->add (new DC::UI::Button
1216 text => "Close container", 1262 text => "Close container",
1217 tooltip => "Close the currently open container (if one is open)", 1263 tooltip => "Close the currently open container (if one is open)",
1272} 1318}
1273 1319
1274sub item_update { 1320sub item_update {
1275 my ($self, $item) = @_; 1321 my ($self, $item) = @_;
1276 1322
1277 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1323 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1278 1324
1279 DC::Item::update_widgets $item; 1325 DC::Item::update_widgets $item;
1280 1326
1281 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1327 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1282 set_opencont ($::CONN, 0, "Floor"); 1328 set_opencont ($::CONN, 0, "Floor");
1283 1329
1284 } elsif ($item->{flags} & F_OPEN) { 1330 } elsif ($item->{flags} & F_OPEN) {
1285 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); 1331 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1301 1347
1302 my $weight = .001 * $self->{player}{weight}; 1348 my $weight = .001 * $self->{player}{weight};
1303 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1349 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1304 1350
1305 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1351 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1306 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1352 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1307 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1353 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1308} 1354}
1309 1355
1310sub update_server_info { 1356sub update_server_info {
1311 my ($self) = @_; 1357 my ($self) = @_;
1319 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1365 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1320 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1366 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1321 . "editing support $yesno[!!$self->{editor_support}]\n" 1367 . "editing support $yesno[!!$self->{editor_support}]\n"
1322 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1368 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1323 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1369 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1324 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1370 . "client support $yesno[$self->{cfplus_ext} > 0]"
1325 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1371 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1326 . "map size $self->{mapw}×$self->{maph}\n" 1372 . "map size $self->{mapw}×$self->{maph}\n"
1327 ); 1373 );
1328 1374
1329} 1375}
1350 }); 1396 });
1351 1397
1352 $self->update_server_info; 1398 $self->update_server_info;
1353 1399
1354 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1400 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1355 $self->send_command ("pickup $::CFG->{pickup}"); 1401 $self->send_pickup ($::CFG->{pickup});
1402
1403 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1404 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1356} 1405}
1357 1406
1358sub lookat { 1407sub lookat {
1359 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1360 1409
1524} 1573}
1525 1574
1526sub send { 1575sub send {
1527 my ($self, $msg) = @_; 1576 my ($self, $msg) = @_;
1528 1577
1529 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1578 $self->{textview}->add_paragraph ({
1579 markup =>
1580 "\n<span foreground='#ffff00'><b>"
1581 . (DC::asxml $msg)
1582 . "</b></span>"
1583 });
1530 $self->{textview}->scroll_to_bottom; 1584 $self->{textview}->scroll_to_bottom;
1531 1585
1532 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1586 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1533} 1587}
1534 1588

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines