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.195 by root, Thu May 8 20:19:49 2008 UTC vs.
Revision 1.218 by root, Thu Apr 8 19:11:21 2010 UTC

1package DC::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict; 4
5use Guard ();
5 6
6use Deliantra::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use DC; 9use DC;
9use DC::DB; 10use DC::DB;
… …
11use DC::Pod; 12use DC::Pod;
12use DC::Macro; 13use DC::Macro;
13use DC::Item; 14use DC::Item;
14 15
15use base 'Deliantra::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
16 25
17sub new { 26sub new {
18 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
19 28
20 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
… …
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 73 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 74 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 75 $_->destroy
67 for values %{delete $ws->{w} || {}}; 76 for values %{delete $ws->{w} || {}};
68 } 77 }
78
79 delete $self->{items};
80 $::INV->clear;
81 $::INVR->clear;
82 $::INVR_HB->clear;
83 $::FLOORBOX->clear;
69 }); 84 });
70 85
71 $self->{map_widget}->add_command (@$_) 86 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 87 for @cmd_help;
73 88
74 { 89 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture 90 $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}}); 91 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 } 92 }
79 93
80 { 94 {
81 $self->{noface} = my $tex = new_from_file DC::Texture 95 $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}}); 96 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 } 97 }
98
99# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
100# $self->{expire_w} = EV::timer 1, 1, sub {
101# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
102#
103# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
104# warn DC::SvREFCNT $self->{texture}[$_];
105# $self->{texture}[$_]->unload;
106# warn "expire texture $_\n";#d#
107# }
108#
109# ($self->{expire_count} += $count) < @{ $self->{texture} }
110# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
111# warn "count is $count\n";#d#
112# };
85 113
86 $self->{open_container} = 0; 114 $self->{open_container} = 0;
87 115
88 # per server 116 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 117 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
… …
250 my %wkw = ( 278 my %wkw = (
251 root => $DC::UI::ROOT, 279 root => $DC::UI::ROOT,
252 tooltip => $DC::UI::TOOLTIP, 280 tooltip => $DC::UI::TOOLTIP,
253 281
254 mapwidget => $::MAPWIDGET, 282 mapwidget => $::MAPWIDGET,
283 menubar => $::MENUBAR,
284 menupopup => $::MENUPOPUP,
285 pickup_enable => $::PICKUP_ENABLE,
255 buttonbar => $::BUTTONBAR, 286 buttonbar => $::BUTTONBAR,
256 metaserver => $::METASERVER, 287 metaserver => $::METASERVER,
257 buttonbar => $::BUTTONBAR, 288 buttonbar => $::BUTTONBAR,
258 login_button => $::LOGIN_BUTTON, 289 login_button => $::LOGIN_BUTTON,
259 quit_dialog => $::QUIT_DIALOG, 290 quit_dialog => $::QUIT_DIALOG,
… …
276 307
277 floorbox => $::FLOORBOX, 308 floorbox => $::FLOORBOX,
278 help_window => $::HELP_WINDOW, 309 help_window => $::HELP_WINDOW,
279 message_window => $::MESSAGE_WINDOW, 310 message_window => $::MESSAGE_WINDOW,
280 message_dist => $::MESSAGE_DIST, 311 message_dist => $::MESSAGE_DIST,
281 statusbox => $::SDTATUSBOX, 312 statusbox => $::STATUSBOX,
282 313
283 inv => $::INV, 314 inv => $::INV,
284 invr => $::INVR, 315 invr => $::INVR,
285 invr_hb => $::INVR_HB, 316 invr_hb => $::INVR_HB,
286 ); 317 );
… …
370 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 401 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
371 : () 402 : ()
372 } 403 }
373 sort { $a <=> $b } keys %{$self->{spell_paths}}; 404 sort { $a <=> $b } keys %{$self->{spell_paths}};
374 405
375 join "", @diff 406 "\u$name: " . (join ", ", @diff)
376} 407}
377 408
378# all stats that are chacked against changes 409# all stats that are chacked against changes
379my @statchange = ( 410my @statchange = (
380 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 411 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
435 } 466 }
436 467
437 if ( 468 if (
438 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 469 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
439 ) { 470 ) {
440 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 471 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
441 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20); 472 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
442 } 473 }
443 474
444 $self->update_stats_window ($stats, $prev); 475 $self->update_stats_window ($stats, $prev);
445 476
… …
483 514
484 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 515 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
485 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 516 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
486 $::GAUGES->{food} ->set_value ($fo, $fo_m); 517 $::GAUGES->{food} ->set_value ($fo, $fo_m);
487 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 518 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
488 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 519 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
489 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 520 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
490 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); 521 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
491 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 522 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
492 my $title = $stats->{+CS_STAT_TITLE}; 523 my $title = $stats->{+CS_STAT_TITLE};
493 $title =~ s/^Player: //; 524 $title =~ s/^Player: //;
494 $::STATWIDS->{title} ->set_text ("Title: " . $title); 525 $::STATWIDS->{title} ->set_text ("Title: " . $title);
495 526
… …
507 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 538 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
508 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 539 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
509 540
510 $self->update_weight; 541 $self->update_weight;
511 542
512 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 543 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
513 for keys %RES_TBL; 544 for keys %RES_TBL;
514 545
515 my $sktbl = $::STATWIDS->{skill_tbl}; 546 my $sktbl = $::STATWIDS->{skill_tbl};
516 my @skills = keys %{ $self->{skill_info} }; 547 my @skills = keys %{ $self->{skill_info} };
517 548
… …
536 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 567 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
537 ]; 568 ];
538 569
539 my @add = @$sw; 570 my @add = @$sw;
540 571
541 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 572 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
542 573
543 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 574 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
544 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 575 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
545 576
546 my ($x, $y) = (0, 1); 577 my ($x, $y) = (0, 1);
… …
608 my $sw = $self->{skillwid}{$idx}; 639 my $sw = $self->{skillwid}{$idx};
609 $sw->[0]->set_text (::formsep ($val->[1])); 640 $sw->[0]->set_text (::formsep ($val->[1]));
610 $sw->[1]->set_text ($val->[0] * 1); 641 $sw->[1]->set_text ($val->[0] * 1);
611 $sw->[2]->set_value (@$val); 642 $sw->[2]->set_value (@$val);
612 643
613 $::GAUGES->{sklprg}->set_label ("$name %d%%"); 644 $::GAUGES->{skillexp}->set_label ("$name %d%%");
614 $::GAUGES->{sklprg}->set_value (@$val); 645 $::GAUGES->{skillexp}->set_value (@$val);
615 } 646 }
616} 647}
617 648
618sub user_send { 649sub user_send {
619 my ($self, $command) = @_; 650 my ($self, $command) = @_;
… …
632} 663}
633 664
634sub map_scroll { 665sub map_scroll {
635 my ($self, $dx, $dy) = @_; 666 my ($self, $dx, $dy) = @_;
636 667
637 $self->{map}->scroll ($dx, $dy); 668 $self->{map_widget}->scroll ($dx, $dy);
638} 669}
639 670
640sub feed_map1a { 671sub feed_map1a {
641 my ($self, $data) = @_; 672 my ($self, $data) = @_;
642 673
… …
646 for my $tile (@$missing) { 677 for my $tile (@$missing) {
647 next if $self->{delay}{$tile}; 678 next if $self->{delay}{$tile};
648 679
649 $delay = 1; 680 $delay = 1;
650 681
651 if (my $tex = $::CONN->{texture}[$tile]) { 682 if (my $tex = $self->{texture}[$tile]) {
652 $tex->upload; 683 $tex->upload;
653 } else { 684 } else {
654 $self->{delay}{$tile} = 1; 685 $self->{delay}{$tile} = 1;
655 686
656 # we assume the face is in-flight and will eventually come 687 # we assume the face is in-flight and will eventually arrive
657 push @{$self->{tile_cb}{$tile}}, sub { 688 push @{$self->{tile_cb}{$tile}}, sub {
658 delete $self->{delay}{$tile}; 689 delete $self->{delay}{$tile};
659 $_[0]->upload; 690 $_[0]->upload;
660 }; 691 };
661 } 692 }
662 } 693 }
663 694
664 if ($delay) { 695 if ($delay) {
665 # delay the map drawing a tiny bit in the hope of getting the missing fetched 696 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
666 EV::once undef, 0, 0.03, sub { 697 EV::once undef, 0, 0.03, sub {
667 $self->{map_widget}->update 698 $self->{map_widget}->update
668 if $self->{map_widget}; 699 if $self->{map_widget};
669 }; 700 };
670 } else { 701 } else {
… …
679} 710}
680 711
681sub flush_map { 712sub flush_map {
682 my ($self) = @_; 713 my ($self) = @_;
683 714
684 my $map_info = delete $self->{map_info} 715 return unless $self->{map_info};
685 or return;
686 716
717 for my $map_info (values %{ $self->{map_cache} || {} }) {
687 my ($hash, $x, $y, $w, $h) = @$map_info; 718 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
688 719
689 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 720 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
690 $self->{map_cache_new}{$hash} = \$data; 721
722 if ($data ne $$rdata) {
723 $map_info->[1] = \$data;
724 my $cdata = Compress::LZF::compress $data;
691 DC::DB::put $self->{mapcache} => $hash => $data, sub { }; 725 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
726 }
727 }
692} 728}
693 729
694sub map_clear { 730sub map_clear {
695 my ($self) = @_; 731 my ($self) = @_;
696 732
697 $self->flush_map; 733 $self->flush_map;
734 delete $self->{map_info};
698 delete $self->{neigh_map}; 735 delete $self->{neigh_map};
699 736
700 $self->{map}->clear; 737 $self->{map}->clear;
701 delete $self->{map_widget}{magicmap}; 738 delete $self->{map_widget}{magicmap};
702} 739}
… …
723 760
724 $self->bg_fetch; 761 $self->bg_fetch;
725 }; 762 };
726} 763}
727 764
728sub load_map($$$) { 765sub load_map($$$$$$) {
729 my ($self, $hash, $x, $y) = @_; 766 my ($self, $hash, $x, $y, $w, $h) = @_;
730 767
731 my $gen = $self->{map_change_gen}; 768 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
732 769
733 my $cb = sub { 770 my $cb = sub {
734 return unless $gen == $self->{map_change_gen}; 771 $map_info->[1] = \$_[0];
735 772
736 my ($data) = @_;
737
738 if (defined $data) {
739 $self->{map_cache_new}{$hash} = \$data;
740
741 my $data = Compress::LZF::decompress $data;
742
743 my $inprogress = @{ $self->{bg_fetch} || [] }; 773 my $inprogress = @{ $self->{bg_fetch} || [] };
744 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 774 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
745 $self->bg_fetch unless $inprogress; 775 $self->bg_fetch unless $inprogress;
746 }
747 }; 776 };
748 777
749 if (my $rdata = $self->{map_cache_old}{$hash}) { 778 if (my $map_info = $self->{map_cache_old}{$hash}) {
750 $cb->($$rdata); 779 $cb->(${ $map_info->[1] });
751 } else { 780 } else {
781 my $gen = $self->{map_change_gen};
782
752 DC::DB::get $self->{mapcache} => $hash, $cb; 783 DC::DB::get $self->{mapcache} => $hash, sub {
784 return unless $gen == $self->{map_change_gen};
785 return unless defined $_[0];
786 $cb->(Compress::LZF::decompress $_[0]);
787 };
753 } 788 }
754} 789}
755 790
756# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 791# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
757# (server resource,s latency, bandwidth), so this hack is warranted. 792# (server resources, latency, bandwidth), so this hack is warranted.
758# the right fix is to make real tiled maps with an overview file 793# the right fix is to make real tiled maps with an overview file
759sub send_mapinfo { 794sub send_mapinfo {
760 my ($self, $data, $cb) = @_; 795 my ($self, $data, $cb) = @_;
761 796
762 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 797 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
787} 822}
788 823
789# this method does a "flood fill" into every tile direction 824# this method does a "flood fill" into every tile direction
790# it assumes that tiles are arranged in a rectangular grid, 825# it assumes that tiles are arranged in a rectangular grid,
791# i.e. a map is the same as the left of the right map etc. 826# i.e. a map is the same as the left of the right map etc.
792# failure to comply are harmless and result in display errors 827# failure to comply is harmless and results in display errors
793# at worst. 828# at worst.
794sub flood_fill { 829sub flood_fill {
795 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 830 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
796 831
797 # the server does not allow map paths > 6 832 # the server does not allow map paths > 6
… …
833 return if $mode ne "spatial"; 868 return if $mode ne "spatial";
834 869
835 $x += $self->{map}->ox; 870 $x += $self->{map}->ox;
836 $y += $self->{map}->oy; 871 $y += $self->{map}->oy;
837 872
838 $self->load_map ($hash, $x, $y) 873 $self->load_map ($hash, $x, $y, $w, $h)
839 unless $self->{neigh_map}{$hash}[5]++;#d# 874 unless $self->{neigh_map}{$hash}[5]++;#d#
840 875
841 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 876 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
842 877
843 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 878 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
851 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 886 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
852 887
853 $self->flush_map; 888 $self->flush_map;
854 889
855 ++$self->{map_change_gen}; 890 ++$self->{map_change_gen};
856 $self->{map_cache_old} = delete $self->{map_cache_new}; 891 $self->{map_cache_old} = delete $self->{map_cache};
857 892
858 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 893 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
859 894
860 my $mapmapw = $self->{mapmap}->{w}; 895 my $mapmapw = $self->{mapmap}->{w};
861 my $mapmaph = $self->{mapmap}->{h}; 896 my $mapmaph = $self->{mapmap}->{h};
… …
873 $self->{map_info} = [$hash, $x, $y, $w, $h]; 908 $self->{map_info} = [$hash, $x, $y, $w, $h];
874 909
875 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 910 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
876 $::STATWIDS->{map}->set_text ("Map: " . $map); 911 $::STATWIDS->{map}->set_text ("Map: " . $map);
877 912
878 $self->load_map ($hash, $x, $y); 913 $self->load_map ($hash, $x, $y, $w, $h);
879 $self->flood_fill (0, 0, 0, "", $hash, $flags); 914 $self->flood_fill (0, 0, 0, "", $hash, $flags);
880} 915}
881 916
882sub face_find { 917sub face_find {
883 my ($self, $facenum, $face, $cb) = @_; 918 my ($self, $facenum, $face, $cb) = @_;
… …
954 989
955 my $tex = $self->{texture}[$tile] ||= 990 my $tex = $self->{texture}[$tile] ||=
956 new DC::Texture 991 new DC::Texture
957 tile => $tile, 992 tile => $tile,
958 image => $data, delete_image => 1, 993 image => $data, delete_image => 1,
959 minify => 1, mipmap => 1; 994 minify => 1;
960 995
961 if (my $cbs = delete $self->{tile_cb}{$tile}) { 996 if (my $cbs = delete $self->{tile_cb}{$tile}) {
962 $_->($tex) for @$cbs; 997 $_->($tex) for @$cbs;
963 } 998 }
964} 999}
… …
969 my ($self, $num, $cb) = @_; 1004 my ($self, $num, $cb) = @_;
970 1005
971 push @{$self->{face_cb}{$num}}, $cb; 1006 push @{$self->{face_cb}{$num}}, $cb;
972 1007
973 defined wantarray 1008 defined wantarray
974 ? DC::guard { 1009 ? Guard::guard {
975 @{$self->{face_cb}{$num}} 1010 @{$self->{face_cb}{$num}}
976 = grep $_ != $cb, 1011 = grep $_ != $cb,
977 @{$self->{face_cb}{$num}}; 1012 @{$self->{face_cb}{$num}};
978 } 1013 }
979 : () 1014 : ()
… …
1083 1118
1084 ## try to create single paragraphs of multiple lines sent by the server 1119 ## try to create single paragraphs of multiple lines sent by the server
1085 # no longer neecssary with TRT servers 1120 # no longer neecssary with TRT servers
1086 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1121 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1087 1122
1088 for (split /\n/, $text) {
1089 ::message ({ 1123 ::message ({
1090 fg => $fg, 1124 fg => $fg,
1091 markup => $_, 1125 markup => $text,
1092 type => $type, 1126 type => $type,
1093 extra => [@extra], 1127 extra => [@extra],
1094 color_flags => $color, #d# ugly, kill 1128 color_flags => $color, #d# ugly, kill
1095 }); 1129 });
1096 1130
1097 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1131# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1098 # actually, this is an ugly design. _we_ should control the channels, 1132# # actually, this is an ugly design. _we_ should control the channels,
1099 # not some random other widget, as the channels are clearly protocol-specific. 1133# # not some random other widget, as the channels are clearly protocol-specific.
1100 # then we could also react to flags such as CLEAR without resorting to 1134# # then we could also react to flags such as CLEAR without resorting to
1101 # hacks such as color_flags, above. 1135# # hacks such as color_flags, above.
1102 }
1103 1136
1104 $self->{statusbox}->add ($text, 1137 $self->{statusbox}->add ($text,
1105 group => $text, 1138 group => $text,
1106 fg => $fg, 1139 fg => $fg,
1107 timeout => $color >= 2 ? 180 : 10, 1140 timeout => $color >= 2 ? 180 : 10,
… …
1210sub set_opencont { 1243sub set_opencont {
1211 my ($conn, $tag, $name) = @_; 1244 my ($conn, $tag, $name) = @_;
1212 $conn->{open_container} = $tag; 1245 $conn->{open_container} = $tag;
1213 update_floorbox; 1246 update_floorbox;
1214 1247
1215 $::INVR_HB->clear (); 1248 $::INVR_HB->clear;
1216 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); 1249 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1217 1250
1218 if ($tag != 0) { # Floor isn't closable, is it? 1251 if ($tag != 0) { # Floor isn't closable, is it?
1219 $::INVR_HB->add (new DC::UI::Button 1252 $::INVR_HB->add (new DC::UI::Button
1220 text => "Close container", 1253 text => "Close container",
… …
1314sub update_server_info { 1347sub update_server_info {
1315 my ($self) = @_; 1348 my ($self) = @_;
1316 1349
1317 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1350 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1318 1351
1352 my $version = JSON::XS->new->encode ($self->{s_version});
1353
1319 $::SERVER_INFO->set_markup ( 1354 $::SERVER_INFO->set_markup (
1320 "server <tt>$self->{host}:$self->{port}</tt>\n" 1355 "server <tt>$self->{host}:$self->{port}</tt>\n"
1321 . "protocol version <tt>$self->{version}</tt>\n" 1356 . "protocol version <tt>$version</tt>\n"
1322 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1357 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1323 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1358 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1324 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1359 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1325 . "editing support $yesno[!!$self->{editor_support}]\n" 1360 . "editing support $yesno[!!$self->{editor_support}]\n"
1326 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1361 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
… …
1354 }); 1389 });
1355 1390
1356 $self->update_server_info; 1391 $self->update_server_info;
1357 1392
1358 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1393 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1359 $self->send_command ("pickup $::CFG->{pickup}"); 1394 $self->send_pickup ($::CFG->{pickup});
1360} 1395}
1361 1396
1362sub lookat { 1397sub lookat {
1363 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1364 1399
… …
1528} 1563}
1529 1564
1530sub send { 1565sub send {
1531 my ($self, $msg) = @_; 1566 my ($self, $msg) = @_;
1532 1567
1533 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1568 $self->{textview}->add_paragraph ({
1569 markup =>
1570 "\n<span foreground='#ffff00'><b>"
1571 . (DC::asxml $msg)
1572 . "</b></span>"
1573 });
1534 $self->{textview}->scroll_to_bottom; 1574 $self->{textview}->scroll_to_bottom;
1535 1575
1536 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1576 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1537} 1577}
1538 1578

Diff Legend

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