--- deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/23 16:11:12 1.65
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2006/07/30 12:51:32 1.68
@@ -34,7 +34,7 @@
$_ = $_ eq ".*" ? "" : " $_"
for @args;
- my $text = CFClient::Pod::as_xml $head2->content;
+ my $text = CFClient::Pod::as_markup $head2->content;
push @cmd_help, ["$cmd$_", $text]
for sort { (length $a) <=> (length $b) }
@@ -263,6 +263,12 @@
$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 $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] }
@@ -272,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);
}
@@ -604,7 +631,7 @@
$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;
@@ -625,7 +652,7 @@
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.";
@@ -651,7 +678,7 @@
my %skill_help;
for my $head2 ($pom->head1->[3]->head2) {
- $skill_help{$head2->title} = CFClient::Pod::as_xml $head2->content;
+ $skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
}
\%skill_help
@@ -976,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
@@ -1036,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 {
@@ -1049,7 +1079,7 @@
sub send {
my ($self, $msg) = @_;
- $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::asxml $msg);
+ $self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
$self->{textview}->scroll_to_bottom;
utf8::encode $msg;
@@ -1068,4 +1098,4 @@
$self->SUPER::destroy;
}
-1;
+1