--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/04/12 07:53:31 1.101
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/23 23:37:57 1.129
@@ -22,6 +22,8 @@
my $self = $class->SUPER::new (%arg,
setup_req => {
extmap => 1,
+ excmd => 1,
+ ywidget => 1,
%{$arg{setup_req} || {}},
},
);
@@ -48,10 +50,64 @@
} sort { $a->{par} <=> $b->{par} }
CFPlus::Pod::find command => "*";
- $self->connect_ext (event_capabilities => sub {
- my ($cap) = @_;
+ $self->connect_ext (music => sub {
+ my (%ev) = @_;
- if (my $ts = $cap->{tileset}) {
+ return unless $::CFG->{bgm_enable};
+
+ 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});
+ };
+ };
+ });
+ }
+ }
+ }
+ }
+
+ if (my $play = $ev{play}) {
+ &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
+ }
+ });
+
+ $self->connect_ext (capabilities => sub {
+ my (%cap) = @_;
+
+ if (my $ts = $cap{tileset}) {
if (my ($default) = grep $_->[2] & 1, @$ts) {
$self->{tileset} = $default;
$self->{tilesize} = $default->[3];
@@ -65,6 +121,122 @@
}
});
+ $self->{json_coder}
+ ->convert_blessed
+ ->filter_json_single_key_object (__widget_ref__ => 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) {
+ $args->{$ev} = sub {
+ my $id = shift->{s_id};
+ $self->send_exti_msg (w_e => $id, $ev, \@_);
+
+ 1
+ };
+ }
+
+ if (my $widget = eval {
+ local $SIG{__DIE__};
+ "CFPlus::UI::$class"->new (
+ %$args,
+ s_ws => $ws,
+ s_id => $id,
+ )
+ }
+ ) {
+ $self->{widget}{$id}
+ = $self->{widgetset}{$ws}{w}{$id}
+ = $widget;
+
+ $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 $class) . ": $@\n";
+ $self->send_exti_msg (w_e => $id, "destroy");
+ }
+ });
+
+ # widget call
+ $self->connect_ext (w_c => sub {
+ 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)]);
+ } 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]);
+ });
+
+ # 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->{map_widget}->add_command (@$_)
for @cmd_help;
@@ -250,9 +422,7 @@
$::GAUGES->{grace} ->set_value ($gr, $gr_m);
$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
- my $rng = $stats->{+CS_STAT_RANGE};
- $rng =~ s/^Range: //; # thank you so much dear server
- $::GAUGES->{range} ->set_text ("Rng: " . $rng);
+ $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
my $title = $stats->{+CS_STAT_TITLE};
$title =~ s/^Player: //;
$::STATWIDS->{title} ->set_text ("Title: " . $title);
@@ -282,12 +452,16 @@
if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
$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 @add;
+
+ 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),
+ ;
my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
@@ -325,15 +499,19 @@
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);
+ 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++ and ($x, $y) = (0, $y + 1);
}
+
+ $sktbl->add_at (@add);
}
for (grep exists $stats->{$_}, @skills) {
@@ -610,12 +788,28 @@
sub set_texture {
my ($self, $id, $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;
+
+ $_->() for @{(delete $self->{face_cb}{$id}) || []};
+}
+
+sub connect_face_update {
+ my ($self, $id, $cb) = @_;
+
+ push @{$self->{face_cb}{$id}}, $cb;
+
+ CFPlus::guard {
+ @{$self->{face_cb}{$id}}
+ = grep $_ != $cb,
+ @{$self->{face_cb}{$id}};
+ }
}
sub sound_play {
@@ -635,51 +829,83 @@
$self->{query}-> ($self, $flags, $prompt);
}
-sub drawinfo {
- my ($self, $color, $text) = @_;
+sub sanitise_xml($) {
+ local $_ = shift;
- my @color = (
- [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
- [1.00, 1.00, 1.00],
- [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
- [1.00, 0.00, 0.00],
- [1.00, 0.54, 0.00],
- [0.11, 0.56, 1.00],
- [0.93, 0.46, 0.00],
- [0.18, 0.54, 0.34],
- [0.56, 0.73, 0.56],
- [0.80, 0.80, 0.80],
- [0.75, 0.61, 0.20],
- [0.99, 0.77, 0.26],
- [0.74, 0.65, 0.41],
- );
-
- my $fg = $color[$color % @color];
-
- $self->logprint ("info: ", $text);
+ # we now weed out all tags we do not support
+ s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g;
+ # now all entities
+ s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g;
+
+ # handle some elements
+ s/(.*?)<\/fg>/$2<\/span>/gs;
+ s/(.*?)<\/fg>/$2<\/span>/gs;
+
+ $_
+}
+
+our %NAME_TO_COLOR = (
+ black => 0,
+ white => 1,
+ darkblue => 2,
+ red => 3,
+ orange => 4,
+ lightblue => 5,
+ darkorange => 6,
+ green => 7,
+ darkgreen => 8,
+ grey => 9,
+ brown => 10,
+ yellow => 11,
+ tan => 12,
+);
- # try to create single paragraphs of multiple lines sent by the server
- $text =~ s/(?<=\S)\n(?=\w)/ /g;
+our @CF_COLOR = (
+ [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
+ [1.00, 1.00, 1.00],
+ [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
+ [1.00, 0.00, 0.00],
+ [1.00, 0.54, 0.00],
+ [0.11, 0.56, 1.00],
+ [0.93, 0.46, 0.00],
+ [0.18, 0.54, 0.34],
+ [0.56, 0.73, 0.56],
+ [0.80, 0.80, 0.80],
+ [0.75, 0.61, 0.20],
+ [0.99, 0.77, 0.26],
+ [0.74, 0.65, 0.41],
+);
- $text = CFPlus::asxml $text;
- $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
- $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
+sub msg {
+ my ($self, $color, $type, $text, @extra) = @_;
- ::message ({ fg => $fg, markup => $_ })
- for split /\n/, $text;
+ $text = sanitise_xml $text;
- $self->{statusbox}->add ($text,
- group => $text,
- fg => $fg,
- timeout => $color >= 2 ? 180 : 10,
- tooltip_font => $::FONT_FIXED,
- );
-}
+ if (my $cb = $self->{cb_msg}{$type}) {
+ $_->($self, $color, $type, $text, @extra) for values %$cb;
+ } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
+ $type =~ s/-/_/g;
+ $self->{$type} = $text;
+ } else {
+ $self->logprint ("msg: ", $text);
+ return if $color < 0; # negative color == ignore if not understood
-sub drawextinfo {
- my ($self, $color, $type, $subtype, $message) = @_;
+ my $fg = $CF_COLOR[$color % @CF_COLOR];
- $self->drawinfo ($color, $message);
+ ## 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;
+
+ $self->{statusbox}->add ($text,
+ group => $text,
+ fg => $fg,
+ timeout => $color >= 2 ? 180 : 10,
+ tooltip_font => $::FONT_FIXED,
+ );
+ }
}
sub spell_add {
@@ -777,6 +1003,8 @@
$::FLOORBOX->clear;
+ my @add;
+
my $row;
for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
if ($row < 6) {
@@ -784,24 +1012,27 @@
local $_->{desc_widget}; # hack to force recreation of widget
CFPlus::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 CFPlus::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 CFPlus::UI::Button
text => "Close container",
on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
- );
+ ;
}
+
+ $::FLOORBOX->add_at (@add);
});
$::WANT_REFRESH++;
@@ -922,8 +1153,10 @@
. "protocol version $self->{version}\n"
. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
+ . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
. "editing support $yesno[!!$self->{editor_support}]\n"
. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
+ . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
. "map size $self->{mapw}×$self->{maph}\n"
@@ -935,13 +1168,15 @@
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
@@ -971,15 +1206,14 @@
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,
;
}
@@ -996,6 +1230,8 @@
if $self->{npc_dialog};
$self->SUPER::destroy;
+
+ %$self = ();
}
package CFPlus::NPCDialog;
@@ -1052,10 +1288,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;
@@ -1088,37 +1326,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::asxml $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;
@@ -1133,7 +1376,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 {
@@ -1142,7 +1385,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});
}