--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/23 23:37:57 1.129 +++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/21 02:39:17 1.157 @@ -23,7 +23,7 @@ setup_req => { extmap => 1, excmd => 1, - ywidget => 1, + xwidget1 => 1,#d# %{$arg{setup_req} || {}}, }, ); @@ -50,62 +50,29 @@ } sort { $a->{par} <=> $b->{par} } CFPlus::Pod::find command => "*"; - $self->connect_ext (music => sub { - my (%ev) = @_; + $self->connect_ext (ambient_music => sub { + my ($songs) = @_; + &::audio_music_set_ambient ($songs); + }); - return unless $::CFG->{bgm_enable}; + $self->connect_ext (capabilities => sub { + my (%cap) = @_; - my $faces = $ev{faces}; - my @songs; + #$self->send ("setup sound 0"); # we use a different protocol + $self->update_fx_want; - # request music from server if appropriate - if (my $faces = $ev{faces}) { - for (@$faces) { - my ($face, $pri, $chksum) = @$_; - utf8::downgrade $chksum; - - $chksum = unpack "H*", $chksum; - $self->{music_map}{$face} = $chksum; - - # check if already cached - CFPlus::DB::get "res-metadata" => $chksum, sub { - my ($meta_json) = @_; - my $path = CFPlus::DB::path_of_res $chksum; - - if (defined $meta_json) { - my $meta = $self->{json_coder}->decode ($meta_json); - $meta->{path} = $path; - $self->{music_meta}{$chksum} = $meta; - &::audio_music_set ($self->{songs}); - } else { - ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); - $self->ask_face ($face, -100 - $pri, undef, sub { - my $len = length $_[1]; - my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; - - CFPlus::DB::write_file $path, $data, sub { - CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { - my $meta = $self->{json_coder}->decode ($meta_json); - $meta->{path} = $path; - $self->{music_meta}{$chksum} = $meta; - - ::message ({ markup => "downloaded song #$face, size $len octets" }); - &::audio_music_set ($self->{songs}); - }; - }; - }); - } - } - } - } + $self->send_exti_req (resource => "exp_table", sub { + my ($exp_table) = @_; - if (my $play = $ev{play}) { - &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]); - } - }); + $self->register_face_handler ($exp_table, sub { + my ($face) = @_; - $self->connect_ext (capabilities => sub { - my (%cap) = @_; + $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data}); + $_->() for values %{ $self->{on_exp_update} || {} }; + }); + + () + }); if (my $ts = $cap{tileset}) { if (my ($default) = grep $_->[2] & 1, @$ts) { @@ -123,7 +90,7 @@ $self->{json_coder} ->convert_blessed - ->filter_json_single_key_object (__widget_ref__ => sub { + ->filter_json_single_key_object (__w_ => sub { $self->{widget}{$_[0]} }); @@ -152,52 +119,82 @@ 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); } }); @@ -229,6 +226,13 @@ $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]); }); + # message window + $self->connect_ext (channel_info => sub { + my ($info) = @_; + $self->{channels}->{$info->{id}} = $info; + $::MESSAGE_WINDOW->add_channel ($info); + }); + # destroy widgets on logout $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { for my $ws (values %{delete $self->{widgetset} || {}}) { @@ -260,26 +264,48 @@ $self } -sub logprint { - my ($self, @a) = @_; +sub widget_associate { + my ($self, $ws, $id, $widget) = @_; - $self->{log_fh} ||= do { - my $path = "$Crossfire::VARDIR/log.$self->{host}"; + if ($widget) { + $widget->{s_id} = $id; + $self->{widget}{$id} = $widget; + + if ($ws) { + $widget->{s_ws} = $ws; + $self->{widgetset}{$ws}{w}{$id} = $widget; + } - open my $fh, ">>:utf8", $path - or die "Couldn't open logfile $path: $!"; + $widget->connect (on_destroy => sub { + my ($widget) = @_; - $fh->autoflush (1); + delete $self->{widget}{$widget->{s_id}}; + delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}} + if exists $widget->{s_ws}; + }); - $fh; - }; + 1 + } else { + $self->send_exti_msg (w_e => $id, undef); - my ($sec, $min, $hour, $mday, $mon, $year) = localtime time; + 0 + } +} - my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d", - $year + 1900, $mon + 1, $mday, $hour, $min, $sec; +sub update_fx_want { + my ($self) = @_; - print {$self->{log_fh}} "$ts ", @a, "\n"; + $self->send_exti_msg (fx_want => { + 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC + 5 => !!$::CFG->{audio_enable}, # FT_SOUND + 6 => 1, # FT_RSRC + }); +} + +sub logprint { + my ($self, @a) = @_; + + CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { }; } sub _stat_numdiff { @@ -422,6 +448,7 @@ $::GAUGES->{grace} ->set_value ($gr, $gr_m); $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); + $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64}); $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); my $title = $stats->{+CS_STAT_TITLE}; $title =~ s/^Player: //; @@ -457,10 +484,12 @@ push @add, 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), - 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), - 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), - 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), - 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), + 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0), + 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), + 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1), + 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), + 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0), + 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), ; my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options"; @@ -500,11 +529,12 @@ }; push @add, - $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label + $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), - $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label + $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), - $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, + $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress), + $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), ; @@ -517,6 +547,7 @@ for (grep exists $stats->{$_}, @skills) { $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); + $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}}); } } @@ -554,8 +585,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->{tile_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 { @@ -572,9 +631,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 { @@ -590,20 +649,22 @@ sub bg_fetch { my ($self) = @_; - my $id; + my $tile; do { - $id = pop @{$self->{bg_fetch}} + $tile = pop @{$self->{bg_fetch}} or return; - } while $self->{texture}[$id]; + } while $self->{texture}[$tile]; - CFPlus::DB::get tilecache => $id, sub { + CFPlus::DB::get tilecache => $tile, sub { my ($data) = @_; return unless $self->{map}; # stop when destroyed - $self->set_texture ($id => $data) - if defined $data; + if (defined $data) { + $self->have_tile ($tile, $data); + $self->{texture}[$tile]->upload; + } $self->bg_fetch; }; @@ -614,20 +675,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, @@ -730,6 +798,7 @@ $self->flush_map; ++$self->{map_change_gen}; + $self->{map_cache_old} = delete $self->{map_cache_new}; my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); @@ -758,25 +827,67 @@ sub face_find { my ($self, $facenum, $face, $cb) = @_; - my $hash = "$face->{chksum},$face->{name}"; + if ($face->{type} == 0) { # FT_FACE + my $id = CFPlus::DB::get_tile_id_sync $face->{name}; - my $id = CFPlus::DB::get_tile_id_sync $hash; + $face->{id} = $id; + $self->{map}->set_tileid ($facenum => $id); - $face->{id} = $id; - $self->{faceid}[$facenum] = $id; + CFPlus::DB::get tilecache => $id, $cb; - $self->{map}->set_tileid ($facenum => $id); + } elsif ($face->{type} & 1) { # with metadata + CFPlus::DB::get res_meta => $face->{name}, $cb; - CFPlus::DB::get tilecache => $id, $cb; + } else { # no metadata + CFPlus::DB::get res_data => $face->{name}, $cb; + } } sub face_update { my ($self, $facenum, $face, $changed) = @_; - CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } - if $changed; + if ($face->{type} == 0) { + # image, FT_FACE + CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } + if $changed; + + $self->have_tile ($face->{id}, delete $face->{data}); + + } elsif ($face->{type} & 1) { + # split metadata case, FT_MUSIC, FT_SOUND + if ($changed) { # new data + my ($meta, $data) = unpack "(w/a*)*", $face->{data}; + $face->{data} = $meta; + + CFPlus::DB::put res_data => $face->{name} => $data, sub { }; + CFPlus::DB::put res_meta => $face->{name} => $meta, sub { }; + } - $self->set_texture ($face->{id} => delete $face->{image}); + $face->{data} = $self->{json_coder}->decode ($face->{data}); + + ::add_license ($face); + + if ($face->{type} == 3) { # FT_MUSIC + ::message ({ markup => "downloaded song #$facenum" }) + if $changed; + + &::audio_music_push ($facenum); + } elsif ($face->{type} == 5) { # FT_SOUND + ::message ({ markup => "downloaded sound #$facenum" }) + if $changed; + + &::audio_sound_push ($facenum); + } + + } else { + # flat resource case, FT_RSRC + CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { } + if $changed; + } + + if (my $cbs = $self->{face_cb}{$facenum}) { + $_->($face, $changed) for @$cbs; + } } sub smooth_update { @@ -785,37 +896,58 @@ $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); } -sub set_texture { - my ($self, $id, $data) = @_; +sub have_tile { + my ($self, $tile, $data) = @_; 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, + image => $data, delete_image => 1, + minify => 1, mipmap => 1; - $_->() for @{(delete $self->{face_cb}{$id}) || []}; + if (my $cbs = delete $self->{tile_cb}{$tile}) { + $_->($tex) for @$cbs; + } } -sub connect_face_update { - my ($self, $id, $cb) = @_; - - push @{$self->{face_cb}{$id}}, $cb; +# call in non-void context registers a temporary +# hook with handle, otherwise its permanent +sub on_face_change { + my ($self, $num, $cb) = @_; + + push @{$self->{face_cb}{$num}}, $cb; + + defined wantarray + ? CFPlus::guard { + @{$self->{face_cb}{$num}} + = grep $_ != $cb, + @{$self->{face_cb}{$num}}; + } + : () +} + +# call in non-void context registers a temporary +# hook with handle, otherwise its permanent +sub register_face_handler { + my ($self, $num, $cb) = @_; + + return unless $num; + + # invoke if available right now + $cb->($self->{face}[$num], 0) + unless exists $self->{face}[$num]{loading}; - CFPlus::guard { - @{$self->{face_cb}{$id}} - = grep $_ != $cb, - @{$self->{face_cb}{$id}}; - } + # future changes + $self->on_face_change ($num => $cb) } sub sound_play { - my ($self, $x, $y, $soundnum, $type) = @_; + 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 @@ -890,14 +1022,19 @@ $self->logprint ("msg: ", $text); return if $color < 0; # negative color == ignore if not understood - my $fg = $CF_COLOR[$color % @CF_COLOR]; + 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 => $_ }) - 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, @@ -963,40 +1100,6 @@ ::stop_game (); } -sub image_info { - my ($self, $numfaces) = @_; - - $self->{num_faces} = $numfaces; - $self->{face_prefetch} = [1 .. $numfaces]; - $self->face_prefetch; -} - -sub face_prefetch { - my ($self) = @_; - - return unless $::CFG->{face_prefetch}; - - if ($self->{num_faces}) { - return if @{ $self->{send_queue} || [] }; - my $todo = @{ $self->{face_prefetch} } - or return; - - my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); - - $self->send ("requestinfo image_sums $face $face"); - - $self->{statusbox}->add (CFPlus::asxml "prefetching $todo", - group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); - } elsif (!exists $self->{num_faces}) { - $self->send ("requestinfo image_info"); - - $self->{num_faces} = 0; - - $self->{statusbox}->add (CFPlus::asxml "starting to prefetch", - group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); - } -} - sub update_floorbox { $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { return unless $::CONN; @@ -1035,7 +1138,7 @@ $::FLOORBOX->add_at (@add); }); - $::WANT_REFRESH++; + $::WANT_REFRESH->start; } sub set_opencont { @@ -1043,17 +1146,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 }, ); @@ -1162,7 +1264,6 @@ . "map size $self->{mapw}×$self->{maph}\n" ); - ::setup_build_button ($self->{editor_support}->{builder_ui}); } sub logged_in { @@ -1194,14 +1295,6 @@ $self->send_command ("pickup $::CFG->{pickup}"); } -sub buildat { - my ($self, $builditem, $x, $y) = @_; - - if ($self->{cfplus_ext}) { - $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem)); - } -} - sub lookat { my ($self, $x, $y) = @_;