--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/21 15:04:27 1.125
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/29 21:31:47 1.141
@@ -23,7 +23,7 @@
setup_req => {
extmap => 1,
excmd => 1,
- ywidget => 1,
+ ywidget => 1,#d#
%{$arg{setup_req} || {}},
},
);
@@ -50,64 +50,24 @@
} sort { $a->{par} <=> $b->{par} }
CFPlus::Pod::find command => "*";
- $self->connect_ext (event_music => sub {
+ $self->connect_ext (music => sub {
my ($ev) = @_;
- return unless $::CFG->{bgm_enable};
-
- my $faces = $ev->{faces};
- my @songs;
+ &::audio_music_set ($self->{songs} = $ev->{play})
+ if $ev->{play};
+ });
- # 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->connect_ext (capabilities => sub {
+ my (%cap) = @_;
- if (my $play = $ev->{play}) {
- &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
- }
- });
+ #$self->send ("setup sound 0"); # we use a different protocol
- $self->connect_ext (event_capabilities => sub {
- my ($cap) = @_;
+ $self->send_exti_msg (fx_want => {
+ 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
+ 5 => !!$::CFG->{audio_enable}, # FT_SOUND
+ });
- if (my $ts = $cap->{tileset}) {
+ if (my $ts = $cap{tileset}) {
if (my ($default) = grep $_->[2] & 1, @$ts) {
$self->{tileset} = $default;
$self->{tilesize} = $default->[3];
@@ -123,40 +83,38 @@
$self->{json_coder}
->convert_blessed
- ->filter_json_single_key_object (__widget_ref__ => sub {
+ ->filter_json_single_key_object (__w_ => sub {
$self->{widget}{$_[0]}
});
# widgetset new
$self->connect_ext (ws_n => sub {
- my ($arg) = @_;
+ my ($id) = @_;
- $self->{widgetset}{$arg{id}} = {
+ $self->{widgetset}{$id} = {
w => {},
};
});
# widgetset destroy
$self->connect_ext (ws_d => sub {
- my ($arg) = @_;
+ my ($id) = @_;
- my $ws = delete $self->{widgetset}{$arg{id}}
+ my $ws = delete $self->{widgetset}{$id}
or return;
$_->destroy
for values %{$ws->{w}};
});
- # widgetset destroy
+ # widgetset create
$self->connect_ext (ws_c => sub {
- my ($arg) = @_;
-
- my $args = $arg->{args} || {};
+ my ($ws, $id, $class, $args) = @_;
for my $ev (grep /^on_/, keys %$args) {
$args->{$ev} = sub {
my $id = shift->{s_id};
- $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
+ $self->send_exti_msg (w_e => $id, $ev, \@_);
1
};
@@ -164,15 +122,15 @@
if (my $widget = eval {
local $SIG{__DIE__};
- "CFPlus::UI::$arg->{class}"->new (
+ "CFPlus::UI::$class"->new (
%$args,
- s_ws => $arg->{ws},
- s_id => $arg->{id},
+ s_ws => $ws,
+ s_id => $id,
)
}
) {
- $self->{widget}{$arg->{id}}
- = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
+ $self->{widget}{$id}
+ = $self->{widgetset}{$ws}{w}{$id}
= $widget;
$widget->connect (on_destroy => sub {
@@ -182,47 +140,60 @@
delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
});
} else {
- warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
- $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
+ warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
+ $self->send_exti_msg (w_e => $id, "destroy");
}
});
# widget call
$self->connect_ext (w_c => sub {
- my ($arg) = @_;
+ my ($id, $rid, $method, $args) = @_;
- my $w = $self->{widget}{$arg->{id}}
+ my $w = $self->{widget}{$id}
or return;
- my $m = $arg->{name};
- my $a = $arg->{args} || [];
+ $args ||= [];
- if (exists $arg->{rid}) {
- $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
+ if ($rid) {
+ $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
} else {
- $w->$m (@$a);
+ $w->$method (@$args);
}
});
# widget set
$self->connect_ext (w_s => sub {
- my ($arg) = @_;
+ my ($id, $attr) = @_;
- my $w = $self->{widget}{$arg->{id}}
+ my $w = $self->{widget}{$id}
or return;
- $w->{$_->[0]} = $_->[1]
- for @{ $arg->{attr} };
+ for (my $i = 0; $i < $#$attr; $i += 2) {
+ my ($member, $value) = @$attr[$i, $i+1];
+ if (defined $value) {
+ $w->{$member} = $value;
+ } else {
+ delete $w->{$member};
+ }
+ $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
+ }
});
# widget get
$self->connect_ext (w_g => sub {
- my ($arg) = @_;
+ my ($id, $rid, $attr) = @_;
- my $w = $self->{widget}{$arg->{id}}
+ my $w = $self->{widget}{$id}
or return;
- $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);
+ $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
@@ -754,25 +725,68 @@
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->{faceid}[$facenum] = $id;
- $face->{id} = $id;
- $self->{faceid}[$facenum] = $id;
+ $self->{map}->set_tileid ($facenum => $id);
- $self->{map}->set_tileid ($facenum => $id);
+ CFPlus::DB::get tilecache => $id, $cb;
- 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_meta => $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) { # FT_FACE
+ CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
+ if $changed;
+
+ $self->set_texture ($face->{id} => delete $face->{data});
+
+ } elsif ($face->{type} & 1) { # split metadata
+ my $cb = sub { };
+
+ if ($face->{type} == 3) { # FT_MUSIC
+ $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;
+
+ ::message ({ markup => "downloaded sound #$facenum" })
+ if $changed;
- $self->set_texture ($face->{id} => delete $face->{image});
+ &::audio_sound_push ($facenum);
+ };
+ }
+
+ if ($changed) { # new data
+ my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
+
+ CFPlus::DB::put res_data => $face->{name} => $data, sub { };
+ CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
+ $face->{meta} = $self->{json_coder}->decode ($meta_json);
+ $cb->();
+ };
+
+ } else {
+ $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+ $cb->();
+ }
+ }
}
sub smooth_update {
@@ -809,9 +823,10 @@
}
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
@@ -886,13 +901,13 @@
$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 & 0x1f] || [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 => $_ })
+ ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
for split /\n/, $text;
$self->{statusbox}->add ($text,
@@ -959,40 +974,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;
@@ -1158,19 +1139,20 @@
. "map size $self->{mapw}×$self->{maph}\n"
);
- ::setup_build_button ($self->{editor_support}->{builder_ui});
}
sub logged_in {
my ($self) = @_;
- $self->send_ext_req (cfplus_support => version => 1, sub {
- $self->{cfplus_ext} = $_[0]{version};
+ $self->send_ext_req (cfplus_support => version => 2, sub {
+ my (%msg) = @_;
+
+ $self->{cfplus_ext} = $msg{version};
$self->update_server_info;
if ($self->{cfplus_ext} >= 2) {
$self->send_ext_req ("editor_support", sub {
- $self->{editor_support} = $_[0];
+ $self->{editor_support} = { @_ };
$self->update_server_info;
0
@@ -1188,27 +1170,18 @@
$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) = @_;
if ($self->{cfplus_ext}) {
- $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
- my ($msg) = @_;
+ $self->send_ext_req (lookat => $x, $y, sub {
+ my (%msg) = @_;
- if (exists $msg->{npc_dialog}) {
+ if (exists $msg{npc_dialog}) {
# start npc chat dialog
$self->{npc_dialog} = new CFPlus::NPCDialog::
- dx => $x,
- dy => $y,
- title => "$msg->{npc_dialog} (NPC)",
+ token => $msg{npc_dialog},
+ title => "$msg{npc_dialog}[0] (NPC)",
conn => $self,
;
}
@@ -1283,10 +1256,12 @@
$self->update_options;
- $self->{id} = $self->{conn}->send_ext_req (
- npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
- sub { $this && $this->feed (@_) }
- );
+ $self->{id} = "npc-channel-" . $self->{conn}->token;
+ $self->{conn}->connect_ext ($self->{id} => sub {
+ $this->feed (@_) if $this;
+ });
+
+ $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
$self->{entry}->grab_focus;
@@ -1319,37 +1294,42 @@
}
sub feed {
- my ($self, $msg) = @_;
+ my ($self, $type, @arg) = @_;
CFPlus::weaken $self;
- if ($msg->{msgtype} eq "reply") {
- $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
- $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
-
- my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
- my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
- my @link;
- $text =~ s{
- ($match)
- }{
- my $kw = $1;
-
- push @link, new CFPlus::UI::Label
- markup => "$kw",
- can_hover => 1,
- can_events => 1,
- padding_x => 0,
- padding_y => 0,
- on_button_up => sub {
- $self->send ($kw);
- };
+ if ($type eq "update") {
+ my (%info) = @arg;
- "\x{fffc}"
- }giex;
+ $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
+ $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
- $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
- $self->{textview}->scroll_to_bottom;
+ if (exists $info{msg}) {
+ my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
+ my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
+ my @link;
+ $text =~ s{
+ ($match)
+ }{
+ my $kw = $1;
+
+ push @link, new CFPlus::UI::Label
+ markup => "$kw",
+ can_hover => 1,
+ can_events => 1,
+ padding_x => 0,
+ padding_y => 0,
+ on_button_up => sub {
+ $self->send ($kw);
+ };
+
+ "\x{fffc}"
+ }giex;
+
+ $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
+ $self->{textview}->scroll_to_bottom;
+ }
+
$self->update_options;
} else {
$self->destroy;
@@ -1364,7 +1344,7 @@
$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
$self->{textview}->scroll_to_bottom;
- $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
+ $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
}
sub destroy {
@@ -1373,7 +1353,7 @@
#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
if ($self->{conn}) {
- $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
+ $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
delete $self->{conn}{npc_dialog};
$self->{conn}->disconnect_ext ($self->{id});
}