--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/08/13 02:43:22 1.72
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/07/22 19:34:58 1.126
@@ -6,15 +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 (@_);
+ my $self = $class->SUPER::new (%arg,
+ setup_req => {
+ extmap => 1,
+ excmd => 1,
+ ywidget => 1,
+ %{$arg{setup_req} || {}},
+ },
+ );
$self->{map_widget}->clr_commands;
@@ -35,22 +47,215 @@
map ["$cmd$_", $text],
sort { (length $a) <=> (length $b) }
@args
- } CFPlus::Pod::find command_help => "*";
+ } sort { $a->{par} <=> $b->{par} }
+ CFPlus::Pod::find command => "*";
- $self->{map_widget}->add_command (@$_)
- for @cmd_help;
+ $self->connect_ext (event_music => sub {
+ my ($ev) = @_;
- $self->{noface} = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ return unless $::CFG->{bgm_enable};
- $self->{open_container} = 0;
+ 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 (event_capabilities => sub {
+ my ($cap) = @_;
+
+ 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 (__widget_ref__ => sub {
+ $self->{widget}{$_[0]}
+ });
+
+ # widgetset new
+ $self->connect_ext (ws_n => sub {
+ my ($arg) = @_;
+
+ $self->{widgetset}{$arg{id}} = {
+ w => {},
+ };
+ });
+
+ # widgetset destroy
+ $self->connect_ext (ws_d => sub {
+ my ($arg) = @_;
+
+ my $ws = delete $self->{widgetset}{$arg{id}}
+ or return;
+
+ $_->destroy
+ for values %{$ws->{w}};
+ });
+
+ # widgetset destroy
+ $self->connect_ext (ws_c => sub {
+ my ($arg) = @_;
+
+ my $args = $arg->{args} || {};
+
+ for my $ev (grep /^on_/, keys %$args) {
+ $args->{$ev} = sub {
+ my $id = shift->{s_id};
+ $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
+
+ 1
+ };
+ }
+
+ 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;
+
+ $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");
+ }
+ });
+
+ # widget call
+ $self->connect_ext (w_c => sub {
+ my ($arg) = @_;
+
+ my $w = $self->{widget}{$arg->{id}}
+ or return;
+ my $m = $arg->{name};
+
+ my $a = $arg->{args} || [];
+
+ if (exists $arg->{rid}) {
+ $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
+ } else {
+ $w->$m (@$a);
+ }
+ });
+
+ # widget set
+ $self->connect_ext (w_s => sub {
+ my ($arg) = @_;
+
+ my $w = $self->{widget}{$arg->{id}}
+ or return;
+
+ my $attr = $arg->{attr};
+
+ for (my $i = 0; $i < $#$attr; $i += 2) {
+ $w->{$attr->[$i]} = $attr->[$i+1];
+ $w->{parent}->realloc if $attr->[$i] =~ /^c_/ && $w->{visible};#d# really?
+ }
+ });
- # "global"
- $self->{tilecache} = CFPlus::db_table "tilecache";
- $self->{facemap} = CFPlus::db_table "facemap";
+ # widget get
+ $self->connect_ext (w_g => sub {
+ my ($arg) = @_;
+
+ my $w = $self->{widget}{$arg->{id}}
+ or return;
+
+ $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{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;
+
+ {
+ $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}});
+ }
+
+ {
+ $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}});
+ }
+
+ $self->{open_container} = 0;
# per server
- $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
+ $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
$self
}
@@ -217,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);
@@ -249,18 +452,21 @@
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";
my @TOOLTIP_LVL = (tooltip => "Level. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
- my @TOOLTIP_NAME = (tooltip => "Name. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
my ($x, $y) = (0, 1);
for (
@@ -279,10 +485,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 {
@@ -292,14 +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, @TOOLTIP_NAME);
+ 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) {
@@ -308,27 +520,29 @@
}
}
+sub macro_send {
+ my ($self, $macro) = @_;
+
+ for my $cmd (@{ $macro->{action} }) {
+ $self->send_command ($cmd);
+ }
+}
+
sub user_send {
my ($self, $command) = @_;
- if ($self->{record}) {
- push @{$self->{record}}, $command;
- }
+ $self->{record}->($command)
+ if $self->{record};
$self->logprint ("send: ", $command);
$self->send_command ($command);
::status ($command);
}
-sub start_record {
- my ($self) = @_;
-
- $self->{record} = [];
-}
+sub record {
+ my ($self, $cb) = @_;
-sub stop_record {
- my ($self) = @_;
- return delete $self->{record};
+ $self->{record} = $cb;
}
sub map_scroll {
@@ -340,7 +554,7 @@
sub feed_map1a {
my ($self, $data) = @_;
- $self->{map}->map1a_update ($data);
+ $self->{map}->map1a_update ($data, $self->{setup}{extmap});
$self->{map_widget}->update;
}
@@ -359,7 +573,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#
}
@@ -373,20 +587,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::get tilecache => $id, sub {
+ my ($data) = @_;
+
+ return unless $self->{map}; # stop when destroyed
+
+ $self->set_texture ($id => $data)
+ if defined $data;
+
+ $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) = @_;
- $self->set_texture ($id => $data);
+ if (defined $data) {
+ $data = Compress::LZF::decompress $data;
+ #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
+
+ 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,
@@ -460,7 +701,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";
@@ -485,6 +729,8 @@
$self->flush_map;
+ ++$self->{map_change_gen};
+
my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
my $mapmapw = $self->{mapmap}->{w};
@@ -510,71 +756,60 @@
}
sub face_find {
- my ($self, $facenum, $face) = @_;
+ my ($self, $facenum, $face, $cb) = @_;
my $hash = "$face->{chksum},$face->{name}";
- my $id = $self->{facemap}->get ($hash);
-
- 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;
-
- goto gotid;
- }
- }
- $txn->txn_abort;
- }
+ my $id = CFPlus::DB::get_tile_id_sync $hash;
- CFPlus::fatal "maximum number of transaction retries reached - database problems?";
- }
+ $face->{id} = $id;
+ $self->{faceid}[$facenum] = $id;
-gotid:
- $face->{id} = $id;
- $self->{map}->set_face ($facenum => $id);
- $self->{faceid}[$facenum] = $id;#d#
+ $self->{map}->set_tileid ($facenum => $id);
- 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
- };
+ CFPlus::DB::get tilecache => $id, $cb;
}
sub face_update {
my ($self, $facenum, $face, $changed) = @_;
- $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
+ CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
+ if $changed;
$self->set_texture ($face->{id} => delete $face->{image});
}
+sub smooth_update {
+ my ($self, $facenum, $face) = @_;
+
+ $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
+}
+
sub set_texture {
my ($self, $id, $data) = @_;
- $self->{texture}[$id] ||= do {
- my $tex =
- new_from_image CFPlus::Texture
- $data, minify => 1, mipmap => 1;
+ return unless $self->{map};
- $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
- $self->{map_widget}->update;
+ $self->{texture}[$id] = my $tex =
+ new_from_image CFPlus::Texture
+ $data, minify => 1, mipmap => 1;
- $tex
- };
+ $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 {
@@ -594,52 +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],
- );
+ # 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,
+);
- $self->logprint ("info: ", $text);
+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],
+);
- my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+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;
-
- $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
- for map "$time $_", split /\n/, $text;
- $self->{logview}->scroll_to_bottom;
-
- $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 % @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 {
@@ -650,7 +916,7 @@
$spell->{message} =~ s/\n+$//;
$spell->{message} ||= "Server did not provide a description for this spell.";
- $::SPELL_PAGE->add_spell ($spell);
+ $::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});
@@ -659,7 +925,14 @@
sub spell_delete {
my ($self, $spell) = @_;
- $::SPELL_PAGE->remove_spell ($spell);
+ $::SPELL_LIST->remove_spell ($spell);
+}
+
+sub setup {
+ my ($self, $setup) = @_;
+
+ $self->{map_widget}->set_tilesize ($self->{tilesize});
+ $::MAP->resize ($self->{mapw}, $self->{maph});
}
sub addme_success {
@@ -730,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) {
@@ -737,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++;
@@ -875,10 +1153,16 @@
. "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 {
@@ -888,6 +1172,15 @@
$self->{cfplus_ext} = $_[0]{version};
$self->update_server_info;
+ if ($self->{cfplus_ext} >= 2) {
+ $self->send_ext_req ("editor_support", sub {
+ $self->{editor_support} = $_[0];
+ $self->update_server_info;
+
+ 0
+ });
+ }
+
0
});
@@ -895,9 +1188,18 @@
$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) = @_;
@@ -923,15 +1225,17 @@
sub destroy {
my ($self) = @_;
- $self->{npc_dialog}->destroy
+ (delete $self->{npc_dialog})->destroy
if $self->{npc_dialog};
$self->SUPER::destroy;
+
+ %$self = ();
}
package CFPlus::NPCDialog;
-our @ISA = 'CFPlus::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::Toplevel';
sub new {
my $class = shift;
@@ -948,7 +1252,7 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ CFPlus::weaken (my $this = $self);
$self->connect (delete => sub { $this->destroy; 1 });
@@ -960,11 +1264,7 @@
$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
$vbox->add ($self->{entry} = new CFPlus::UI::Entry
- tooltip => "Enter a message you want to tell the NPC and press return.\n\n"
- . "Sometimes you have to tell an NPC something you cannot find out during "
- . "a normal conversation (such as a password). In those cases you have to use "
- . "this text entry. You can also enter responses manually instead of using the response "
- . "buttons below.",
+ tooltip => "#npc_message_entry",
on_activate => sub {
my ($entry, $text) = @_;
@@ -1006,7 +1306,7 @@
sub update_options {
my ($self) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
$self->{options}->clear;
$self->{options}->add ($self->{bye_button});
@@ -1025,13 +1325,13 @@
sub feed {
my ($self, $msg) = @_;
- 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 $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{
@@ -1049,7 +1349,7 @@
$self->send ($kw);
};
- chr 0xfffc
+ "\x{fffc}"
}giex;
$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
@@ -1086,3 +1386,4 @@
}
1
+