--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/17 21:18:01 1.155
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/22 21:27:13 1.164
@@ -50,177 +50,12 @@
} sort { $a->{par} <=> $b->{par} }
CFPlus::Pod::find command => "*";
- $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->update_fx_want;
-
- if (my $ts = $cap{tileset}) {
- if (my ($default) = grep $_->[2] & 1, @$ts) {
- $self->{tileset} = $default;
- $self->{tilesize} = $default->[3];
- $self->setup_req (tileset => $default->[0]);
-
- my $w = int $self->{mapw} * 32 / $self->{tilesize};
- my $h = int $self->{maph} * 32 / $self->{tilesize};
-
- $self->setup_req (mapsize => "${w}x${h}");
- }
- }
- });
-
$self->{json_coder}
->convert_blessed
->filter_json_single_key_object (__w_ => sub {
$self->{widget}{$_[0]}
});
- # widgetset new
- $self->connect_ext (ws_n => sub {
- my ($id) = @_;
-
- $self->{widgetset}{$id} = {
- w => {},
- };
- });
-
- # widgetset destroy
- $self->connect_ext (ws_d => sub {
- my ($id) = @_;
-
- my $ws = delete $self->{widgetset}{$id}
- or return;
-
- $_->destroy
- for values %{$ws->{w}};
- });
-
- # widgetset create
- $self->connect_ext (ws_c => sub {
- 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, $rid, @_);
-
- 1
- };
- }
-
- $self->widget_associate (
- $ws, $id => scalar eval {
- local $SIG{__DIE__};
- "CFPlus::UI::$class"->new (%$args)
- }
- ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
- });
-
- # 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,
-
- );
-
- 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 $w = $self->{widget}{$id}
- or return;
-
- if ($rid) {
- $self->send_exti_msg (w_r => $rid, $w->$method (@args));
- } else {
- $w->$method (@args);
- }
- });
-
- # widget set
- $self->connect_ext (w_s => sub {
- my ($id, $attr) = @_;
-
- my $w = $self->{widget}{$id}
- or return;
-
- 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 ($id, $rid, $attr) = @_;
-
- my $w = $self->{widget}{$id}
- or return;
-
- $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} || {}}) {
@@ -252,6 +87,56 @@
$self
}
+sub update_fx_want {
+ my ($self) = @_;
+
+ $self->send_exti_msg (fx_want => {
+ 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
+ 5 => !!$::CFG->{audio_enable}, # FT_SOUND
+ 6 => 1, # FT_RSRC
+ });
+}
+
+sub ext_capabilities {
+ my ($self, %cap) = @_;
+
+ #$self->send ("setup sound 0"); # we use a different protocol
+ $self->update_fx_want;
+
+ $self->send_exti_req (resource => "exp_table", sub {
+ my ($exp_table) = @_;
+
+ $self->register_face_handler ($exp_table, sub {
+ my ($face) = @_;
+
+ $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) {
+ $self->{tileset} = $default;
+ $self->{tilesize} = $default->[3];
+ $self->setup_req (tileset => $default->[0]);
+
+ my $w = int $self->{mapw} * 32 / $self->{tilesize};
+ my $h = int $self->{maph} * 32 / $self->{tilesize};
+
+ $self->setup_req (mapsize => "${w}x${h}");
+ }
+ }
+}
+
+sub ext_ambient_music {
+ my ($self, $songs) = @_;
+ &::audio_music_set_ambient ($songs);
+}
+
+#############################################################################
+
sub widget_associate {
my ($self, $ws, $id, $widget) = @_;
@@ -280,15 +165,147 @@
}
}
-sub update_fx_want {
- my ($self) = @_;
+# widgetset new
+sub ext_ws_n {
+ my ($self, $id) = @_;
- $self->send_exti_msg (fx_want => {
- 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
- 5 => !!$::CFG->{audio_enable}, # FT_SOUND
- });
+ $self->{widgetset}{$id} = {
+ w => {},
+ };
+}
+
+# widgetset destroy
+sub ext_ws_d {
+ my ($self, $id) = @_;
+
+ my $ws = delete $self->{widgetset}{$id}
+ or return;
+
+ $_->destroy
+ for values %{$ws->{w}};
+}
+
+# widgetset create
+sub ext_ws_c {
+ my ($self, $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, $rid, @_);
+
+ 1
+ };
+ }
+
+ $self->widget_associate (
+ $ws, $id => scalar eval {
+ local $SIG{__DIE__};
+ "CFPlus::UI::$class"->new (%$args)
+ }
+ ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
+}
+
+# widgetset associate
+sub ext_ws_a {
+ my ($self, %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,
+ );
+
+ 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
+sub ext_w_c {
+ my ($self, $id, $rid, $method, @args) = @_;
+
+ my $w = $self->{widget}{$id}
+ or return;
+
+ if ($rid) {
+ $self->send_exti_msg (w_r => $rid, $w->$method (@args));
+ } else {
+ $w->$method (@args);
+ }
+}
+
+# widget set
+sub ext_w_s {
+ my ($self, $id, $attr) = @_;
+
+ my $w = $self->{widget}{$id}
+ or return;
+
+ 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
+sub ext_w_g {
+ my ($self, $id, $rid, $attr) = @_;
+
+ my $w = $self->{widget}{$id}
+ or return;
+
+ $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
+}
+
+# message window
+sub ext_channel_info {
+ my ($self, $info) = @_;
+ $self->{channels}->{$info->{id}} = $info;
+ $::MESSAGE_WINDOW->add_channel ($info);
}
+#############################################################################
+
sub logprint {
my ($self, @a) = @_;
@@ -435,6 +452,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: //;
@@ -462,19 +480,28 @@
my $sktbl = $::STATWIDS->{skill_tbl};
my @skills = keys %{ $self->{skill_info} };
- if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
- $sktbl->clear;
+ my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
+ map [$_, $self->{skill_info}{$_}],
+ grep exists $stats->{$_},
+ @skills;
+
+ if ($self->{stat_order} ne join ",", map $_->[0], @order) {
+ $self->{stat_order} = join ",", map $_->[0], @order;
- my @add;
+ $sktbl->clear;
- push @add,
+ my $sw = $self->{skillwid}{""} ||= [
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 @add = @$sw;
my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
@@ -482,12 +509,7 @@
my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
my ($x, $y) = (0, 1);
- for (
- sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
- map [$_, $self->{skill_info}{$_}],
- grep exists $stats->{$_},
- @skills
- ) {
+ for (@order) {
my ($idx, $name) = @$_;
my $spell_cb = sub {
@@ -512,13 +534,28 @@
1
};
+ my $sw = $self->{skillwid}{$idx} ||= [
+ # exp
+ (new CFPlus::UI::Label
+ align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
+
+ # level
+ (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),
+
+ # progress
+ (new CFPlus::UI::ExperienceProgress),
+
+ # label
+ (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),
+ ];
+
push @add,
- $x * 3 + 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
- 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,
- can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+ $x * 4 + 0, $y, $sw->[0],
+ $x * 4 + 1, $y, $sw->[1],
+ $x * 4 + 2, $y, $sw->[2],
+ $x * 4 + 3, $y, $sw->[3],
;
$x++ and ($x, $y) = (0, $y + 1);
@@ -527,9 +564,19 @@
$sktbl->add_at (@add);
}
- for (grep exists $stats->{$_}, @skills) {
- $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
- $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
+ for (@order) {
+ my ($idx, $name) = @$_;
+ my $val = $stats->{$idx};
+
+ next if $prev->{$idx}[1] == $val->[1];
+
+ my $sw = $self->{skillwid}{$idx};
+ $sw->[0]->set_text (::formsep ($val->[1]));
+ $sw->[1]->set_text ($val->[0] * 1);
+ $sw->[2]->set_value (@$val);
+
+ $::GAUGES->{sklprg}->set_label ("$name %d%%");
+ $::GAUGES->{sklprg}->set_value (@$val);
}
}
@@ -581,7 +628,7 @@
$self->{delay}{$tile} = 1;
# we assume the face is in-flight and will eventually come
- push @{$self->{face_cb}{$tile}}, sub {
+ push @{$self->{tile_cb}{$tile}}, sub {
delete $self->{delay}{$tile};
$_[0]->upload;
};
@@ -592,7 +639,8 @@
# 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;
+ $self->{map_widget}->update
+ if $self->{map_widget};
});
} else {
$self->{map_widget}->update;
@@ -631,21 +679,21 @@
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::exists tilecache => $id, sub {
- my ($exists) = @_;
+ CFPlus::DB::get tilecache => $tile, sub {
+ my ($data) = @_;
return unless $self->{map}; # stop when destroyed
- if ($exists) {
- $self->have_tile ($id);
- $self->{texture}[$id]->upload;
+ if (defined $data) {
+ $self->have_tile ($tile, $data);
+ $self->{texture}[$tile]->upload;
}
$self->bg_fetch;
@@ -812,56 +860,63 @@
if ($face->{type} == 0) { # FT_FACE
my $id = CFPlus::DB::get_tile_id_sync $face->{name};
- $face->{id} = $id;
- $self->{faceid}[$facenum] = $id;
-
+ $face->{id} = $id;
$self->{map}->set_tileid ($facenum => $id);
CFPlus::DB::get tilecache => $id, $cb;
} elsif ($face->{type} & 1) { # with metadata
CFPlus::DB::get res_meta => $face->{name}, $cb;
+
+ } else { # no metadata
+ CFPlus::DB::get res_data => $face->{name}, $cb;
}
}
sub face_update {
my ($self, $facenum, $face, $changed) = @_;
- if ($face->{type} == 0) { # FT_FACE
+ if ($face->{type} == 0) {
+ # image, FT_FACE
CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
if $changed;
- $self->have_tile ($face->{id});
+ $self->have_tile ($face->{id}, delete $face->{data});
- } elsif ($face->{type} & 1) { # split metadata
+ } elsif ($face->{type} & 1) {
+ # split metadata case, FT_MUSIC, FT_SOUND
if ($changed) { # new data
- my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
- $face->{meta} = $self->{json_coder}->decode ($meta_json);
+ 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_json, sub { };
- } else {
- $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+ CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
}
+ $face->{data} = $self->{json_coder}->decode ($face->{data});
+
::add_license ($face);
if ($face->{type} == 3) { # FT_MUSIC
- $self->{music_meta}{$facenum} = $face;
-
::message ({ markup => "downloaded song #$facenum" })
if $changed;
&::audio_music_push ($facenum);
} elsif ($face->{type} == 5) { # FT_SOUND
- $self->{sound_meta}{$facenum} = $face;
-
::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;
}
}
@@ -872,27 +927,50 @@
}
sub have_tile {
- my ($self, $tile) = @_;
+ my ($self, $tile, $data) = @_;
return unless $self->{map};
my $tex = $self->{texture}[$tile] ||=
new CFPlus::Texture
- tile => $tile, minify => 1, mipmap => 1, delay => 1;
+ tile => $tile,
+ image => $data, delete_image => 1,
+ minify => 1, mipmap => 1;
- $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
+ if (my $cbs = delete $self->{tile_cb}{$tile}) {
+ $_->($tex) for @$cbs;
+ }
}
-sub connect_face_update {
- my ($self, $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}{$id}}, $cb;
+ push @{$self->{face_cb}{$num}}, $cb;
- CFPlus::guard {
- @{$self->{face_cb}{$id}}
- = grep $_ != $cb,
- @{$self->{face_cb}{$id}};
- }
+ 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};
+
+ # future changes
+ $self->on_face_change ($num => $cb)
}
sub sound_play {