--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/23 08:58:44 1.64
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 12:51:32 1.68
@@ -7,6 +7,7 @@
use CFClient;
use CFClient::UI;
+use CFClient::Pod;
use base 'Crossfire::Protocol::Base';
@@ -17,7 +18,7 @@
$self->{map_widget}->clr_commands;
- my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
+ my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
my ($pom) = @_;
my @cmd_help;
@@ -33,7 +34,7 @@
$_ = $_ eq ".*" ? "" : " $_"
for @args;
- my $text = CFClient::pod_to_pango $head2->content;
+ my $text = CFClient::Pod::as_markup $head2->content;
push @cmd_help, ["$cmd$_", $text]
for sort { (length $a) <=> (length $b) }
@@ -262,7 +263,13 @@
$sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
$sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
- my ($x, $y) = (1, 0);
+ 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 (
sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
map [$_, $self->{skill_info}{$_}],
@@ -271,11 +278,32 @@
) {
my ($idx, $name) = @$_;
+ my $spell_cb = sub {
+ my ($widget, $ev) = @_;
+
+ if ($ev->{button} == 1) {
+ $::CONN->user_send ("ready_skill $name");
+ } elsif ($ev->{button} == 2) {
+ $::CONN->user_send ("use_skill $name");
+ } elsif ($ev->{button} == 3) {
+ (new CFClient::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"]) }],
+ ],
+ )->popup ($ev);
+ } else {
+ return 0;
+ }
+
+ 1
+ };
+
$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
- text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
+ 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
- text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
- $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
+ 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);
$x++ and ($x, $y) = (0, $y + 1);
}
@@ -599,11 +627,11 @@
# try to create single paragraphs of multiple lines sent by the server
$text =~ s/(?<=\S)\n(?=\w)/ /g;
- $text = CFClient::UI::Label::escape $text;
+ $text = CFClient::asxml $text;
$text =~ s/\[b\](.*?)\[\/b\]/\1<\/b>/g;
$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
- $self->{logview}->add_paragraph ($color[$color], $_)
+ $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
for map "$time $_", split /\n/, $text;
$self->{logview}->scroll_to_bottom;
@@ -624,15 +652,15 @@
sub spell_add {
my ($self, $spell) = @_;
- # try to create single paragraphs of multiple lines sent by the server
+ # try to create single paragraphs out of the multiple lines sent by the server
$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
$spell->{message} =~ s/\n+$//;
$spell->{message} ||= "Server did not provide a description for this spell.";
$::SPELL_PAGE->add_spell ($spell);
- $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
- $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
+ $self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
+ $self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
}
sub spell_delete {
@@ -644,13 +672,13 @@
sub addme_success {
my ($self) = @_;
- my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
+ my $skill_help = CFClient::Pod::load CFClient::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_to_pango $head2->content;
+ $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
}
\%skill_help
@@ -658,10 +686,10 @@
for my $skill (values %{$self->{skill_info}}) {
$self->{map_widget}->add_command ("ready_skill $skill",
- (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
+ (CFClient::asxml "Ready the skill '$skill'\n\n")
. $skill_help->{$skill});
$self->{map_widget}->add_command ("use_skill $skill",
- (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
+ (CFClient::asxml "Immediately use the skill '$skill'\n\n")
. $skill_help->{$skill});
}
}
@@ -696,14 +724,14 @@
$self->send ("requestinfo image_sums $face $face");
- $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
+ $self->{statusbox}->add (CFClient::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::UI::Label::escape "starting to prefetch",
+ $self->{statusbox}->add (CFClient::asxml "starting to prefetch",
group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
}
}
@@ -975,7 +1003,10 @@
$self->{entry}->grab_focus;
- $self->{textview}->add_paragraph ([1, 1, 0, 1], "[starting conversation with $self->{title}]\n\n");
+ $self->{textview}->add_paragraph ({
+ fg => [1, 1, 0, 1],
+ markup => "[starting conversation with $self->{title}]\n\n",
+ });
$self->show;
$self
@@ -1014,7 +1045,7 @@
$self->{kw}{$_} = 1 for @kw;
- $msg = "\n" . CFClient::UI::Label::escape $msg;
+ $msg = "\n" . CFClient::UI::asxml $msg;
my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
my @link;
$msg =~ s{
@@ -1035,7 +1066,7 @@
chr 0xfffc
}giex;
- $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
+ $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
$self->{textview}->scroll_to_bottom;
$self->update_options;
} else {
@@ -1048,7 +1079,7 @@
sub send {
my ($self, $msg) = @_;
- $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
+ $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
$self->{textview}->scroll_to_bottom;
utf8::encode $msg;
@@ -1067,4 +1098,4 @@
$self->SUPER::destroy;
}
-1;
+1