--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/10/01 11:53:59 1.85
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/04/12 07:53:31 1.101
@@ -6,15 +6,25 @@
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,
+ %{$arg{setup_req} || {}},
+ },
+ );
$self->{map_widget}->clr_commands;
@@ -35,14 +45,28 @@
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 (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->{noface} = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ my $w = int $self->{mapw} * 32 / $self->{tilesize};
+ my $h = int $self->{maph} * 32 / $self->{tilesize};
+
+ $self->setup_req (mapsize => "${w}x${h}");
+ }
+ }
+ });
+
+ $self->{map_widget}->add_command (@$_)
+ for @cmd_help;
{
$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
@@ -50,17 +74,16 @@
$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
}
@@ -288,10 +311,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 {
@@ -318,27 +342,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) = @_;
+sub record {
+ my ($self, $cb) = @_;
- $self->{record} = [];
-}
-
-sub stop_record {
- my ($self) = @_;
- return delete $self->{record};
+ $self->{record} = $cb;
}
sub map_scroll {
@@ -369,7 +395,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#
}
@@ -383,20 +409,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};
- $self->set_texture ($id => $data);
+ 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#
+
+ 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,
@@ -470,7 +523,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";
@@ -495,6 +551,8 @@
$self->flush_map;
+ ++$self->{map_change_gen};
+
my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
my $mapmapw = $self->{mapmap}->{w};
@@ -520,71 +578,44 @@
}
sub face_find {
- my ($self, $facenum, $face) = @_;
+ my ($self, $facenum, $face, $cb) = @_;
my $hash = "$face->{chksum},$face->{name}";
- my $id = $self->{facemap}->get ($hash);
+ my $id = CFPlus::DB::get_tile_id_sync $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;
+ $face->{id} = $id;
+ $self->{faceid}[$facenum] = $id;
- goto gotid;
- }
- }
- $txn->txn_abort;
- }
-
- CFPlus::fatal "maximum number of transaction retries reached - database problems?";
- }
-
-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;
+ $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;
-
- $tex
- };
+ $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ $self->{map_widget}->update;
}
sub sound_play {
@@ -623,9 +654,9 @@
[0.74, 0.65, 0.41],
);
- $self->logprint ("info: ", $text);
+ my $fg = $color[$color % @color];
- my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+ $self->logprint ("info: ", $text);
# try to create single paragraphs of multiple lines sent by the server
$text =~ s/(?<=\S)\n(?=\w)/ /g;
@@ -634,13 +665,12 @@
$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;
+ ::message ({ fg => $fg, markup => $_ })
+ for split /\n/, $text;
$self->{statusbox}->add ($text,
group => $text,
- fg => $color[$color],
+ fg => $fg,
timeout => $color >= 2 ? 180 : 10,
tooltip_font => $::FONT_FIXED,
);
@@ -660,7 +690,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});
@@ -669,7 +699,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 {
@@ -885,13 +922,14 @@
. "protocol version $self->{version}\n"
. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
- . "editor support $yesno[!!length $self->{cvs_root}]\n"
- . "test server " . (length $self->{test_server} ? $self->{test_server} : $yesno[0]) . "\n"
+ . "editing support $yesno[!!$self->{editor_support}]\n"
. "map attributes $yesno[$self->{setup}{extmap} > 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 {
@@ -903,9 +941,7 @@
if ($self->{cfplus_ext} >= 2) {
$self->send_ext_req ("editor_support", sub {
- $self->{cvs_root} = $_[0]{cvs_root};
- $self->{upload} = $_[0]{upload};
- $self->{test_server} = $_[0]{server};
+ $self->{editor_support} = $_[0];
$self->update_server_info;
0
@@ -919,9 +955,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) = @_;
@@ -972,7 +1017,7 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ CFPlus::weaken (my $this = $self);
$self->connect (delete => sub { $this->destroy; 1 });
@@ -1026,7 +1071,7 @@
sub update_options {
my ($self) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
$self->{options}->clear;
$self->{options}->add ($self->{bye_button});
@@ -1045,7 +1090,7 @@
sub feed {
my ($self, $msg) = @_;
- Scalar::Util::weaken $self;
+ CFPlus::weaken $self;
if ($msg->{msgtype} eq "reply") {
$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};