--- deliantra/Deliantra-Client/DC/UI.pm 2006/06/02 09:02:49 1.270
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/05 22:30:35 1.290
@@ -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))
@@ -279,7 +280,7 @@
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;
@@ -373,13 +374,20 @@
}
sub children {
+ # nop
+}
+
+sub visible_children {
+ $_[0]->children
}
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;
}
sub set_tooltip {
@@ -394,7 +402,7 @@
if ($CFClient::UI::TOOLTIP->{owner} == $self) {
delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ $CFClient::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -441,15 +449,17 @@
unless $FOCUS;
}
-sub mouse_motion { }
-sub button_up { }
-sub key_down { }
-sub key_up { }
+sub mouse_motion { 0 }
+sub button_up { 0 }
+sub key_down { 0 }
+sub key_up { 0 }
sub button_down {
my ($self, $ev, $x, $y) = @_;
$self->focus_in;
+
+ 0
}
sub find_widget {
@@ -543,20 +553,16 @@
glPushMatrix;
glTranslate $self->{x}, $self->{y}, 0;
- $self->_draw;
- glPopMatrix;
if ($self == $HOVER && $self->{can_hover}) {
- my ($x, $y) = @$self{qw(x y)};
-
- glColor 1, 0.8, 0.5, 0.2;
+ glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
- glVertex $x , $y;
- glVertex $x + $self->{w}, $y;
- glVertex $x + $self->{w}, $y + $self->{h};
- glVertex $x , $y + $self->{h};
+ glVertex 0 , 0;
+ glVertex $self->{w}, 0;
+ glVertex $self->{w}, $self->{h};
+ glVertex 0 , $self->{h};
glEnd;
glDisable GL_BLEND;
}
@@ -564,7 +570,7 @@
if ($ENV{CFPLUS_DEBUG} & 1) {
glPushMatrix;
glColor 1, 1, 0, 1;
- glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+ glTranslate 0.375, 0.375;
glBegin GL_LINE_LOOP;
glVertex 0 , 0;
glVertex $self->{w} - 1, 0;
@@ -574,6 +580,9 @@
glPopMatrix;
#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
+
+ $self->_draw;
+ glPopMatrix;
}
sub _draw {
@@ -621,8 +630,8 @@
my ($w, $h) = @$self{qw(w h)};
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glColor @$color;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor_premultiply @$color;
glBegin GL_QUADS;
glVertex 0 , 0;
@@ -663,14 +672,16 @@
sub new {
my ($class, %arg) = @_;
- my $children = delete $arg{children} || [];
+ my $children = delete $arg{children};
my $self = $class->SUPER::new (
children => [],
can_events => 0,
%arg,
);
- $self->add ($_) for @$children;
+
+ $self->add (@$children)
+ if $children;
$self
}
@@ -728,7 +739,7 @@
my $res;
- for (reverse @{ $self->{children} }) {
+ for (reverse $self->visible_children) {
$res = $_->find_widget ($x, $y)
and return $res;
}
@@ -787,6 +798,8 @@
#############################################################################
+# back-buffered drawing area
+
package CFClient::UI::Window;
our @ISA = CFClient::UI::Bin::;
@@ -847,7 +860,7 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
+ glColor 0, 0, 0, 1;
$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
@@ -948,7 +961,9 @@
our @ISA = CFClient::UI::HBox::;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $child = delete $arg{child};
my $self;
@@ -963,16 +978,21 @@
$self = $class->SUPER::new (
vp => (new CFClient::UI::ViewPort expand => 1),
slider => $slider,
- @_,
+ %arg,
);
- $self->{vp}->add ($self->{scrolled});
- $self->add ($self->{vp});
- $self->add ($self->{slider});
+ $self->SUPER::add ($self->{vp}, $self->{slider});
+ $self->add ($child) if $child;
$self
}
+sub add {
+ my ($self, $widget) = @_;
+
+ $self->{vp}->add ($self->{child} = $widget);
+}
+
sub update {
my ($self) = @_;
@@ -1019,8 +1039,8 @@
my ($w, $h) = @$self{qw(w h)};
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glColor @{ $self->{bg} };
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor_premultiply @{ $self->{bg} };
glBegin GL_QUADS;
glVertex 0 , 0;
@@ -1144,8 +1164,8 @@
$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
- $self->realloc;
$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
+ $self->realloc;
};
} elsif ($lr ^ $td) {
@@ -1158,20 +1178,28 @@
($x, $y) = ($ev->{x}, $ev->{y});
$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});
};
+ } else {
+ return 0;
}
+
+ 1
}
sub button_up {
my ($self, $ev, $x, $y) = @_;
- delete $self->{motion};
+ !!delete $self->{motion}
}
sub mouse_motion {
my ($self, $ev, $x, $y) = @_;
$self->{motion}->($ev, $x, $y) if $self->{motion};
+
+ !!$self->{motion}
}
sub _draw {
@@ -1513,6 +1541,13 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1522,6 +1557,7 @@
$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1537,6 +1573,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;
}
@@ -1544,25 +1581,29 @@
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 {
@@ -1583,6 +1624,14 @@
$self->realloc;
}
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+
+ $self->SUPER::reconfigure;
+}
+
sub _draw {
my ($self) = @_;
@@ -1610,12 +1659,13 @@
};
glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
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});
} else {
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
}
@@ -1654,15 +1704,17 @@
return if $self->{text} eq $text;
- delete $self->{texture};
-
$self->{last_activity} = $::NOW;
$self->{text} = $text;
$text =~ s/./*/g if $self->{hidden};
$self->{layout}->set_text ("$text ");
+ delete $self->{size_req};
$self->_emit (changed => $self->{text});
+
+ $self->realloc;
+ $self->update;
}
sub set_text {
@@ -1670,8 +1722,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
-
- $self->realloc;
}
sub get_text {
@@ -1711,11 +1761,15 @@
$self->_emit ('escape');
} elsif ($uni) {
substr $text, $self->{cursor}++, 0, chr $uni;
+ } else {
+ return 0;
}
$self->_set_text ($text);
$self->realloc;
+
+ 1
}
sub focus_in {
@@ -1740,11 +1794,15 @@
$self->_set_text ($self->{text});
$self->update;
+
+ 1
}
sub mouse_motion {
my ($self, $ev, $x, $y) = @_;
# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+
+ 0
}
sub _draw {
@@ -1753,14 +1811,14 @@
local $self->{fg} = $self->{fg};
if ($FOCUS == $self) {
- glColor @{$self->{active_bg}};
+ glColor_premultiply @{$self->{active_bg}};
$self->{fg} = $self->{active_fg};
} else {
- glColor @{$self->{bg}};
+ glColor_premultiply @{$self->{bg}};
}
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
glVertex 0 , 0;
glVertex 0 , $self->{h};
@@ -1831,9 +1889,10 @@
}
} else {
- $self->SUPER::key_down ($ev);
+ return $self->SUPER::key_down ($ev)
}
+ 1
}
#############################################################################
@@ -1872,16 +1931,14 @@
$self->emit ("activate")
if $x >= 0 && $x < $self->{w}
&& $y >= 0 && $y < $self->{h};
+
+ 1
}
sub _draw {
my ($self) = @_;
- local $self->{fg} = $self->{fg};
-
- if ($GRAB == $self) {
- $self->{fg} = $self->{active_fg};
- }
+ local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -1935,7 +1992,11 @@
&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
$self->{state} = !$self->{state};
$self->_emit (changed => $self->{state});
+ } else {
+ return 0
}
+
+ 1
}
sub _draw {
@@ -2112,7 +2173,8 @@
my $h2 = $self->{h} * (1 - $ycut2);
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+ GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2283,7 +2345,7 @@
$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
- $self->mouse_motion ($ev, $x, $y);
+ $self->mouse_motion ($ev, $x, $y)
}
sub mouse_motion {
@@ -2297,13 +2359,24 @@
$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+ } else {
+ return 0;
}
+
+ 1
}
sub update {
my ($self) = @_;
- $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+ delete $self->{knob_w};
+ $self->SUPER::update;
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ unless ($self->{knob_w}) {
$self->set_value ($self->{range}[0]);
my ($value, $lo, $hi, $page) = @{$self->{range}};
@@ -2319,13 +2392,7 @@
$self->{knob_x} = $value - $knob_w * 0.5;
$self->{knob_w} = $knob_w;
- });
-
- $self->SUPER::update;
-}
-
-sub _draw {
- my ($self) = @_;
+ }
$self->SUPER::_draw ();
@@ -2529,7 +2596,7 @@
}
$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
- glClearColor 0.5, 0.5, 0.5, 0;
+ glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
my $top = int $self->{children}[1]{range}[0];
@@ -2574,8 +2641,8 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
- $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+ glColor 0, 0, 0, 1;
+ $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
glDisable GL_TEXTURE_2D;
$self->{children}[1]->draw;
@@ -2812,7 +2879,7 @@
if ($tex) {
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
+ glColor 0, 0, 0, 1;
$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
}
@@ -2829,6 +2896,14 @@
#############################################################################
+package CFClient::UI::Buttonbar;
+
+our @ISA = CFClient::UI::HBox::;
+
+# TODO: should actualyl wrap buttons and other goodies.
+
+#############################################################################
+
package CFClient::UI::Menu;
our @ISA = CFClient::UI::FancyFrame::;
@@ -2885,6 +2960,8 @@
# TODO: should use vbox->find_widget or so
$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
$self->{hover} = $self->{item}{$HOVER};
+
+ 0
}
sub button_up {
@@ -2896,7 +2973,119 @@
$self->_emit ("popdown");
$self->{hover}[1]->() if $self->{hover};
+ } else {
+ return 0
}
+
+ 1
+}
+
+#############################################################################
+
+package CFClient::UI::Multiplexer;
+
+our @ISA = CFClient::UI::Container::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ @_,
+ );
+
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+
+ $self
+}
+
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+}
+
+sub set_current_page {
+ my ($self, $page_or_widget) = @_;
+
+ my $widget = ref $page_or_widget
+ ? $page_or_widget
+ : $self->{children}[$page_or_widget];
+
+ $self->{current} = $widget;
+ $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+
+ $self->_emit (page_changed => $self->{current});
+
+ $self->realloc;
+}
+
+sub visible_children {
+ $_[0]{current}
+}
+
+sub size_request {
+ my ($self) = @_;
+
+ $self->{current}->size_request
+}
+
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->{current}->configure (0, 0, $w, $h);
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ $self->{current}->draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Notebook;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ buttonbar => (new CFClient::UI::Buttonbar),
+ multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+ # filter => # will be put between multiplexer and $self
+ @_,
+ );
+
+ $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+ $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+
+ $self
+}
+
+sub add {
+ my ($self, $title, $widget, $tooltip) = @_;
+
+ Scalar::Util::weaken $self;
+
+ $self->{buttonbar}->add (new CFClient::UI::Button
+ markup => $title,
+ tooltip => $tooltip,
+ on_activate => sub { $self->set_current_page ($widget) },
+ );
+
+ $self->{multiplexer}->add ($widget);
+}
+
+sub set_current_page {
+ my ($self, $page) = @_;
+
+ $self->{multiplexer}->set_current_page ($page);
+ $self->_emit (page_changed => $self->{multiplexer}{current});
}
#############################################################################
@@ -2908,15 +3097,26 @@
sub new {
my $class = shift;
- $class->SUPER::new (
+ my $self = $class->SUPER::new (
fontsize => 0.8,
@_,
- )
+ );
+
+ Scalar::Util::weaken (my $this = $self);
+
+ $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+
+ $self
}
sub reorder {
my ($self) = @_;
- my $NOW = time;
+ 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;
@@ -2929,11 +3129,13 @@
or $b->{id} <=> $a->{id}
} values %{ $self->{item} };
+ $self->{timer}->interval (1);
+
my $count = 10 + 1;
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}"
@@ -2951,10 +3153,22 @@
tooltip_width => 0.67,
fontsize => $item->{fontsize} || $self->{fontsize},
max_w => $::WIDTH * 0.44,
- fg => $item->{fg},
+ fg => [@{ $item->{fg} }],
can_events => 1,
can_hover => 1
};
+
+ if ((my $diff = $item->{timeout} - $NOW) < 2) {
+ $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;
@@ -2969,7 +3183,7 @@
return unless $text;
- my $timeout = time + ((delete $arg{timeout}) || 60);
+ my $timeout = (int time) + ((delete $arg{timeout}) || 60);
my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
@@ -3009,6 +3223,14 @@
$self->SUPER::reconfigure;
}
+sub DESTROY {
+ my ($self) = @_;
+
+ $self->{timer}->cancel;
+
+ $self->SUPER::DESTROY;
+}
+
#############################################################################
package CFClient::UI::Inventory;
@@ -3019,7 +3241,7 @@
my $class = shift;
my $self = $class->SUPER::new (
- scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+ child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
@_,
);
@@ -3029,7 +3251,7 @@
sub set_items {
my ($self, $items) = @_;
- $self->{scrolled}->clear;
+ $self->{child}->clear;
return unless $items;
my @items = sort {
@@ -3043,9 +3265,9 @@
for my $item (@items) {
CFClient::Item::update_widgets $item;
- $self->{scrolled}->add (0, $row, $item->{face_widget});
- $self->{scrolled}->add (1, $row, $item->{desc_widget});
- $self->{scrolled}->add (2, $row, $item->{weight_widget});
+ $self->{child}->add (0, $row, $item->{face_widget});
+ $self->{child}->add (1, $row, $item->{desc_widget});
+ $self->{child}->add (2, $row, $item->{weight_widget});
$row++;
}
@@ -3252,56 +3474,83 @@
package CFClient::UI::SpellList;
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFClient::UI::Table::;
sub new {
my $class = shift;
- my $self = $class->SUPER::new (binding => [], commands => [], @_);
+ my $self = $class->SUPER::new (
+ binding => [],
+ commands => [],
+ @_,
+ )
+}
- $self->add (new CFClient::UI::ScrolledWindow
- scrolled => $self->{spellbox} = new CFClient::UI::Table);
+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.");
+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.");
+my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Damage. The amount of damage the spell deals when it hits.");
- $self;
-}
+sub rebuild_spell_list {
+ my ($self) = @_;
-# XXX: Do sorting? Argl...
-sub add_spell {
- my ($self, $spell) = @_;
- $self->{spells}->{$spell->{name}} = $spell;
+ $CFClient::UI::ROOT->on_refresh ($self => sub {
+ $self->clear;
- $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
- face => $spell->{face},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message});
+ $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
+ $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
+ $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
+ $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
- $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
- text => $spell->{name},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message},
- expand => 1);
+ my $row = 0;
+
+ for (sort { $a cmp $b } keys %{ $self->{spell} }) {
+ my $spell = $self->{spell}{$_};
- $self->{spellbox}->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->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
- text => "bind to key",
- on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
+ $row++;
+
+ $self->add (0, $row, new CFClient::UI::Face
+ face => $spell->{face},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $spell->{message},
+ );
+
+ $self->add (1, $row, new CFClient::UI::Label
+ expand => 1,
+ text => $spell->{name},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $spell->{message},
+ );
+
+ $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
+ $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
+ $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
+
+ # TODO: should be done via popup
+ $self->add (5, $row, new CFClient::UI::Button
+ text => "bind",
+ tooltip => "bind spell readying (cast command) to key",
+ on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
+ );
+ }
+ });
}
-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;
}
@@ -3311,6 +3560,8 @@
our @ISA = CFClient::UI::Container::;
+use List::Util qw(min max);
+
use CFClient::OpenGL;
sub new {
@@ -3454,8 +3705,11 @@
my ($w, $h) = $widget->size_request;
- $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
- $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+ $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+ $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+ $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+ $h = min $widget->{max_h}, $h if exists $widget->{max_h};
$w = $widget->{force_w} if exists $widget->{force_w};
$h = $widget->{force_h} if exists $widget->{force_h};