--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/30 01:42:16 1.256
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/26 21:59:04 1.314
@@ -5,6 +5,7 @@
use Scalar::Util ();
use List::Util ();
+use Event;
use CFClient;
use CFClient::Texture;
@@ -18,36 +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};
- }
-
- $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;
@@ -63,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
@@ -86,7 +91,7 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
$BUTTON_STATE |= 1 << ($ev->{button} - 1);
@@ -111,7 +116,7 @@
$grab->update if $grab;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
}
@@ -127,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))
@@ -169,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};
@@ -179,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.]+$/;
}
}
@@ -209,16 +214,6 @@
@_
}, $class;
- if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
- $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
- $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
- $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
- $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
-
- $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
- $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
- }
-
Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
for (keys %$self) {
@@ -227,6 +222,18 @@
}
}
+ if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
+ $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
+ $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
+ $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
+ $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
+
+ $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
+ $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
+
+ $self->show if $layout->{show};
+ }
+
$self
}
@@ -267,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);
}
@@ -310,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;
@@ -331,6 +337,10 @@
Carp::confess "size_request is abstract";
}
+sub baseline_shift {
+ 0
+}
+
sub configure {
my ($self, $x, $y, $w, $h) = @_;
@@ -352,25 +362,31 @@
$self->update;
}
- if ($self->{w} != $w || $self->{h} != $h) {
+ if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
return unless $self->{visible};
- $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
+ $self->{alloc_w} = $w;
+ $self->{alloc_h} = $h;
+
+ $self->{root}{size_alloc}{$self+0} = $self;
}
}
-sub size_allocate {
- # nothing to be done
+sub children {
+ # nop
}
-sub children {
+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 {
@@ -385,7 +401,7 @@
if ($CFClient::UI::TOOLTIP->{owner} == $self) {
delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ $CFClient::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -403,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;
@@ -411,43 +427,60 @@
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 { }
-sub button_up { }
-sub key_down { }
-sub key_up { }
+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;
+
+ 1
}
-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} }
+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 {
my ($self, $x, $y) = @_;
@@ -465,43 +498,20 @@
my ($self, $parent) = @_;
Scalar::Util::weaken ($self->{parent} = $parent);
-
$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) = @_;
if ($self->{visible}) {
- return if $self->{root}{realloc}{$self};
+ return if $self->{root}{realloc}{$self+0};
- $self->{root}{realloc}{$self} = $self;
+ $self->{root}{realloc}{$self+0} = $self;
$self->{root}->update;
} else {
delete $self->{req_w};
+ delete $self->{req_h};
}
}
@@ -519,35 +529,43 @@
$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};
+
+ # 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;
}
- if ($ENV{CFPLUS_DEBUG}) {
+ 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;
@@ -557,6 +575,9 @@
glPopMatrix;
#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
+
+ $self->_draw;
+ glPopMatrix;
}
sub _draw {
@@ -569,7 +590,9 @@
my ($self) = @_;
delete $WIDGET{$self+0};
- #$self->deactivate;
+
+ eval { $self->destroy };
+ warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
}
#############################################################################
@@ -604,8 +627,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;
@@ -646,14 +669,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
}
@@ -711,7 +736,7 @@
my $res;
- for (reverse @{ $self->{children} }) {
+ for (reverse $self->visible_children) {
$res = $_->find_widget ($x, $y)
and return $res;
}
@@ -742,8 +767,7 @@
sub add {
my ($self, $child) = @_;
- $self->{children} = [];
-
+ $self->SUPER::remove ($_) for @{ $self->{children} };
$self->SUPER::add ($child);
}
@@ -762,14 +786,18 @@
$_[0]{children}[0]->size_request
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
$self->{children}[0]->configure (0, 0, $w, $h);
+
+ 1
}
#############################################################################
+# back-buffered drawing area
+
package CFClient::UI::Window;
our @ISA = CFClient::UI::Bin::;
@@ -789,16 +817,18 @@
$self->SUPER::update;
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->update;
- $self->SUPER::size_allocate ($w, $h, $changed);
- $self->update
- if $changed;
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
sub _render {
- $_[0]{children}[0]->draw;
+ my ($self) = @_;
+
+ $self->{children}[0]->draw;
}
sub render_child {
@@ -808,6 +838,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;
};
}
@@ -815,14 +852,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);
@@ -848,7 +885,7 @@
sub size_request {
my ($self) = @_;
- my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
+ my ($w, $h) = @{$self->child}{qw(req_w req_h)};
$w = 10 if $self->{scroll_x};
$h = 10 if $self->{scroll_y};
@@ -856,14 +893,18 @@
($w, $h)
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ my $child = $self->child;
- $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
- $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
+ $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
+ $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
$self->child->configure (0, 0, $w, $h);
$self->update;
+
+ 1
}
sub set_offset {
@@ -906,6 +947,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;
@@ -918,7 +962,9 @@
our @ISA = CFClient::UI::HBox::;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $child = delete $arg{child};
my $self;
@@ -933,38 +979,45 @@
$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
}
+#TODO# update range on size_allocate depending on child
+
+sub add {
+ my ($self, $widget) = @_;
+
+ $self->{vp}->add ($self->{child} = $widget);
+}
+
+sub update_slider {
+ my ($self) = @_;
+
+ $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+}
+
sub update {
my ($self) = @_;
$self->SUPER::update;
- # todo: overwrite size_allocate of child
- my $child = $self->{vp}->child;
- $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+ $self->update_slider;
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h, $changed);
+ $self->update_slider;
- 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
-# update viewport offset on scroll
-
#############################################################################
package CFClient::UI::Frame;
@@ -989,8 +1042,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;
@@ -1022,26 +1075,45 @@
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 $self = $class->SUPER::new (
bg => [1, 1, 1, 1],
border_bg => [1, 1, 1, 1],
border => 0.6,
- is_toplevel => 1,
can_events => 1,
- @_
+ min_w => 16,
+ min_h => 16,
+ %arg,
);
- $self->{title} &&= new CFClient::UI::Label
+ $self->{title_widget} = new CFClient::UI::Label
align => 0,
valign => 1,
text => $self->{title},
- fontsize => $self->{border};
+ 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
}
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+ $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 {
int $_[0]{border} * $::FONTSIZE
}
@@ -1049,6 +1121,12 @@
sub size_request {
my ($self) = @_;
+ $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;
(
@@ -1057,21 +1135,29 @@
)
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $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;
- return unless $changed;
+ $h -= List::Util::max 0, $border * 2;
+ $w -= List::Util::max 0, $border * 2;
- $h -= List::Util::max 0, $self->border * 2;
- $w -= List::Util::max 0, $self->border * 2;
+ $self->child->configure ($border, $border, $w, $h);
- $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
- if $self->{title};
+ $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
+ if $self->{close_button};
- $self->child->configure ($self->border, $self->border, $w, $h);
+ 1
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
my ($w, $h) = @$self{qw(w h)};
@@ -1097,8 +1183,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) {
@@ -1111,27 +1197,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}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
};
+ } else {
+ return 0;
}
+
+ 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}
}
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;
@@ -1156,9 +1252,17 @@
glDisable GL_TEXTURE_2D;
- $self->{title}->draw if $self->{title};
+ $child->draw;
+
+ if ($self->{title_widget}) {
+ glTranslate 0, $border - $self->{h};
+ $self->{title_widget}->_draw;
+
+ glTranslate 0, - ($border - $self->{h});
+ }
- $self->child->draw;
+ $self->{close_button}->draw
+ if $self->{close_button};
}
#############################################################################
@@ -1193,6 +1297,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) = @_;
@@ -1241,8 +1351,8 @@
)
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
my ($ws, $hs) = $self->get_wh;
@@ -1283,6 +1393,7 @@
$y += $row_h;
}
+ 1
}
sub find_widget {
@@ -1329,39 +1440,39 @@
)
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+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;
}
@@ -1423,7 +1534,8 @@
fontsize => 1,
align => -1,
valign => -1,
- padding => 2,
+ padding_x => 2,
+ padding_y => 2,
can_events => 0,
%arg
);
@@ -1460,6 +1572,13 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1469,6 +1588,7 @@
$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1484,6 +1604,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;
}
@@ -1491,35 +1612,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 + $self->{padding} * 2,
- $h + $self->{padding} * 2,
- )
+ [$w, $h]
+ };
+
+ @{ $self->{size_req} }
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub baseline_shift {
+ $_[0]{layout}->descent
+}
+
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ delete $self->{ox};
delete $self->{texture}
- if $changed;
+ unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
+
+ 1
}
sub set_fontsize {
@@ -1531,6 +1661,14 @@
$self->realloc;
}
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+
+ $self->SUPER::reconfigure;
+}
+
sub _draw {
my ($self) = @_;
@@ -1544,27 +1682,31 @@
$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}
+ };
- $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
- : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+ 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);
- $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
- : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+ $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;
@@ -1591,6 +1733,7 @@
valign => 0,
can_events => 1,
#text => ...
+ #hidden => "*",
@_
)
}
@@ -1602,15 +1745,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->_emit (changed => $self->{text});
+ $self->realloc;
+ $self->update;
}
sub set_text {
@@ -1618,8 +1763,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
-
- $self->realloc;
}
sub get_text {
@@ -1634,7 +1777,7 @@
($w + 1, $h) # add 1 for cursor
}
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
my $mod = $ev->{mod};
@@ -1656,28 +1799,32 @@
} 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 {
+ return 0;
}
$self->_set_text ($text);
$self->realloc;
+
+ 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);
@@ -1688,11 +1835,15 @@
$self->_set_text ($self->{text});
$self->update;
+
+ 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#
+
+ 1
}
sub _draw {
@@ -1701,14 +1852,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};
@@ -1743,7 +1894,7 @@
use CFClient::OpenGL;
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
my $sym = $ev->{sym};
@@ -1751,9 +1902,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) {
@@ -1779,9 +1931,10 @@
}
} else {
- $self->SUPER::key_down ($ev);
+ return $self->SUPER::invoke_key_down ($ev)
}
+ 1
}
#############################################################################
@@ -1800,7 +1953,8 @@
my $class = shift;
$class->SUPER::new (
- padding => 4,
+ padding_x => 4,
+ padding_y => 4,
fg => [1, 1, 1],
active_fg => [0, 0, 1],
can_hover => 1,
@@ -1811,24 +1965,20 @@
)
}
-sub activate { }
-
-sub button_up {
+sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
$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;
@@ -1843,6 +1993,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::;
@@ -1857,7 +2043,8 @@
my $class = shift;
$class->SUPER::new (
- padding => 2,
+ padding_x => 2,
+ padding_y => 2,
fg => [1, 1, 1],
active_fg => [1, 1, 0],
bg => [0, 0, 0, 0.2],
@@ -1871,17 +2058,21 @@
sub size_request {
my ($self) = @_;
- ($self->{padding} * 2 + 6) x 2
+ (6) x 2
}
-sub button_down {
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
- if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
- && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
+ 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
}
+
+ 1
}
sub _draw {
@@ -1889,9 +2080,11 @@
$self->SUPER::_draw;
- glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
+ glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
- my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
+ my ($w, $h) = @$self{qw(w h)};
+
+ my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
@@ -1909,25 +2102,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
}
@@ -1935,7 +2129,7 @@
sub size_request {
my ($self) = @_;
- ($self->{tex}->{w}, $self->{tex}->{h})
+ ($self->{tex}{w}, $self->{tex}{h})
}
sub _draw {
@@ -2056,7 +2250,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;
@@ -2166,8 +2361,8 @@
bg => [0, 0, 0, 0.2],
active_bg => [1, 1, 1, 0.5],
range => [0, 0, 100, 10, 0],
- req_w => $::WIDTH / 80,
- req_h => $::WIDTH / 80,
+ min_w => $::WIDTH / 80,
+ min_h => $::WIDTH / 80,
vertical => 0,
can_hover => 1,
inner_pad => 0.02,
@@ -2180,15 +2375,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 {
@@ -2209,7 +2404,7 @@
@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
if ($value != $old_value) {
- $self->_emit (changed => $value);
+ $self->emit (changed => $value);
$self->update;
}
}
@@ -2217,23 +2412,20 @@
sub size_request {
my ($self) = @_;
- my $w = $self->{req_w};
- my $h = $self->{req_h};
-
- $self->{vertical} ? ($h, $w) : ($w, $h)
+ ($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) {
@@ -2244,13 +2436,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}};
@@ -2266,13 +2469,7 @@
$self->{knob_x} = $value - $knob_w * 0.5;
$self->{knob_w} = $knob_w;
- });
-
- $self->SUPER::update;
-}
-
-sub _draw {
- my ($self) = @_;
+ }
$self->SUPER::_draw ();
@@ -2343,7 +2540,7 @@
#############################################################################
-package CFClient::UI::TextView;
+package CFClient::UI::TextScroller;
our @ISA = CFClient::UI::HBox::;
@@ -2355,6 +2552,7 @@
my $self = $class->SUPER::new (
fontsize => 1,
can_events => 0,
+ indent => 0,
#font => default_font
@_,
@@ -2379,30 +2577,51 @@
$self->reflow;
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub size_request {
+ my ($self) = @_;
+
+ my ($empty, $slider) = @{ $self->{children} };
+
+ local $self->{children} = [$empty, $slider];
+ $self->SUPER::size_request
+}
- $self->SUPER::size_allocate ($w, $h, $changed);
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
- return unless $changed;
+ 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 {
@@ -2422,21 +2641,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;
- $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
+ $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;
+}
+
+sub scroll_to_bottom {
+ my ($self) = @_;
+
+ $self->{scroll_to_bottom} = 1;
+ $self->update;
}
sub update {
@@ -2448,37 +2686,38 @@
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.5, 0.5, 0.5, 0;
+ glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
my $top = int $self->{children}[1]{range}[0];
@@ -2488,26 +2727,37 @@
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;
+
+ glDisable GL_BLEND;
+ for (@w) {
+ my ($dx, $dy) = splice @s, 0, 2, ();
+
+ $_->{x} = $dx + $para->{indent};
+ $_->{y} = $dy + $y - $y0;
+
+ $_->draw;
+ }
+ glEnable GL_BLEND;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ }
}
$y += $h;
@@ -2518,17 +2768,25 @@
});
}
+sub reconfigure {
+ my ($self) = @_;
+
+ $self->SUPER::reconfigure;
+
+ $_->{w} = 1e10 for @{ $self->{par} };
+ $self->reflow;
+}
+
sub _draw {
my ($self) = @_;
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;
-
}
#############################################################################
@@ -2617,8 +2875,20 @@
sub set_tooltip_from {
my ($self, $widget) = @_;
+ my $tooltip = $widget->{tooltip};
+
+ if ($ENV{CFPLUS_DEBUG} & 2) {
+ $tooltip .= "\n\n" . (ref $widget) . "\n"
+ . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
+ . "req $widget->{req_w} $widget->{req_h}\n"
+ . "visible $widget->{visible}";
+ }
+
+ $tooltip =~ s/^\n+//;
+ $tooltip =~ s/\n+$//;
+
$self->add (new CFClient::UI::Label
- markup => $widget->{tooltip},
+ markup => $tooltip,
max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
fontsize => 0.8,
fg => [0, 0, 0, 1],
@@ -2635,15 +2905,13 @@
($w + 4, $h + 4)
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
-
- return unless $changed;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
+ $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
}
-sub visibility_change {
+sub invoke_visibility_change {
my ($self, $visible) = @_;
return unless $visible;
@@ -2655,7 +2923,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);
});
@@ -2754,62 +3022,28 @@
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;
}
}
-sub DESTROY {
+sub destroy {
my ($self) = @_;
$self->{timer}->cancel
if $self->{timer};
- $self->SUPER::DESTROY;
+ $self->SUPER::destroy;
}
#############################################################################
-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]),
- @_,
- );
-
- $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;
+package CFClient::UI::Buttonbar;
- $self->{real_items} = \@items;
-
- my $row = 0;
- for my $item (@items) {
- CFClient::Item::update_widgets $item;
+our @ISA = CFClient::UI::HBox::;
- $self->{scrolled}->add (0, $row, $item->{face_widget});
- $self->{scrolled}->add (1, $row, $item->{desc_widget});
- $self->{scrolled}->add (2, $row, $item->{weight_widget});
-
- $row++;
- }
-}
+# TODO: should actualyl wrap buttons and other goodies.
#############################################################################
@@ -2831,14 +3065,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;
@@ -2853,34 +3088,206 @@
sub popup {
my ($self, $ev) = @_;
- $self->_emit ("popdown");
+ $self->emit ("popdown");
# maybe save $GRAB? must be careful about events...
$GRAB = $self;
$self->{button} = $ev->{button};
$self->show;
- $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+ $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
$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
$self->{hover} = $self->{item}{$HOVER};
+
+ 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
}
+
+ 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 invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->{current}->configure (0, 0, $w, $h);
+
+ 1
+}
+
+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 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);
}
#############################################################################
@@ -2892,15 +3299,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;
@@ -2913,11 +3331,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}"
@@ -2935,10 +3355,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;
@@ -2953,7 +3385,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};
@@ -2964,7 +3396,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 {
@@ -2993,41 +3425,199 @@
$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 configure {
- my ($self, $x, $y, $w, $h) = @_;
+sub set_items {
+ my ($self, $items) = @_;
+
+ $self->{child}->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->{child}->add (0, $row, $item->{face_widget});
+ $self->{child}->add (1, $row, $item->{desc_widget});
+ $self->{child}->add (2, $row, $item->{weight_widget});
- $self->{w} = $w;
- $self->{h} = $h;
+ $row++;
+ }
}
-sub reconfigure {
+#############################################################################
+
+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 => -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");
+
+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";
+
+ #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 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;
+}
+
+sub clear_spells {
my ($self) = @_;
- $self->SUPER::reconfigure;
+ $self->{spell} = {};
+ $self->rebuild_spell_list;
+}
- $self->size_allocate ($self->{w}, $self->{h}, 1)
- if $self->{w};
+#############################################################################
+
+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 {
@@ -3050,8 +3640,8 @@
int $coord + 0.5
}
-sub size_allocate {
- my ($self, $w, $h, $changed) = @_;
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
for my $child ($self->children) {
my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
@@ -3064,6 +3654,8 @@
$child->configure ($X, $Y, $W, $H);
}
+
+ 1
}
sub coord2local {
@@ -3129,48 +3721,72 @@
}
if ($self->{realloc}) {
+ my %queue;
my @queue;
+ my $widget;
+ outer:
while () {
- if ($self->{realloc}) {
- #TODO use array-of-depth approach
+ 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
- @queue = sort { $a->{visible} <=> $b->{visible} }
- @queue, values %{delete $self->{realloc}};
+ push @{ $queue[$widget->{visible}] }, $widget;
+ }
}
- my $widget = pop @queue || last;
+ while () {
+ @queue or last outer;
+
+ $widget = pop @{ $queue[-1] || [] }
+ and last;
+
+ pop @queue;
+ }
+
+ delete $queue{$widget+0};
- $widget->{visible} or last; # do not resize invisible widgets
+ my ($w, $h) = $widget->size_request;
- my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
- ? @$widget{qw(force_w force_h)}
- : $widget->size_request;
+ $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+ $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
- my $min_size = $widget->{is_toplevel} ? 16 : 0;
+ $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+ $h = min $widget->{max_h}, $h if exists $widget->{max_h};
- $w = $min_size if $w < $min_size;
- $h = $min_size if $h < $min_size;
+ $w = $widget->{force_w} if exists $widget->{force_w};
+ $h = $widget->{force_h} if exists $widget->{force_h};
- $widget->{req_w} = $w;
- $widget->{req_h} = $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} = [$widget, undef, undef];
+ $self->{size_alloc}{$widget+0} = $widget;
- push @queue, $widget->{parent}
- if $widget->{parent};
+ 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->[0]{visible} <=> $a->[0]{visible},
+ my @queue = sort { $b->{visible} <=> $a->{visible} }
values %$size_alloc;
while () {
- my ($widget, $w, $h) = @{ pop @queue or last };
+ my $widget = pop @queue || last;
- $w = $widget->{w} || $widget->{req_w} unless defined $w;
- $h = $widget->{h} || $widget->{req_h} unless defined $h;
+ my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
$w = 0 if $w < 0;
$h = 0 if $h < 0;
@@ -3178,12 +3794,15 @@
$w = int $w + 0.5;
$h = int $h + 0.5;
- my $changed = $widget->{w} != $w || $widget->{h} != $h;
+ 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->{w} = $w;
+ $widget->{h} = $h;
- $widget->emit (size_allocate => $w, $h, $changed);
+ $widget->emit (size_allocate => $w, $h);
+ }
}
}
@@ -3192,6 +3811,7 @@
for values %{delete $self->{post_alloc_hook}};
}
+
glViewport 0, 0, $::WIDTH, $::HEIGHT;
glClearColor +($::CFG->{fow_intensity}) x 3, 1;
glClear GL_COLOR_BUFFER_BIT;
@@ -3202,6 +3822,13 @@
glMatrixMode GL_MODELVIEW;
glLoadIdentity;
+ {
+ package CFClient::UI::Base;
+
+ ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+ }
+
$self->_draw;
}