--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/29 18:22:34 1.139 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/17 21:18:01 1.155 @@ -23,7 +23,7 @@ setup_req => { extmap => 1, excmd => 1, - ywidget => 1,#d# + xwidget1 => 1,#d# %{$arg{setup_req} || {}}, }, ); @@ -50,22 +50,16 @@ } sort { $a->{par} <=> $b->{par} } CFPlus::Pod::find command => "*"; - $self->connect_ext (music => sub { - my ($ev) = @_; - - &::audio_music_set ($self->{songs} = $ev->{play}) - if $ev->{play}; + $self->connect_ext (ambient_music => sub { + my ($songs) = @_; + &::audio_music_set_ambient ($songs); }); $self->connect_ext (capabilities => sub { my (%cap) = @_; #$self->send ("setup sound 0"); # we use a different protocol - - $self->send_exti_msg (fx_want => { - 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC - 5 => !!$::CFG->{audio_enable}, # FT_SOUND - }); + $self->update_fx_want; if (my $ts = $cap{tileset}) { if (my ($default) = grep $_->[2] & 1, @$ts) { @@ -112,52 +106,83 @@ my ($ws, $id, $class, $args) = @_; for my $ev (grep /^on_/, keys %$args) { + my $rid = $args->{$ev}; $args->{$ev} = sub { my $id = shift->{s_id}; - $self->send_exti_msg (w_e => $id, $ev, \@_); + $self->send_exti_msg (w_e => $id, $rid, @_); 1 }; } - if (my $widget = eval { + $self->widget_associate ( + $ws, $id => scalar eval { local $SIG{__DIE__}; - "CFPlus::UI::$class"->new ( - %$args, - s_ws => $ws, - s_id => $id, - ) + "CFPlus::UI::$class"->new (%$args) } - ) { - $self->{widget}{$id} - = $self->{widgetset}{$ws}{w}{$id} - = $widget; + ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; + }); - $widget->connect (on_destroy => sub { - my ($widget) = @_; + # widgetset associate + $self->connect_ext (ws_a => sub { + my (%ass) = @_; + + # everything that has a name, wether conceivably useful or not + my %wkw = ( + root => $CFPlus::UI::ROOT, + tooltip => $CFPlus::UI::TOOLTIP, + + mapwidget => $::MAPWIDGET, + buttonbar => $::BUTTONBAR, + metaserver => $::METASERVER, + buttonbar => $::BUTTONBAR, + login_button => $::LOGIN_BUTTON, + quit_dialog => $::QUIT_DIALOG, + host_entry => $::HOST_ENTRY, + metaserver => $::METASERVER, + server_info => $::SERVER_INFO, + + setup_dialog => $::SETUP_DIALOG, + setup_notebook => $::SETUP_NOTEBOOK, + setup_server => $::SETUP_SERVER, + setup_keyboard => $::SETUP_KEYBOARD, + + pl_notebook => $::PL_NOTEBOOK, + pl_window => $::PL_WINDOW, + inventory_page => $::INVENTORY_PAGE, + stats_page => $::STATS_PAGE, + skill_page => $::SKILL_PAGE, + spell_page => $::SPELL_PAGE, + spell_list => $::SPELL_LIST, + + floorbox => $::FLOORBOX, + help_window => $::HELP_WINDOW, + message_window => $::MESSAGE_WINDOW, + statusbox => $::SDTATUSBOX, + + inv => $::INV, + invr => $::INVR, + invr_hb => $::INVR_HB, - delete $self->{widget}{$widget->{s_id}}; - delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; - }); - } else { - warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; - $self->send_exti_msg (w_e => $id, "destroy"); + ); + + while (my ($id, $name) = each %ass) { + $self->widget_associate (undef, $id => $wkw{$name}) + or warn "server failed to associate non-existent well-known widget $name\n"; } }); # widget call $self->connect_ext (w_c => sub { - my ($id, $rid, $method, $args) = @_; + my ($id, $rid, $method, @args) = @_; my $w = $self->{widget}{$id} or return; - $args ||= []; - if ($rid) { - $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); + $self->send_exti_msg (w_r => $rid, $w->$method (@args)); } else { - $w->$method (@$args); + $w->$method (@args); } }); @@ -227,26 +252,47 @@ $self } -sub logprint { - my ($self, @a) = @_; +sub widget_associate { + my ($self, $ws, $id, $widget) = @_; + + if ($widget) { + $widget->{s_id} = $id; + $self->{widget}{$id} = $widget; + + if ($ws) { + $widget->{s_ws} = $ws; + $self->{widgetset}{$ws}{w}{$id} = $widget; + } - $self->{log_fh} ||= do { - my $path = "$Crossfire::VARDIR/log.$self->{host}"; + $widget->connect (on_destroy => sub { + my ($widget) = @_; - open my $fh, ">>:utf8", $path - or die "Couldn't open logfile $path: $!"; + delete $self->{widget}{$widget->{s_id}}; + delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} + if exists $widget->{s_ws}; + }); - $fh->autoflush (1); + 1 + } else { + $self->send_exti_msg (w_e => $id, undef); - $fh; - }; + 0 + } +} - my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; +sub update_fx_want { + my ($self) = @_; - my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", - $year + 1900, $mon + 1, $mday, $hour, $min, $sec; + $self->send_exti_msg (fx_want => { + 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC + 5 => !!$::CFG->{audio_enable}, # FT_SOUND + }); +} - print {$self->{log_fh}} "$ts ", @a, "\n"; +sub logprint { + my ($self, @a) = @_; + + CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; } sub _stat_numdiff { @@ -521,8 +567,36 @@ sub feed_map1a { my ($self, $data) = @_; - $self->{map}->map1a_update ($data, $self->{setup}{extmap}); - $self->{map_widget}->update; + my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap}); + my $delay; + + for my $tile (@$missing) { + next if $self->{delay}{$tile}; + + $delay = 1; + + if (my $tex = $::CONN->{texture}[$tile]) { + $tex->upload; + } else { + $self->{delay}{$tile} = 1; + + # we assume the face is in-flight and will eventually come + push @{$self->{face_cb}{$tile}}, sub { + delete $self->{delay}{$tile}; + $_[0]->upload; + }; + } + } + + if ($delay) { + # delay the map drawing a tiny bit in the hope of getting the missing fetched + Event->timer (after => 0.03, cb => sub { + $_[0]->w->cancel; + $self->{map_widget}->update; + }); + } else { + $self->{map_widget}->update; + } } sub magicmap { @@ -539,9 +613,9 @@ my ($hash, $x, $y, $w, $h) = @$map_info; - my $data = $self->{map}->get_rect ($x, $y, $w, $h); - CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; - #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# + my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h); + $self->{map_cache_new}{$hash} = \$data; + CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { }; } sub map_clear { @@ -564,13 +638,15 @@ or return; } while $self->{texture}[$id]; - CFPlus::DB::get tilecache => $id, sub { - my ($data) = @_; + CFPlus::DB::exists tilecache => $id, sub { + my ($exists) = @_; return unless $self->{map}; # stop when destroyed - $self->set_texture ($id => $data) - if defined $data; + if ($exists) { + $self->have_tile ($id); + $self->{texture}[$id]->upload; + } $self->bg_fetch; }; @@ -581,20 +657,27 @@ my $gen = $self->{map_change_gen}; - CFPlus::DB::get $self->{mapcache} => $hash, sub { + my $cb = sub { return unless $gen == $self->{map_change_gen}; my ($data) = @_; if (defined $data) { - $data = Compress::LZF::decompress $data; - #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# + $self->{map_cache_new}{$hash} = \$data; + + my $data = Compress::LZF::decompress $data; my $inprogress = @{ $self->{bg_fetch} || [] }; unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); $self->bg_fetch unless $inprogress; } }; + + if (my $rdata = $self->{map_cache_old}{$hash}) { + $cb->($$rdata); + } else { + CFPlus::DB::get $self->{mapcache} => $hash, $cb; + } } # hardcode /world/world_xxx_xxx map names, the savings are enourmous, @@ -697,6 +780,7 @@ $self->flush_map; ++$self->{map_change_gen}; + $self->{map_cache_old} = delete $self->{map_cache_new}; my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); @@ -736,8 +820,7 @@ CFPlus::DB::get tilecache => $id, $cb; } elsif ($face->{type} & 1) { # with metadata - #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); - CFPlus::DB::get "res-metadata" => $face->{name}, $cb; + CFPlus::DB::get res_meta => $face->{name}, $cb; } } @@ -748,57 +831,37 @@ CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } if $changed; - $self->set_texture ($face->{id} => delete $face->{data}); + $self->have_tile ($face->{id}); } elsif ($face->{type} & 1) { # split metadata - my $cb = sub { }; - my $path; - - if ($face->{type} == 3) { # FT_MUSIC - # store externally - $path = CFPlus::DB::path_of_res $face->{name}; - - $cb = sub { - $self->{music_meta}{$facenum} = $face; - - ::message ({ markup => "downloaded song #$facenum" }) - if $changed; - - &::audio_music_set ($self->{songs}); - }; - } elsif ($face->{type} == 5) { # FT_SOUND - $cb = sub { - $self->{sound_meta}{$facenum} = $face; + if ($changed) { # new data + my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; + $face->{meta} = $self->{json_coder}->decode ($meta_json); - use Data::Dumper; warn Dumper $face;#d# - ::message ({ markup => "downloaded sound #$facenum" }) - if $changed; - }; + CFPlus::DB::put res_data => $face->{name} => $data, sub { }; + CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; + } else { + $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); } + ::add_license ($face); - if ($changed) { # new data - my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; + if ($face->{type} == 3) { # FT_MUSIC + $self->{music_meta}{$facenum} = $face; - my $put_cb = sub { - CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { - $face->{meta} = $self->{json_coder}->decode ($meta_json); - $face->{path} = $path; + ::message ({ markup => "downloaded song #$facenum" }) + if $changed; - $cb->(); - }; - }; + &::audio_music_push ($facenum); + } elsif ($face->{type} == 5) { # FT_SOUND + $self->{sound_meta}{$facenum} = $face; - if (defined $path) { - CFPlus::DB::write_file $path, $data, $put_cb; - } else { - CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb; - } - } else { - $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); - $face->{path} = $path; - $cb->(); + ::message ({ markup => "downloaded sound #$facenum" }) + if $changed; + + &::audio_sound_push ($facenum); } + } } @@ -808,19 +871,16 @@ $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); } -sub set_texture { - my ($self, $id, $data) = @_; +sub have_tile { + my ($self, $tile) = @_; return unless $self->{map}; - $self->{texture}[$id] = my $tex = - new_from_image CFPlus::Texture - $data, minify => 1, mipmap => 1; - - $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); - $self->{map_widget}->update; + my $tex = $self->{texture}[$tile] ||= + new CFPlus::Texture + tile => $tile, minify => 1, mipmap => 1, delay => 1; - $_->() for @{(delete $self->{face_cb}{$id}) || []}; + $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; } sub connect_face_update { @@ -836,10 +896,10 @@ } sub sound_play { - my ($self, $x, $y, $soundnum, $type) = @_; - warn "sound play <@_>\n";#d# + my ($self, $type, $face, $dx, $dy, $vol) = @_; - #$self->{sound_play}->($x, $y, $soundnum, $type); + &::audio_sound_play ($face, $dx, $dy, $vol) + unless $type & 1; # odd types are silent for future expansion } my $LAST_QUERY; # server is stupid, stupid, stupid @@ -914,14 +974,19 @@ $self->logprint ("msg: ", $text); return if $color < 0; # negative color == ignore if not understood - my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0]; + my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0]; ## try to create single paragraphs of multiple lines sent by the server # no longer neecssary with TRT servers #$text =~ s/(?<=\S)\n(?=\w)/ /g; - ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] }) - for split /\n/, $text; + ::message ({ + fg => $fg, + markup => $_, + type => $type, + extra => [@extra], + color_flags => $color + }) for split /\n/, $text; $self->{statusbox}->add ($text, group => $text, @@ -1025,7 +1090,7 @@ $::FLOORBOX->add_at (@add); }); - $::WANT_REFRESH++; + $::WANT_REFRESH->start; } sub set_opencont { @@ -1033,17 +1098,16 @@ $conn->{open_container} = $tag; update_floorbox; - $::INV_RIGHT_HB->clear (); - $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); + $::INVR_HB->clear (); + $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); if ($tag != 0) { # Floor isn't closable, is it? - $::INV_RIGHT_HB->add (new CFPlus::UI::Button + $::INVR_HB->add (new CFPlus::UI::Button text => "Close container", tooltip => "Close the currently open container (if one is open)", on_activate => sub { $::CONN->send ("apply $tag") # $::CONN->{open_container}") if $tag != 0; - #if $CONN->{open_container} != 0; 0 }, );