--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/12/27 18:35:56 1.184 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2008/12/20 19:45:50 1.207 @@ -14,6 +14,17 @@ use base 'Deliantra::Protocol::Base'; +our $TEX_DIALOGUE = new_from_resource DC::Texture + "dialogue.png", minify => 1, mipmap => 1; + +our $TEX_NOFACE = new_from_resource DC::Texture + "noface.png", minify => 1, mipmap => 1; + +our $TEX_HIDDEN = new_from_resource DC::Texture + "hidden.png", minify => 1, mipmap => 1; + +sub MIN_TEXTURE_UNUSED() { 1 }#d# + sub new { my ($class, %arg) = @_; @@ -29,8 +40,8 @@ $self->{map_widget}->clr_commands; my @cmd_help = map { - $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x - or die "unparseable command help: $_->{kw}[0]"; + $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x + or die "unparseable command help: $_->[DC::Pod::N_KW][0]"; my $cmd = $1; my @args = split /\|/, $2; @@ -45,7 +56,7 @@ map ["$cmd$_", $text], sort { (length $a) <=> (length $b) } @args - } sort { $a->{par} <=> $b->{par} } + } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] } DC::Pod::find command => "*"; $self->{json_coder} @@ -66,23 +77,47 @@ $_->destroy for values %{delete $ws->{w} || {}}; } + + delete $self->{items}; + $::INV->clear; + $::INVR->clear; + $::INVR_HB->clear; + $::FLOORBOX->clear; }); $self->{map_widget}->add_command (@$_) for @cmd_help; { - $self->{dialogue} = my $tex = new_from_file DC::Texture - DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1; + $self->{dialogue} = my $tex = $TEX_DIALOGUE; $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); } { - $self->{noface} = my $tex = new_from_file DC::Texture - DC::find_rcfile "noface.png", minify => 1, mipmap => 1; + $self->{noface} = my $tex = $TEX_NOFACE; $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); } + { + $self->{hidden} = my $tex = $TEX_HIDDEN; + $self->{map}->set_texture (3, @$tex{qw(name w h s t)}, @{$tex->{minified}}); + } + +# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id +# $self->{expire_w} = EV::timer 1, 1, sub { +# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1; +# +# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) { +# warn DC::SvREFCNT $self->{texture}[$_]; +# $self->{texture}[$_]->unload; +# warn "expire texture $_\n";#d# +# } +# +# ($self->{expire_count} += $count) < @{ $self->{texture} } +# or $self->{expire_count} = DC::DB::FIRST_TILE_ID; +# warn "count is $count\n";#d# +# }; + $self->{open_container} = 0; # per server @@ -196,46 +231,9 @@ # widgetset create template sub ext_ws_ct { - my ($self, $ws, $template, $cfg) = @_; + my ($self, $ws, $type, $template, $done_cb, $cfg) = @_; - $template = eval < { - s_id => "toplevel", - title => "Character Creation", - x => "center", - y => "center", - z => 5, - s_cl => [VBox => {s_cl => [ - Label => { - text => "Character Creation", - fontsize => 1, - align => 0, - }, - Label => { - markup => "View or Edit your character attributes below, then press Finish to create your character", - fontsize => 0.8, - align => 0, - }, - Notebook => { - s_cl => [ - Label => { - text => "hulla-hoop" - }, - Entry => { - s_id => "entry", - }, - ], - }, - Button => { - s_id => "finish", - title => "Finish", - }, - ]}], - }, -] -EOF - die if $@; + $done_cb ||= sub { }; my $parse_list; $parse_list = sub { my ($list) = @_; @@ -262,8 +260,21 @@ @w }; - $parse_list->($template); + # either array reference, or face # + if ($type eq "inline") { + $done_cb->(); + $parse_list->($template); + } elsif ($type eq "face") { + my $handler; $handler = $self->register_face_handler ($template, sub { + my ($face) = @_; + undef $handler; + $done_cb->(); + $parse_list->($self->{json_coder}->decode ($face->{data})); + }); + } else { + $done_cb->(0); + } } # widgetset associate @@ -301,6 +312,7 @@ floorbox => $::FLOORBOX, help_window => $::HELP_WINDOW, message_window => $::MESSAGE_WINDOW, + message_dist => $::MESSAGE_DIST, statusbox => $::SDTATUSBOX, inv => $::INV, @@ -359,7 +371,7 @@ sub ext_channel_info { my ($self, $info) = @_; $self->{channels}->{$info->{id}} = $info; - $::MESSAGE_WINDOW->add_channel ($info); + $::MESSAGE_DIST->add_channel ($info); } ############################################################################# @@ -551,17 +563,17 @@ my $sw = $self->{skillwid}{""} ||= [ 0, 0, (new DC::UI::Label text => "Experience", align => 1), 1, 0, (new DC::UI::Label text => "Lvl.", align => 1), - 2, 0, (new DC::UI::Label text => "Progress", align => 0), - 3, 0, (new DC::UI::Label text => "Skill", expand => 1), + 2, 0, (new DC::UI::Label text => "Progress"), + 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), 4, 0, (new DC::UI::Label text => "Experience", align => 1), 5, 0, (new DC::UI::Label text => "Lvl.", align => 1), - 6, 0, (new DC::UI::Label text => "Progress", align => 0), - 7, 0, (new DC::UI::Label text => "Skill", expand => 1), + 6, 0, (new DC::UI::Label text => "Progress"), + 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0), ]; my @add = @$sw; - my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options"; + my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use skill\nRight click - further options"; my @TOOLTIP_LVL = (tooltip => "Level. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); @@ -605,7 +617,7 @@ (new DC::UI::ExperienceProgress), # label - (new DC::UI::Label text => $name, on_button_down => $spell_cb, + (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0, can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), ]; @@ -657,7 +669,7 @@ sub map_scroll { my ($self, $dx, $dy) = @_; - $self->{map}->scroll ($dx, $dy); + $self->{map_widget}->scroll ($dx, $dy); } sub feed_map1a { @@ -671,12 +683,12 @@ $delay = 1; - if (my $tex = $::CONN->{texture}[$tile]) { + if (my $tex = $self->{texture}[$tile]) { $tex->upload; } else { $self->{delay}{$tile} = 1; - # we assume the face is in-flight and will eventually come + # we assume the face is in-flight and will eventually arrive push @{$self->{tile_cb}{$tile}}, sub { delete $self->{delay}{$tile}; $_[0]->upload; @@ -685,7 +697,7 @@ } if ($delay) { - # delay the map drawing a tiny bit in the hope of getting the missing fetched + # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched EV::once undef, 0, 0.03, sub { $self->{map_widget}->update if $self->{map_widget}; @@ -704,20 +716,26 @@ sub flush_map { my ($self) = @_; - my $map_info = delete $self->{map_info} - or return; + return unless $self->{map_info}; + + for my $map_info (values %{ $self->{map_cache} || {} }) { + my ($hash, $rdata, $x, $y, $w, $h) = @$map_info; - my ($hash, $x, $y, $w, $h) = @$map_info; + my $data = $self->{map}->get_rect ($x, $y, $w, $h); - my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); - $self->{map_cache_new}{$hash} = \$data; - DC::DB::put $self->{mapcache} => $hash => $data, sub { }; + if ($data ne $$rdata) { + $map_info->[1] = \$data; + my $cdata = Compress::LZF::compress $data; + DC::DB::put $self->{mapcache} => $hash => $cdata, sub { }; + } + } } sub map_clear { my ($self) = @_; $self->flush_map; + delete $self->{map_info}; delete $self->{neigh_map}; $self->{map}->clear; @@ -748,36 +766,34 @@ }; } -sub load_map($$$) { - my ($self, $hash, $x, $y) = @_; +sub load_map($$$$$$) { + my ($self, $hash, $x, $y, $w, $h) = @_; - my $gen = $self->{map_change_gen}; + my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h]; my $cb = sub { - return unless $gen == $self->{map_change_gen}; - - my ($data) = @_; - - if (defined $data) { - $self->{map_cache_new}{$hash} = \$data; - - my $data = Compress::LZF::decompress $data; + $map_info->[1] = \$_[0]; - my $inprogress = @{ $self->{bg_fetch} || [] }; - unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); - $self->bg_fetch unless $inprogress; - } + my $inprogress = @{ $self->{bg_fetch} || [] }; + unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]); + $self->bg_fetch unless $inprogress; }; - if (my $rdata = $self->{map_cache_old}{$hash}) { - $cb->($$rdata); + if (my $map_info = $self->{map_cache_old}{$hash}) { + $cb->(${ $map_info->[1] }); } else { - DC::DB::get $self->{mapcache} => $hash, $cb; + my $gen = $self->{map_change_gen}; + + DC::DB::get $self->{mapcache} => $hash, sub { + return unless $gen == $self->{map_change_gen}; + return unless defined $_[0]; + $cb->(Compress::LZF::decompress $_[0]); + }; } } # hardcode /world/world_xxx_xxx map names, the savings are enourmous, -# (server resource,s latency, bandwidth), so this hack is warranted. +# (server resources, latency, bandwidth), so this hack is warranted. # the right fix is to make real tiled maps with an overview file sub send_mapinfo { my ($self, $data, $cb) = @_; @@ -812,7 +828,7 @@ # this method does a "flood fill" into every tile direction # it assumes that tiles are arranged in a rectangular grid, # i.e. a map is the same as the left of the right map etc. -# failure to comply are harmless and result in display errors +# failure to comply is harmless and results in display errors # at worst. sub flood_fill { my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; @@ -858,7 +874,7 @@ $x += $self->{map}->ox; $y += $self->{map}->oy; - $self->load_map ($hash, $x, $y) + $self->load_map ($hash, $x, $y, $w, $h) unless $self->{neigh_map}{$hash}[5]++;#d# $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; @@ -876,7 +892,7 @@ $self->flush_map; ++$self->{map_change_gen}; - $self->{map_cache_old} = delete $self->{map_cache_new}; + $self->{map_cache_old} = delete $self->{map_cache}; my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); @@ -898,7 +914,7 @@ (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; $::STATWIDS->{map}->set_text ("Map: " . $map); - $self->load_map ($hash, $x, $y); + $self->load_map ($hash, $x, $y, $w, $h); $self->flood_fill (0, 0, 0, "", $hash, $flags); } @@ -1051,6 +1067,8 @@ s/(.*?)<\/fg>/$2<\/span>/gs; s/(.*?)<\/fg>/$2<\/span>/gs; + s/\s+$//; + $_ } @@ -1106,21 +1124,19 @@ # no longer neecssary with TRT servers #$text =~ s/(?<=\S)\n(?=\w)/ /g; - for (split /\n/, $text) { - ::message ({ - fg => $fg, - markup => $_, - type => $type, - extra => [@extra], - color_flags => $color, #d# ugly, kill - }); + ::message ({ + fg => $fg, + markup => $text, + type => $type, + extra => [@extra], + color_flags => $color, #d# ugly, kill + }); - $color &= ~NDI_CLEAR; # only clear once for multiline messages - # actually, this is an ugly design. _we_ should control the channels, - # not some random other widget, as the channels are clearly protocol-specific. - # then we could also react to flags such as CLEAR without resorting to - # hacks such as color_flags, above. - } +# $color &= ~NDI_CLEAR; # only clear once for multiline messages +# # actually, this is an ugly design. _we_ should control the channels, +# # not some random other widget, as the channels are clearly protocol-specific. +# # then we could also react to flags such as CLEAR without resorting to +# # hacks such as color_flags, above. $self->{statusbox}->add ($text, group => $text, @@ -1165,7 +1181,7 @@ for my $node (DC::Pod::find skill_description => "*") { my (undef, @par) = DC::Pod::section_of $node; - $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par; + $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par; }; for my $skill (values %{$self->{skill_info}}) { @@ -1195,7 +1211,8 @@ my @add; my $row; - for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { + for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { + next if $_->{tag} & 0x80000000; if ($row < 6) { local $_->{face_widget}; # hack to force recreation of widget local $_->{desc_widget}; # hack to force recreation of widget @@ -1232,8 +1249,8 @@ $conn->{open_container} = $tag; update_floorbox; - $::INVR_HB->clear (); - $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name); + $::INVR_HB->clear; + $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name); if ($tag != 0) { # Floor isn't closable, is it? $::INVR_HB->add (new DC::UI::Button @@ -1298,10 +1315,10 @@ sub item_update { my ($self, $item) = @_; - #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; + #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n"; DC::Item::update_widgets $item; - + if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { set_opencont ($::CONN, 0, "Floor"); @@ -1327,7 +1344,7 @@ my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); - $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); + $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit); $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); } @@ -1345,7 +1362,7 @@ . "editing support $yesno[!!$self->{editor_support}]\n" . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" - . "cfplus support $yesno[$self->{cfplus_ext} > 0]" + . "client support $yesno[$self->{cfplus_ext} > 0]" . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" . "map size $self->{mapw}×$self->{maph}\n" ); @@ -1377,6 +1394,9 @@ $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; $self->send_command ("pickup $::CFG->{pickup}"); + + $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]", + DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d# } sub lookat { @@ -1550,7 +1570,12 @@ sub send { my ($self, $msg) = @_; - $self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg }); + $self->{textview}->add_paragraph ({ + markup => + "\n" + . (DC::asxml $msg) + . "" + }); $self->{textview}->scroll_to_bottom; $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);