--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 12:51:32 1.68
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 13:16:44 1.69
@@ -1,13 +1,13 @@
-package CFClient::Protocol;
+package CFPlus::Protocol;
use utf8;
use strict;
use Crossfire::Protocol::Constants;
-use CFClient;
-use CFClient::UI;
-use CFClient::Pod;
+use CFPlus;
+use CFPlus::UI;
+use CFPlus::Pod;
use base 'Crossfire::Protocol::Base';
@@ -18,7 +18,7 @@
$self->{map_widget}->clr_commands;
- my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
+ my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
my ($pom) = @_;
my @cmd_help;
@@ -34,7 +34,7 @@
$_ = $_ eq ".*" ? "" : " $_"
for @args;
- my $text = CFClient::Pod::as_markup $head2->content;
+ my $text = CFPlus::Pod::as_markup $head2->content;
push @cmd_help, ["$cmd$_", $text]
for sort { (length $a) <=> (length $b) }
@@ -47,17 +47,17 @@
$self->{map_widget}->add_command (@$_)
for @$cmd_help;
- $self->{noface} = new_from_file CFClient::Texture
- CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ $self->{noface} = new_from_file CFPlus::Texture
+ CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
$self->{open_container} = 0;
# "global"
- $self->{tilecache} = CFClient::db_table "tilecache";
- $self->{facemap} = CFClient::db_table "facemap";
+ $self->{tilecache} = CFPlus::db_table "tilecache";
+ $self->{facemap} = CFPlus::db_table "facemap";
# per server
- $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
+ $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
$self
}
@@ -256,12 +256,12 @@
if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
$sktbl->clear;
- $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
- $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
- $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
- $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
- $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
- $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
+ $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 $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
@@ -286,7 +286,7 @@
} elsif ($ev->{button} == 2) {
$::CONN->user_send ("use_skill $name");
} elsif ($ev->{button} == 3) {
- (new CFClient::UI::Menu
+ (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"]) }],
@@ -299,11 +299,11 @@
1
};
- $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
+ $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 CFClient::UI::Label
+ $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 CFClient::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
+ $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
$x++ and ($x, $y) = (0, $y + 1);
}
@@ -527,7 +527,7 @@
# create new id for face
# I love transactions
for (1..100) {
- my $txn = $CFClient::DB_ENV->txn_begin;
+ 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;
@@ -541,7 +541,7 @@
$txn->txn_abort;
}
- CFClient::fatal "maximum number of transaction retries reached - database problems?";
+ CFPlus::fatal "maximum number of transaction retries reached - database problems?";
}
gotid:
@@ -574,7 +574,7 @@
$self->{texture}[$id] ||= do {
my $tex =
- new_from_image CFClient::Texture
+ new_from_image CFPlus::Texture
$data, minify => 1, mipmap => 1;
$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
@@ -627,7 +627,7 @@
# try to create single paragraphs of multiple lines sent by the server
$text =~ s/(?<=\S)\n(?=\w)/ /g;
- $text = CFClient::asxml $text;
+ $text = CFPlus::asxml $text;
$text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
@@ -659,8 +659,8 @@
$::SPELL_PAGE->add_spell ($spell);
- $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
- $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
+ $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
+ $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
}
sub spell_delete {
@@ -672,13 +672,13 @@
sub addme_success {
my ($self) = @_;
- my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
+ my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
my ($pom) = @_;
my %skill_help;
for my $head2 ($pom->head1->[3]->head2) {
- $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
+ $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
}
\%skill_help
@@ -686,10 +686,10 @@
for my $skill (values %{$self->{skill_info}}) {
$self->{map_widget}->add_command ("ready_skill $skill",
- (CFClient::asxml "Ready the skill '$skill'\n\n")
+ (CFPlus::asxml "Ready the skill '$skill'\n\n")
. $skill_help->{$skill});
$self->{map_widget}->add_command ("use_skill $skill",
- (CFClient::asxml "Immediately use the skill '$skill'\n\n")
+ (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
. $skill_help->{$skill});
}
}
@@ -724,20 +724,20 @@
$self->send ("requestinfo image_sums $face $face");
- $self->{statusbox}->add (CFClient::asxml "prefetching $todo",
+ $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 (CFClient::asxml "starting to prefetch",
+ $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
}
}
sub update_floorbox {
- $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
+ $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
return unless $::CONN;
$::FLOORBOX->clear;
@@ -747,14 +747,14 @@
if ($row < 6) {
local $_->{face_widget}; # hack to force recreation of widget
local $_->{desc_widget}; # hack to force recreation of widget
- CFClient::Item::update_widgets $_;
+ CFPlus::Item::update_widgets $_;
$::FLOORBOX->add (0, $row, $_->{face_widget});
$::FLOORBOX->add (1, $row, $_->{desc_widget});
$row++;
} else {
- $::FLOORBOX->add (1, $row, new CFClient::UI::Button
+ $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
text => "More...",
on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
);
@@ -762,7 +762,7 @@
}
}
if ($::CONN->{open_container}) {
- $::FLOORBOX->add (1, $row++, new CFClient::UI::Button
+ $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
text => "Close container",
on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
);
@@ -778,10 +778,10 @@
update_floorbox;
$::INV_RIGHT_HB->clear ();
- $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
+ $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
if ($tag != 0) { # Floor isn't closable, is it?
- $::INV_RIGHT_HB->add (new CFClient::UI::Button
+ $::INV_RIGHT_HB->add (new CFPlus::UI::Button
text => "Close container",
tooltip => "Close the currently open container (if one is open)",
on_activate => sub {
@@ -799,7 +799,7 @@
sub update_containers {
my ($self) = @_;
- $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
+ $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
my $todo = delete $self->{update_container}
or return;
@@ -846,13 +846,13 @@
#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
- CFClient::Item::update_widgets $item;
+ CFPlus::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}, CFClient::Item::desc_string $item);
+ set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
} else {
$self->{update_container}{$item->{container}}++;
@@ -917,7 +917,7 @@
if (exists $res{npc_dialog}) {
# start npc chat dialog
- $self->{npc_dialog} = new CFClient::NPCDialog::
+ $self->{npc_dialog} = new CFPlus::NPCDialog::
dx => $x,
dy => $y,
title => "$res{npc_dialog} (NPC)",
@@ -939,9 +939,9 @@
$self->SUPER::destroy;
}
-package CFClient::NPCDialog;
+package CFPlus::NPCDialog;
-our @ISA = 'CFClient::UI::FancyFrame';
+our @ISA = 'CFPlus::UI::FancyFrame';
sub new {
my $class = shift;
@@ -963,13 +963,13 @@
$self->connect (delete => sub { $this->destroy; 1 });
# better use a pane...
- $self->add (my $hbox = new CFClient::UI::HBox);
- $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
+ $self->add (my $hbox = new CFPlus::UI::HBox);
+ $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
- $hbox->add (my $vbox = new CFClient::UI::VBox);
+ $hbox->add (my $vbox = new CFPlus::UI::VBox);
- $vbox->add (new CFClient::UI::Label text => "Message Entry:");
- $vbox->add ($self->{entry} = new CFClient::UI::Entry
+ $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 "
@@ -987,9 +987,9 @@
},
);
- $vbox->add ($self->{options} = new CFClient::UI::VBox);
+ $vbox->add ($self->{options} = new CFPlus::UI::VBox);
- $self->{bye_button} = new CFClient::UI::Button
+ $self->{bye_button} = new CFPlus::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 },
@@ -1021,7 +1021,7 @@
$self->{options}->add ($self->{bye_button});
for my $kw (sort keys %{ $self->{kw} }) {
- $self->{options}->add (new CFClient::UI::Button
+ $self->{options}->add (new CFPlus::UI::Button
text => $kw,
on_activate => sub {
$self->send ($kw);
@@ -1045,7 +1045,7 @@
$self->{kw}{$_} = 1 for @kw;
- $msg = "\n" . CFClient::UI::asxml $msg;
+ $msg = "\n" . CFPlus::UI::asxml $msg;
my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
my @link;
$msg =~ s{
@@ -1053,7 +1053,7 @@
}{
my $kw = $1;
- push @link, new CFClient::UI::Label
+ push @link, new CFPlus::UI::Label
markup => "$kw",
can_hover => 1,
can_events => 1,
@@ -1079,7 +1079,7 @@
sub send {
my ($self, $msg) = @_;
- $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
+ $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
$self->{textview}->scroll_to_bottom;
utf8::encode $msg;