--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/15 22:07:48 1.122
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/12/27 19:12:19 1.185
@@ -1,20 +1,18 @@
-package CFPlus::Protocol;
+package DC::Protocol;
use utf8;
use strict;
-use Crossfire::Protocol::Constants;
+use Deliantra::Protocol::Constants;
-use CFPlus;
-use CFPlus::DB;
-use CFPlus::UI;
-use CFPlus::Pod;
-use CFPlus::Macro;
-use CFPlus::Item;
+use DC;
+use DC::DB;
+use DC::UI;
+use DC::Pod;
+use DC::Macro;
+use DC::Item;
-use Crossfire::Protocol::Base 0.95;
-
-use base 'Crossfire::Protocol::Base';
+use base 'Deliantra::Protocol::Base';
sub new {
my ($class, %arg) = @_;
@@ -23,7 +21,7 @@
setup_req => {
extmap => 1,
excmd => 1,
- ywidget => 1,
+ widget => 2,
%{$arg{setup_req} || {}},
},
);
@@ -38,8 +36,8 @@
my @args = split /\|/, $2;
@args = (".*") unless @args;
- my (undef, @par) = CFPlus::Pod::section_of $_;
- my $text = CFPlus::Pod::as_label @par;
+ my (undef, @par) = DC::Pod::section_of $_;
+ my $text = DC::Pod::as_label @par;
$_ = $_ eq ".*" ? "" : " $_"
for @args;
@@ -48,226 +46,299 @@
sort { (length $a) <=> (length $b) }
@args
} sort { $a->{par} <=> $b->{par} }
- CFPlus::Pod::find command => "*";
-
- $self->connect_ext (event_music => sub {
- my ($ev) = @_;
-
- return unless $::CFG->{bgm_enable};
+ DC::Pod::find command => "*";
- my $faces = $ev->{faces};
- my @songs;
-
- # 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->{json_coder}
+ ->convert_blessed
+ ->filter_json_single_key_object ("\fw" => sub {
+ $self->{widget}{$_[0]}
+ })
+ ->filter_json_single_key_object ("\fc" => sub {
+ my ($id) = @_;
+ sub {
+ $self->send_exti_msg (w_e => $id, @_);
}
- }
+ });
- if (my $play = $ev->{play}) {
- &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
+ # destroy widgets on logout
+ $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
+ for my $ws (values %{delete $self->{widgetset} || {}}) {
+ $_->destroy
+ for values %{delete $ws->{w} || {}};
}
});
- $self->connect_ext (event_capabilities => sub {
- my ($cap) = @_;
+ $self->{map_widget}->add_command (@$_)
+ for @cmd_help;
- 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]);
+ {
+ $self->{dialogue} = my $tex = new_from_file DC::Texture
+ DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+ $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ }
- my $w = int $self->{mapw} * 32 / $self->{tilesize};
- my $h = int $self->{maph} * 32 / $self->{tilesize};
+ {
+ $self->{noface} = my $tex = new_from_file DC::Texture
+ DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ }
- $self->setup_req (mapsize => "${w}x${h}");
- }
- }
- });
+ $self->{open_container} = 0;
- $self->{json_coder}
- ->convert_blessed
- ->filter_json_single_key_object (__widget_ref__ => sub {
- $self->{widget}{$_[0]}
- });
+ # per server
+ $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
- $self->connect_ext (ws_n => sub {
- my ($arg) = @_;
+ $self
+}
- $self->{widgetset}{$arg{id}} = {
- w => {},
- };
+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
});
+}
- $self->connect_ext (ws_d => sub {
- my ($arg) = @_;
+sub ext_capabilities {
+ my ($self, %cap) = @_;
- my $ws = delete $self->{widgetset}{$arg{id}}
- or return;
+ $self->update_fx_want;
- $_->destroy
- for values %{$ws->{w}};
- });
+ $self->send_exti_req (resource => "exp_table", sub {
+ my ($exp_table) = @_;
- $self->connect_ext (ws_c => sub {
- my ($arg) = @_;
+ $self->register_face_handler ($exp_table, sub {
+ my ($face) = @_;
- my $args = $arg->{args} || {};
+ $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
+ $_->() for values %{ $self->{on_exp_update} || {} };
+ });
- 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 => \@_);
+ ()
+ });
- 1
- };
+ 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}");
}
+ }
+}
- if (my $widget = eval {
- local $SIG{__DIE__};
- "CFPlus::UI::$arg->{class}"->new (
- %$args,
- s_ws => $arg->{ws},
- s_id => $arg->{id},
- )
- }
- ) {
- $self->{widget}{$arg->{id}}
- = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
- = $widget;
+sub ext_ambient_music {
+ my ($self, $songs) = @_;
+ &::audio_music_set_ambient ($songs);
+}
- $widget->connect (on_destroy => sub {
- my ($widget) = @_;
+#############################################################################
- 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 $arg) . ": $@\n";
- $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
- }
- });
+sub widget_associate {
+ my ($self, $ws, $id, $widget) = @_;
- $self->connect_ext (w_c => sub {
- my ($arg) = @_;
+ $widget ||= new DC::UI::Bin;
- my $w = $self->{widget}{$arg->{id}}
- or return;
- my $m = $arg->{name};
+ $widget->{s_id} = $id;
+ $self->{widget}{$id} = $widget;
+
+ if ($ws) {
+ $widget->{s_ws} = $ws;
+ $self->{widgetset}{$ws}{w}{$id} = $widget;
+ }
- my $a = $arg->{args} || [];
+ $widget->connect (on_destroy => sub {
+ my ($widget) = @_;
- if (exists $arg->{rid}) {
- $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
- } else {
- $w->$m (@$a);
- }
+ delete $self->{widget}{$widget->{s_id}};
+ delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
+ if exists $widget->{s_ws};
});
+}
- $self->connect_ext (w_s => sub {
- my ($arg) = @_;
+# widgetset new
+sub ext_ws_n {
+ my ($self, $id) = @_;
- my $w = $self->{widget}{$arg->{id}}
- or return;
+ $self->{widgetset}{$id} = {
+ w => {},
+ };
+}
- $w->{$arg->{name}} = $arg->{value};
- });
+# widgetset destroy
+sub ext_ws_d {
+ my ($self, $id) = @_;
- $self->connect_ext (w_g => sub {
- my ($arg) = @_;
+ my $ws = delete $self->{widgetset}{$id}
+ or return;
- my $w = $self->{widget}{$arg->{id}}
- or return;
+ $_->destroy
+ for values %{$ws->{w}};
+}
- $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
- });
+# widgetset create
+sub ext_ws_c {
+ my ($self, $ws, $id, $class, $args) = @_;
+
+ $self->widget_associate (
+ $ws, $id => scalar eval {
+ local $SIG{__DIE__};
+ "DC::UI::$class"->new (%$args)
+ }
+ );
+}
- $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
- for my $ws (values %{delete $self->{widgetset} || {}}) {
- $_->destroy
- for values %{delete $ws->{w} || {}};
+# widgetset create template
+sub ext_ws_ct {
+ my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
+
+ $done_cb ||= sub { };
+
+ my $parse_list; $parse_list = sub {
+ my ($list) = @_;
+ my @w;
+
+ while (@$list) {
+ my ($class, $args) = splice @$list, 0, 2;
+ my $name = delete $args->{s_id};
+ my $cl = delete $args->{s_cl};
+ my $cfg = delete $cfg->{$name};
+ my $id = delete $cfg->{id};
+ my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
+ or next;
+
+ $self->widget_associate ($ws, $id, $w)
+ if $id;
+
+ $w->add ($parse_list->($cl))
+ if $cl;
+
+ push @w, $w;
}
- });
- $self->{map_widget}->add_command (@$_)
- for @cmd_help;
+ @w
+ };
- {
- $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
- $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ # either array reference, or face #
+ if ($type eq "inline") {
+ $parse_list->($template);
+ $done_cb->();
+ } elsif ($type eq "face") {
+ #...
+ $done_cb->(0);
+ } else {
+ $done_cb->(0);
}
+}
- {
- $self->{noface} = my $tex = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
- $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+# widgetset associate
+sub ext_ws_a {
+ my ($self, %ass) = @_;
+
+ # everything that has a name, wether conceivably useful or not
+ my %wkw = (
+ root => $DC::UI::ROOT,
+ tooltip => $DC::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});
}
+}
- $self->{open_container} = 0;
+# widget call
+sub ext_w_c {
+ my ($self, $id, $rcb, $method, @args) = @_;
- # per server
- $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
+ my $w = $self->{widget}{$id}
+ or return;
- $self
+ if ($rcb) {
+ $rcb->($w->$method (@args));
+ } else {
+ $w->$method (@args);
+ }
}
-sub logprint {
- my ($self, @a) = @_;
+# widget set
+sub ext_w_s {
+ my ($self, $id, $attr) = @_;
- $self->{log_fh} ||= do {
- my $path = "$Crossfire::VARDIR/log.$self->{host}";
+ my $w = $self->{widget}{$id}
+ or return;
- open my $fh, ">>:utf8", $path
- or die "Couldn't open logfile $path: $!";
+ 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};
+ }
+}
- $fh->autoflush (1);
+# widget get
+sub ext_w_g {
+ my ($self, $id, $rid, @attr) = @_;
- $fh;
- };
+ my $w = $self->{widget}{$id}
+ or return;
- my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
+ $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
+}
+
+# message window
+sub ext_channel_info {
+ my ($self, $info) = @_;
+ $self->{channels}->{$info->{id}} = $info;
+ $::MESSAGE_WINDOW->add_channel ($info);
+}
- my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
- $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
+#############################################################################
- print {$self->{log_fh}} "$ts ", @a, "\n";
+sub logprint {
+ my ($self, @a) = @_;
+
+ DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
}
sub _stat_numdiff {
@@ -361,7 +432,7 @@
my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
) {
my $msg = "stat change: " . (join " ", @diffs);
- $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
+ $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
}
$self->update_stats_window ($stats, $prev);
@@ -410,6 +481,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: //;
@@ -437,15 +509,28 @@
my $sktbl = $::STATWIDS->{skill_tbl};
my @skills = keys %{ $self->{skill_info} };
- if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
+ 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;
+
$sktbl->clear;
- $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
- $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
- $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
- $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
- $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
- $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
+ 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),
+ 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),
+ ];
+
+ my @add = @$sw;
my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
@@ -453,12 +538,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 {
@@ -469,11 +549,11 @@
} elsif ($ev->{button} == 2) {
$::CONN->user_send ("use_skill $name");
} elsif ($ev->{button} == 3) {
- my $shortname = CFPlus::shorten $name, 14;
- (new CFPlus::UI::Menu
+ my $shortname = DC::shorten $name, 14;
+ (new DC::UI::Menu
items => [
- ["bind ready_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
- ["bind use_skill $shortname to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
+ ["bind ready_skill $shortname to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
+ ["bind use_skill $shortname to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
],
)->popup ($ev);
} else {
@@ -483,28 +563,49 @@
1
};
- $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
- text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
- $sktbl->add ($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);
- $sktbl->add ($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);
+ my $sw = $self->{skillwid}{$idx} ||= [
+ # exp
+ (new DC::UI::Label
+ align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
+
+ # level
+ (new DC::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 DC::UI::ExperienceProgress),
+
+ # label
+ (new DC::UI::Label text => $name, on_button_down => $spell_cb,
+ can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+ ];
+
+ push @add,
+ $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);
}
- }
- for (grep exists $stats->{$_}, @skills) {
- $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
- $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
+ $sktbl->add_at (@add);
}
-}
-sub macro_send {
- my ($self, $macro) = @_;
+ for (@order) {
+ my ($idx, $name) = @$_;
+ my $val = $stats->{$idx};
+
+ next if $prev->{$idx}[1] eq $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);
- for my $cmd (@{ $macro->{action} }) {
- $self->send_command ($cmd);
+ $::GAUGES->{sklprg}->set_label ("$name %d%%");
+ $::GAUGES->{sklprg}->set_value (@$val);
}
}
@@ -516,7 +617,6 @@
$self->logprint ("send: ", $command);
$self->send_command ($command);
- ::status ($command);
}
sub record {
@@ -534,8 +634,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
+ EV::once undef, 0, 0.03, sub {
+ $self->{map_widget}->update
+ if $self->{map_widget};
+ };
+ } else {
+ $self->{map_widget}->update;
+ }
}
sub magicmap {
@@ -552,9 +680,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;
+ DC::DB::put $self->{mapcache} => $hash => $data, sub { };
}
sub map_clear {
@@ -570,20 +698,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 {
+ DC::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;
};
@@ -594,20 +724,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 {
+ DC::DB::get $self->{mapcache} => $hash, $cb;
+ }
}
# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
@@ -710,6 +847,7 @@
$self->flush_map;
++$self->{map_change_gen};
+ $self->{map_cache_old} = delete $self->{map_cache_new};
my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
@@ -738,25 +876,63 @@
sub face_find {
my ($self, $facenum, $face, $cb) = @_;
- my $hash = "$face->{chksum},$face->{name}";
+ if ($face->{type} == 0) { # FT_FACE
+ my $id = DC::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;
+ DC::DB::get tilecache => $id, $cb;
- $self->{map}->set_tileid ($facenum => $id);
+ } elsif ($face->{type} & 1) { # with metadata
+ DC::DB::get res_meta => $face->{name}, $cb;
- CFPlus::DB::get tilecache => $id, $cb;
+ } else { # no metadata
+ DC::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
+ DC::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;
+
+ # rely on strict ordering here and also on later fetch
+ DC::DB::put res_data => $face->{name} => $data, sub { };
+ DC::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);
+ ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
+ if $changed;
+
+ if ($face->{type} == 3) { # FT_MUSIC
+ &::audio_music_push ($facenum);
+ } elsif ($face->{type} == 5) { # FT_SOUND
+ &::audio_sound_push ($facenum);
+ }
+
+ } else {
+ # flat resource case, FT_RSRC
+ DC::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 {
@@ -765,37 +941,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 DC::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
+ ? DC::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
@@ -813,7 +1010,11 @@
local $_ = shift;
# we now weed out all tags we do not support
- s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g;
+ s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
+ }{
+ "<"
+ }gex;
+
# now all entities
s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g;
@@ -870,21 +1071,34 @@
$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;
+ for (split /\n/, $text) {
+ ::message ({
+ fg => $fg,
+ markup => $_,
+ 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.
+ }
$self->{statusbox}->add ($text,
group => $text,
fg => $fg,
timeout => $color >= 2 ? 180 : 10,
tooltip_font => $::FONT_FIXED,
- );
+ ) if $type eq "info";
}
}
@@ -898,8 +1112,8 @@
$::SPELL_LIST->add_spell ($spell);
- $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
- $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
+ $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
+ $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
}
sub spell_delete {
@@ -920,17 +1134,17 @@
my %skill_help;
- for my $node (CFPlus::Pod::find skill_description => "*") {
- my (undef, @par) = CFPlus::Pod::section_of $node;
- $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
+ 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;
};
for my $skill (values %{$self->{skill_info}}) {
$self->{map_widget}->add_command ("ready_skill $skill",
- (CFPlus::asxml "Ready the skill '$skill'\n\n")
+ (DC::asxml "Ready the skill '$skill'\n\n")
. $skill_help{$skill});
$self->{map_widget}->add_command ("use_skill $skill",
- (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
+ (DC::asxml "Immediately use the skill '$skill'\n\n")
. $skill_help{$skill});
}
}
@@ -943,74 +1157,45 @@
::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 {
+ $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
return unless $::CONN;
$::FLOORBOX->clear;
+ my @add;
+
my $row;
for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
if ($row < 6) {
local $_->{face_widget}; # hack to force recreation of widget
local $_->{desc_widget}; # hack to force recreation of widget
- CFPlus::Item::update_widgets $_;
+ DC::Item::update_widgets $_;
- $::FLOORBOX->add (0, $row, $_->{face_widget});
- $::FLOORBOX->add (1, $row, $_->{desc_widget});
+ push @add,
+ 0, $row, $_->{face_widget},
+ 1, $row, $_->{desc_widget};
$row++;
} else {
- $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
+ push @add, 1, $row, new DC::UI::Button
text => "More...",
on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
- );
+ ;
last;
}
}
if ($::CONN->{open_container}) {
- $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
+ push @add, 1, $row++, new DC::UI::Button
text => "Close container",
on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
- );
+ ;
}
+
+ $::FLOORBOX->add_at (@add);
});
- $::WANT_REFRESH++;
+ $::WANT_REFRESH = 1;
}
sub set_opencont {
@@ -1018,17 +1203,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 DC::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 DC::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
},
);
@@ -1040,7 +1224,7 @@
sub update_containers {
my ($self) = @_;
- $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
+ $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
my $todo = delete $self->{update_container}
or return;
@@ -1087,13 +1271,13 @@
#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
- CFPlus::Item::update_widgets $item;
+ DC::Item::update_widgets $item;
if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
set_opencont ($::CONN, 0, "Floor");
} elsif ($item->{flags} & F_OPEN) {
- set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
+ set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
} else {
$self->{update_container}{$item->{container}}++;
@@ -1137,19 +1321,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
@@ -1161,33 +1346,22 @@
$self->update_server_info;
- $self->send_command ("output-sync $::CFG->{output_sync}");
- $self->send_command ("output-count $::CFG->{output_count}");
$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
$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)",
+ $self->{npc_dialog} = new DC::NPCDialog::
+ token => $msg{npc_dialog},
+ title => "$msg{npc_dialog}[0] (NPC)",
conn => $self,
;
}
@@ -1208,9 +1382,9 @@
%$self = ();
}
-package CFPlus::NPCDialog;
+package DC::NPCDialog;
-our @ISA = 'CFPlus::UI::Toplevel';
+our @ISA = 'DC::UI::Toplevel';
sub new {
my $class = shift;
@@ -1227,18 +1401,18 @@
@_,
);
- CFPlus::weaken (my $this = $self);
+ DC::weaken (my $this = $self);
$self->connect (delete => sub { $this->destroy; 1 });
# better use a pane...
- $self->add (my $hbox = new CFPlus::UI::HBox);
- $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
+ $self->add (my $hbox = new DC::UI::HBox);
+ $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
- $hbox->add (my $vbox = new CFPlus::UI::VBox);
+ $hbox->add (my $vbox = new DC::UI::VBox);
- $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
- $vbox->add ($self->{entry} = new CFPlus::UI::Entry
+ $vbox->add (new DC::UI::Label text => "Message Entry:");
+ $vbox->add ($self->{entry} = new DC::UI::Entry
tooltip => "#npc_message_entry",
on_activate => sub {
my ($entry, $text) = @_;
@@ -1252,9 +1426,9 @@
},
);
- $vbox->add ($self->{options} = new CFPlus::UI::VBox);
+ $vbox->add ($self->{options} = new DC::UI::VBox);
- $self->{bye_button} = new CFPlus::UI::Button
+ $self->{bye_button} = new DC::UI::Button
text => "Bye (close)",
tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
on_activate => sub { $this->destroy; 1 },
@@ -1262,10 +1436,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;
@@ -1281,13 +1457,13 @@
sub update_options {
my ($self) = @_;
- CFPlus::weaken $self;
+ DC::weaken $self;
$self->{options}->clear;
$self->{options}->add ($self->{bye_button});
for my $kw (sort keys %{ $self->{kw} }) {
- $self->{options}->add (new CFPlus::UI::Button
+ $self->{options}->add (new DC::UI::Button
text => $kw,
on_activate => sub {
$self->send ($kw);
@@ -1298,37 +1474,42 @@
}
sub feed {
- my ($self, $msg) = @_;
+ my ($self, $type, @arg) = @_;
- CFPlus::weaken $self;
+ DC::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" . DC::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 DC::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;
@@ -1340,10 +1521,10 @@
sub send {
my ($self, $msg) = @_;
- $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
+ $self->{textview}->add_paragraph ({ markup => "\n" . DC::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 {
@@ -1352,7 +1533,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});
}