--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/12/04 15:17:14 1.89
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/10 04:02:13 1.148
@@ -6,17 +6,27 @@
use Crossfire::Protocol::Constants;
use CFPlus;
+use CFPlus::DB;
use CFPlus::UI;
use CFPlus::Pod;
+use CFPlus::Macro;
+use CFPlus::Item;
use Crossfire::Protocol::Base 0.95;
use base 'Crossfire::Protocol::Base';
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
- my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
+ my $self = $class->SUPER::new (%arg,
+ setup_req => {
+ extmap => 1,
+ excmd => 1,
+ ywidget => 1,#d#
+ %{$arg{setup_req} || {}},
+ },
+ );
$self->{map_widget}->clr_commands;
@@ -37,14 +47,159 @@
map ["$cmd$_", $text],
sort { (length $a) <=> (length $b) }
@args
- } sort { $a->{par} <=> $b->{par} }
- CFPlus::Pod::find command => "*";
+ } 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) {
+ $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");
+ }
+ });
- $self->{map_widget}->add_command (@$_)
- for @cmd_help;
+ # widget call
+ $self->connect_ext (w_c => sub {
+ my ($id, $rid, $method, $args) = @_;
- $self->{noface} = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ 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]);
+ });
+
+ # 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} || {}}) {
+ $_->destroy
+ for values %{delete $ws->{w} || {}};
+ }
+ });
+
+ $self->{map_widget}->add_command (@$_)
+ for @cmd_help;
{
$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
@@ -52,41 +207,33 @@
$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
}
- $self->{open_container} = 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}});
+ }
- # "global"
- $self->{tilecache} = CFPlus::db_table "tilecache"
- or die "tilecache: unable to open database table";
- $self->{facemap} = CFPlus::db_table "facemap"
- or die "facemap: unable to open database table";
+ $self->{open_container} = 0;
# per server
- $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"
- or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
+ $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
$self
}
-sub logprint {
- my ($self, @a) = @_;
-
- $self->{log_fh} ||= do {
- my $path = "$Crossfire::VARDIR/log.$self->{host}";
-
- open my $fh, ">>:utf8", $path
- or die "Couldn't open logfile $path: $!";
-
- $fh->autoflush (1);
-
- $fh;
- };
+sub update_fx_want {
+ my ($self) = @_;
- my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
+ $self->send_exti_msg (fx_want => {
+ 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
+ 5 => !!$::CFG->{audio_enable}, # FT_SOUND
+ });
+}
- my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
- $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
+sub logprint {
+ my ($self, @a) = @_;
- print {$self->{log_fh}} "$ts ", @a, "\n";
+ CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
}
sub _stat_numdiff {
@@ -229,9 +376,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);
@@ -261,12 +406,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";
@@ -290,10 +439,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
items => [
- ["bind ready_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
- ["bind use_skill $name to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
+ ["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"] }],
],
)->popup ($ev);
} else {
@@ -303,15 +453,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) {
@@ -320,10 +474,18 @@
}
}
+sub macro_send {
+ my ($self, $macro) = @_;
+
+ for my $cmd (@{ $macro->{action} }) {
+ $self->send_command ($cmd);
+ }
+}
+
sub user_send {
my ($self, $command) = @_;
- push @{$self->{record}}, $command
+ $self->{record}->($command)
if $self->{record};
$self->logprint ("send: ", $command);
@@ -331,15 +493,10 @@
::status ($command);
}
-sub start_record {
- my ($self) = @_;
+sub record {
+ my ($self, $cb) = @_;
- $self->{record} = [];
-}
-
-sub stop_record {
- my ($self) = @_;
- return delete $self->{record};
+ $self->{record} = $cb;
}
sub map_scroll {
@@ -351,8 +508,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->{face_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 {
@@ -370,7 +555,7 @@
my ($hash, $x, $y, $w, $h) = @$map_info;
my $data = $self->{map}->get_rect ($x, $y, $w, $h);
- $self->{mapcache}->put ($hash => Compress::LZF::compress $data);
+ CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
}
@@ -384,20 +569,47 @@
delete $self->{map_widget}{magicmap};
}
+sub bg_fetch {
+ my ($self) = @_;
+
+ my $id;
+
+ do {
+ $id = pop @{$self->{bg_fetch}}
+ or return;
+ } while $self->{texture}[$id];
+
+ CFPlus::DB::exists tilecache => $id, sub {
+ my ($exists) = @_;
+
+ return unless $self->{map}; # stop when destroyed
+
+ $self->have_tile ($id)
+ if $exists;
+
+ $self->bg_fetch;
+ };
+}
sub load_map($$$) {
my ($self, $hash, $x, $y) = @_;
- if (defined (my $data = $self->{mapcache}->get ($hash))) {
- $data = Compress::LZF::decompress $data;
- #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
- for my $id ($self->{map}->set_rect ($x, $y, $data)) {
- my $data = $self->{tilecache}->get ($id)
- or next;
+ my $gen = $self->{map_change_gen};
+
+ CFPlus::DB::get $self->{mapcache} => $hash, 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->set_texture ($id => $data);
+ my $inprogress = @{ $self->{bg_fetch} || [] };
+ unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
+ $self->bg_fetch unless $inprogress;
}
- }
+ };
}
# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
@@ -471,7 +683,10 @@
if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
} else {
+ my $gen = $self->{map_change_gen};
$self->send_mapinfo ("spatial $path$tile", sub {
+ return unless $gen == $self->{map_change_gen};
+
my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
return if $mode ne "spatial";
@@ -496,6 +711,8 @@
$self->flush_map;
+ ++$self->{map_change_gen};
+
my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
my $mapmapw = $self->{mapmap}->{w};
@@ -521,77 +738,99 @@
}
sub face_find {
- my ($self, $facenum, $face) = @_;
+ 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 = $self->{facemap}->get ($hash);
+ $face->{id} = $id;
+ $self->{faceid}[$facenum] = $id;
- unless ($id) {
- # create new id for face
- # I love transactions
- for (1..100) {
- my $txn = $CFPlus::DB_ENV->txn_begin;
- my $status = $self->{facemap}->db_get (id => $id);
- if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
- $id = ($id || 64) + 1;
- if ($self->{facemap}->put (id => $id) == 0
- && $self->{facemap}->put ($hash => $id) == 0) {
- $txn->txn_commit;
+ $self->{map}->set_tileid ($facenum => $id);
- goto gotid;
- }
- }
- $txn->txn_abort;
- }
+ CFPlus::DB::get tilecache => $id, $cb;
- CFPlus::fatal "maximum number of transaction retries reached - database problems?";
+ } elsif ($face->{type} & 1) { # with metadata
+ CFPlus::DB::get res_meta => $face->{name}, $cb;
}
-
-gotid:
- $face->{id} = $id;
- $self->{map}->set_face ($facenum => $id);
- $self->{faceid}[$facenum] = $id;#d#
-
- my $face = $self->{tilecache}->get ($id);
-
- if ($face) {
- #$self->face_prefetch;
- $face
- } else {
- my $tex = $self->{noface};
- $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
- undef
- };
}
sub face_update {
my ($self, $facenum, $face, $changed) = @_;
- $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
+ if ($face->{type} == 0) { # FT_FACE
+ CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
+ if $changed;
+
+ $self->have_tile ($face->{id});
+
+ } elsif ($face->{type} & 1) { # split metadata
+ if ($changed) { # new data
+ my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
+ $face->{meta} = $self->{json_coder}->decode ($meta_json);
+
+ 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});
+ }
+
+ ::add_license ($face);
+
+ if ($face->{type} == 3) { # FT_MUSIC
+ $self->{music_meta}{$facenum} = $face;
- $self->set_texture ($face->{id} => delete $face->{image});
+ ::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);
+ }
+
+ }
}
-sub set_texture {
- my ($self, $id, $data) = @_;
+sub smooth_update {
+ my ($self, $facenum, $face) = @_;
- $self->{texture}[$id] ||= do {
- my $tex =
- new_from_image CFPlus::Texture
- $data, minify => 1, mipmap => 1;
+ $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
+}
- $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
- $self->{map_widget}->update;
+sub have_tile {
+ my ($self, $tile) = @_;
- $tex
- };
+ return unless $self->{map};
+
+ my $tex = $self->{texture}[$tile] ||=
+ new CFPlus::Texture
+ tile => $tile, minify => 1, mipmap => 1, delay => 1;
+
+ $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
+}
+
+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 {
- 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
@@ -605,49 +844,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],
- );
+ # 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,
+);
+
+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],
+);
- $self->logprint ("info: ", $text);
+sub msg {
+ my ($self, $color, $type, $text, @extra) = @_;
- # try to create single paragraphs of multiple lines sent by the server
- $text =~ s/(?<=\S)\n(?=\w)/ /g;
+ $text = sanitise_xml $text;
- $text = CFPlus::asxml $text;
- $text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
- $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
-
- ::message ({ fg => $color[$color], markup => $_ })
- for split /\n/, $text;
-
- $self->{statusbox}->add ($text,
- group => $text,
- fg => $color[$color],
- 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 & 0x1f] || [1, 0, 0];
- $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 => $_, type => $type, extra => [@extra] })
+ for split /\n/, $text;
+
+ $self->{statusbox}->add ($text,
+ group => $text,
+ fg => $fg,
+ timeout => $color >= 2 ? 180 : 10,
+ tooltip_font => $::FONT_FIXED,
+ );
+ }
}
sub spell_add {
@@ -673,6 +946,7 @@
sub setup {
my ($self, $setup) = @_;
+ $self->{map_widget}->set_tilesize ($self->{tilesize});
$::MAP->resize ($self->{mapw}, $self->{maph});
}
@@ -704,46 +978,14 @@
::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;
$::FLOORBOX->clear;
+ my @add;
+
my $row;
for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
if ($row < 6) {
@@ -751,27 +993,30 @@
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++;
+ $::WANT_REFRESH->start;
}
sub set_opencont {
@@ -889,26 +1134,29 @@
. "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"
);
- ::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
@@ -922,30 +1170,22 @@
$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)",
+ token => $msg{npc_dialog},
+ title => "$msg{npc_dialog}[0] (NPC)",
conn => $self,
;
}
@@ -962,6 +1202,8 @@
if $self->{npc_dialog};
$self->SUPER::destroy;
+
+ %$self = ();
}
package CFPlus::NPCDialog;
@@ -983,7 +1225,7 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ CFPlus::weaken (my $this = $self);
$self->connect (delete => sub { $this->destroy; 1 });
@@ -1018,10 +1260,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;
@@ -1037,7 +1281,7 @@
sub update_options {
my ($self) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
$self->{options}->clear;
$self->{options}->add ($self->{bye_button});
@@ -1054,37 +1298,42 @@
}
sub feed {
- my ($self, $msg) = @_;
+ my ($self, $type, @arg) = @_;
- Scalar::Util::weaken $self;
+ 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;
@@ -1099,7 +1348,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 {
@@ -1108,7 +1357,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});
}