--- deliantra/Deliantra-Client/DC/UI.pm 2006/06/05 01:22:08 1.280
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/23 23:54:30 1.312
@@ -5,6 +5,7 @@
use Scalar::Util ();
use List::Util ();
+use Event;
use CFClient;
use CFClient::Texture;
@@ -18,32 +19,7 @@
our %WIDGET; # all widgets, weak-referenced
-sub get_layout {
- my $layout;
-
- for (grep { $_->{name} } values %WIDGET) {
- my $win = $layout->{$_->{name}} = { };
-
- $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
- $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
- $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
- $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
-
- $win->{show} = $_->{visible} && $_->{is_toplevel};
- }
-
- $layout
-}
-
-sub set_layout {
- my ($layout) = @_;
-
- $LAYOUT = $layout;
-}
-
-sub check_tooltip {
- return if $ENV{CFPLUS_DEBUG} & 8;
-
+our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
@@ -52,6 +28,8 @@
$TOOLTIP->{owner} = $widget;
+ return if $ENV{CFPLUS_DEBUG} & 8;
+
my $tip = $widget->{tooltip};
$tip = $tip->($widget) if CODE:: eq ref $tip;
@@ -67,6 +45,29 @@
$TOOLTIP->hide;
delete $TOOLTIP->{owner};
+});
+
+sub get_layout {
+ my $layout;
+
+ for (grep { $_->{name} } values %WIDGET) {
+ my $win = $layout->{$_->{name}} = { };
+
+ $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
+ $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
+ $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
+ $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
+
+ $win->{show} = $_->{visible} && $_->{is_toplevel};
+ }
+
+ $layout
+}
+
+sub set_layout {
+ my ($layout) = @_;
+
+ $LAYOUT = $layout;
}
# class methods for events
@@ -90,7 +91,7 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
$BUTTON_STATE |= 1 << ($ev->{button} - 1);
@@ -115,7 +116,7 @@
$grab->update if $grab;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
}
@@ -131,7 +132,7 @@
$hover->update if $hover && $hover->{can_hover};
$HOVER->update if $HOVER && $HOVER->{can_hover};
- check_tooltip;
+ $TOOLTIP_WATCHER->start;
}
$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
@@ -273,17 +274,16 @@
$_->set_invisible for $self->children;
- delete $self->{root};
delete $self->{visible};
+ delete $self->{root};
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- CFClient::UI::check_tooltip
+ $CFClient::UI::TOOLTIP_WATCHER->cb->()
if $TOOLTIP->{owner} == $self;
- $self->focus_out;
-
+ $self->emit ("focus_out");
$self->emit (visibility_change => 0);
}
@@ -316,8 +316,8 @@
sub move_abs {
my ($self, $x, $y, $z) = @_;
- $self->{x} = List::Util::max 0, int $x;
- $self->{y} = List::Util::max 0, int $y;
+ $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
+ $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
$self->{z} = $z if defined $z;
$self->update;
@@ -337,6 +337,10 @@
Carp::confess "size_request is abstract";
}
+sub baseline_shift {
+ 0
+}
+
sub configure {
my ($self, $x, $y, $w, $h) = @_;
@@ -368,10 +372,6 @@
}
}
-sub size_allocate {
- # nothing to be done
-}
-
sub children {
# nop
}
@@ -383,8 +383,8 @@
sub set_max_size {
my ($self, $w, $h) = @_;
- delete $self->{max_w}; $self->{max_w} = $w if $w;
- delete $self->{max_h}; $self->{max_h} = $h if $h;
+ $self->{max_w} = int $w if defined $w;
+ $self->{max_h} = int $h if defined $h;
$self->realloc;
}
@@ -401,7 +401,7 @@
if ($CFClient::UI::TOOLTIP->{owner} == $self) {
delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ $CFClient::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -419,7 +419,7 @@
$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
-sub focus_in {
+sub invoke_focus_in {
my ($self) = @_;
return if $FOCUS == $self;
@@ -427,38 +427,59 @@
my $focus = $FOCUS; $FOCUS = $self;
- $self->_emit (focus_in => $focus);
-
$focus->update if $focus;
$FOCUS->update;
+
+ 0
}
-sub focus_out {
+sub invoke_focus_out {
my ($self) = @_;
return unless $FOCUS == $self;
my $focus = $FOCUS; undef $FOCUS;
- $self->_emit (focus_out => $focus);
-
$focus->update if $focus; #?
- $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
+ $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
unless $FOCUS;
+
+ 0
+}
+
+sub grab_focus {
+ my ($self) = @_;
+
+ $self->emit ("focus_in");
}
-sub mouse_motion { 0 }
-sub button_up { 0 }
-sub key_down { 0 }
-sub key_up { 0 }
+sub invoke_mouse_motion { 1 }
+sub invoke_button_up { 1 }
+sub invoke_key_down { 1 }
+sub invoke_key_up { 1 }
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
- $self->focus_in;
+ $self->grab_focus;
- 0
+ 1
+}
+
+sub connect {
+ my ($self, $signal, $cb) = @_;
+
+ push @{ $self->{signal_cb}{$signal} }, $cb;
+}
+
+sub emit {
+ my ($self, $signal, @args) = @_;
+
+ #d##TODO# stop propagating at first true, do not use sum
+ (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
+ || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
+ || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
}
sub find_widget {
@@ -480,29 +501,6 @@
$self->set_visible if $parent->{visible};
}
-sub connect {
- my ($self, $signal, $cb) = @_;
-
- push @{ $self->{signal_cb}{$signal} }, $cb;
-}
-
-sub _emit {
- my ($self, $signal, @args) = @_;
-
- List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
-}
-
-sub emit {
- my ($self, $signal, @args) = @_;
-
- $self->_emit ($signal, @args)
- || $self->$signal (@args);
-}
-
-sub visibility_change {
- #my ($self, $visible) = @_;
-}
-
sub realloc {
my ($self) = @_;
@@ -543,8 +541,6 @@
# update screen rectangle
local $draw_x = $draw_x + $self->{x};
local $draw_y = $draw_y + $self->{y};
- local $draw_w = $draw_x + $self->{w};
- local $draw_h = $draw_y + $self->{h};
# skip widgets that are entirely outside the drawing area
return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
@@ -594,7 +590,9 @@
my ($self) = @_;
delete $WIDGET{$self+0};
- #$self->deactivate;
+
+ eval { $self->destroy };
+ warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
}
#############################################################################
@@ -769,8 +767,7 @@
sub add {
my ($self, $child) = @_;
- $self->{children} = [];
-
+ $self->SUPER::remove ($_) for @{ $self->{children} };
$self->SUPER::add ($child);
}
@@ -789,10 +786,12 @@
$_[0]{children}[0]->size_request
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
$self->{children}[0]->configure (0, 0, $w, $h);
+
+ 1
}
#############################################################################
@@ -818,11 +817,12 @@
$self->SUPER::update;
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
$self->update;
+
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
sub _render {
@@ -893,7 +893,7 @@
($w, $h)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
my $child = $self->child;
@@ -903,6 +903,8 @@
$self->child->configure (0, 0, $w, $h);
$self->update;
+
+ 1
}
sub set_offset {
@@ -1002,13 +1004,13 @@
$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
-
my $child = $self->{vp}->child;
$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
#TODO# update range on size_allocate depending on child
@@ -1073,8 +1075,6 @@
sub new {
my ($class, %arg) = @_;
- my $title = delete $arg{title};
-
my $self = $class->SUPER::new (
bg => [1, 1, 1, 1],
border_bg => [1, 1, 1, 1],
@@ -1085,12 +1085,21 @@
%arg,
);
- $self->{title} = new CFClient::UI::Label
+ $self->{title_widget} = new CFClient::UI::Label
align => 0,
valign => 1,
- text => $title,
- fontsize => $self->{border}
- if defined $title;
+ text => $self->{title},
+ fontsize => $self->{border},
+ if exists $self->{title};
+
+ if ($self->{has_close_button}) {
+ $self->{close_button} =
+ new CFClient::UI::ImageButton
+ path => 'x1_close.png',
+ on_activate => sub { $self->hide };
+
+ $self->CFClient::UI::Container::add ($self->{close_button});
+ }
$self
}
@@ -1099,7 +1108,8 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
+ $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
+ $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
}
sub border {
@@ -1109,8 +1119,11 @@
sub size_request {
my ($self) = @_;
- $self->{title}->size_request
- if $self->{title};
+ $self->{title_widget}->size_request
+ if $self->{title_widget};
+
+ $self->{close_button}->size_request
+ if $self->{close_button};
my ($w, $h) = $self->SUPER::size_request;
@@ -1120,24 +1133,29 @@
)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- if ($self->{title}) {
- $self->{title}{w} = $w;
- $self->{title}{h} = $h;
- $self->{title}->size_allocate ($w, $h);
+ if ($self->{title_widget}) {
+ $self->{title_widget}{w} = $w;
+ $self->{title_widget}{h} = $h;
+ $self->{title_widget}->invoke_size_allocate ($w, $h);
}
my $border = $self->border;
$h -= List::Util::max 0, $border * 2;
$w -= List::Util::max 0, $border * 2;
-
+
$self->child->configure ($border, $border, $w, $h);
+
+ $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
+ if $self->{close_button};
+
+ 1
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
my ($w, $h) = @$self{qw(w h)};
@@ -1178,7 +1196,7 @@
$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
# HACK: the next line is required to enforce placement
- $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
+ $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
};
} else {
return 0;
@@ -1187,18 +1205,18 @@
1
}
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
- !!delete $self->{motion}
+ ! ! delete $self->{motion}
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
$self->{motion}->($ev, $x, $y) if $self->{motion};
- !!$self->{motion}
+ ! ! $self->{motion}
}
sub _draw {
@@ -1234,10 +1252,15 @@
$child->draw;
- if ($self->{title}) {
+ if ($self->{title_widget}) {
glTranslate 0, $border - $self->{h};
- $self->{title}->_draw;
+ $self->{title_widget}->_draw;
+
+ glTranslate 0, - ($border - $self->{h});
}
+
+ $self->{close_button}->draw
+ if $self->{close_button};
}
#############################################################################
@@ -1272,6 +1295,12 @@
$self->realloc;
}
+sub remove {
+ my ($self, $child) = @_;
+
+ # TODO: not yet implemented
+}
+
# TODO: move to container class maybe? send children a signal on removal?
sub clear {
my ($self) = @_;
@@ -1320,7 +1349,7 @@
)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
my ($ws, $hs) = $self->get_wh;
@@ -1362,6 +1391,7 @@
$y += $row_h;
}
+ 1
}
sub find_widget {
@@ -1408,39 +1438,39 @@
)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
my $space = $self->{vertical} ? $h : $w;
- my $children = $self->{children};
+ my @children = $self->visible_children;
my @req;
if ($self->{homogeneous}) {
- @req = ($space / (@$children || 1)) x @$children;
+ @req = ($space / (@children || 1)) x @children;
} else {
- @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
+ @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
my $req = List::Util::sum @req;
if ($req > $space) {
# ah well, not enough space
$_ *= $space / $req for @req;
} else {
- my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
+ my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
$space = ($space - $req) / $expand; # remaining space to give away
- $req[$_] += $space * $children->[$_]{expand}
- for 0 .. $#$children;
+ $req[$_] += $space * $children[$_]{expand}
+ for 0 .. $#children;
}
}
CFClient::UI::harmonize \@req;
my $pos = 0;
- for (0 .. $#$children) {
+ for (0 .. $#children) {
my $alloc = $req[$_];
- $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
+ $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
$pos += $alloc;
}
@@ -1540,6 +1570,13 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1549,6 +1586,7 @@
$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1564,6 +1602,7 @@
$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
$self->{layout}->set_markup ($markup);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1571,34 +1610,44 @@
sub size_request {
my ($self) = @_;
- $self->{layout}->set_font ($self->{font}) if $self->{font};
- $self->{layout}->set_width ($self->{max_w} || -1);
- $self->{layout}->set_ellipsise ($self->{ellipsise});
- $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
- $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+ $self->{size_req} ||= do {
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
+ $self->{layout}->set_width ($self->{max_w} || -1);
+ $self->{layout}->set_ellipsise ($self->{ellipsise});
+ $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+ $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- my ($w, $h) = $self->{layout}->size;
+ my ($w, $h) = $self->{layout}->size;
- if (exists $self->{template}) {
- $self->{template}->set_font ($self->{font}) if $self->{font};
- $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
+ if (exists $self->{template}) {
+ $self->{template}->set_font ($self->{font}) if $self->{font};
+ $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
- my ($w2, $h2) = $self->{template}->size;
+ my ($w2, $h2) = $self->{template}->size;
- $w = List::Util::max $w, $w2;
- $h = List::Util::max $h, $h2;
- }
+ $w = List::Util::max $w, $w2;
+ $h = List::Util::max $h, $h2;
+ }
- ($w, $h)
+ [$w, $h]
+ };
+
+ @{ $self->{size_req} }
}
-sub size_allocate {
+sub baseline_shift {
+ $_[0]{layout}->descent
+}
+
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
delete $self->{ox};
delete $self->{texture}
unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
+
+ 1
}
sub set_fontsize {
@@ -1610,6 +1659,14 @@
$self->realloc;
}
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+
+ $self->SUPER::reconfigure;
+}
+
sub _draw {
my ($self) = @_;
@@ -1637,12 +1694,18 @@
};
glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor_premultiply @{$self->{fg}}
- if $tex->{format} == GL_ALPHA;
+ my $w = List::Util::min $self->{w} + 4, $tex->{w};
+ my $h = List::Util::min $self->{h} + 2, $tex->{h};
- $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+ if ($tex->{format} == GL_ALPHA) {
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+ glColor @{$self->{fg}};
+ $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
+ } else {
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
+ }
glDisable GL_TEXTURE_2D;
}
@@ -1668,6 +1731,7 @@
valign => 0,
can_events => 1,
#text => ...
+ #hidden => "*",
@_
)
}
@@ -1684,8 +1748,11 @@
$text =~ s/./*/g if $self->{hidden};
$self->{layout}->set_text ("$text ");
+ delete $self->{size_req};
+
+ $self->emit (changed => $self->{text});
- $self->_emit (changed => $self->{text});
+ $self->realloc;
$self->update;
}
@@ -1694,8 +1761,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
-
- $self->realloc;
}
sub get_text {
@@ -1710,7 +1775,7 @@
($w + 1, $h) # add 1 for cursor
}
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
my $mod = $ev->{mod};
@@ -1732,7 +1797,7 @@
} elsif ($sym == CFClient::SDLK_END) {
$self->{cursor} = length $text;
} elsif ($uni == 27) {
- $self->_emit ('escape');
+ $self->emit ('escape');
} elsif ($uni) {
substr $text, $self->{cursor}++, 0, chr $uni;
} else {
@@ -1746,18 +1811,18 @@
1
}
-sub focus_in {
+sub invoke_focus_in {
my ($self) = @_;
$self->{last_activity} = $::NOW;
- $self->SUPER::focus_in;
+ $self->SUPER::invoke_focus_in
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
- $self->SUPER::button_down ($ev, $x, $y);
+ $self->SUPER::invoke_button_down ($ev, $x, $y);
my $idx = $self->{layout}->xy_to_index ($x, $y);
@@ -1772,11 +1837,11 @@
1
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
- 0
+ 1
}
sub _draw {
@@ -1827,7 +1892,7 @@
use CFClient::OpenGL;
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
my $sym = $ev->{sym};
@@ -1835,9 +1900,10 @@
if ($sym == 13) {
unshift @{$self->{history}},
my $txt = $self->get_text;
+
$self->{history_pointer} = -1;
$self->{history_saveback} = '';
- $self->_emit (activate => $txt);
+ $self->emit (activate => $txt);
$self->update;
} elsif ($sym == CFClient::SDLK_UP) {
@@ -1863,7 +1929,7 @@
}
} else {
- return $self->SUPER::key_down ($ev)
+ return $self->SUPER::invoke_key_down ($ev)
}
1
@@ -1897,9 +1963,7 @@
)
}
-sub activate { }
-
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
$self->emit ("activate")
@@ -1927,6 +1991,42 @@
#############################################################################
+package CFClient::UI::ImageButton;
+
+our @ISA = CFClient::UI::Image::;
+
+use CFClient::OpenGL;
+
+my %textures;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ padding_x => 4,
+ padding_y => 4,
+ fg => [1, 1, 1],
+ active_fg => [0, 0, 1],
+ can_hover => 1,
+ align => 0,
+ valign => 0,
+ can_events => 1,
+ @_
+ );
+}
+
+sub invoke_button_up {
+ my ($self, $ev, $x, $y) = @_;
+
+ $self->emit ("activate")
+ if $x >= 0 && $x < $self->{w}
+ && $y >= 0 && $y < $self->{h};
+
+ 1
+}
+
+#############################################################################
+
package CFClient::UI::CheckBox;
our @ISA = CFClient::UI::DrawBG::;
@@ -1959,13 +2059,13 @@
(6) x 2
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
$self->{state} = !$self->{state};
- $self->_emit (changed => $self->{state});
+ $self->emit (changed => $self->{state});
} else {
return 0
}
@@ -2000,25 +2100,26 @@
our @ISA = CFClient::UI::Base::;
use CFClient::OpenGL;
-use Carp qw/confess/;
-our %loaded_images;
+our %texture_cache;
sub new {
my $class = shift;
- my $self = $class->SUPER::new (can_events => 0, @_);
-
- $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+ my $self = $class->SUPER::new (
+ can_events => 0,
+ @_,
+ );
- $loaded_images{$self->{image}} ||=
- new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+ $self->{path}
+ or Carp::croak "required attribute 'path' not set";
- my $tex = $self->{tex} = $loaded_images{$self->{image}};
+ $self->{tex} = $texture_cache{$self->{path}} ||=
+ new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
- Scalar::Util::weaken $loaded_images{$self->{image}};
+ Scalar::Util::weaken $texture_cache{$self->{path}};
- $self->{aspect} = $tex->{w} / $tex->{h};
+ $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
$self
}
@@ -2026,7 +2127,7 @@
sub size_request {
my ($self) = @_;
- ($self->{tex}->{w}, $self->{tex}->{h})
+ ($self->{tex}{w}, $self->{tex}{h})
}
sub _draw {
@@ -2272,15 +2373,15 @@
$self
}
-sub changed { }
-
sub set_range {
my ($self, $range) = @_;
($range, $self->{range}) = ($self->{range}, $range);
- $self->update
- if "@$range" ne "@{$self->{range}}";
+ if ("@$range" ne "@{$self->{range}}") {
+ $self->update;
+ $self->set_value ($self->{range}[0]);
+ }
}
sub set_value {
@@ -2301,7 +2402,7 @@
@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
if ($value != $old_value) {
- $self->_emit (changed => $value);
+ $self->emit (changed => $value);
$self->update;
}
}
@@ -2312,17 +2413,17 @@
($self->{req_w}, $self->{req_h})
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
- $self->SUPER::button_down ($ev, $x, $y);
+ $self->SUPER::invoke_button_down ($ev, $x, $y);
$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
- $self->mouse_motion ($ev, $x, $y)
+ $self->invoke_mouse_motion ($ev, $x, $y)
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
if ($GRAB == $self) {
@@ -2437,7 +2538,7 @@
#############################################################################
-package CFClient::UI::TextView;
+package CFClient::UI::TextScroller;
our @ISA = CFClient::UI::HBox::;
@@ -2449,6 +2550,7 @@
my $self = $class->SUPER::new (
fontsize => 1,
can_events => 0,
+ indent => 0,
#font => default_font
@_,
@@ -2473,28 +2575,51 @@
$self->reflow;
}
-sub size_allocate {
+sub size_request {
+ my ($self) = @_;
+
+ my ($empty, $slider) = @{ $self->{children} };
+
+ local $self->{children} = [$empty, $slider];
+ $self->SUPER::size_request
+}
+
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
+ my ($empty, $slider, @other) = @{ $self->{children} };
+ $_->configure (@$_{qw(x y req_w req_h)}) for @other;
$self->{layout}->set_font ($self->{font}) if $self->{font};
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- $self->{layout}->set_width ($self->{children}[0]{w});
+ $self->{layout}->set_width ($empty->{w});
+ $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$self->reflow;
+
+ local $self->{children} = [$empty, $slider];
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
-sub text_size {
- my ($self, $text, $indent) = @_;
+sub get_layout {
+ my ($self, $para) = @_;
my $layout = $self->{layout};
+ $layout->set_font ($self->{font}) if $self->{font};
+ $layout->set_foreground (@{$para->{fg}});
$layout->set_height ($self->{fontsize} * $::FONTSIZE);
- $layout->set_width ($self->{children}[0]{w} - $indent);
- $layout->set_markup ($text);
-
- $layout->size
+ $layout->set_width ($self->{children}[0]{w} - $para->{indent});
+ $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
+ $layout->set_markup ($para->{markup});
+
+ $layout->set_shapes (
+ map
+ +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+ @{$para->{widget}}
+ );
+
+ $layout
}
sub reflow {
@@ -2514,21 +2639,40 @@
sub clear {
my ($self) = @_;
+ my (undef, undef, @other) = @{ $self->{children} };
+ $self->remove ($_) for @other;
+
$self->{par} = [];
$self->{height} = 0;
$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
}
sub add_paragraph {
- my ($self, $color, $text, $indent) = @_;
+ my ($self, $color, $para, $indent) = @_;
- for my $line (split /\n/, $text) {
- my ($w, $h) = $self->text_size ($line);
- $self->{height} += $h;
- push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
- }
+ my ($text, @w) = ref $para ? @$para : $para;
+
+ $para = {
+ w => 1e10,
+ wrapped => 1,
+ fg => $color,
+ indent => $indent,
+ markup => $text,
+ widget => \@w,
+ };
+
+ $self->add (@w) if @w;
+ push @{$self->{par}}, $para;
+
+ $self->{need_reflow}++;
+ $self->update;
+}
- $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
+sub scroll_to_bottom {
+ my ($self) = @_;
+
+ $self->{scroll_to_bottom} = 1;
+ $self->update;
}
sub update {
@@ -2540,35 +2684,36 @@
delete $self->{texture};
- $ROOT->on_post_alloc ($self, sub {
+ $ROOT->on_post_alloc ($self => sub {
my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
if (delete $self->{need_reflow}) {
my $height = 0;
- my $layout = $self->{layout};
-
- $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-
- for (@{$self->{par}}) {
- if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
- $layout->set_width ($W - $_->[3]);
- $layout->set_markup ($_->[4]);
+ for my $para (@{$self->{par}}) {
+ if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
+ my $layout = $self->get_layout ($para);
my ($w, $h) = $layout->size;
- $_->[0] = $w + $_->[3];
- $_->[1] = $h;
+
+ $para->{w} = $w + $para->{indent};
+ $para->{h} = $h;
+ $para->{wrapped} = $layout->has_wrapped;
}
- $height += $_->[1];
+ $height += $para->{h};
}
$self->{height} = $height;
- $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
-
+ $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
+
delete $self->{texture};
}
+ if (delete $self->{scroll_to_bottom}) {
+ $self->{children}[1]->set_value (1e10);
+ }
+
$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
@@ -2580,26 +2725,34 @@
my $y = 0;
- my $layout = $self->{layout};
-
- $layout->set_font ($self->{font}) if $self->{font};
-
glEnable GL_BLEND;
#TODO# not correct in windows where rgba is forced off
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
- for my $par (@{$self->{par}}) {
- my $h = $par->[1];
+ for my $para (@{$self->{par}}) {
+ my $h = $para->{h};
if ($y0 < $y + $h && $y < $y1) {
- $layout->set_foreground (@{ $par->[2] });
- $layout->set_width ($W - $par->[3]);
- $layout->set_markup ($par->[4]);
+
+ my $layout = $self->get_layout ($para);
my ($w, $h, $data, $format, $internalformat) = $layout->render;
- glRasterPos $par->[3], $y - $y0;
+ glRasterPos $para->{indent}, $y - $y0;
glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
+
+ if (my @w = @{ $para->{widget} }) {
+ my @s = $layout->get_shapes;
+
+ for (@w) {
+ my ($dx, $dy) = splice @s, 0, 2, ();
+
+ $_->{x} = $dx + $para->{indent};
+ $_->{y} = $dy + $y - $y0;
+
+ $_->draw;
+ }
+ }
}
$y += $h;
@@ -2610,6 +2763,15 @@
});
}
+sub reconfigure {
+ my ($self) = @_;
+
+ $self->SUPER::reconfigure;
+
+ $_->{w} = 1e10 for @{ $self->{par} };
+ $self->reflow;
+}
+
sub _draw {
my ($self) = @_;
@@ -2620,7 +2782,6 @@
glDisable GL_TEXTURE_2D;
$self->{children}[1]->draw;
-
}
#############################################################################
@@ -2718,6 +2879,9 @@
. "visible $widget->{visible}";
}
+ $tooltip =~ s/^\n+//;
+ $tooltip =~ s/\n+$//;
+
$self->add (new CFClient::UI::Label
markup => $tooltip,
max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
@@ -2736,13 +2900,13 @@
($w + 4, $h + 4)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w - 4, $h - 4);
+ $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
}
-sub visibility_change {
+sub invoke_visibility_change {
my ($self, $visible) = @_;
return unless $visible;
@@ -2754,7 +2918,7 @@
my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
($x, $y) = $widget->coord2global (-$self->{w}, 0)
- if $x + $self->{w} > $::WIDTH;
+ if $x + $self->{w} > $self->{root}{w};
$self->move_abs ($x, $y);
});
@@ -2859,13 +3023,13 @@
}
}
-sub DESTROY {
+sub destroy {
my ($self) = @_;
$self->{timer}->cancel
if $self->{timer};
- $self->SUPER::DESTROY;
+ $self->SUPER::destroy;
}
#############################################################################
@@ -2896,14 +3060,15 @@
$self->add ($self->{vbox} = new CFClient::UI::VBox);
for my $item (@{ $self->{items} }) {
- my ($widget, $cb) = @$item;
+ my ($widget, $cb, $tooltip) = @$item;
# handle various types of items, only text for now
if (!ref $widget) {
$widget = new CFClient::UI::Label
can_hover => 1,
can_events => 1,
- text => $widget;
+ markup => $widget,
+ tooltip => $tooltip
}
$self->{item}{$widget} = $item;
@@ -2918,7 +3083,7 @@
sub popup {
my ($self, $ev) = @_;
- $self->_emit ("popdown");
+ $self->emit ("popdown");
# maybe save $GRAB? must be careful about events...
$GRAB = $self;
@@ -2928,7 +3093,7 @@
$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
}
-sub mouse_motion {
+sub invoke_mouse_motion {
my ($self, $ev, $x, $y) = @_;
# TODO: should use vbox->find_widget or so
@@ -2938,14 +3103,14 @@
0
}
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
if ($ev->{button} == $self->{button}) {
undef $GRAB;
$self->hide;
- $self->_emit ("popdown");
+ $self->emit ("popdown");
$self->{hover}[1]->() if $self->{hover};
} else {
return 0
@@ -2992,7 +3157,7 @@
$self->{current} = $widget;
$self->{current}->configure (0, 0, $self->{w}, $self->{h});
- $self->_emit (page_changed => $self->{current});
+ $self->emit (page_changed => $self->{current});
$self->realloc;
}
@@ -3007,10 +3172,12 @@
$self->{current}->size_request
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
$self->{current}->configure (0, 0, $w, $h);
+
+ 1
}
sub _draw {
@@ -3059,7 +3226,63 @@
my ($self, $page) = @_;
$self->{multiplexer}->set_current_page ($page);
- $self->_emit (page_changed => $self->{multiplexer}{current});
+ $self->emit (page_changed => $self->{multiplexer}{current});
+}
+
+#############################################################################
+
+package CFClient::UI::Combobox;
+
+use utf8;
+
+our @ISA = CFClient::UI::Button::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ options => [], # [value, title, longdesc], ...
+ value => undef,
+ @_,
+ );
+
+ $self->_set_value ($self->{value});
+
+ $self
+}
+
+sub invoke_button_down {
+ my ($self, $ev) = @_;
+
+ my @menu_items;
+
+ for (@{ $self->{options} }) {
+ my ($value, $title, $tooltip) = @$_;
+
+ push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
+ }
+
+ CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+}
+
+sub _set_value {
+ my ($self, $value) = @_;
+
+ my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
+ or return;
+
+ $self->{value} = $item->[0];
+ $self->set_markup ("$item->[1] ⇓");
+ $self->set_tooltip ($item->[2]);
+}
+
+sub set_value {
+ my ($self, $value) = @_;
+
+ return unless $self->{value} ne $value;
+
+ $self->_set_value ($value);
+ $self->emit (changed => $value);
}
#############################################################################
@@ -3078,10 +3301,7 @@
Scalar::Util::weaken (my $this = $self);
- $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
- $this->reorder;
- $this->update;
- });
+ $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
$self
}
@@ -3090,6 +3310,11 @@
my ($self) = @_;
my $NOW = Time::HiRes::time;
+ # freeze display when hovering over any label
+ return if $CFClient::UI::TOOLTIP->{owner}
+ && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+ values %{ $self->{item} };
+
while (my ($k, $v) = each %{ $self->{item} }) {
delete $self->{item}{$k} if $v->{timeout} < $NOW;
}
@@ -3107,7 +3332,7 @@
for my $item (@items) {
last unless --$count;
- push @widgets, $item->{label} ||= do {
+ my $label = $item->{label} ||= do {
# TODO: doesn't handle markup well (read as: at all)
my $short = $item->{count} > 1
? "$item->{count} × $item->{text}"
@@ -3125,21 +3350,22 @@
tooltip_width => 0.67,
fontsize => $item->{fontsize} || $self->{fontsize},
max_w => $::WIDTH * 0.44,
- fg => $item->{fg},
- orig_alpha => $item->{fg}[3] || 1,
+ fg => [@{ $item->{fg} }],
can_events => 1,
can_hover => 1
};
if ((my $diff = $item->{timeout} - $NOW) < 2) {
- $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
- if ($diff < 1) {
- $item->{label}{max_h} = $item->{label}{req_h} * $diff;
- $item->{label}->realloc;
- }
- $item->{label}->update;
+ $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
+ $label->update;
+ $label->set_max_size (undef, $label->{req_h} * $diff)
+ if $diff < 1;
$self->{timer}->interval (1/30);
+ } else {
+ $label->{fg}[3] = $item->{fg}[3] || 1;
}
+
+ push @widgets, $label;
}
$self->clear;
@@ -3165,7 +3391,7 @@
$item->{count} = 1;
$item->{text} = $item->{tooltip} = $text;
}
- $item->{id} = ++$self->{id};
+ $item->{id} += 0.2;#d#
$item->{timeout} = $timeout;
delete $item->{label};
} else {
@@ -3194,12 +3420,12 @@
$self->SUPER::reconfigure;
}
-sub DESTROY {
+sub destroy {
my ($self) = @_;
$self->{timer}->cancel;
- $self->SUPER::DESTROY;
+ $self->SUPER::destroy;
}
#############################################################################
@@ -3310,6 +3536,18 @@
$self
}
+sub cfg_bind {
+ my ($self, $mod, $sym, $cmds) = @_;
+ $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
+ ::update_bindings ();
+}
+
+sub cfg_unbind {
+ my ($self, $mod, $sym, $cmds) = @_;
+ delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
+ ::update_bindings ();
+}
+
sub commit {
my ($self) = @_;
my ($mod, $sym, $cmds) = $self->get_binding;
@@ -3353,13 +3591,14 @@
}
sub ask_for_bind {
- my ($self, $commit) = @_;
+ my ($self, $commit, $end_cb) = @_;
CFClient::Binder::open_binding_dialog (sub {
my ($mod, $sym) = @_;
$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
$self->update_binding_widgets;
$self->commit if $commit;
+ $end_cb->() if $end_cb;
});
}
@@ -3387,11 +3626,9 @@
# this is a shortcut method that asks for a binding
# and then just binds it.
sub do_quick_binding {
- my ($self, $cmds) = @_;
- $self->set_binding (undef, undef, $cmds, sub {
- $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
- });
- $self->ask_for_bind (1);
+ my ($self, $cmds, $end_cb) = @_;
+ $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
+ $self->ask_for_bind (1, $end_cb);
}
sub update_binding_widgets {
@@ -3457,43 +3694,109 @@
)
}
-# XXX: Do sorting? Argl...
-sub add_spell {
- my ($self, $spell) = @_;
- $self->{spells}->{$spell->{name}} = $spell;
+my $TOOLTIP_ALL = "\n\nLeft click - ready spell\nMiddle click - invoke spell\nRight click - further options";
- $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
- face => $spell->{face},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message});
+my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
+ "Name. The name of the spell.$TOOLTIP_ALL");
+my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
+ "Skill. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
+my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Level. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
+my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Spell points / Grace points. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
+my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Damage. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
- $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
- text => $spell->{name},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message},
- expand => 1);
+sub rebuild_spell_list {
+ my ($self) = @_;
+
+ $CFClient::UI::ROOT->on_refresh ($self => sub {
+ $self->clear;
+
+ return unless $::CONN;
+
+ $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
+ $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
+ $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
+ $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
+ $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
+
+ my $row = 0;
+
+ for (sort { $a cmp $b } keys %{ $self->{spell} }) {
+ my $spell = $self->{spell}{$_};
+
+ $row++;
+
+ my $spell_cb = sub {
+ my ($widget, $ev) = @_;
+
+ if ($ev->{button} == 1) {
+ $::CONN->user_send ("cast $spell->{name}");
+ } elsif ($ev->{button} == 2) {
+ $::CONN->user_send ("invoke $spell->{name}");
+ } elsif ($ev->{button} == 3) {
+ (new CFClient::UI::Menu
+ items => [
+ ["bind cast $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
+ ["bind invoke $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
+ ],
+ )->popup ($ev);
+ } else {
+ return 0;
+ }
+
+ 1
+ };
+
+ my $tooltip = "$spell->{message}$TOOLTIP_ALL";
- $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
- text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
- $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
- expand => 1);
-
- $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
- text => "bind to key",
- on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
+ #TODO: add path info to tooltip
+ #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
+
+ $self->add (0, $row, new CFClient::UI::Face
+ face => $spell->{face},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $tooltip,
+ on_button_down => $spell_cb,
+ );
+
+ $self->add (1, $row, new CFClient::UI::Label
+ expand => 1,
+ text => $spell->{name},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $tooltip,
+ on_button_down => $spell_cb,
+ );
+
+ $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
+ $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
+ $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
+ $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
+ }
+ });
}
-sub rebuild_spell_list {
- my ($self) = @_;
- $self->{tbl_idx} = 0;
- $self->add_spell ($_) for values %{$self->{spells}};
+sub add_spell {
+ my ($self, $spell) = @_;
+
+ $self->{spell}->{$spell->{name}} = $spell;
+ $self->rebuild_spell_list;
}
sub remove_spell {
my ($self, $spell) = @_;
- delete $self->{spells}->{$spell->{name}};
+
+ delete $self->{spell}->{$spell->{name}};
+ $self->rebuild_spell_list;
+}
+
+sub clear_spells {
+ my ($self) = @_;
+
+ $self->{spell} = {};
$self->rebuild_spell_list;
}
@@ -3540,7 +3843,7 @@
int $coord + 0.5
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
for my $child ($self->children) {
@@ -3554,6 +3857,8 @@
$child->configure ($X, $Y, $W, $H);
}
+
+ 1
}
sub coord2local {