--- deliantra/Deliantra-Client/DC/UI.pm 2006/08/14 03:41:28 1.347
+++ deliantra/Deliantra-Client/DC/UI.pm 2008/09/19 02:24:32 1.470
@@ -1,15 +1,13 @@
-package CFPlus::UI;
+package DC::UI;
use utf8;
use strict;
-use Scalar::Util ();
use List::Util ();
-use Event;
-use CFPlus;
-use CFPlus::Pod;
-use CFPlus::Texture;
+use DC;
+use DC::Pod;
+use DC::Texture;
our ($FOCUS, $HOVER, $GRAB); # various widgets
@@ -20,21 +18,21 @@
our %WIDGET; # all widgets, weak-referenced
-our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
+our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
+ $_[0]->stop;
+
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
if ($TOOLTIP->{owner} != $widget) {
+ $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
$TOOLTIP->hide;
$TOOLTIP->{owner} = $widget;
+ $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
return if $ENV{CFPLUS_DEBUG} & 8;
- my $tip = $widget->{tooltip};
-
- $tip = $tip->($widget) if CODE:: eq ref $tip;
-
$TOOLTIP->set_tooltip_from ($widget);
$TOOLTIP->show;
}
@@ -45,8 +43,9 @@
}
$TOOLTIP->hide;
+ $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
delete $TOOLTIP->{owner};
-});
+};
sub get_layout {
my $layout;
@@ -91,7 +90,7 @@
$hover->update if $hover && $hover->{can_hover};
$HOVER->update if $HOVER && $HOVER->{can_hover};
- $TOOLTIP_WATCHER->start;
+ $TOOLTIP_WATCHER->again;
}
}
@@ -107,14 +106,18 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- $TOOLTIP_WATCHER->cb->();
+ $TOOLTIP_WATCHER->invoke;
}
if ($GRAB) {
if ($ev->{button} == 4 || $ev->{button} == 5) {
# mousewheel
- $ev->{dx} = 0;
- $ev->{dy} = $ev->{button} * 2 - 9;
+ my $delta = $ev->{button} * 2 - 9;
+ my $shift = $ev->{mod} & DC::KMOD_SHIFT;
+
+ $ev->{dx} = $shift ? $delta : 0;
+ $ev->{dy} = $shift ? 0 : $delta;
+
$GRAB->emit (mouse_wheel => $ev);
} else {
$GRAB->emit (button_down => $ev)
@@ -138,7 +141,7 @@
$GRAB->update if $GRAB;
check_hover $widget;
- $TOOLTIP_WATCHER->cb->();
+ $TOOLTIP_WATCHER->invoke;
}
}
@@ -210,7 +213,7 @@
#############################################################################
-package CFPlus::UI::Event;
+package DC::UI::Event;
sub xy {
$_[1]->coord2local ($_[0]{x}, $_[0]{y})
@@ -218,11 +221,11 @@
#############################################################################
-package CFPlus::UI::Base;
+package DC::UI::Base;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -237,7 +240,7 @@
@_
}, $class;
- Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
+ DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
for (keys %$self) {
if (/^on_(.*)$/) {
@@ -245,11 +248,11 @@
}
}
- if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
- $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
- $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
- $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
- $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
+ if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
+ $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
+ $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
+ $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
+ $self->{force_h} = $layout->{h} * $DC::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};
@@ -264,15 +267,20 @@
my ($self) = @_;
$self->hide;
+ $self->emit ("destroy");
%$self = ();
}
+sub TO_JSON {
+ { "\fw" => $_[0]{s_id} }
+}
+
sub show {
my ($self) = @_;
return if $self->{parent};
- $CFPlus::UI::ROOT->add ($self);
+ $DC::UI::ROOT->add ($self);
}
sub set_visible {
@@ -287,7 +295,7 @@
$self->realloc if !exists $self->{req_w};
- $_->set_visible for $self->children;
+ $_->set_visible for $self->visible_children;
}
sub set_invisible {
@@ -303,7 +311,7 @@
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- $CFPlus::UI::TOOLTIP_WATCHER->cb->()
+ $DC::UI::TOOLTIP_WATCHER->invoke
if $TOOLTIP->{owner} == $self;
$self->emit ("focus_out");
@@ -315,8 +323,8 @@
return if $self->{visible} == $visible;
- $visible ? $self->hide
- : $self->show;
+ $visible ? $self->show
+ : $self->hide;
}
sub toggle_visibility {
@@ -332,8 +340,11 @@
$self->set_invisible;
- $self->{parent}->remove ($self)
- if $self->{parent};
+ # extra $parent copy for 5.8.8+ bug workaround
+ # (otherwise $_[0] in remove gets freed
+ if (my $parent = $self->{parent}) {
+ $parent->remove ($self);
+ }
}
sub move_abs {
@@ -355,6 +366,24 @@
$self->realloc;
}
+# traverse the widget chain up to find the maximum "physical" size constraints
+sub get_max_wh {
+ my ($self) = @_;
+
+ my ($w, $h) = @$self{qw(max_w max_h)};
+
+ if ($w <= 0 || $h <= 0) {
+ my ($mw, $mh) = $self->{parent}
+ ? $self->{parent}->get_max_wh
+ : ($::WIDTH, $::HEIGHT);
+
+ $w = $mw if $w <= 0;
+ $h = $mh if $h <= 0;
+ }
+
+ ($w, $h)
+}
+
sub size_request {
require Carp;
Carp::confess "size_request is abstract";
@@ -370,8 +399,8 @@
if ($self->{aspect}) {
my ($ow, $oh) = ($w, $h);
- $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
- $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
+ $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
+ $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
# use alignment to adjust x, y
@@ -422,9 +451,9 @@
$self->{tooltip} = $tooltip;
- if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
- delete $CFPlus::UI::TOOLTIP->{owner};
- $CFPlus::UI::TOOLTIP_WATCHER->cb->();
+ if ($DC::UI::TOOLTIP->{owner} == $self) {
+ delete $DC::UI::TOOLTIP->{owner};
+ $DC::UI::TOOLTIP_WATCHER->invoke;
}
}
@@ -432,7 +461,7 @@
sub coord2local {
my ($self, $x, $y) = @_;
- Carp::confess unless $self->{parent};#d#
+ return (undef, undef) unless $self->{parent};
$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
}
@@ -441,7 +470,7 @@
sub coord2global {
my ($self, $x, $y) = @_;
- Carp::confess unless $self->{parent};#d#
+ return (undef, undef) unless $self->{parent};
$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
@@ -500,12 +529,18 @@
push @{ $self->{signal_cb}{$signal} }, $cb;
- defined wantarray and CFPlus::guard {
+ defined wantarray and DC::guard {
@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
@{ $self->{signal_cb}{$signal} };
}
}
+sub disconnect_all {
+ my ($self, $signal) = @_;
+
+ delete $self->{signal_cb}{$signal};
+}
+
my %has_coords = (
button_down => 1,
button_up => 1,
@@ -516,8 +551,8 @@
sub emit {
my ($self, $signal, @args) = @_;
- # I do not really like this solution, but I dislike duplication
- # and needlessly verbose code, too.
+ # I do not really like this solution, but I do not like duplication
+ # and needlessly verbose code, either.
my @append
= $has_coords{$signal}
? $args[0]->xy ($self)
@@ -525,28 +560,24 @@
#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
- #d##TODO# stop propagating at first true, do not use sum
- (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
- || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
- || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
-}
-
-sub find_widget {
- my ($self, $x, $y) = @_;
-
- return () unless $self->{can_events};
-
- return $self
- if $x >= $self->{x} && $x < $self->{x} + $self->{w}
- && $y >= $self->{y} && $y < $self->{y} + $self->{h};
+ for my $cb (
+ @{$self->{signal_cb}{$signal} || []}, # before
+ ($self->can ("invoke_$signal") || sub { 1 }), # closure
+ ) {
+ return $cb->($self, @args, @append) || next;
+ }
- ()
+ # parent
+ $self->{parent} && $self->{parent}->emit ($signal, @args)
}
+#sub find_widget {
+# in .xs
+
sub set_parent {
my ($self, $parent) = @_;
- Scalar::Util::weaken ($self->{parent} = $parent);
+ DC::weaken ($self->{parent} = $parent);
$self->set_visible if $parent->{visible};
}
@@ -582,52 +613,8 @@
# 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;
-
- if ($self == $HOVER && $self->{can_hover}) {
- glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
- glEnable GL_BLEND;
- glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex $self->{w}, 0;
- glVertex $self->{w}, $self->{h};
- glVertex 0 , $self->{h};
- glEnd;
- glDisable GL_BLEND;
- }
-
- if ($ENV{CFPLUS_DEBUG} & 1) {
- glPushMatrix;
- glColor 1, 1, 0, 1;
- glTranslate 0.375, 0.375;
- glBegin GL_LINE_LOOP;
- glVertex 0 , 0;
- glVertex $self->{w} - 1, 0;
- glVertex $self->{w} - 1, $self->{h} - 1;
- glVertex 0 , $self->{h} - 1;
- glEnd;
- glPopMatrix;
- #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
- }
-
- $self->_draw;
- glPopMatrix;
-}
+#sub draw {
+#CFPlus.xs
sub _draw {
my ($self) = @_;
@@ -638,28 +625,27 @@
sub DESTROY {
my ($self) = @_;
- return if CFPlus::in_destruct;
-
- delete $WIDGET{$self+0};
+ return if DC::in_destruct;
+ local $@;
eval { $self->destroy };
warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
+
+ delete $WIDGET{$self+0};
}
#############################################################################
-package CFPlus::UI::DrawBG;
+package DC::UI::DrawBG;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
- # range [value, low, high, page]
-
$class->SUPER::new (
#bg => [0, 0, 0, 0.2],
#active_bg => [1, 1, 1, 0.5],
@@ -680,23 +666,16 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glColor_premultiply @$color;
-
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
-
+ glRect 0, 0, $w, $h;
glDisable GL_BLEND;
}
}
#############################################################################
-package CFPlus::UI::Empty;
+package DC::UI::Empty;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -713,9 +692,9 @@
#############################################################################
-package CFPlus::UI::Container;
+package DC::UI::Container;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -729,7 +708,7 @@
);
$self->add (@$children)
- if $children;
+ if $children && @$children;
$self
}
@@ -748,6 +727,7 @@
$_->set_parent ($self)
for @widgets;
+ # TODO: only do this in widgets that need it, e.g. root, fixed
use sort 'stable';
$self->{children} = [
@@ -756,6 +736,10 @@
];
$self->realloc;
+
+ $self->emit (c_add => \@widgets);
+
+ map $_+0, @widgets
}
sub children {
@@ -763,12 +747,15 @@
}
sub remove {
- my ($self, $child) = @_;
+ my ($self, @widgets) = @_;
- delete $child->{parent};
- $child->hide;
+ $self->emit (c_remove => \@widgets);
- $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
+ for my $child (@widgets) {
+ delete $child->{parent};
+ $child->hide;
+ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
+ }
$self->realloc;
}
@@ -776,7 +763,7 @@
sub clear {
my ($self) = @_;
- my $children = delete $self->{children};
+ my $children = $self->{children};
$self->{children} = [];
for (@$children) {
@@ -806,19 +793,19 @@
sub _draw {
my ($self) = @_;
- $_->draw for @{$self->{children}};
+ $_->draw for $self->visible_children;
}
#############################################################################
-package CFPlus::UI::Bin;
+package DC::UI::Bin;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub new {
my ($class, %arg) = @_;
- my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
+ my $child = (delete $arg{child}) || new DC::UI::Empty::;
$class->SUPER::new (children => [$child], %arg)
}
@@ -826,7 +813,7 @@
sub add {
my ($self, $child) = @_;
- $self->SUPER::remove ($_) for @{ $self->{children} };
+ $self->clear;
$self->SUPER::add ($child);
}
@@ -835,7 +822,7 @@
$self->SUPER::remove ($widget);
- $self->{children} = [new CFPlus::UI::Empty]
+ $self->{children} = [new DC::UI::Empty]
unless @{$self->{children}};
}
@@ -854,14 +841,13 @@
}
#############################################################################
-
# back-buffered drawing area
-package CFPlus::UI::Window;
+package DC::UI::Window;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -893,18 +879,18 @@
sub render_child {
my ($self) = @_;
- $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
+ $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
{
- package CFPlus::UI::Base;
+ package DC::UI::Base;
- ($draw_x, $draw_y, $draw_w, $draw_h) =
+ local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
- }
- $self->_render;
+ $self->_render;
+ }
};
}
@@ -925,9 +911,11 @@
#############################################################################
-package CFPlus::UI::ViewPort;
+package DC::UI::ViewPort;
+
+use List::Util qw(min max);
-our @ISA = CFPlus::UI::Window::;
+our @ISA = DC::UI::Window::;
sub new {
my $class = shift;
@@ -944,8 +932,8 @@
my ($w, $h) = @{$self->child}{qw(req_w req_h)};
- $w = 10 if $self->{scroll_x};
- $h = 10 if $self->{scroll_y};
+ $w = 1 if $self->{scroll_x};
+ $h = 1 if $self->{scroll_y};
($w, $h)
}
@@ -967,10 +955,34 @@
sub set_offset {
my ($self, $x, $y) = @_;
- $self->{view_x} = int $x;
- $self->{view_y} = int $y;
+ my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
+ my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
- $self->update;
+ if ($x != $self->{view_x} or $y != $self->{view_y}) {
+ $self->{view_x} = $x;
+ $self->{view_y} = $y;
+
+ $self->emit (changed => $x, $y);
+ $self->update;
+ }
+}
+
+sub set_center {
+ my ($self, $x, $y) = @_;
+
+ $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
+}
+
+sub make_visible {
+ my ($self, $x, $y, $border) = @_;
+
+ if ( $x < $self->{view_x} + $self->{w} * $border
+ || $x > $self->{view_x} + $self->{w} * (1 - $border)
+ || $y < $self->{view_y} + $self->{h} * $border
+ || $y > $self->{view_y} + $self->{h} * (1 - $border)
+ ) {
+ $self->set_center ($x, $y);
+ }
}
# hmm, this does not work for topleft of $self... but we should not ask for that
@@ -995,28 +1007,28 @@
if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
) {
- $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
+ $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
} else {
- $self->CFPlus::UI::Base::find_widget ($x, $y)
+ $self->DC::UI::Base::find_widget ($x, $y)
}
}
sub _render {
my ($self) = @_;
- local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
- local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
+ local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
+ local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
- CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+ DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
}
#############################################################################
-package CFPlus::UI::ScrolledWindow;
+package DC::UI::ScrolledWindow;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::Table::;
sub new {
my ($class, %arg) = @_;
@@ -1025,74 +1037,180 @@
my $self;
- my $slider = new CFPlus::UI::Slider
+ my $hslider = new DC::UI::Slider
+ c_col => 0,
+ c_row => 1,
+ vertical => 0,
+ range => [0, 0, 1, 0.01], # HACK fix
+ on_changed => sub {
+ $self->{hpos} = $_[1];
+ $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
+ },
+ ;
+
+ my $vslider = new DC::UI::Slider
+ c_col => 1,
+ c_row => 0,
vertical => 1,
range => [0, 0, 1, 0.01], # HACK fix
on_changed => sub {
- $self->{vp}->set_offset (0, $_[1]);
+ $self->{vpos} = $_[1];
+ $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
},
;
$self = $class->SUPER::new (
- vp => (new CFPlus::UI::ViewPort expand => 1),
+ scroll_x => 0,
+ scroll_y => 1,
can_events => 1,
- slider => $slider,
+ hslider => $hslider,
+ vslider => $vslider,
+ col_expand => [1, 0],
+ row_expand => [1, 0],
%arg,
);
- $self->SUPER::add ($self->{vp}, $self->{slider});
+ $self->{vp} = new DC::UI::ViewPort
+ c_col => 0,
+ c_row => 0,
+ expand => 1,
+ scroll_x => $self->{scroll_x},
+ scroll_y => $self->{scroll_y},
+ on_changed => sub {
+ my ($vp, $x, $y) = @_;
+
+ $vp->{parent}{hslider}->set_value ($x);
+ $vp->{parent}{vslider}->set_value ($y);
+
+ 0
+ },
+ on_size_allocate => sub {
+ my ($vp, $w, $h) = @_;
+ $vp->{parent}->update_slider;
+ 0
+ },
+ ;
+
+ $self->SUPER::add ($self->{vp});
+
$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 invoke_mouse_wheel {
+sub set_offset { shift->{vp}->set_offset (@_) }
+sub set_center { shift->{vp}->set_center (@_) }
+sub make_visible { shift->{vp}->make_visible (@_) }
+
+sub update_slider {
+ my ($self) = @_;
+
+ my $child = ($self->{vp} or return)->child;
+
+ if ($self->{scroll_x}) {
+ my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
+ $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+
+ my $visible = $w1 > $w2;
+ if ($visible != $self->{hslider_visible}) {
+ $self->{hslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{hslider})
+ : $self->SUPER::remove ($self->{hslider});
+ }
+ }
+
+ if ($self->{scroll_y}) {
+ my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
+ $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
+
+ my $visible = $h1 > $h2;
+ if ($visible != $self->{vslider_visible}) {
+ $self->{vslider_visible} = $visible;
+ $visible ? $self->SUPER::add ($self->{vslider})
+ : $self->SUPER::remove ($self->{vslider});
+ }
+ }
+}
+
+sub start_dragging {
my ($self, $ev) = @_;
- return 0 unless $ev->{dy}; # only vertical movements
+ $self->grab_focus;
+
+ my $ox = $self->{vp}{view_x};
+ my $oy = $self->{vp}{view_y};
+
+ $self->{motion} = sub {
+ my ($ev, $x, $y) = @_;
+
+ $ox -= $ev->{xrel};
+ $oy -= $ev->{yrel};
+
+ $self->{vp}->set_offset ($ox, $oy);
+ };
+}
- $self->{slider}->emit (mouse_wheel => $ev);
+sub invoke_mouse_wheel {
+ my ($self, $ev) = @_;
+
+ $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
+ $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1
}
-sub update_slider {
- my ($self) = @_;
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
- $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+ if ($ev->{button} == 2) {
+ $self->start_dragging ($ev);
+ return 1;
+ }
+
+ 0
}
-sub update {
- my ($self) = @_;
+sub invoke_button_up {
+ my ($self, $ev, $x, $y) = @_;
- $self->SUPER::update;
+ if (delete $self->{motion}) {
+ return 1;
+ }
- $self->update_slider;
+ 0
+}
+
+sub invoke_mouse_motion {
+ my ($self, $ev, $x, $y) = @_;
+
+ if ($self->{motion}) {
+ $self->{motion}->($ev, $x, $y);
+ return 1;
+ }
+
+ 0
}
sub invoke_size_allocate {
my ($self, $w, $h) = @_;
$self->update_slider;
-
$self->SUPER::invoke_size_allocate ($w, $h)
}
#############################################################################
-package CFPlus::UI::Frame;
+package DC::UI::Frame;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -1112,14 +1230,7 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glColor_premultiply @{ $self->{bg} };
-
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
-
+ glRect 0, 0, $w, $h;
glDisable GL_BLEND;
}
@@ -1128,26 +1239,26 @@
#############################################################################
-package CFPlus::UI::FancyFrame;
+package DC::UI::FancyFrame;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
if ((exists $arg{label}) && !ref $arg{label}) {
- $arg{label} = new CFPlus::UI::Label
+ $arg{label} = new DC::UI::Label
align => 1,
- valign => 0,
+ valign => 0.5,
text => $arg{label},
fontsize => ($arg{border} || 0.8) * 0.75;
}
my $self = $class->SUPER::new (
# label => "",
- fg => [0.6, 0.3, 0.1],
+ fg => undef,
border => 0.8,
style => 'single',
%arg,
@@ -1160,7 +1271,7 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+ $self->DC::UI::Container::add ($self->{label}) if $self->{label};
}
sub border {
@@ -1210,7 +1321,7 @@
$child->draw;
- glColor @{$self->{fg}};
+ glColor @{$self->{fg} || $DC::THEME{fancyframe}};
glBegin GL_LINE_STRIP;
glVertex $border * 1.5 , $border * 0.5 + 0.5;
glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
@@ -1228,35 +1339,39 @@
#############################################################################
-package CFPlus::UI::Toplevel;
+package DC::UI::Toplevel;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
my $bg =
- new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
+ new_from_resource DC::Texture "d1_bg.png",
mipmap => 1, wrap => 1;
my @border =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
+my @icon =
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
+ qw(x1_move.png x1_resize.png);
+
sub new {
my ($class, %arg) = @_;
my $self = $class->SUPER::new (
bg => [1, 1, 1, 1],
border_bg => [1, 1, 1, 1],
- border => 0.6,
+ border => 0.8,
can_events => 1,
min_w => 64,
min_h => 32,
%arg,
);
- $self->{title_widget} = new CFPlus::UI::Label
- align => 0,
+ $self->{title_widget} = new DC::UI::Label
+ align => 0.5,
valign => 1,
text => $self->{title},
fontsize => $self->{border},
@@ -1264,11 +1379,11 @@
if ($self->{has_close_button}) {
$self->{close_button} =
- new CFPlus::UI::ImageButton
+ new DC::UI::ImageButton
path => 'x1_close.png',
on_activate => sub { $self->emit ("delete") };
- $self->CFPlus::UI::Container::add ($self->{close_button});
+ $self->DC::UI::Container::add ($self->{close_button});
}
$self
@@ -1278,14 +1393,23 @@
my ($self, @widgets) = @_;
$self->SUPER::add (@widgets);
- $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
- $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
+ $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
+ $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
}
sub border {
int $_[0]{border} * $::FONTSIZE
}
+sub get_max_wh {
+ my ($self) = @_;
+
+ return ($self->{w}, $self->{h})
+ if $self->{visible} && $self->{w};
+
+ $self->SUPER::get_max_wh
+}
+
sub size_request {
my ($self) = @_;
@@ -1419,10 +1543,24 @@
my $border = $self->border;
glColor @{ $self->{border_bg} };
- $border[0]->draw_quad_alpha (0, 0, $w, $border);
- $border[1]->draw_quad_alpha (0, $border, $border, $ch);
- $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
- $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
+ $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
+ $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
+ $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
+ $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
+
+ # move
+ my $w2 = ($w - $border) * .5;
+ my $h2 = ($h - $border) * .5;
+ $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
+ $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
+ $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
+
+ # resize
+ $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
+ $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
+ unless $self->{has_close_button};
+ $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
+ $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
glColor @{ $self->{bg} };
@@ -1451,60 +1589,50 @@
#############################################################################
-package CFPlus::UI::Table;
+package DC::UI::Table;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Container::;
use List::Util qw(max sum);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
$class->SUPER::new (
col_expand => [],
+ row_expand => [],
@_,
)
}
-sub children {
- grep $_, map @$_, grep $_, @{ $_[0]{children} }
-}
-
sub add {
- my ($self) = shift;
+ my ($self, @widgets) = @_;
- while (@_) {
- my ($x, $y, $child) = splice @_, 0, 3, ();
- $child->set_parent ($self);
- $self->{children}[$y][$x] = $child;
+ for my $child (@widgets) {
+ $child->{c_rowspan} ||= 1;
+ $child->{c_colspan} ||= 1;
}
- $self->{force_realloc} = 1;
- $self->{force_size_alloc} = 1;
- $self->realloc;
+ $self->SUPER::add (@widgets);
}
-sub remove {
- my ($self, $child) = @_;
+sub add_at {
+ my $self = shift;
- # TODO: not yet implemented
-}
+ my @widgets;
-# TODO: move to container class maybe? send children a signal on removal?
-sub clear {
- my ($self) = @_;
+ while (@_) {
+ my ($col, $row, $child) = splice @_, 0, 3, ();
- my @children = $self->children;
- delete $self->{children};
-
- for (@children) {
- delete $_->{parent};
- $_->hide;
+ $child->{c_row} = $row;
+ $child->{c_col} = $col;
+
+ push @widgets, $child;
}
- $self->realloc;
+ $self->add (@widgets);
}
sub get_wh {
@@ -1512,17 +1640,27 @@
my (@w, @h);
- for my $y (0 .. $#{$self->{children}}) {
- my $row = $self->{children}[$y]
- or next;
-
- for my $x (0 .. $#$row) {
- my $widget = $row->[$x]
- or next;
- my ($w, $h) = @$widget{qw(req_w req_h)};
+ my @children = $self->children;
+
+ # first pass, columns
+ for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
+ my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
+
+ my $sw = sum @w[$c .. $c + $cs - 1];
+
+ if ($w > $sw) {
+ $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
+ }
+ }
+
+ # second pass, rows
+ for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
+ my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
+
+ my $sh = sum @h[$r .. $r + $rs - 1];
- $w[$x] = max $w[$x], $w;
- $h[$y] = max $h[$y], $h;
+ if ($h > $sh) {
+ $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
}
}
@@ -1548,84 +1686,123 @@
my $req_w = (sum @$ws) || 1;
my $req_h = (sum @$hs) || 1;
- # TODO: nicer code && do row_expand
+ # now linearly scale the rows/columns to the allocated size
my @col_expand = @{$self->{col_expand}};
@col_expand = (1) x @$ws unless @col_expand;
my $col_expand = (sum @col_expand) || 1;
- # linearly scale sizes
$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
- $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
- CFPlus::UI::harmonize $ws;
- CFPlus::UI::harmonize $hs;
+ DC::UI::harmonize $ws;
- my $y;
+ my @row_expand = @{$self->{row_expand}};
+ @row_expand = (1) x @$ws unless @row_expand;
+ my $row_expand = (sum @row_expand) || 1;
- for my $r (0 .. $#{$self->{children}}) {
- my $row = $self->{children}[$r]
- or next;
+ $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
- my $x = 0;
- my $row_h = $hs->[$r];
-
- for my $c (0 .. $#$row) {
- my $col_w = $ws->[$c];
+ DC::UI::harmonize $hs;
- if (my $widget = $row->[$c]) {
- $widget->configure ($x, $y, $col_w, $row_h);
- }
+ my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
+ my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
- $x += $col_w;
- }
+ for my $widget ($self->children) {
+ my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
- $y += $row_h;
+ $widget->configure (
+ $x[$c], $y[$r],
+ $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
+ );
}
1
}
-sub find_widget {
- my ($self, $x, $y) = @_;
+#############################################################################
- $x -= $self->{x};
- $y -= $self->{y};
+package DC::UI::Fixed;
- my $res;
+use List::Util qw(min max);
- for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
- $res = $_->find_widget ($x, $y)
- and return $res;
- }
+our @ISA = DC::UI::Container::;
- $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
+sub _scale($$$) {
+ my ($rel, $val, $max) = @_;
+
+ $rel ? $val * $max : $val
}
-sub _draw {
+sub size_request {
my ($self) = @_;
- for (grep $_, @{$self->{children}}) {
- $_->draw for grep $_, @$_;
+ my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
+
+ # determine overall size by querying abs widgets
+ for my $child ($self->visible_children) {
+ unless ($child->{c_rel}) {
+ my $x = $child->{c_x};
+ my $y = $child->{c_y};
+
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
+ }
+ }
+
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
+
+ # now layout remaining widgets
+ for my $child ($self->visible_children) {
+ if ($child->{c_rel}) {
+ my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+ my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
+
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
+ }
}
+
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
+
+ ($W, $H)
+}
+
+sub invoke_size_allocate {
+ my ($self, $W, $H) = @_;
+
+ for my $child ($self->visible_children) {
+ my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+ my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
+
+ $x += $child->{c_halign} * $child->{req_w};
+ $y += $child->{c_valign} * $child->{req_h};
+
+ $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
+ }
+
+ 1
}
#############################################################################
-package CFPlus::UI::Box;
+package DC::UI::Box;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub size_request {
my ($self) = @_;
+ my @children = $self->visible_children;
+
$self->{vertical}
? (
- (List::Util::max map $_->{req_w}, @{$self->{children}}),
- (List::Util::sum map $_->{req_h}, @{$self->{children}}),
+ (List::Util::max map $_->{req_w}, @children),
+ (List::Util::sum map $_->{req_h}, @children),
)
: (
- (List::Util::sum map $_->{req_w}, @{$self->{children}}),
- (List::Util::max map $_->{req_h}, @{$self->{children}}),
+ (List::Util::sum map $_->{req_w}, @children),
+ (List::Util::max map $_->{req_h}, @children),
)
}
@@ -1656,7 +1833,7 @@
}
}
- CFPlus::UI::harmonize \@req;
+ DC::UI::harmonize \@req;
my $pos = 0;
for (0 .. $#children) {
@@ -1671,9 +1848,9 @@
#############################################################################
-package CFPlus::UI::HBox;
+package DC::UI::HBox;
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
sub new {
my $class = shift;
@@ -1686,9 +1863,9 @@
#############################################################################
-package CFPlus::UI::VBox;
+package DC::UI::VBox;
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
sub new {
my $class = shift;
@@ -1701,11 +1878,11 @@
#############################################################################
-package CFPlus::UI::Label;
+package DC::UI::Label;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -1720,18 +1897,18 @@
#max_w => maximum pixel width
#style => 0, # render flags
ellipsise => 3, # end
- layout => (new CFPlus::Layout),
+ layout => (new DC::Layout),
fontsize => 1,
- align => -1,
- valign => -1,
- padding_x => 2,
+ align => 0.5,
+ valign => 0.5,
+ padding_x => 4,
padding_y => 2,
can_events => 0,
%arg
);
if (exists $self->{template}) {
- my $layout = new CFPlus::Layout;
+ my $layout = new DC::Layout;
$layout->set_text (delete $self->{template});
$self->{template} = $layout;
}
@@ -1759,6 +1936,12 @@
$self->SUPER::realloc;
}
+sub clear {
+ my ($self) = @_;
+
+ $self->set_text ("");
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1791,8 +1974,10 @@
my ($self) = @_;
$self->{size_req} ||= do {
+ my ($max_w, $max_h) = $self->get_max_wh;
+
$self->{layout}->set_font ($self->{font}) if $self->{font};
- $self->{layout}->set_width ($self->{max_w} || -1);
+ $self->{layout}->set_width ($max_w);
$self->{layout}->set_ellipsise ($self->{ellipsise});
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
@@ -1801,7 +1986,7 @@
if (exists $self->{template}) {
$self->{template}->set_font ($self->{font}) if $self->{font};
- $self->{template}->set_width ($self->{max_w} || -1);
+ $self->{template}->set_width ($max_w);
$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
my ($w2, $h2) = $self->{template}->size;
@@ -1867,28 +2052,39 @@
};
unless (exists $self->{ox}) {
- $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
- : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
- : ($self->{w} - $size->[0]) * 0.5);
-
- $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
- : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
- : ($self->{h} - $size->[1]) * 0.5);
+ $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
+ $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
+
+ $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
};
- my $w = List::Util::min $self->{w} + 4, $size->[0];
- my $h = List::Util::min $self->{h} + 2, $size->[1];
+# unless ($self->{list}) {
+# $self->{list} = DC::OpenGL::glGenList;
+# DC::OpenGL::glNewList $self->{list};
+# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
+# DC::OpenGL::glEndList;
+# }
+#
+# DC::OpenGL::glCallList $self->{list};
- $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
+ $self->{layout}->draw;
}
+#sub destroy {
+# my ($self) = @_;
+#
+# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
+#
+# $self->SUPER::destroy;
+#}
+
#############################################################################
-package CFPlus::UI::EntryBase;
+package DC::UI::EntryBase;
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Label::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -1896,12 +2092,18 @@
$class->SUPER::new (
fg => [1, 1, 1],
bg => [0, 0, 0, 0.2],
- active_bg => [1, 1, 1, 0.5],
- active_fg => [0, 0, 0],
+ outline => undef,
+ active_bg => [0, 0, 1, .2],
+ active_fg => [1, 1, 1],
+ active_outline => [1, 1, 0],
can_hover => 1,
can_focus => 1,
- valign => 0,
+ align => 0,
+ valign => 0.5,
can_events => 1,
+ ellipsise => 0,
+ padding_x => 4,
+ padding_y => 2,
#text => ...
#hidden => "*",
@_
@@ -1956,21 +2158,36 @@
my $text = $self->get_text;
- if ($uni == 8) {
+ $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
+
+ if ($sym == DC::SDLK_BACKSPACE) {
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
- } elsif ($uni == 127) {
+ } elsif ($sym == DC::SDLK_DELETE) {
substr $text, $self->{cursor}, 1, "";
- } elsif ($sym == CFPlus::SDLK_LEFT) {
+ } elsif ($sym == DC::SDLK_LEFT) {
--$self->{cursor} if $self->{cursor};
- } elsif ($sym == CFPlus::SDLK_RIGHT) {
+ } elsif ($sym == DC::SDLK_RIGHT) {
++$self->{cursor} if $self->{cursor} < length $self->{text};
- } elsif ($sym == CFPlus::SDLK_HOME) {
+ } elsif ($sym == DC::SDLK_HOME) {
+ # what a hack
+ $self->{cursor} =
+ (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
+ ? length $1
+ : 0;
+ } elsif ($sym == DC::SDLK_END) {
+ # uh, again
+ $self->{cursor} =
+ (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
+ ? $self->{cursor} + length $1
+ : length $self->{text};
+ } elsif ($uni == 21) { # ctrl-u
+ $text = "";
$self->{cursor} = 0;
- } elsif ($sym == CFPlus::SDLK_END) {
- $self->{cursor} = length $text;
} elsif ($uni == 27) {
$self->emit ('escape');
- } elsif ($uni) {
+ } elsif ($uni == 0x0d) {
+ substr $text, $self->{cursor}++, 0, "\012";
+ } elsif ($uni >= 0x20) {
substr $text, $self->{cursor}++, 0, chr $uni;
} else {
return 0;
@@ -1979,6 +2196,7 @@
$self->_set_text ($text);
$self->realloc;
+ $self->update;
1
}
@@ -2030,12 +2248,7 @@
glEnable GL_BLEND;
glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $self->{h};
- glVertex $self->{w}, $self->{h};
- glVertex $self->{w}, 0;
- glEnd;
+ glRect 0, 0, $self->{w}, $self->{h};
glDisable GL_BLEND;
$self->SUPER::_draw;
@@ -2047,28 +2260,55 @@
my $text = substr $self->{text}, 0, $self->{cursor};
utf8::encode $text;
- @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
+ @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
}
+ glColor_premultiply @{$self->{active_fg}};
glBegin GL_LINES;
- glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
- glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+ glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
+ glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+ glEnd;
+
+ glLineWidth 3;
+ glColor @{$self->{active_outline}};
+ glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
+ glLineWidth 1;
+
+ } else {
+ glColor @{$self->{outline} || $DC::THEME{entry_outline}};
+ glBegin GL_LINE_STRIP;
+ glVertex .5, $self->{h} * .5;
+ glVertex .5, $self->{h} - 2.5;
+ glVertex $self->{w} - .5, $self->{h} - 2.5;
+ glVertex $self->{w} - .5, $self->{h} * .5;
glEnd;
}
}
-package CFPlus::UI::Entry;
+#############################################################################
+
+package DC::UI::Entry;
-our @ISA = CFPlus::UI::EntryBase::;
+our @ISA = DC::UI::EntryBase::;
+
+use DC::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ history_pointer => -1,
+ @_
+ )
+}
-use CFPlus::OpenGL;
sub invoke_key_down {
my ($self, $ev) = @_;
my $sym = $ev->{sym};
- if ($sym == 13) {
+ if ($ev->{uni} == 0x0d || $sym == 13) {
unshift @{$self->{history}},
my $txt = $self->get_text;
@@ -2077,7 +2317,7 @@
$self->emit (activate => $txt);
$self->update;
- } elsif ($sym == CFPlus::SDLK_UP) {
+ } elsif ($sym == DC::SDLK_UP) {
if ($self->{history_pointer} < 0) {
$self->{history_saveback} = $self->get_text;
}
@@ -2089,14 +2329,17 @@
$self->set_text ($self->{history}->[$self->{history_pointer}]);
}
- } elsif ($sym == CFPlus::SDLK_DOWN) {
+ } elsif ($sym == DC::SDLK_DOWN) {
$self->{history_pointer}--;
$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
if ($self->{history_pointer} >= 0) {
$self->set_text ($self->{history}->[$self->{history_pointer}]);
} else {
- $self->set_text ($self->{history_saveback});
+ if (defined $self->{history_saveback}) {
+ $self->set_text ($self->{history_saveback});
+ $self->{history_saveback} = undef;
+ }
}
} else {
@@ -2108,27 +2351,125 @@
#############################################################################
-package CFPlus::UI::Button;
+package DC::UI::TextEdit;
+
+our @ISA = DC::UI::EntryBase::;
+
+use DC::OpenGL;
-our @ISA = CFPlus::UI::Label::;
+sub new {
+ my $class = shift;
-use CFPlus::OpenGL;
+ $class->SUPER::new (
+ padding_y => 4,
+
+ @_
+ )
+}
+
+sub move_cursor_ver {
+ my ($self, $dy) = @_;
+
+ my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+
+ $line += $dy;
+
+ if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
+ $self->{cursor} = $index;
+ delete $self->{cur_h};
+ $self->update;
+ return;
+ }
+}
+
+sub invoke_key_down {
+ my ($self, $ev) = @_;
+
+ my $sym = $ev->{sym};
+
+ if ($sym == DC::SDLK_UP) {
+ $self->move_cursor_ver (-1);
+ } elsif ($sym == DC::SDLK_DOWN) {
+ $self->move_cursor_ver (+1);
+ } else {
+ return $self->SUPER::invoke_key_down ($ev)
+ }
+
+ 1
+}
+
+#############################################################################
+
+package DC::UI::ButtonBin;
+
+our @ISA = DC::UI::Bin::;
+
+use DC::OpenGL;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
- qw(b1_button_active.png);
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
+ qw(b1_button_inactive.png b1_button_active.png);
sub new {
my $class = shift;
$class->SUPER::new (
- padding_x => 4,
+ can_hover => 1,
+ align => 0.5,
+ valign => 0.5,
+ 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
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glColor 0, 0, 0, 1;
+
+ my $tex = $tex[$GRAB == $self];
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+
+ glDisable GL_TEXTURE_2D;
+
+ $self->SUPER::_draw;
+}
+
+#############################################################################
+
+package DC::UI::Button;
+
+our @ISA = DC::UI::Label::;
+
+use DC::OpenGL;
+
+my @tex =
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
+ qw(b1_button_inactive.png b1_button_active.png);
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ padding_x => 8,
padding_y => 4,
- fg => [1, 1, 1],
- active_fg => [0, 0, 1],
+ fg => [1.0, 1.0, 1.0],
+ active_fg => [0.8, 0.8, 0.8],
can_hover => 1,
- align => 0,
- valign => 0,
+ align => 0.5,
+ valign => 0.5,
can_events => 1,
@_
)
@@ -2153,7 +2494,8 @@
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 0, 0, 0, 1;
- $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+ my $tex = $tex[$GRAB == $self];
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
@@ -2162,15 +2504,15 @@
#############################################################################
-package CFPlus::UI::CheckBox;
+package DC::UI::CheckBox;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -2220,7 +2562,7 @@
$self->SUPER::_draw;
- glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
+ glTranslate $self->{padding_x}, $self->{padding_y}, 0;
my ($w, $h) = @$self{qw(w h)};
@@ -2237,11 +2579,11 @@
#############################################################################
-package CFPlus::UI::Image;
+package DC::UI::Image;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
our %texture_cache;
@@ -2250,6 +2592,7 @@
my $self = $class->SUPER::new (
can_events => 0,
+ scale => 1,
@_,
);
@@ -2257,9 +2600,9 @@
or Carp::croak "'path' or 'tex' attributes required";
$self->{tex} ||= $texture_cache{$self->{path}} ||=
- new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
+ new_from_resource DC::Texture $self->{path}, mipmap => 1;
- Scalar::Util::weaken $texture_cache{$self->{path}};
+ DC::weaken $texture_cache{$self->{path}};
$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
@@ -2270,7 +2613,7 @@
my ($self, $cloning) = @_;
$self->{path}
- or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
+ or die "cannot serialise DC::UI::Image on non-loadable images\n";
$self->{path}
}
@@ -2284,7 +2627,7 @@
sub size_request {
my ($self) = @_;
- ($self->{tex}{w}, $self->{tex}{h})
+ (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
}
sub _draw {
@@ -2304,18 +2647,18 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $tex->draw_quad (0, 0, $w, $h);
+ $tex->draw_quad_alpha (0, 0, $w, $h);
glDisable GL_TEXTURE_2D;
}
#############################################################################
-package CFPlus::UI::ImageButton;
+package DC::UI::ImageButton;
-our @ISA = CFPlus::UI::Image::;
+our @ISA = DC::UI::Image::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
my %textures;
@@ -2328,13 +2671,19 @@
fg => [1, 1, 1],
active_fg => [0, 0, 1],
can_hover => 1,
- align => 0,
- valign => 0,
+ align => 0.5,
+ valign => 0.5,
can_events => 1,
@_
);
}
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
+
+ 1
+}
+
sub invoke_button_up {
my ($self, $ev, $x, $y) = @_;
@@ -2347,29 +2696,29 @@
#############################################################################
-package CFPlus::UI::VGauge;
+package DC::UI::VGauge;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
use List::Util qw(min max);
-use CFPlus::OpenGL;
+use DC::OpenGL;
my %tex = (
food => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
],
grace => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
],
hp => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
],
mana => [
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ map { new_from_resource DC::Texture $_, mipmap => 1 }
qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
],
);
@@ -2482,9 +2831,147 @@
#############################################################################
-package CFPlus::UI::Gauge;
+package DC::UI::Progress;
+
+our @ISA = DC::UI::Label::;
+
+use DC::OpenGL;
+
+sub new {
+ my ($class, %arg) = @_;
+
+ my $self = $class->SUPER::new (
+ fg => [1, 1, 1],
+ bg => [0, 0, 1, 0.2],
+ bar => [0.7, 0.5, 0.1, 0.8],
+ outline => [0.4, 0.3, 0],
+ fontsize => 0.9,
+ valign => 0.5,
+ align => 0.5,
+ can_events => 1,
+ ellipsise => 1,
+ label => "%d%%",
+ %arg,
+ );
+
+ $self->set_value ($arg{value} || -1);
+
+ $self
+}
+
+sub set_label {
+ my ($self, $label) = @_;
+
+ return if $self->{label} eq $label;
+ $self->{label} = $label;
+
+ $self->DC::UI::Progress::set_value (0 + delete $self->{value});
+}
+
+sub set_value {
+ my ($self, $value) = @_;
+
+ if ($self->{value} ne $value) {
+ $self->{value} = $value;
+
+ if ($value < 0) {
+ $self->set_text ("-");
+ } else {
+ $self->set_text (sprintf $self->{label}, $value * 100);
+ }
+
+ $self->update;
+ }
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ glEnable GL_BLEND;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+
+ if ($self->{value} >= 0) {
+ my $s = int 2 + ($self->{w} - 4) * $self->{value};
+
+ glColor_premultiply @{$self->{bar}};
+ glRect 2, 2, $s, $self->{h} - 2;
+ glColor_premultiply @{$self->{bg}};
+ glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
+ }
+
+ glColor_premultiply @{$self->{outline}};
+ glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
+
+ glDisable GL_BLEND;
+
+ {
+ local $self->{bg}; # do not draw background
+ $self->SUPER::_draw;
+ }
+}
+
+#############################################################################
+
+package DC::UI::ExperienceProgress;
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::Progress::;
+
+sub new {
+ my ($class, %arg) = @_;
+
+ my $self = $class->SUPER::new (
+ tooltip => sub {
+ my ($self) = @_;
+
+ sprintf "level %d\n%s points\n%s next level\n%s to go",
+ $self->{lvl},
+ ::formsep ($self->{exp}),
+ ::formsep ($self->{nxt}),
+ ::formsep ($self->{nxt} - $self->{exp}),
+ },
+ %arg
+ );
+
+ $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
+ if $::CONN;
+
+ $self
+}
+
+sub DESTROY {
+ my ($self) = @_;
+
+ delete $::CONN->{on_exp_update}{$self+0}
+ if $::CONN;
+
+ $self->SUPER::DESTROY;
+}
+
+sub set_value {
+ my ($self, $lvl, $exp) = @_;
+
+ $self->{lvl} = $lvl;
+ $self->{exp} = $exp;
+
+ my $v = -1;
+
+ if ($::CONN && (my $table = $::CONN->{exp_table})) {
+ my $l0 = $table->[$lvl - 1];
+ my $l1 = $table->[$lvl];
+
+ $self->{nxt} = $l1;
+
+ $v = ($exp - $l0) / ($l1 - $l0);
+ }
+
+ $self->SUPER::set_value ($v);
+}
+
+#############################################################################
+
+package DC::UI::Gauge;
+
+our @ISA = DC::UI::VBox::;
sub new {
my ($class, %arg) = @_;
@@ -2496,9 +2983,9 @@
%arg,
);
- $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
- $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
- $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
+ $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
+ $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+ $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
$self
}
@@ -2529,16 +3016,16 @@
#############################################################################
-package CFPlus::UI::Slider;
+package DC::UI::Slider;
use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
my @tex =
- map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
+ map { new_from_resource DC::Texture $_ }
qw(s1_slider.png s1_slider_bg.png);
sub new {
@@ -2585,12 +3072,10 @@
my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
- $hi = $lo + 1 if $hi <= $lo;
-
- $page = $hi - $lo if $page > $hi - $lo;
+ $hi = $lo if $hi < $lo;
- $value = $lo if $value < $lo;
$value = $hi - $page if $value > $hi - $page;
+ $value = $lo if $value < $lo;
$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
if $unit;
@@ -2616,7 +3101,9 @@
$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
- $self->invoke_mouse_motion ($ev, $x, $y)
+ $self->invoke_mouse_motion ($ev, $x, $y);
+
+ 1
}
sub invoke_mouse_motion {
@@ -2642,9 +3129,11 @@
my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
- $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
+ my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
+
+ $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
- ! ! $delta
+ 1
}
sub update {
@@ -2660,10 +3149,10 @@
unless ($self->{knob_w}) {
$self->set_value ($self->{range}[0]);
- my ($value, $lo, $hi, $page) = @{$self->{range}};
- my $range = ($hi - $page - $lo) || 1e-100;
+ my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
+ my $range = ($hi - $page - $lo) || 1e-10;
- my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
+ my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
@@ -2703,9 +3192,9 @@
#############################################################################
-package CFPlus::UI::ValSlider;
+package DC::UI::ValSlider;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
sub new {
my ($class, %arg) = @_;
@@ -2713,8 +3202,8 @@
my $range = delete $arg{range};
my $self = $class->SUPER::new (
- slider => (new CFPlus::UI::Slider expand => 1, range => $range),
- entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
+ slider => (new DC::UI::Slider expand => 1, range => $range),
+ entry => (new DC::UI::Label text => "", template => delete $arg{template}),
to_value => sub { shift },
from_value => sub { shift },
%arg,
@@ -2744,11 +3233,11 @@
#############################################################################
-package CFPlus::UI::TextScroller;
+package DC::UI::TextScroller;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -2760,12 +3249,13 @@
#font => default_font
@_,
- layout => (new CFPlus::Layout),
+ layout => (new DC::Layout),
par => [],
+ max_par => 0,
height => 0,
children => [
- (new CFPlus::UI::Empty expand => 1),
- (new CFPlus::UI::Slider vertical => 1),
+ (new DC::UI::Empty expand => 1),
+ (new DC::UI::Slider vertical => 1),
],
);
@@ -2784,7 +3274,7 @@
sub size_request {
my ($self) = @_;
- my ($empty, $slider) = @{ $self->{children} };
+ my ($empty, $slider) = $self->visible_children;
local $self->{children} = [$empty, $slider];
$self->SUPER::size_request
@@ -2831,7 +3321,7 @@
$layout->set_shapes (
map
- +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+ +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
@{$para->{widget}}
);
@@ -2896,6 +3386,10 @@
push @{$self->{par}}, $para;
}
+ if (my $max = $self->{max_par}) {
+ shift @{$self->{par}} while @{$self->{par}} > $max;
+ }
+
$self->{need_reflow}++;
$self->update;
}
@@ -2954,10 +3448,14 @@
my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
- $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
+ $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
+ package DC::UI::Base;
+ local ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+
my $top = int $self->{children}[1]{range}[0];
my $paridx = 0;
@@ -2975,6 +3473,7 @@
my $layout = $self->get_layout ($para);
$layout->render ($para->{indent}, $y - $y0);
+ $layout->draw;
if (my @w = @{ $para->{widget} }) {
my @s = $layout->get_shapes;
@@ -3022,11 +3521,11 @@
#############################################################################
-package CFPlus::UI::Animator;
+package DC::UI::Animator;
-use CFPlus::OpenGL;
+use DC::OpenGL;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
sub moveto {
my ($self, $x, $y) = @_;
@@ -3064,9 +3563,9 @@
#############################################################################
-package CFPlus::UI::Flopper;
+package DC::UI::Flopper;
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
sub new {
my $class = shift;
@@ -3088,11 +3587,11 @@
#############################################################################
-package CFPlus::UI::Tooltip;
+package DC::UI::Tooltip;
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -3106,26 +3605,29 @@
sub set_tooltip_from {
my ($self, $widget) = @_;
- $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
- if $widget->{tooltip} =~ /^#(.*)$/;
-
- my $tooltip = $widget->{tooltip};
+ my $tip = $widget->{tooltip};
+ $tip = $tip->($widget) if "CODE" eq ref $tip;
+
+ $tip = DC::Pod::section_label tooltip => $1
+ if $tip =~ /^#(.*)$/;
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}";
+ $tip .= "\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 CFPlus::UI::Label
- markup => $tooltip,
+ $tip =~ s/^\n+//;
+ $tip =~ s/\n+$//;
+
+ $self->add (new DC::UI::Label
+ fg => $DC::THEME{tooltip_fg},
+ markup => $tip,
max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+ align => 0,
fontsize => 0.8,
- style => 1, # FLAG_INVERSE
+ style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
ellipsise => 0,
font => ($widget->{tooltip_font} || $::FONT_PROP),
);
@@ -3170,67 +3672,112 @@
sub _draw {
my ($self) = @_;
- glTranslate 0.375, 0.375;
-
my ($w, $h) = @$self{qw(w h)};
- glColor 1, 0.8, 0.4;
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
+ glColor @{ $DC::THEME{tooltip_bg} };
+ glRect 0, 0, $w, $h;
- glColor 0, 0, 0;
- glBegin GL_LINE_LOOP;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
+ glColor @{ $DC::THEME{tooltip_border} };
+ glRect_lineloop .5, .5, $w + .5, $h + .5;
- glTranslate 2 - 0.375, 2 - 0.375;
+ glTranslate 2, 2;
$self->SUPER::_draw;
}
#############################################################################
-package CFPlus::UI::Face;
+package DC::UI::Face;
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
+ size_w => 32,
+ size_h => 8,
aspect => 1,
can_events => 0,
@_,
);
if ($self->{anim} && $self->{animspeed}) {
- Scalar::Util::weaken (my $widget = $self);
+ DC::weaken (my $widget = $self);
- $self->{timer} = Event->timer (
- at => $self->{animspeed} * int $::NOW / $self->{animspeed},
- hard => 1,
- interval => $self->{animspeed},
- cb => sub {
- ++$widget->{frame};
- $widget->update;
- },
- );
+ $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
+ $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
+ return unless $::CONN;
+
+ my $w = $widget
+ or return;
+
+ ++$w->{frame};
+ $w->update_face;
+
+ # somehow, $widget can go away
+ $w->update;
+ $w->update_timer;
+ };
+
+ $self->update_face;
+ $self->update_timer;
}
$self
}
+sub update_timer {
+ my ($self) = @_;
+
+ return unless $self->{timer};
+
+ if ($self->{visible}) {
+ $self->{timer}->start;
+ } else {
+ $self->{timer}->stop;
+ }
+}
+
+sub update_face {
+ my ($self) = @_;
+
+ if ($::CONN) {
+ if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+ if ($anim && @$anim) {
+ $self->{face} = $anim->[ $self->{frame} % @$anim ];
+ delete $self->{face_change_cb};
+
+ if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
+ unless ($tex->{name} || $tex->{loading}) {
+ $tex->upload (sub { $self->reconfigure });
+ }
+ }
+ }
+ }
+ }
+}
+
sub size_request {
- (32, 8)
+ my ($self) = @_;
+
+ if ($::CONN) {
+ if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
+ if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
+ if ($tex->{name}) {
+ return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+ } elsif (!$tex->{loading}) {
+ $tex->upload (sub { $self->reconfigure });
+ }
+ }
+
+ $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
+ }
+ }
+
+ ($self->{size_w} || 8, $self->{size_h} || 8)
}
sub update {
@@ -3241,25 +3788,20 @@
$self->SUPER::update;
}
-sub _draw {
+sub invoke_visibility_change {
my ($self) = @_;
- return unless $::CONN;
+ $self->update_timer;
- $self->SUPER::_draw;
-
- my $face;
+ 0
+}
- if ($self->{frame}) {
- my $anim = $::CONN->{anim}[$self->{anim}];
+sub _draw {
+ my ($self) = @_;
- $face = $anim->[ $self->{frame} % @$anim ]
- if $anim && @$anim;
- }
-
- my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+ $self->SUPER::_draw;
- if ($tex) {
+ if (my $tex = $self->{tex}) {
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 0, 0, 0, 1;
@@ -3271,7 +3813,7 @@
sub destroy {
my ($self) = @_;
- $self->{timer}->cancel
+ (delete $self->{timer})->cancel
if $self->{timer};
$self->SUPER::destroy;
@@ -3279,19 +3821,19 @@
#############################################################################
-package CFPlus::UI::Buttonbar;
+package DC::UI::Buttonbar;
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
#############################################################################
-package CFPlus::UI::Menu;
+package DC::UI::Menu;
-our @ISA = CFPlus::UI::Toplevel::;
+our @ISA = DC::UI::Toplevel::;
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -3302,7 +3844,7 @@
@_,
);
- $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+ $self->add ($self->{vbox} = new DC::UI::VBox);
for my $item (@{ $self->{items} }) {
my ($widget, $cb, $tooltip) = @$item;
@@ -3312,20 +3854,21 @@
if ($widget =~ /\t/) {
my ($left, $right) = split /\t/, $widget, 2;
- $widget = new CFPlus::UI::HBox
+ $widget = new DC::UI::HBox
can_hover => 1,
can_events => 1,
tooltip => $tooltip,
children => [
- (new CFPlus::UI::Label markup => $left, expand => 1),
- (new CFPlus::UI::Label markup => $right, align => +1),
+ (new DC::UI::Label markup => $left , align => 0, expand => 1),
+ (new DC::UI::Label markup => $right, align => 1),
],
;
-
+
} else {
- $widget = new CFPlus::UI::Label
+ $widget = new DC::UI::Label
can_hover => 1,
can_events => 1,
+ align => 0,
markup => $widget,
tooltip => $tooltip;
}
@@ -3381,9 +3924,9 @@
#############################################################################
-package CFPlus::UI::Multiplexer;
+package DC::UI::Multiplexer;
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
sub new {
my $class = shift;
@@ -3392,8 +3935,7 @@
@_,
);
- $self->{current} = $self->{children}[0]
- if @{ $self->{children} };
+ $self->set_current_page (0);
$self
}
@@ -3403,8 +3945,8 @@
$self->SUPER::add (@widgets);
- $self->{current} = $self->{children}[0]
- if @{ $self->{children} };
+ $self->set_current_page (0)
+ unless @widgets == @{ $self->{children} };
}
sub get_current_page {
@@ -3420,28 +3962,35 @@
? $page_or_widget
: $self->{children}[$page_or_widget];
- $self->{current} = $widget;
- $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+ $self->{current}->set_invisible if $self->{current} && $self->{visible};
+
+ if (($self->{current} = $widget)) {
+ $self->{current}->set_visible if $self->{current} && $self->{visible};
+ $self->{current}->configure (0, 0, $self->{w}, $self->{h});
- $self->emit (page_changed => $self->{current});
+ $self->emit (page_changed => $self->{current});
+ }
$self->realloc;
}
sub visible_children {
- $_[0]{current}
+ $_[0]{current} || ()
}
sub size_request {
my ($self) = @_;
- $self->{current}->size_request
+ $self->{current}
+ ? $self->{current}->size_request
+ : (0, 0)
}
sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->{current}->configure (0, 0, $w, $h);
+ $self->{current}->configure (0, 0, $w, $h)
+ if $self->{current};
1
}
@@ -3449,43 +3998,105 @@
sub _draw {
my ($self) = @_;
- $self->{current}->draw;
+ $self->{current}->draw
+ if $self->{current};
}
#############################################################################
-package CFPlus::UI::Notebook;
+package DC::UI::Notebook;
+
+use DC::OpenGL;
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- buttonbar => (new CFPlus::UI::Buttonbar),
- multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
+ buttonbar => (new DC::UI::Buttonbar),
+ multiplexer => (new DC::UI::Multiplexer expand => 1),
+ active_outline => [.7, .7, 0.2],
# 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});
+ {
+ Scalar::Util::weaken (my $wself = $self);
+
+ $self->{multiplexer}->connect (c_add => sub {
+ my ($mplex, $widgets) = @_;
+
+ for my $child (@$widgets) {
+ Scalar::Util::weaken $child;
+ $child->{c_tab_} ||= do {
+ my $tab =
+ (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
+ ? $child->{c_tab}
+ : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
+
+ $tab->connect (activate => sub {
+ $wself->set_current_page ($child);
+ });
+
+ $tab
+ };
+
+ $self->{buttonbar}->add ($child->{c_tab_});
+ }
+ });
+
+ $self->{multiplexer}->connect (c_remove => sub {
+ my ($mplex, $widgets) = @_;
+
+ for my $child (@$widgets) {
+ $wself->{buttonbar}->remove ($child->{c_tab_});
+ }
+ });
+ }
+
$self
}
sub add {
- my ($self, $title, $widget, $tooltip) = @_;
+ my ($self, @widgets) = @_;
- Scalar::Util::weaken $self;
+ $self->{multiplexer}->add (@widgets)
+}
- $self->{buttonbar}->add (new CFPlus::UI::Button
- markup => $title,
- tooltip => $tooltip,
- on_activate => sub { $self->set_current_page ($widget) },
- );
+sub remove {
+ my ($self, @widgets) = @_;
+
+ $self->{multiplexer}->remove (@widgets)
+}
+
+sub pages {
+ my ($self) = @_;
+ $self->{multiplexer}->children
+}
- $self->{multiplexer}->add ($widget);
+sub page_index {
+ my ($self, $widget) = @_;
+
+ my $i = 0;
+ for ($self->pages) {
+ if ($_ eq $widget) { return $i };
+ $i++;
+ }
+
+ undef
+}
+
+sub add_tab {
+ my ($self, $title, $widget, $tooltip) = @_;
+
+ $title = [$title, $tooltip] unless ref $title;
+ $widget->{c_tab} = $title;
+
+ $self->add ($widget);
}
sub get_current_page {
@@ -3501,13 +4112,33 @@
$self->emit (page_changed => $self->{multiplexer}{current});
}
+sub _draw {
+ my ($self) = @_;
+
+ $self->SUPER::_draw ();
+
+ if (my $cur = $self->{multiplexer}{current}) {
+ if ($cur = $cur->{c_tab_}) {
+ glTranslate $self->{buttonbar}{x} + $cur->{x},
+ $self->{buttonbar}{y} + $cur->{y};
+ glLineWidth 3;
+ #glEnable GL_BLEND;
+ #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor @{$self->{active_outline}};
+ glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
+ glLineWidth 1;
+ #glDisable GL_BLEND;
+ }
+ }
+}
+
#############################################################################
-package CFPlus::UI::Selector;
+package DC::UI::Selector;
use utf8;
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
sub new {
my $class = shift;
@@ -3534,18 +4165,19 @@
push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
}
- CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
sub _set_value {
my ($self, $value) = @_;
- my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
+ my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
+ $item ||= $self->{options}[0]
or return;
$self->{value} = $item->[0];
$self->set_markup ("$item->[1] ⇓");
- $self->set_tooltip ($item->[2]);
+# $self->set_tooltip ($item->[2]);
}
sub set_value {
@@ -3557,11 +4189,18 @@
$self->emit (changed => $value);
}
+sub set_options {
+ my ($self, $options) = @_;
+
+ $self->{options} = $options;
+ $self->_set_value ($self->{value});
+}
+
#############################################################################
-package CFPlus::UI::Statusbox;
+package DC::UI::Statusbox;
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
sub new {
my $class = shift;
@@ -3571,26 +4210,28 @@
@_,
);
- Scalar::Util::weaken (my $this = $self);
+ DC::weaken (my $this = $self);
- $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+ $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
$self
}
sub reorder {
my ($self) = @_;
- my $NOW = Time::HiRes::time;
+ my $NOW = EV::time;
# freeze display when hovering over any label
- return if $CFPlus::UI::TOOLTIP->{owner}
- && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
+ return if $DC::UI::TOOLTIP->{owner}
+ && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
values %{ $self->{item} };
while (my ($k, $v) = each %{ $self->{item} }) {
delete $self->{item}{$k} if $v->{timeout} < $NOW;
}
+ $self->{timer}->set (1, 1);
+
my @widgets;
my @items = sort {
@@ -3598,8 +4239,6 @@
or $b->{id} <=> $a->{id}
} values %{ $self->{item} };
- $self->{timer}->interval (1);
-
my $count = 10 + 1;
for my $item (@items) {
last unless --$count;
@@ -3615,13 +4254,14 @@
s/\s+/ /g;
}
- new CFPlus::UI::Label
+ new DC::UI::Label
markup => $short,
tooltip => $item->{tooltip},
tooltip_font => $::FONT_PROP,
tooltip_width => 0.67,
fontsize => $item->{fontsize} || $self->{fontsize},
max_w => $::WIDTH * 0.44,
+ align => 0,
fg => [@{ $item->{fg} }],
can_events => 1,
can_hover => 1
@@ -3632,7 +4272,7 @@
$label->update;
$label->set_max_size (undef, $label->{req_h} * $diff)
if $diff < 1;
- $self->{timer}->interval (1/30);
+ $self->{timer}->set (1/30, 1/30);
} else {
$label->{fg}[3] = $item->{fg}[3] || 1;
}
@@ -3640,6 +4280,10 @@
push @widgets, $label;
}
+ my $hash = join ",", @widgets;
+ return if $hash eq $self->{last_widget_hash};
+ $self->{last_widget_hash} = $hash;
+
$self->clear;
$self->SUPER::add (reverse @widgets);
}
@@ -3704,197 +4348,13 @@
#############################################################################
-package CFPlus::UI::Inventory;
+package DC::UI::Root;
-our @ISA = CFPlus::UI::Table::;
-
-sub new {
- my $class = shift;
-
- my $self = $class->SUPER::new (
- col_expand => [0, 1, 0],
- items => [],
- @_,
- );
-
- $self->set_sort_order (undef);
-
- $self
-}
-
-sub update_items {
- my ($self) = @_;
-
- $self->clear;
-
- my @item = $self->{sort}->(@{ $self->{items} });
-
- my @adds;
- my $row = 0;
- for my $item ($self->{sort}->(@{ $self->{items} })) {
- CFPlus::Item::update_widgets $item;
-
- push @adds, 0, $row, $item->{face_widget};
- push @adds, 1, $row, $item->{desc_widget};
- push @adds, 2, $row, $item->{weight_widget};
-
- $row++;
- }
-
- $self->add (@adds);
-}
-
-sub set_sort_order {
- my ($self, $order) = @_;
-
- $self->{sort} = $order ||= sub {
- sort {
- $a->{type} <=> $b->{type}
- or $a->{name} cmp $b->{name}
- } @_
- };
-
- $self->update_items;
-}
-
-sub set_items {
- my ($self, $items) = @_;
-
- $self->{items} = [$items ? values %$items : ()];
- $self->update_items;
-}
-
-#############################################################################
-
-package CFPlus::UI::SpellList;
-
-our @ISA = CFPlus::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) = @_;
-
- $CFPlus::UI::ROOT->on_refresh ($self => sub {
- $self->clear;
-
- return unless $::CONN;
-
- $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
- $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
- $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
- $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
- $self->add (5, 0, new CFPlus::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 CFPlus::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 CFPlus::UI::Label text => $spell->{path});
-
- $self->add (0, $row, new CFPlus::UI::Face
- face => $spell->{face},
- can_hover => 1,
- can_events => 1,
- tooltip => $tooltip,
- on_button_down => $spell_cb,
- );
-
- $self->add (1, $row, new CFPlus::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 CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
- $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
- $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
- $self->add (5, $row, new CFPlus::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->{spell} = {};
- $self->rebuild_spell_list;
-}
-
-#############################################################################
-
-package CFPlus::UI::Root;
-
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
use List::Util qw(min max);
-use CFPlus::OpenGL;
+use DC::OpenGL;
sub new {
my $class = shift;
@@ -3904,7 +4364,7 @@
@_,
);
- Scalar::Util::weaken ($self->{root} = $self);
+ DC::weaken ($self->{root} = $self);
$self
}
@@ -3962,7 +4422,7 @@
sub update {
my ($self) = @_;
- $::WANT_REFRESH++;
+ $::WANT_REFRESH = 1;
}
sub add {
@@ -4009,7 +4469,7 @@
for values %{delete $self->{refresh_hook}};
}
- if ($self->{realloc}) {
+ while ($self->{realloc}) {
my %queue;
my @queue;
my $widget;
@@ -4039,8 +4499,11 @@
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 += $widget->{padding_x} * 2;
+ $h += $widget->{padding_y} * 2;
+
+ $w = max $widget->{min_w}, $w;
+ $h = max $widget->{min_h}, $h;
$w = min $widget->{max_w}, $w if exists $widget->{max_w};
$h = min $widget->{max_h}, $h if exists $widget->{max_h};
@@ -4066,40 +4529,37 @@
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;
+ while (my $size_alloc = delete $self->{size_alloc}) {
+ my @queue = sort { $a->{visible} <=> $b->{visible} }
+ values %$size_alloc;
- my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
+ while () {
+ my $widget = pop @queue || last;
- $w = 0 if $w < 0;
- $h = 0 if $h < 0;
+ my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
- $w = max $widget->{min_w}, $w;
- $h = max $widget->{min_h}, $h;
+ $w = max $widget->{min_w}, $w;
+ $h = max $widget->{min_h}, $h;
# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
- $w = min $widget->{max_w}, $w if exists $widget->{max_w};
- $h = min $widget->{max_h}, $h if exists $widget->{max_h};
+ $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+ $h = min $widget->{max_h}, $h if exists $widget->{max_h};
- $w = int $w + 0.5;
- $h = int $h + 0.5;
+ $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};
+ 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);
+ $widget->emit (size_allocate => $w, $h);
+ }
}
}
}
@@ -4109,7 +4569,6 @@
for values %{delete $self->{post_alloc_hook}};
}
-
glViewport 0, 0, $::WIDTH, $::HEIGHT;
glClearColor +($::CFG->{fow_intensity}) x 3, 1;
glClear GL_COLOR_BUFFER_BIT;
@@ -4121,21 +4580,21 @@
glLoadIdentity;
{
- package CFPlus::UI::Base;
+ package DC::UI::Base;
- ($draw_x, $draw_y, $draw_w, $draw_h) =
+ local ($draw_x, $draw_y, $draw_w, $draw_h) =
(0, 0, $self->{w}, $self->{h});
- }
- $self->_draw;
+ $self->_draw;
+ }
}
#############################################################################
-package CFPlus::UI;
+package DC::UI;
-$ROOT = new CFPlus::UI::Root;
-$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
+$ROOT = new DC::UI::Root;
+$TOOLTIP = new DC::UI::Tooltip z => 900;
1