--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/30 14:45:56 1.261
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/07 07:00:30 1.298
@@ -5,6 +5,7 @@
use Scalar::Util ();
use List::Util ();
+use Event;
use CFClient;
use CFClient::Texture;
@@ -18,39 +19,17 @@
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 {
+our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
-
if ($TOOLTIP->{owner} != $widget) {
$TOOLTIP->hide;
$TOOLTIP->{owner} = $widget;
+ return if $ENV{CFPLUS_DEBUG} & 8;
+
my $tip = $widget->{tooltip};
$tip = $tip->($widget) if CODE:: eq ref $tip;
@@ -66,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
@@ -89,7 +91,7 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
$BUTTON_STATE |= 1 << ($ev->{button} - 1);
@@ -114,7 +116,7 @@
$grab->update if $grab;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
}
@@ -130,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))
@@ -172,8 +174,8 @@
for my $widget (values %WIDGET) {
if ($widget->{is_toplevel}) {
- $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
- $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+ $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+ $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
@@ -182,8 +184,8 @@
$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
- $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
- $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+ $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+ $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
}
}
@@ -278,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;
@@ -315,8 +317,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;
@@ -372,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 {
@@ -393,7 +402,7 @@
if ($CFClient::UI::TOOLTIP->{owner} == $self) {
delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ $CFClient::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -440,22 +449,18 @@
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;
-}
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
-sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
-sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
-sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
-sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
+ 0
+}
sub find_widget {
my ($self, $x, $y) = @_;
@@ -527,27 +532,37 @@
$self->update;
}
+# using global variables seems a bit hacky, but passing through all drawing
+# functions seems pointless.
+our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
+
sub draw {
my ($self) = @_;
return unless $self->{h} && $self->{w};
+ # 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)
+ || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
+
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;
}
@@ -555,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;
@@ -565,6 +580,9 @@
glPopMatrix;
#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
+
+ $self->_draw;
+ glPopMatrix;
}
sub _draw {
@@ -612,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;
@@ -654,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
}
@@ -719,7 +739,7 @@
my $res;
- for (reverse @{ $self->{children} }) {
+ for (reverse $self->visible_children) {
$res = $_->find_widget ($x, $y)
and return $res;
}
@@ -778,6 +798,8 @@
#############################################################################
+# back-buffered drawing area
+
package CFClient::UI::Window;
our @ISA = CFClient::UI::Bin::;
@@ -805,7 +827,9 @@
}
sub _render {
- $_[0]{children}[0]->draw;
+ my ($self) = @_;
+
+ $self->{children}[0]->draw;
}
sub render_child {
@@ -815,6 +839,13 @@
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
+ {
+ package CFClient::UI::Base;
+
+ ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+ }
+
$self->_render;
};
}
@@ -822,14 +853,14 @@
sub _draw {
my ($self) = @_;
- my ($w, $h) = ($self->w, $self->h);
+ my ($w, $h) = @$self{qw(w h)};
my $tex = $self->{texture}
or return;
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);
@@ -915,6 +946,9 @@
sub _render {
my ($self) = @_;
+ local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
+ local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
+
CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
@@ -927,7 +961,9 @@
our @ISA = CFClient::UI::HBox::;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $child = delete $arg{child};
my $self;
@@ -942,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) = @_;
@@ -998,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;
@@ -1031,7 +1072,9 @@
qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $title = delete $arg{title};
my $self = $class->SUPER::new (
bg => [1, 1, 1, 1],
@@ -1040,18 +1083,26 @@
can_events => 1,
min_w => 16,
min_h => 16,
- @_
+ %arg,
);
- $self->{title} &&= new CFClient::UI::Label
+ $self->{title} = new CFClient::UI::Label
align => 0,
valign => 1,
- text => $self->{title},
- fontsize => $self->{border};
+ text => $title,
+ fontsize => $self->{border}
+ if defined $title;
$self
}
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+ $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
+}
+
sub border {
int $_[0]{border} * $::FONTSIZE
}
@@ -1059,6 +1110,9 @@
sub size_request {
my ($self) = @_;
+ $self->{title}->size_request
+ if $self->{title};
+
my ($w, $h) = $self->SUPER::size_request;
(
@@ -1070,13 +1124,18 @@
sub size_allocate {
my ($self, $w, $h) = @_;
- $h -= List::Util::max 0, $self->border * 2;
- $w -= List::Util::max 0, $self->border * 2;
+ if ($self->{title}) {
+ $self->{title}{w} = $w;
+ $self->{title}{h} = $h;
+ $self->{title}->size_allocate ($w, $h);
+ }
- $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
- if $self->{title};
+ my $border = $self->border;
- $self->child->configure ($self->border, $self->border, $w, $h);
+ $h -= List::Util::max 0, $border * 2;
+ $w -= List::Util::max 0, $border * 2;
+
+ $self->child->configure ($border, $border, $w, $h);
}
sub button_down {
@@ -1105,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) {
@@ -1119,27 +1178,37 @@
($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 {
my ($self) = @_;
+ my $child = $self->{children}[0];
+
my ($w, $h ) = ($self->{w}, $self->{h});
- my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
+ my ($cw, $ch) = ($child->{w}, $child->{h});
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
@@ -1164,9 +1233,12 @@
glDisable GL_TEXTURE_2D;
- $self->{title}->draw if $self->{title};
+ $child->draw;
- $self->child->draw;
+ if ($self->{title}) {
+ glTranslate 0, $border - $self->{h};
+ $self->{title}->_draw;
+ }
}
#############################################################################
@@ -1469,6 +1541,13 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1478,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;
}
@@ -1493,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;
}
@@ -1500,31 +1581,38 @@
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 {
my ($self, $w, $h) = @_;
- delete $self->{texture};
+ delete $self->{ox};
+
+ delete $self->{texture}
+ unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
}
sub set_fontsize {
@@ -1536,6 +1624,14 @@
$self->realloc;
}
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+
+ $self->SUPER::reconfigure;
+}
+
sub _draw {
my ($self) = @_;
@@ -1549,8 +1645,10 @@
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- my $tex = new_from_layout CFClient::Texture $self->{layout};
+ new_from_layout CFClient::Texture $self->{layout}
+ };
+ unless (exists $self->{ox}) {
$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
: ($self->{w} - $tex->{w}) * 0.5);
@@ -1558,18 +1656,20 @@
$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
: ($self->{h} - $tex->{h}) * 0.5);
-
- $tex
};
glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+ my $w = List::Util::min $self->{w} + 4, $tex->{w};
+ my $h = List::Util::min $self->{h} + 2, $tex->{h};
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});
+ $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
} else {
- $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+ 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;
@@ -1596,6 +1696,7 @@
valign => 0,
can_events => 1,
#text => ...
+ #hidden => "*",
@_
)
}
@@ -1607,15 +1708,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 {
@@ -1623,8 +1726,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
-
- $self->realloc;
}
sub get_text {
@@ -1664,11 +1765,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 {
@@ -1693,11 +1798,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 {
@@ -1706,14 +1815,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};
@@ -1784,9 +1893,10 @@
}
} else {
- $self->SUPER::key_down ($ev);
+ return $self->SUPER::key_down ($ev)
}
+ 1
}
#############################################################################
@@ -1825,16 +1935,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;
@@ -1888,7 +1996,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 {
@@ -2065,7 +2177,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;
@@ -2196,8 +2309,10 @@
($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 {
@@ -2236,7 +2351,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 {
@@ -2250,13 +2365,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}};
@@ -2272,13 +2398,7 @@
$self->{knob_x} = $value - $knob_w * 0.5;
$self->{knob_w} = $knob_w;
- });
-
- $self->SUPER::update;
-}
-
-sub _draw {
- my ($self) = @_;
+ }
$self->SUPER::_draw ();
@@ -2349,7 +2469,7 @@
#############################################################################
-package CFClient::UI::TextView;
+package CFClient::UI::TextScroller;
our @ISA = CFClient::UI::HBox::;
@@ -2361,6 +2481,7 @@
my $self = $class->SUPER::new (
fontsize => 1,
can_events => 0,
+ indent => 0,
#font => default_font
@_,
@@ -2393,6 +2514,7 @@
$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_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$self->reflow;
}
@@ -2404,6 +2526,7 @@
$layout->set_height ($self->{fontsize} * $::FONTSIZE);
$layout->set_width ($self->{children}[0]{w} - $indent);
+ $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$layout->set_markup ($text);
$layout->size
@@ -2452,7 +2575,7 @@
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}) {
@@ -2465,6 +2588,7 @@
for (@{$self->{par}}) {
if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
$layout->set_width ($W - $_->[3]);
+ $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$layout->set_markup ($_->[4]);
my ($w, $h) = $layout->size;
$_->[0] = $w + $_->[3];
@@ -2477,12 +2601,12 @@
$self->{height} = $height;
$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
-
+
delete $self->{texture};
}
$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];
@@ -2506,6 +2630,7 @@
if ($y0 < $y + $h && $y < $y1) {
$layout->set_foreground (@{ $par->[2] });
$layout->set_width ($W - $par->[3]);
+ $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$layout->set_markup ($par->[4]);
my ($w, $h, $data, $format, $internalformat) = $layout->render;
@@ -2527,8 +2652,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;
@@ -2630,6 +2755,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,
@@ -2666,7 +2794,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);
});
@@ -2765,7 +2893,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;
}
@@ -2782,45 +2910,11 @@
#############################################################################
-package CFClient::UI::Inventory;
-
-our @ISA = CFClient::UI::ScrolledWindow::;
-
-sub new {
- my $class = shift;
-
- my $self = $class->SUPER::new (
- scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
- @_,
- );
+package CFClient::UI::Buttonbar;
- $self
-}
-
-sub set_items {
- my ($self, $items) = @_;
-
- $self->{scrolled}->clear;
- return unless $items;
-
- my @items = sort {
- ($a->{type} <=> $b->{type})
- or ($a->{name} cmp $b->{name})
- } @$items;
-
- $self->{real_items} = \@items;
-
- my $row = 0;
- 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});
+our @ISA = CFClient::UI::HBox::;
- $row++;
- }
-}
+# TODO: should actualyl wrap buttons and other goodies.
#############################################################################
@@ -2842,14 +2936,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;
@@ -2880,6 +2975,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 {
@@ -2891,7 +2988,175 @@
$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});
+}
+
+#############################################################################
+
+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 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);
}
#############################################################################
@@ -2903,15 +3168,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;
@@ -2924,11 +3200,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}"
@@ -2946,10 +3224,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;
@@ -2964,7 +3254,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};
@@ -3004,210 +3294,54 @@
$self->SUPER::reconfigure;
}
-#############################################################################
+sub DESTROY {
+ my ($self) = @_;
-package CFClient::UI::Root;
+ $self->{timer}->cancel;
-our @ISA = CFClient::UI::Container::;
+ $self->SUPER::DESTROY;
+}
-use CFClient::OpenGL;
+#############################################################################
+
+package CFClient::UI::Inventory;
+
+our @ISA = CFClient::UI::ScrolledWindow::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- visible => 1,
+ child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
@_,
);
- Scalar::Util::weaken ($self->{root} = $self);
-
$self
}
-sub size_request {
- my ($self) = @_;
-
- ($self->{w}, $self->{h})
-}
-
-sub _to_pixel {
- my ($coord, $size, $max) = @_;
-
- $coord =
- $coord eq "center" ? ($max - $size) * 0.5
- : $coord eq "max" ? $max
- : $coord;
-
- $coord = 0 if $coord < 0;
- $coord = $max - $size if $coord > $max - $size;
-
- int $coord + 0.5
-}
-
-sub size_allocate {
- my ($self, $w, $h) = @_;
-
- for my $child ($self->children) {
- my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
-
- $X = $child->{force_x} if exists $child->{force_x};
- $Y = $child->{force_y} if exists $child->{force_y};
-
- $X = _to_pixel $X, $W, $self->{w};
- $Y = _to_pixel $Y, $H, $self->{h};
-
- $child->configure ($X, $Y, $W, $H);
- }
-}
-
-sub coord2local {
- my ($self, $x, $y) = @_;
-
- ($x, $y)
-}
-
-sub coord2global {
- my ($self, $x, $y) = @_;
-
- ($x, $y)
-}
-
-sub update {
- my ($self) = @_;
-
- $::WANT_REFRESH++;
-}
-
-sub add {
- my ($self, @children) = @_;
-
- $_->{is_toplevel} = 1
- for @children;
-
- $self->SUPER::add (@children);
-}
-
-sub remove {
- my ($self, @children) = @_;
-
- $self->SUPER::remove (@children);
-
- delete $self->{is_toplevel}
- for @children;
-
- while (@children) {
- my $w = pop @children;
- push @children, $w->children;
- $w->set_invisible;
- }
-}
-
-sub on_refresh {
- my ($self, $id, $cb) = @_;
-
- $self->{refresh_hook}{$id} = $cb;
-}
-
-sub on_post_alloc {
- my ($self, $id, $cb) = @_;
-
- $self->{post_alloc_hook}{$id} = $cb;
-}
-
-sub draw {
- my ($self) = @_;
-
- while ($self->{refresh_hook}) {
- $_->()
- for values %{delete $self->{refresh_hook}};
- }
-
- if ($self->{realloc}) {
- my @queue;
-
- while () {
- if ($self->{realloc}) {
- #TODO use array-of-depth approach
-
- use sort 'stable';
-
- @queue = sort { $a->{visible} <=> $b->{visible} }
- @queue, values %{delete $self->{realloc}};
- }
-
- my $widget = pop @queue || last;
-
- $widget->{visible} or last; # do not resize invisible widgets
-
- 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 = $widget->{force_w} if exists $widget->{force_w};
- $h = $widget->{force_h} if exists $widget->{force_h};
-
- if ($widget->{req_w} != $w || $widget->{req_h} != $h
- || delete $widget->{force_realloc}) {
- $widget->{req_w} = $w;
- $widget->{req_h} = $h;
-
- $self->{size_alloc}{$widget+0} = $widget;
-
- if (my $parent = $widget->{parent}) {
- $self->{realloc}{$parent+0} = $parent;
- #unshift @queue, $parent;
- $parent->{force_size_alloc} = 1;
- $self->{size_alloc}{$parent+0} = $parent;
- }
- }
-
- delete $self->{realloc}{$widget+0};
- }
- }
-
- while (my $size_alloc = delete $self->{size_alloc}) {
- my @queue = sort { $b->{visible} <=> $a->{visible} }
- values %$size_alloc;
-
- while () {
- my $widget = pop @queue || last;
+sub set_items {
+ my ($self, $items) = @_;
- my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+ $self->{child}->clear;
+ return unless $items;
- $w = 0 if $w < 0;
- $h = 0 if $h < 0;
+ my @items = sort {
+ ($a->{type} <=> $b->{type})
+ or ($a->{name} cmp $b->{name})
+ } @$items;
- $w = int $w + 0.5;
- $h = int $h + 0.5;
+ $self->{real_items} = \@items;
- if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
- $widget->{w} = $w;
- $widget->{h} = $h;
+ my $row = 0;
+ for my $item (@items) {
+ CFClient::Item::update_widgets $item;
- $widget->emit (size_allocate => $w, $h);
- }
- }
- }
+ $self->{child}->add (0, $row, $item->{face_widget});
+ $self->{child}->add (1, $row, $item->{desc_widget});
+ $self->{child}->add (2, $row, $item->{weight_widget});
- while ($self->{post_alloc_hook}) {
- $_->()
- for values %{delete $self->{post_alloc_hook}};
+ $row++;
}
-
-
- glViewport 0, 0, $::WIDTH, $::HEIGHT;
- glClearColor +($::CFG->{fow_intensity}) x 3, 1;
- glClear GL_COLOR_BUFFER_BIT;
-
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
- glMatrixMode GL_MODELVIEW;
- glLoadIdentity;
-
- $self->_draw;
}
#############################################################################
@@ -3312,6 +3446,12 @@
$self->set_command_list ($rec);
}
+
+sub ask_for_bind_and_commit {
+ my ($self) = @_;
+ $self->ask_for_bind (1);
+}
+
sub ask_for_bind {
my ($self, $commit) = @_;
@@ -3323,6 +3463,11 @@
});
}
+# $mod and $sym are the modifiers and key symbol
+# $cmds is a array ref of strings (the commands)
+# $cb is the callback that is executed on OK
+# $ccb is the callback that is executed on CANCEL and
+# when the binding was unsuccessful on OK
sub set_binding {
my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
@@ -3339,6 +3484,16 @@
$self->update_binding_widgets;
}
+# 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);
+}
+
sub update_binding_widgets {
my ($self) = @_;
my ($mod, $sym, $cmds) = $self->get_binding;
@@ -3372,6 +3527,7 @@
$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
my $i = $idx;
+ $hb->add (new CFClient::UI::Label text => $_);
$hb->add (new CFClient::UI::Button
text => "delete",
tooltip => "Deletes the action from the record",
@@ -3380,12 +3536,347 @@
$cmds->[$i] = undef;
});
- $hb->add (new CFClient::UI::Label text => $_);
$idx++
}
}
+#############################################################################
+
+package CFClient::UI::SpellList;
+
+our @ISA = CFClient::UI::Table::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ binding => [],
+ commands => [],
+ @_,
+ )
+}
+
+my $TOOLTIP_ALL = "\n\nLeft click - ready spell\nMiddle click - invoke spell\nRight click - further options";
+
+my @TOOLTIP_NAME = (align => 0, can_events => 1, can_hover => 1, tooltip =>
+ "Name. The name of the 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");
+
+sub rebuild_spell_list {
+ my ($self) = @_;
+
+ $CFClient::UI::ROOT->on_refresh ($self => sub {
+ $self->clear;
+
+ $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_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);
+
+ 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
+ };
+
+ $self->add (0, $row, new CFClient::UI::Face
+ face => $spell->{face},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $spell->{message},
+ 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 => "$spell->{message}$TOOLTIP_ALL",
+ on_button_down => $spell_cb,
+ );
+
+ $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);
+ }
+ });
+}
+
+sub add_spell {
+ my ($self, $spell) = @_;
+
+ $self->{spell}->{$spell->{name}} = $spell;
+ $self->rebuild_spell_list;
+}
+
+sub remove_spell {
+ my ($self, $spell) = @_;
+
+ delete $self->{spell}->{$spell->{name}};
+ $self->rebuild_spell_list;
+}
+
+#############################################################################
+
+package CFClient::UI::Root;
+
+our @ISA = CFClient::UI::Container::;
+
+use List::Util qw(min max);
+
+use CFClient::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ visible => 1,
+ @_,
+ );
+
+ Scalar::Util::weaken ($self->{root} = $self);
+
+ $self
+}
+
+sub size_request {
+ my ($self) = @_;
+
+ ($self->{w}, $self->{h})
+}
+
+sub _to_pixel {
+ my ($coord, $size, $max) = @_;
+
+ $coord =
+ $coord eq "center" ? ($max - $size) * 0.5
+ : $coord eq "max" ? $max
+ : $coord;
+
+ $coord = 0 if $coord < 0;
+ $coord = $max - $size if $coord > $max - $size;
+
+ int $coord + 0.5
+}
+
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ for my $child ($self->children) {
+ my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
+
+ $X = $child->{force_x} if exists $child->{force_x};
+ $Y = $child->{force_y} if exists $child->{force_y};
+
+ $X = _to_pixel $X, $W, $self->{w};
+ $Y = _to_pixel $Y, $H, $self->{h};
+
+ $child->configure ($X, $Y, $W, $H);
+ }
+}
+
+sub coord2local {
+ my ($self, $x, $y) = @_;
+
+ ($x, $y)
+}
+
+sub coord2global {
+ my ($self, $x, $y) = @_;
+
+ ($x, $y)
+}
+
+sub update {
+ my ($self) = @_;
+
+ $::WANT_REFRESH++;
+}
+
+sub add {
+ my ($self, @children) = @_;
+
+ $_->{is_toplevel} = 1
+ for @children;
+
+ $self->SUPER::add (@children);
+}
+
+sub remove {
+ my ($self, @children) = @_;
+
+ $self->SUPER::remove (@children);
+
+ delete $self->{is_toplevel}
+ for @children;
+
+ while (@children) {
+ my $w = pop @children;
+ push @children, $w->children;
+ $w->set_invisible;
+ }
+}
+
+sub on_refresh {
+ my ($self, $id, $cb) = @_;
+
+ $self->{refresh_hook}{$id} = $cb;
+}
+
+sub on_post_alloc {
+ my ($self, $id, $cb) = @_;
+
+ $self->{post_alloc_hook}{$id} = $cb;
+}
+
+sub draw {
+ my ($self) = @_;
+
+ while ($self->{refresh_hook}) {
+ $_->()
+ for values %{delete $self->{refresh_hook}};
+ }
+
+ if ($self->{realloc}) {
+ my %queue;
+ my @queue;
+ my $widget;
+
+ outer:
+ while () {
+ if (my $realloc = delete $self->{realloc}) {
+ for $widget (values %$realloc) {
+ $widget->{visible} or next; # do not resize invisible widgets
+
+ $queue{$widget+0}++ and next; # duplicates are common
+
+ push @{ $queue[$widget->{visible}] }, $widget;
+ }
+ }
+
+ while () {
+ @queue or last outer;
+
+ $widget = pop @{ $queue[-1] || [] }
+ and last;
+
+ pop @queue;
+ }
+
+ delete $queue{$widget+0};
+
+ my ($w, $h) = $widget->size_request;
+
+ $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};
+
+ if ($widget->{req_w} != $w || $widget->{req_h} != $h
+ || delete $widget->{force_realloc}) {
+ $widget->{req_w} = $w;
+ $widget->{req_h} = $h;
+
+ $self->{size_alloc}{$widget+0} = $widget;
+
+ if (my $parent = $widget->{parent}) {
+ $self->{realloc}{$parent+0} = $parent
+ unless $queue{$parent+0};
+
+ $parent->{force_size_alloc} = 1;
+ $self->{size_alloc}{$parent+0} = $parent;
+ }
+ }
+
+ delete $self->{realloc}{$widget+0};
+ }
+ }
+
+ while (my $size_alloc = delete $self->{size_alloc}) {
+ my @queue = sort { $b->{visible} <=> $a->{visible} }
+ values %$size_alloc;
+
+ while () {
+ my $widget = pop @queue || last;
+
+ my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+
+ $w = 0 if $w < 0;
+ $h = 0 if $h < 0;
+
+ $w = int $w + 0.5;
+ $h = int $h + 0.5;
+
+ if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+ $widget->{old_w} = $widget->{w};
+ $widget->{old_h} = $widget->{h};
+
+ $widget->{w} = $w;
+ $widget->{h} = $h;
+
+ $widget->emit (size_allocate => $w, $h);
+ }
+ }
+ }
+
+ while ($self->{post_alloc_hook}) {
+ $_->()
+ for values %{delete $self->{post_alloc_hook}};
+ }
+
+
+ glViewport 0, 0, $::WIDTH, $::HEIGHT;
+ glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+ glClear GL_COLOR_BUFFER_BIT;
+
+ glMatrixMode GL_PROJECTION;
+ glLoadIdentity;
+ glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
+ glMatrixMode GL_MODELVIEW;
+ glLoadIdentity;
+
+ {
+ package CFClient::UI::Base;
+
+ ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+ }
+
+ $self->_draw;
+}
#############################################################################