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.183 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

… …
12use DC::Macro; 12use DC::Macro;
13use DC::Item; 13use DC::Item;
14 14
15use base 'Deliantra::Protocol::Base'; 15use base 'Deliantra::Protocol::Base';
16 16
17our $TEX_DIALOGUE = new_from_resource DC::Texture
18 "dialogue.png", minify => 1, mipmap => 1;
19
20our $TEX_NOFACE = new_from_resource DC::Texture
21 "noface.png", minify => 1, mipmap => 1;
22
23our $TEX_HIDDEN = new_from_resource DC::Texture
24 "hidden.png", minify => 1, mipmap => 1;
25
26sub MIN_TEXTURE_UNUSED() { 1 }#d#
27
17sub new { 28sub new {
18 my ($class, %arg) = @_; 29 my ($class, %arg) = @_;
19 30
20 my $self = $class->SUPER::new (%arg, 31 my $self = $class->SUPER::new (%arg,
21 setup_req => { 32 setup_req => {
22 extmap => 1, 33 extmap => 1,
23 excmd => 1, 34 excmd => 1,
24 widget => 1, 35 widget => 2,
25 %{$arg{setup_req} || {}}, 36 %{$arg{setup_req} || {}},
26 }, 37 },
27 ); 38 );
28 39
29 $self->{map_widget}->clr_commands; 40 $self->{map_widget}->clr_commands;
30 41
31 my @cmd_help = map { 42 my @cmd_help = map {
32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 43 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33 or die "unparseable command help: $_->{kw}[0]"; 44 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34 45
35 my $cmd = $1; 46 my $cmd = $1;
36 my @args = split /\|/, $2; 47 my @args = split /\|/, $2;
37 @args = (".*") unless @args; 48 @args = (".*") unless @args;
38 49
… …
43 for @args; 54 for @args;
44 55
45 map ["$cmd$_", $text], 56 map ["$cmd$_", $text],
46 sort { (length $a) <=> (length $b) } 57 sort { (length $a) <=> (length $b) }
47 @args 58 @args
48 } sort { $a->{par} <=> $b->{par} } 59 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49 DC::Pod::find command => "*"; 60 DC::Pod::find command => "*";
50 61
51 $self->{json_coder} 62 $self->{json_coder}
52 ->convert_blessed 63 ->convert_blessed
53 ->filter_json_single_key_object ("\fw" => sub { 64 ->filter_json_single_key_object ("\fw" => sub {
… …
64 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 75 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
65 for my $ws (values %{delete $self->{widgetset} || {}}) { 76 for my $ws (values %{delete $self->{widgetset} || {}}) {
66 $_->destroy 77 $_->destroy
67 for values %{delete $ws->{w} || {}}; 78 for values %{delete $ws->{w} || {}};
68 } 79 }
80
81 delete $self->{items};
82 $::INV->clear;
83 $::INVR->clear;
84 $::INVR_HB->clear;
85 $::FLOORBOX->clear;
69 }); 86 });
70 87
71 $self->{map_widget}->add_command (@$_) 88 $self->{map_widget}->add_command (@$_)
72 for @cmd_help; 89 for @cmd_help;
73 90
74 { 91 {
75 $self->{dialogue} = my $tex = new_from_file DC::Texture 92 $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}}); 93 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
78 } 94 }
79 95
80 { 96 {
81 $self->{noface} = my $tex = new_from_file DC::Texture 97 $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}}); 98 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
84 } 99 }
100
101 {
102 $self->{hidden} = my $tex = $TEX_HIDDEN;
103 $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}});
104 }
105
106# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
107# $self->{expire_w} = EV::timer 1, 1, sub {
108# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
109#
110# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
111# warn DC::SvREFCNT $self->{texture}[$_];
112# $self->{texture}[$_]->unload;
113# warn "expire texture $_\n";#d#
114# }
115#
116# ($self->{expire_count} += $count) < @{ $self->{texture} }
117# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
118# warn "count is $count\n";#d#
119# };
85 120
86 $self->{open_container} = 0; 121 $self->{open_container} = 0;
87 122
88 # per server 123 # per server
89 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 124 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
… …
102} 137}
103 138
104sub ext_capabilities { 139sub ext_capabilities {
105 my ($self, %cap) = @_; 140 my ($self, %cap) = @_;
106 141
107 #$self->send ("setup sound 0"); # we use a different protocol
108 $self->update_fx_want; 142 $self->update_fx_want;
109 143
110 $self->send_exti_req (resource => "exp_table", sub { 144 $self->send_exti_req (resource => "exp_table", sub {
111 my ($exp_table) = @_; 145 my ($exp_table) = @_;
112 146
… …
191 $ws, $id => scalar eval { 225 $ws, $id => scalar eval {
192 local $SIG{__DIE__}; 226 local $SIG{__DIE__};
193 "DC::UI::$class"->new (%$args) 227 "DC::UI::$class"->new (%$args)
194 } 228 }
195 ); 229 );
230}
231
232# widgetset create template
233sub ext_ws_ct {
234 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
235
236 $done_cb ||= sub { };
237
238 my $parse_list; $parse_list = sub {
239 my ($list) = @_;
240 my @w;
241
242 while (@$list) {
243 my ($class, $args) = splice @$list, 0, 2;
244 my $name = delete $args->{s_id};
245 my $cl = delete $args->{s_cl};
246 my $cfg = delete $cfg->{$name};
247 my $id = delete $cfg->{id};
248 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
249 or next;
250
251 $self->widget_associate ($ws, $id, $w)
252 if $id;
253
254 $w->add ($parse_list->($cl))
255 if $cl;
256
257 push @w, $w;
258 }
259
260 @w
261 };
262
263 # either array reference, or face #
264 if ($type eq "inline") {
265 $done_cb->();
266 $parse_list->($template);
267 } elsif ($type eq "face") {
268 my $handler; $handler = $self->register_face_handler ($template, sub {
269 my ($face) = @_;
270
271 undef $handler;
272 $done_cb->();
273 $parse_list->($self->{json_coder}->decode ($face->{data}));
274 });
275 } else {
276 $done_cb->(0);
277 }
196} 278}
197 279
198# widgetset associate 280# widgetset associate
199sub ext_ws_a { 281sub ext_ws_a {
200 my ($self, %ass) = @_; 282 my ($self, %ass) = @_;
… …
228 spell_list => $::SPELL_LIST, 310 spell_list => $::SPELL_LIST,
229 311
230 floorbox => $::FLOORBOX, 312 floorbox => $::FLOORBOX,
231 help_window => $::HELP_WINDOW, 313 help_window => $::HELP_WINDOW,
232 message_window => $::MESSAGE_WINDOW, 314 message_window => $::MESSAGE_WINDOW,
315 message_dist => $::MESSAGE_DIST,
233 statusbox => $::SDTATUSBOX, 316 statusbox => $::SDTATUSBOX,
234 317
235 inv => $::INV, 318 inv => $::INV,
236 invr => $::INVR, 319 invr => $::INVR,
237 invr_hb => $::INVR_HB, 320 invr_hb => $::INVR_HB,
… …
286 369
287# message window 370# message window
288sub ext_channel_info { 371sub ext_channel_info {
289 my ($self, $info) = @_; 372 my ($self, $info) = @_;
290 $self->{channels}->{$info->{id}} = $info; 373 $self->{channels}->{$info->{id}} = $info;
291 $::MESSAGE_WINDOW->add_channel ($info); 374 $::MESSAGE_DIST->add_channel ($info);
292} 375}
293 376
294############################################################################# 377#############################################################################
295 378
296sub logprint { 379sub logprint {
… …
478 $sktbl->clear; 561 $sktbl->clear;
479 562
480 my $sw = $self->{skillwid}{""} ||= [ 563 my $sw = $self->{skillwid}{""} ||= [
481 0, 0, (new DC::UI::Label text => "Experience", align => 1), 564 0, 0, (new DC::UI::Label text => "Experience", align => 1),
482 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), 565 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
483 2, 0, (new DC::UI::Label text => "Progress", align => 0), 566 2, 0, (new DC::UI::Label text => "Progress"),
484 3, 0, (new DC::UI::Label text => "Skill", expand => 1), 567 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
485 4, 0, (new DC::UI::Label text => "Experience", align => 1), 568 4, 0, (new DC::UI::Label text => "Experience", align => 1),
486 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), 569 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
487 6, 0, (new DC::UI::Label text => "Progress", align => 0), 570 6, 0, (new DC::UI::Label text => "Progress"),
488 7, 0, (new DC::UI::Label text => "Skill", expand => 1), 571 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
489 ]; 572 ];
490 573
491 my @add = @$sw; 574 my @add = @$sw;
492 575
493 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 576 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
494 577
495 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 578 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
496 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 579 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
497 580
498 my ($x, $y) = (0, 1); 581 my ($x, $y) = (0, 1);
… …
532 615
533 # progress 616 # progress
534 (new DC::UI::ExperienceProgress), 617 (new DC::UI::ExperienceProgress),
535 618
536 # label 619 # label
537 (new DC::UI::Label text => $name, on_button_down => $spell_cb, 620 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
538 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 621 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
539 ]; 622 ];
540 623
541 push @add, 624 push @add,
542 $x * 4 + 0, $y, $sw->[0], 625 $x * 4 + 0, $y, $sw->[0],
… …
584} 667}
585 668
586sub map_scroll { 669sub map_scroll {
587 my ($self, $dx, $dy) = @_; 670 my ($self, $dx, $dy) = @_;
588 671
589 $self->{map}->scroll ($dx, $dy); 672 $self->{map_widget}->scroll ($dx, $dy);
590} 673}
591 674
592sub feed_map1a { 675sub feed_map1a {
593 my ($self, $data) = @_; 676 my ($self, $data) = @_;
594 677
… …
598 for my $tile (@$missing) { 681 for my $tile (@$missing) {
599 next if $self->{delay}{$tile}; 682 next if $self->{delay}{$tile};
600 683
601 $delay = 1; 684 $delay = 1;
602 685
603 if (my $tex = $::CONN->{texture}[$tile]) { 686 if (my $tex = $self->{texture}[$tile]) {
604 $tex->upload; 687 $tex->upload;
605 } else { 688 } else {
606 $self->{delay}{$tile} = 1; 689 $self->{delay}{$tile} = 1;
607 690
608 # we assume the face is in-flight and will eventually come 691 # we assume the face is in-flight and will eventually arrive
609 push @{$self->{tile_cb}{$tile}}, sub { 692 push @{$self->{tile_cb}{$tile}}, sub {
610 delete $self->{delay}{$tile}; 693 delete $self->{delay}{$tile};
611 $_[0]->upload; 694 $_[0]->upload;
612 }; 695 };
613 } 696 }
614 } 697 }
615 698
616 if ($delay) { 699 if ($delay) {
617 # delay the map drawing a tiny bit in the hope of getting the missing fetched 700 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
618 EV::once undef, 0, 0.03, sub { 701 EV::once undef, 0, 0.03, sub {
619 $self->{map_widget}->update 702 $self->{map_widget}->update
620 if $self->{map_widget}; 703 if $self->{map_widget};
621 }; 704 };
622 } else { 705 } else {
… …
631} 714}
632 715
633sub flush_map { 716sub flush_map {
634 my ($self) = @_; 717 my ($self) = @_;
635 718
636 my $map_info = delete $self->{map_info} 719 return unless $self->{map_info};
637 or return;
638 720
721 for my $map_info (values %{ $self->{map_cache} || {} }) {
639 my ($hash, $x, $y, $w, $h) = @$map_info; 722 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
640 723
641 my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); 724 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
642 $self->{map_cache_new}{$hash} = \$data; 725
726 if ($data ne $$rdata) {
727 $map_info->[1] = \$data;
728 my $cdata = Compress::LZF::compress $data;
643 DC::DB::put $self->{mapcache} => $hash => $data, sub { }; 729 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
730 }
731 }
644} 732}
645 733
646sub map_clear { 734sub map_clear {
647 my ($self) = @_; 735 my ($self) = @_;
648 736
649 $self->flush_map; 737 $self->flush_map;
738 delete $self->{map_info};
650 delete $self->{neigh_map}; 739 delete $self->{neigh_map};
651 740
652 $self->{map}->clear; 741 $self->{map}->clear;
653 delete $self->{map_widget}{magicmap}; 742 delete $self->{map_widget}{magicmap};
654} 743}
… …
675 764
676 $self->bg_fetch; 765 $self->bg_fetch;
677 }; 766 };
678} 767}
679 768
680sub load_map($$$) { 769sub load_map($$$$$$) {
681 my ($self, $hash, $x, $y) = @_; 770 my ($self, $hash, $x, $y, $w, $h) = @_;
682 771
683 my $gen = $self->{map_change_gen}; 772 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
684 773
685 my $cb = sub { 774 my $cb = sub {
686 return unless $gen == $self->{map_change_gen}; 775 $map_info->[1] = \$_[0];
687 776
688 my ($data) = @_;
689
690 if (defined $data) {
691 $self->{map_cache_new}{$hash} = \$data;
692
693 my $data = Compress::LZF::decompress $data;
694
695 my $inprogress = @{ $self->{bg_fetch} || [] }; 777 my $inprogress = @{ $self->{bg_fetch} || [] };
696 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 778 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
697 $self->bg_fetch unless $inprogress; 779 $self->bg_fetch unless $inprogress;
698 }
699 }; 780 };
700 781
701 if (my $rdata = $self->{map_cache_old}{$hash}) { 782 if (my $map_info = $self->{map_cache_old}{$hash}) {
702 $cb->($$rdata); 783 $cb->(${ $map_info->[1] });
703 } else { 784 } else {
785 my $gen = $self->{map_change_gen};
786
704 DC::DB::get $self->{mapcache} => $hash, $cb; 787 DC::DB::get $self->{mapcache} => $hash, sub {
788 return unless $gen == $self->{map_change_gen};
789 return unless defined $_[0];
790 $cb->(Compress::LZF::decompress $_[0]);
791 };
705 } 792 }
706} 793}
707 794
708# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 795# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
709# (server resource,s latency, bandwidth), so this hack is warranted. 796# (server resources, latency, bandwidth), so this hack is warranted.
710# the right fix is to make real tiled maps with an overview file 797# the right fix is to make real tiled maps with an overview file
711sub send_mapinfo { 798sub send_mapinfo {
712 my ($self, $data, $cb) = @_; 799 my ($self, $data, $cb) = @_;
713 800
714 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 801 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
739} 826}
740 827
741# this method does a "flood fill" into every tile direction 828# this method does a "flood fill" into every tile direction
742# it assumes that tiles are arranged in a rectangular grid, 829# it assumes that tiles are arranged in a rectangular grid,
743# i.e. a map is the same as the left of the right map etc. 830# i.e. a map is the same as the left of the right map etc.
744# failure to comply are harmless and result in display errors 831# failure to comply is harmless and results in display errors
745# at worst. 832# at worst.
746sub flood_fill { 833sub flood_fill {
747 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 834 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
748 835
749 # the server does not allow map paths > 6 836 # the server does not allow map paths > 6
… …
785 return if $mode ne "spatial"; 872 return if $mode ne "spatial";
786 873
787 $x += $self->{map}->ox; 874 $x += $self->{map}->ox;
788 $y += $self->{map}->oy; 875 $y += $self->{map}->oy;
789 876
790 $self->load_map ($hash, $x, $y) 877 $self->load_map ($hash, $x, $y, $w, $h)
791 unless $self->{neigh_map}{$hash}[5]++;#d# 878 unless $self->{neigh_map}{$hash}[5]++;#d#
792 879
793 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 880 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
794 881
795 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 882 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
803 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 890 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
804 891
805 $self->flush_map; 892 $self->flush_map;
806 893
807 ++$self->{map_change_gen}; 894 ++$self->{map_change_gen};
808 $self->{map_cache_old} = delete $self->{map_cache_new}; 895 $self->{map_cache_old} = delete $self->{map_cache};
809 896
810 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 897 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
811 898
812 my $mapmapw = $self->{mapmap}->{w}; 899 my $mapmapw = $self->{mapmap}->{w};
813 my $mapmaph = $self->{mapmap}->{h}; 900 my $mapmaph = $self->{mapmap}->{h};
… …
825 $self->{map_info} = [$hash, $x, $y, $w, $h]; 912 $self->{map_info} = [$hash, $x, $y, $w, $h];
826 913
827 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 914 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
828 $::STATWIDS->{map}->set_text ("Map: " . $map); 915 $::STATWIDS->{map}->set_text ("Map: " . $map);
829 916
830 $self->load_map ($hash, $x, $y); 917 $self->load_map ($hash, $x, $y, $w, $h);
831 $self->flood_fill (0, 0, 0, "", $hash, $flags); 918 $self->flood_fill (0, 0, 0, "", $hash, $flags);
832} 919}
833 920
834sub face_find { 921sub face_find {
835 my ($self, $facenum, $face, $cb) = @_; 922 my ($self, $facenum, $face, $cb) = @_;
… …
977 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1064 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
978 1065
979 # handle some elements 1066 # handle some elements
980 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1067 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
981 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1068 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1069
1070 s/\s+$//;
982 1071
983 $_ 1072 $_
984} 1073}
985 1074
986our %NAME_TO_COLOR = ( 1075our %NAME_TO_COLOR = (
… …
1033 1122
1034 ## try to create single paragraphs of multiple lines sent by the server 1123 ## try to create single paragraphs of multiple lines sent by the server
1035 # no longer neecssary with TRT servers 1124 # no longer neecssary with TRT servers
1036 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1125 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
1037 1126
1038 for (split /\n/, $text) {
1039 ::message ({ 1127 ::message ({
1040 fg => $fg, 1128 fg => $fg,
1041 markup => $_, 1129 markup => $text,
1042 type => $type, 1130 type => $type,
1043 extra => [@extra], 1131 extra => [@extra],
1044 color_flags => $color, #d# ugly, kill 1132 color_flags => $color, #d# ugly, kill
1045 }); 1133 });
1046 1134
1047 $color &= ~NDI_CLEAR; # only clear once for multiline messages 1135# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1048 # actually, this is an ugly design. _we_ should control the channels, 1136# # actually, this is an ugly design. _we_ should control the channels,
1049 # not some random other widget, as the channels are clearly protocol-specific. 1137# # not some random other widget, as the channels are clearly protocol-specific.
1050 # then we could also react to flags such as CLEAR without resorting to 1138# # then we could also react to flags such as CLEAR without resorting to
1051 # hacks such as color_flags, above. 1139# # hacks such as color_flags, above.
1052 }
1053 1140
1054 $self->{statusbox}->add ($text, 1141 $self->{statusbox}->add ($text,
1055 group => $text, 1142 group => $text,
1056 fg => $fg, 1143 fg => $fg,
1057 timeout => $color >= 2 ? 180 : 10, 1144 timeout => $color >= 2 ? 180 : 10,
… …
1092 1179
1093 my %skill_help; 1180 my %skill_help;
1094 1181
1095 for my $node (DC::Pod::find skill_description => "*") { 1182 for my $node (DC::Pod::find skill_description => "*") {
1096 my (undef, @par) = DC::Pod::section_of $node; 1183 my (undef, @par) = DC::Pod::section_of $node;
1097 $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; 1184 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
1098 }; 1185 };
1099 1186
1100 for my $skill (values %{$self->{skill_info}}) { 1187 for my $skill (values %{$self->{skill_info}}) {
1101 $self->{map_widget}->add_command ("ready_skill $skill", 1188 $self->{map_widget}->add_command ("ready_skill $skill",
1102 (DC::asxml "Ready the skill '$skill'\n\n") 1189 (DC::asxml "Ready the skill '$skill'\n\n")
… …
1122 $::FLOORBOX->clear; 1209 $::FLOORBOX->clear;
1123 1210
1124 my @add; 1211 my @add;
1125 1212
1126 my $row; 1213 my $row;
1127 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1214 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1215 next if $_->{tag} & 0x80000000;
1128 if ($row < 6) { 1216 if ($row < 6) {
1129 local $_->{face_widget}; # hack to force recreation of widget 1217 local $_->{face_widget}; # hack to force recreation of widget
1130 local $_->{desc_widget}; # hack to force recreation of widget 1218 local $_->{desc_widget}; # hack to force recreation of widget
1131 DC::Item::update_widgets $_; 1219 DC::Item::update_widgets $_;
1132 1220
… …
1159sub set_opencont { 1247sub set_opencont {
1160 my ($conn, $tag, $name) = @_; 1248 my ($conn, $tag, $name) = @_;
1161 $conn->{open_container} = $tag; 1249 $conn->{open_container} = $tag;
1162 update_floorbox; 1250 update_floorbox;
1163 1251
1164 $::INVR_HB->clear (); 1252 $::INVR_HB->clear;
1165 $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); 1253 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1166 1254
1167 if ($tag != 0) { # Floor isn't closable, is it? 1255 if ($tag != 0) { # Floor isn't closable, is it?
1168 $::INVR_HB->add (new DC::UI::Button 1256 $::INVR_HB->add (new DC::UI::Button
1169 text => "Close container", 1257 text => "Close container",
1170 tooltip => "Close the currently open container (if one is open)", 1258 tooltip => "Close the currently open container (if one is open)",
… …
1225} 1313}
1226 1314
1227sub item_update { 1315sub item_update {
1228 my ($self, $item) = @_; 1316 my ($self, $item) = @_;
1229 1317
1230 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1318 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1231 1319
1232 DC::Item::update_widgets $item; 1320 DC::Item::update_widgets $item;
1233 1321
1234 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1322 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1235 set_opencont ($::CONN, 0, "Floor"); 1323 set_opencont ($::CONN, 0, "Floor");
1236 1324
1237 } elsif ($item->{flags} & F_OPEN) { 1325 } elsif ($item->{flags} & F_OPEN) {
1238 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item); 1326 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
… …
1254 1342
1255 my $weight = .001 * $self->{player}{weight}; 1343 my $weight = .001 * $self->{player}{weight};
1256 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1344 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1257 1345
1258 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1346 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1259 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1347 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1260 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1348 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1261} 1349}
1262 1350
1263sub update_server_info { 1351sub update_server_info {
1264 my ($self) = @_; 1352 my ($self) = @_;
… …
1272 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1360 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1273 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1361 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1274 . "editing support $yesno[!!$self->{editor_support}]\n" 1362 . "editing support $yesno[!!$self->{editor_support}]\n"
1275 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1363 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1276 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1364 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1277 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1365 . "client support $yesno[$self->{cfplus_ext} > 0]"
1278 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1366 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1279 . "map size $self->{mapw}×$self->{maph}\n" 1367 . "map size $self->{mapw}×$self->{maph}\n"
1280 ); 1368 );
1281 1369
1282} 1370}
… …
1304 1392
1305 $self->update_server_info; 1393 $self->update_server_info;
1306 1394
1307 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1395 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1308 $self->send_command ("pickup $::CFG->{pickup}"); 1396 $self->send_command ("pickup $::CFG->{pickup}");
1397
1398 $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
1399 DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
1309} 1400}
1310 1401
1311sub lookat { 1402sub lookat {
1312 my ($self, $x, $y) = @_; 1403 my ($self, $x, $y) = @_;
1313 1404
… …
1477} 1568}
1478 1569
1479sub send { 1570sub send {
1480 my ($self, $msg) = @_; 1571 my ($self, $msg) = @_;
1481 1572
1482 $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); 1573 $self->{textview}->add_paragraph ({
1574 markup =>
1575 "\n<span foreground='#ffff00'><b>"
1576 . (DC::asxml $msg)
1577 . "</b></span>"
1578 });
1483 $self->{textview}->scroll_to_bottom; 1579 $self->{textview}->scroll_to_bottom;
1484 1580
1485 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg); 1581 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1486} 1582}
1487 1583

Diff Legend

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