--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/25 02:23:14 1.232
+++ deliantra/Deliantra-Client/DC/UI.pm 2007/07/16 12:36:48 1.374
@@ -1,28 +1,36 @@
-package CFClient::UI;
+package CFPlus::UI;
use utf8;
use strict;
-use Scalar::Util ();
use List::Util ();
+use Event;
-use CFClient;
+use CFPlus;
+use CFPlus::Pod;
+use CFPlus::Texture;
our ($FOCUS, $HOVER, $GRAB); # various widgets
+our $LAYOUT;
our $ROOT;
our $TOOLTIP;
our $BUTTON_STATE;
our %WIDGET; # all widgets, weak-referenced
-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->{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};
@@ -30,15 +38,6 @@
$TOOLTIP->set_tooltip_from ($widget);
$TOOLTIP->show;
-
- my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
-
- ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
- if $x + $TOOLTIP->{w} > $::WIDTH;
-
- $TOOLTIP->move ($x, $y);
- $TOOLTIP->check_size;
- $TOOLTIP->update;
}
return;
@@ -47,7 +46,31 @@
}
$TOOLTIP->hide;
+ $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
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
@@ -61,42 +84,63 @@
if $FOCUS;
}
+sub check_hover {
+ my ($widget) = @_;
+
+ if ($widget != $HOVER) {
+ my $hover = $HOVER; $HOVER = $widget;
+
+ $hover->update if $hover && $hover->{can_hover};
+ $HOVER->update if $HOVER && $HOVER->{can_hover};
+
+ $TOOLTIP_WATCHER->start;
+ }
+}
+
sub feed_sdl_button_down_event {
my ($ev) = @_;
my ($x, $y) = ($ev->{x}, $ev->{y});
- if (!$BUTTON_STATE) {
+ $BUTTON_STATE |= 1 << ($ev->{button} - 1);
+
+ unless ($GRAB) {
my $widget = $ROOT->find_widget ($x, $y);
$GRAB = $widget;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
- $BUTTON_STATE |= 1 << ($ev->{button} - 1);
-
- $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
- if $GRAB;
+ if ($GRAB) {
+ if ($ev->{button} == 4 || $ev->{button} == 5) {
+ # mousewheel
+ $ev->{dx} = 0;
+ $ev->{dy} = $ev->{button} * 2 - 9;
+ $GRAB->emit (mouse_wheel => $ev);
+ } else {
+ $GRAB->emit (button_down => $ev)
+ }
+ }
}
sub feed_sdl_button_up_event {
my ($ev) = @_;
- my ($x, $y) = ($ev->{x}, $ev->{y});
- my $widget = $GRAB || $ROOT->find_widget ($x, $y);
+ my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
- $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
- if $GRAB;
+ $GRAB->emit (button_up => $ev)
+ if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
- if (!$BUTTON_STATE) {
+ unless ($BUTTON_STATE) {
my $grab = $GRAB; undef $GRAB;
$grab->update if $grab;
$GRAB->update if $GRAB;
- check_tooltip;
+ check_hover $widget;
+ $TOOLTIP_WATCHER->cb->();
}
}
@@ -106,16 +150,9 @@
my $widget = $GRAB || $ROOT->find_widget ($x, $y);
- if ($widget != $HOVER) {
- my $hover = $HOVER; $HOVER = $widget;
-
- $hover->update if $hover && $hover->{can_hover};
- $HOVER->update if $HOVER && $HOVER->{can_hover};
+ check_hover $widget;
- check_tooltip;
- }
-
- $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
+ $HOVER->emit (mouse_motion => $ev)
if $HOVER;
}
@@ -154,14 +191,19 @@
for my $widget (values %WIDGET) {
if ($widget->{is_toplevel}) {
- $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
- $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
- $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
- $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
- $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
- $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
- $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
- $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
+ $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};
+ $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
+ $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
+ $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} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+ $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+
}
}
@@ -170,30 +212,52 @@
#############################################################################
-package CFClient::UI::Base;
+package CFPlus::UI::Event;
+
+sub xy {
+ $_[1]->coord2local ($_[0]{x}, $_[0]{y})
+}
+
+#############################################################################
+
+package CFPlus::UI::Base;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
my $self = bless {
- x => 0,
- y => 0,
+ x => "center",
+ y => "center",
z => 0,
+ w => undef,
+ h => undef,
can_events => 1,
@_
}, $class;
+ CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
+
for (keys %$self) {
- if (/^connect_(.*)$/) {
+ if (/^on_(.*)$/) {
$self->connect ($1 => delete $self->{$_});
}
}
- Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+ 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};
+
+ $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
}
@@ -202,43 +266,72 @@
my ($self) = @_;
$self->hide;
+ $self->emit ("destroy");
%$self = ();
}
+sub TO_JSON {
+ { __widget_ref__ => $_[0]{s_id} }
+}
+
sub show {
my ($self) = @_;
+
return if $self->{parent};
- $CFClient::UI::ROOT->add ($self);
+ $CFPlus::UI::ROOT->add ($self);
}
-sub show_centered {
+sub set_visible {
my ($self) = @_;
- return if $self->{parent};
- $self->show;
+ return if $self->{visible};
- $CFClient::UI::ROOT->on_post_alloc (
- "centered $self" => sub {
- $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
- },
- );
+ $self->{root} = $self->{parent}{root};
+ $self->{visible} = $self->{parent}{visible} + 1;
+
+ $self->emit (visibility_change => 1);
+
+ $self->realloc if !exists $self->{req_w};
+
+ $_->set_visible for $self->children;
}
sub set_invisible {
my ($self) = @_;
- # broken show/hide model
+ return unless $self->{visible};
+
+ $_->set_invisible for $self->children;
delete $self->{visible};
+ delete $self->{root};
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- CFClient::UI::check_tooltip
- if $CFClient::UI::TOOLTIP->{owner} == $self;
+ $CFPlus::UI::TOOLTIP_WATCHER->cb->()
+ if $TOOLTIP->{owner} == $self;
+
+ $self->emit ("focus_out");
+ $self->emit (visibility_change => 0);
+}
+
+sub set_visibility {
+ my ($self, $visible) = @_;
+
+ return if $self->{visible} == $visible;
- $self->focus_out;
+ $visible ? $self->show
+ : $self->hide;
+}
+
+sub toggle_visibility {
+ my ($self) = @_;
+
+ $self->{visible}
+ ? $self->hide
+ : $self->show;
}
sub hide {
@@ -250,11 +343,11 @@
if $self->{parent};
}
-sub move {
+sub move_abs {
my ($self, $x, $y, $z) = @_;
- $self->{x} = int $x;
- $self->{y} = 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;
@@ -263,10 +356,10 @@
sub set_size {
my ($self, $w, $h) = @_;
- $self->{user_w} = $w;
- $self->{user_h} = $h;
+ $self->{force_w} = $w;
+ $self->{force_h} = $h;
- $self->check_size;
+ $self->realloc;
}
sub size_request {
@@ -274,61 +367,71 @@
Carp::confess "size_request is abstract";
}
+sub baseline_shift {
+ 0
+}
+
sub configure {
my ($self, $x, $y, $w, $h) = @_;
if ($self->{aspect}) {
- my $w2 = List::Util::min $w, int $h * $self->{aspect};
- my $h2 = List::Util::min $h, int $w / $self->{aspect};
+ my ($ow, $oh) = ($w, $h);
- # use alignment to adjust x, y
+ $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
+ $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
- $x += int +($w - $w2) * 0.5;
- $y += int +($h - $h2) * 0.5;
+ # use alignment to adjust x, y
- ($w, $h) = ($w2, $h2);
+ $x += int 0.5 * ($ow - $w);
+ $y += int 0.5 * ($oh - $h);
}
- if ($self->{x} != $x || $self->{y} != $y) {
+ if ($self->{x} ne $x || $self->{y} ne $y) {
$self->{x} = $x;
$self->{y} = $y;
$self->update;
}
- if ($self->{w} != $w || $self->{h} != $h) {
- $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
- }
-}
-
-sub size_allocate {
- # nothing to be done
-}
+ if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
+ return unless $self->{visible};
-sub reconfigure {
- my ($self) = @_;
+ $self->{alloc_w} = $w;
+ $self->{alloc_h} = $h;
- $self->check_size (1);
- $self->update;
+ $self->{root}{size_alloc}{$self+0} = $self;
+ }
}
sub children {
+ # nop
+}
+
+sub visible_children {
+ $_[0]->children
}
sub set_max_size {
my ($self, $w, $h) = @_;
- delete $self->{max_w}; $self->{max_w} = $w if $w;
- delete $self->{max_h}; $self->{max_h} = $h if $h;
+ $self->{max_w} = int $w if defined $w;
+ $self->{max_h} = int $h if defined $h;
+
+ $self->realloc;
}
sub set_tooltip {
my ($self, $tooltip) = @_;
+ $tooltip =~ s/^\s+//;
+ $tooltip =~ s/\s+$//;
+
+ return if $self->{tooltip} eq $tooltip;
+
$self->{tooltip} = $tooltip;
- if ($CFClient::UI::TOOLTIP->{owner} == $self) {
- delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
+ delete $CFPlus::UI::TOOLTIP->{owner};
+ $CFPlus::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -336,6 +439,8 @@
sub coord2local {
my ($self, $x, $y) = @_;
+ Carp::confess unless $self->{parent};#d#
+
$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
}
@@ -343,99 +448,105 @@
sub coord2global {
my ($self, $x, $y) = @_;
+ Carp::confess unless $self->{parent};#d#
+
$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
-sub focus_in {
+sub invoke_focus_in {
my ($self) = @_;
return if $FOCUS == $self;
return unless $self->{can_focus};
- my $focus = $FOCUS; $FOCUS = $self;
+ $FOCUS = $self;
- $self->_emit (focus_in => $focus);
+ $self->update;
- $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;
+ undef $FOCUS;
- $self->_emit (focus_out => $focus);
-
- $focus->update if $focus; #?
+ $self->update;
- $::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;
-}
-sub mouse_motion { }
-sub button_up { }
-sub key_down { }
-sub key_up { }
+ 0
+}
-sub button_down {
- my ($self, $ev, $x, $y) = @_;
+sub grab_focus {
+ my ($self) = @_;
- $self->focus_in;
+ $FOCUS->emit ("focus_out") if $FOCUS;
+ $self->emit ("focus_in");
}
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
-sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
-sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
-sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
-sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
+sub invoke_mouse_motion { 0 }
+sub invoke_button_up { 0 }
+sub invoke_key_down { 0 }
+sub invoke_key_up { 0 }
+sub invoke_mouse_wheel { 0 }
-sub draw {
- my ($self) = @_;
+sub invoke_button_down {
+ my ($self, $ev, $x, $y) = @_;
- return unless $self->{h} && $self->{w};
+ $self->grab_focus;
- glPushMatrix;
- glTranslate $self->{x}, $self->{y}, 0;
- $self->_draw;
- glPopMatrix;
+ 0
+}
- if ($self == $HOVER && $self->{can_hover}) {
- my ($x, $y) = @$self{qw(x y)};
+sub connect {
+ my ($self, $signal, $cb) = @_;
- glColor 1, 0.8, 0.5, 0.2;
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, 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};
- glEnd;
- glDisable GL_BLEND;
- }
+ push @{ $self->{signal_cb}{$signal} }, $cb;
- if ($ENV{PCLIENT_DEBUG}) {
- glPushMatrix;
- glColor 1, 1, 0, 1;
- glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
- glBegin GL_LINE_LOOP;
- glVertex 0 , 0;
- glVertex $self->{w}, 0;
- glVertex $self->{w}, $self->{h};
- glVertex 0 , $self->{h};
- glEnd;
- glPopMatrix;
- #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+ defined wantarray and CFPlus::guard {
+ @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
+ @{ $self->{signal_cb}{$signal} };
}
}
-sub _draw {
- my ($self) = @_;
+sub disconnect_all {
+ my ($self, $signal) = @_;
- warn "no draw defined for $self\n";
+ delete $self->{signal_cb}{$signal};
+}
+
+my %has_coords = (
+ button_down => 1,
+ button_up => 1,
+ mouse_motion => 1,
+ mouse_wheel => 1,
+);
+
+sub emit {
+ my ($self, $signal, @args) = @_;
+
+ # 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)
+ : ();
+
+ #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
+
+ 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 {
@@ -453,20 +564,22 @@
sub set_parent {
my ($self, $parent) = @_;
- Scalar::Util::weaken ($self->{parent} = $parent);
-
- # TODO: req_w _does_change after ->reconfigure
- $self->check_size
- unless exists $self->{req_w};
-
- $self->show;
+ CFPlus::weaken ($self->{parent} = $parent);
+ $self->set_visible if $parent->{visible};
}
-sub check_size {
- my ($self, $forced) = @_;
+sub realloc {
+ my ($self) = @_;
+
+ if ($self->{visible}) {
+ return if $self->{root}{realloc}{$self+0};
- $self->{force_alloc} = 1 if $forced;
- $CFClient::UI::ROOT->{check_size}{$self} = $self;
+ $self->{root}{realloc}{$self+0} = $self;
+ $self->{root}->update;
+ } else {
+ delete $self->{req_w};
+ delete $self->{req_h};
+ }
}
sub update {
@@ -476,40 +589,90 @@
if $self->{parent};
}
-sub connect {
- my ($self, $signal, $cb) = @_;
+sub reconfigure {
+ my ($self) = @_;
- push @{ $self->{signal_cb}{$signal} }, $cb;
+ $self->realloc;
+ $self->update;
}
-sub _emit {
- my ($self, $signal, @args) = @_;
+# 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;
+
+ 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;
+ }
- List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
+ 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 emit {
- my ($self, $signal, @args) = @_;
+sub _draw {
+ my ($self) = @_;
- $self->_emit ($signal, @args)
- || $self->$signal (@args);
+ warn "no draw defined for $self\n";
}
+my $cntx;#d#
sub DESTROY {
my ($self) = @_;
+ return if CFPlus::in_destruct;
+
+ eval { $self->destroy };
+ warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
+
delete $WIDGET{$self+0};
- #$self->deactivate;
}
#############################################################################
-package CFClient::UI::DrawBG;
+package CFPlus::UI::DrawBG;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -534,8 +697,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;
@@ -550,9 +713,9 @@
#############################################################################
-package CFClient::UI::Empty;
+package CFPlus::UI::Empty;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
sub new {
my ($class, %arg) = @_;
@@ -560,32 +723,44 @@
}
sub size_request {
- (0, 0)
+ my ($self) = @_;
+
+ ($self->{w} + 0, $self->{h} + 0)
}
sub draw { }
#############################################################################
-package CFClient::UI::Container;
+package CFPlus::UI::Container;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
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
}
+sub realloc {
+ my ($self) = @_;
+
+ $self->{force_realloc} = 1;
+ $self->{force_size_alloc} = 1;
+ $self->SUPER::realloc;
+}
+
sub add {
my ($self, @widgets) = @_;
@@ -599,8 +774,7 @@
@{$self->{children}}, @widgets
];
- $self->check_size (1);
- $self->update;
+ $self->realloc;
}
sub children {
@@ -615,8 +789,7 @@
$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
- $self->check_size;
- $self->update;
+ $self->realloc;
}
sub clear {
@@ -630,8 +803,7 @@
$_->hide;
}
- $self->check_size;
- $self->update;
+ $self->realloc;
}
sub find_widget {
@@ -642,7 +814,7 @@
my $res;
- for (reverse @{ $self->{children} }) {
+ for (reverse $self->visible_children) {
$res = $_->find_widget ($x, $y)
and return $res;
}
@@ -658,14 +830,14 @@
#############################################################################
-package CFClient::UI::Bin;
+package CFPlus::UI::Bin;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
sub new {
my ($class, %arg) = @_;
- my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
+ my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
$class->SUPER::new (children => [$child], %arg)
}
@@ -673,8 +845,7 @@
sub add {
my ($self, $child) = @_;
- $self->{children} = [];
-
+ $self->SUPER::remove ($_) for @{ $self->{children} };
$self->SUPER::add ($child);
}
@@ -683,7 +854,7 @@
$self->SUPER::remove ($widget);
- $self->{children} = [new CFClient::UI::Empty]
+ $self->{children} = [new CFPlus::UI::Empty]
unless @{$self->{children}};
}
@@ -693,19 +864,23 @@
$_[0]{children}[0]->size_request
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
$self->{children}[0]->configure (0, 0, $w, $h);
+
+ 1
}
#############################################################################
-package CFClient::UI::Window;
+# back-buffered drawing area
+
+package CFPlus::UI::Window;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -720,66 +895,92 @@
$self->SUPER::update;
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
$self->update;
+
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
sub _render {
- $_[0]{children}[0]->draw;
+ my ($self) = @_;
+
+ $self->{children}[0]->draw;
}
sub render_child {
my ($self) = @_;
- $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+ $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
- $self->_render;
+ {
+ package CFPlus::UI::Base;
+
+ local ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+
+ $self->_render;
+ }
};
}
sub _draw {
my ($self) = @_;
- my ($w, $h) = ($self->w, $self->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);
+ $tex->draw_quad_alpha_premultiplied (0, 0);
glDisable GL_TEXTURE_2D;
}
#############################################################################
-package CFClient::UI::ViewPort;
+package CFPlus::UI::ViewPort;
-our @ISA = CFClient::UI::Window::;
+our @ISA = CFPlus::UI::Window::;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ scroll_x => 0,
+ scroll_y => 1,
+ @_,
+ )
+}
sub size_request {
my ($self) = @_;
- @$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};
- @$self{qw(child_w child_h)}
+ ($w, $h)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- my ($cw, $ch) = @$self{qw(child_w child_h)};
-# $w = $self->{w};
- $self->child->configure (0, 0, $cw, $ch);
+ my $child = $self->child;
+
+ $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 {
@@ -815,69 +1016,139 @@
) {
$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
} else {
- $self->CFClient::UI::Base::find_widget ($x, $y)
+ $self->CFPlus::UI::Base::find_widget ($x, $y)
}
}
sub _render {
my ($self) = @_;
- CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+ 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};
+
+ CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
}
#############################################################################
-package CFClient::UI::ScrolledWindow;
+package CFPlus::UI::ScrolledWindow;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::Table::;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $child = delete $arg{child};
my $self;
- my $slider = new CFClient::UI::Slider
- vertical => 1,
- range => [0, 0, 1, 0.01], # HACK fix
- connect_changed => sub {
- $self->{vp}->set_offset (0, $_[1]);
+ my $hslider = new CFPlus::UI::Slider
+ 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 CFPlus::UI::Slider
+ vertical => 1,
+ range => [0, 0, 1, 0.01], # HACK fix
+ on_changed => sub {
+ $self->{vpos} = $_[1];
+ $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
},
;
$self = $class->SUPER::new (
- vp => (new CFClient::UI::ViewPort expand => 1),
- slider => $slider,
- @_,
+ scroll_x => 0,
+ scroll_y => 1,
+ can_events => 1,
+ hslider => $hslider,
+ vslider => $vslider,
+ col_expand => [1, 0],
+ row_expand => [1, 0],
+ %arg,
);
- $self->{vp}->add ($self->{scrolled});
- $self->add ($self->{vp});
- $self->add ($self->{slider});
+ $self->{vp} = new CFPlus::UI::ViewPort
+ expand => 1,
+ scroll_x => $self->{scroll_x},
+ scroll_y => $self->{scroll_y},
+ ;
+
+ $self->SUPER::add (0, 0, $self->{vp});
+
+ $self->add ($child) if $child;
$self
}
-sub size_allocate {
- my ($self, $w, $h) = @_;
+#TODO# update range on size_allocate depending on child
- $self->SUPER::size_allocate ($w, $h);
+sub add {
+ my ($self, $widget) = @_;
- my $child = $self->{vp}->child;
- $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+ $self->{vp}->add ($self->{child} = $widget);
}
-#TODO# update range on size_allocate depending on child
-# update viewport offset on scroll
+sub invoke_mouse_wheel {
+ my ($self, $ev) = @_;
+
+ return 0 unless $ev->{dy}; # only vertical movements for now
+
+ $self->{vslider}->emit (mouse_wheel => $ev);
+
+ 1
+}
+
+sub update_slider {
+ my ($self) = @_;
+
+ my $child = ($self->{vp} or return)->child;
+
+ my ($w1, $w2) = ($child->{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}) {
+ $visible ? $self->SUPER::add (0, 1, $self->{hslider})
+ : $self->{hslider}->hide;
+ }
+
+ my ($h1, $h2) = ($child->{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}) {
+ $visible ? $self->SUPER::add (1, 0, $self->{vslider})
+ : $self->{vslider}->hide;
+ }
+}
+
+sub update {
+ my ($self) = @_;
+
+ $self->SUPER::update;
+ $self->update_slider;
+}
+
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->update_slider;
+ $self->SUPER::invoke_size_allocate ($w, $h)
+}
#############################################################################
-package CFClient::UI::Frame;
+package CFPlus::UI::Frame;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -895,8 +1166,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;
@@ -913,39 +1184,160 @@
#############################################################################
-package CFClient::UI::FancyFrame;
+package CFPlus::UI::FancyFrame;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
-
-my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
- qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
+use CFPlus::OpenGL;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
- # TODO: user_x, user_y, overwrite moveto?
+ if ((exists $arg{label}) && !ref $arg{label}) {
+ $arg{label} = new CFPlus::UI::Label
+ align => 1,
+ valign => 0,
+ text => $arg{label},
+ fontsize => ($arg{border} || 0.8) * 0.75;
+ }
+
+ my $self = $class->SUPER::new (
+ # label => "",
+ fg => [0.6, 0.3, 0.1],
+ border => 0.8,
+ style => 'single',
+ %arg,
+ );
+
+ $self
+}
+
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+ $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+}
+
+sub border {
+ int $_[0]{border} * $::FONTSIZE
+}
+
+sub size_request {
+ my ($self) = @_;
+
+ ($self->{label_w}, undef) = $self->{label}->size_request
+ if $self->{label};
+
+ my ($w, $h) = $self->SUPER::size_request;
+
+ (
+ $w + $self->border * 2,
+ $h + $self->border * 2,
+ )
+}
+
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ my $border = $self->border;
+
+ $w -= List::Util::max 0, $border * 2;
+ $h -= List::Util::max 0, $border * 2;
+
+ if (my $label = $self->{label}) {
+ $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
+ $label->{h} = List::Util::min $h, $border;
+ $label->invoke_size_allocate ($label->{w}, $label->{h});
+ }
+
+ $self->child->configure ($border, $border, $w, $h);
+
+ 1
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ my $child = $self->{children}[0];
+
+ my $border = $self->border;
+ my ($w, $h) = ($self->{w}, $self->{h});
+
+ $child->draw;
+
+ glColor @{$self->{fg}};
+ glBegin GL_LINE_STRIP;
+ glVertex $border * 1.5 , $border * 0.5 + 0.5;
+ glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+ glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+ glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+ glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+ glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
+ glEnd;
+
+ if ($self->{label}) {
+ glTranslate $border * 2, 0;
+ $self->{label}->_draw;
+ }
+}
+
+#############################################################################
+
+package CFPlus::UI::Toplevel;
+
+our @ISA = CFPlus::UI::Bin::;
+
+use CFPlus::OpenGL;
+
+my $bg =
+ new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
+ mipmap => 1, wrap => 1;
+
+my @border =
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+ qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.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,
- is_toplevel => 1,
can_events => 1,
- @_
+ min_w => 64,
+ min_h => 32,
+ %arg,
);
- $self->{title} &&= new CFClient::UI::Label
+ $self->{title_widget} = new CFPlus::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 CFPlus::UI::ImageButton
+ path => 'x1_close.png',
+ on_activate => sub { $self->emit ("delete") };
+
+ $self->CFPlus::UI::Container::add ($self->{close_button});
+ }
$self
}
+sub add {
+ 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};
+}
+
sub border {
int $_[0]{border} * $::FONTSIZE
}
@@ -953,6 +1345,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;
(
@@ -961,19 +1359,37 @@
)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $h -= List::Util::max 0, $self->border * 2;
- $w -= List::Util::max 0, $self->border * 2;
+ if ($self->{title_widget}) {
+ $self->{title_widget}{w} = $w;
+ $self->{title_widget}{h} = $h;
+ $self->{title_widget}->invoke_size_allocate ($w, $h);
+ }
+
+ my $border = $self->border;
+
+ $h -= List::Util::max 0, $border * 2;
+ $w -= List::Util::max 0, $border * 2;
+
+ $self->child->configure ($border, $border, $w, $h);
- $self->{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_delete {
+ my ($self) = @_;
+
+ $self->hide;
+
+ 1
+}
+
+sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
my ($w, $h) = @$self{qw(w h)};
@@ -996,10 +1412,11 @@
my $dx = $ev->{x} - $ox;
my $dy = $ev->{y} - $oy;
- $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
- $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
- $self->move ($wx + $dx * $mx, $wy + $dy * $my);
- $self->check_size;
+ $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
+ $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
+
+ $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
+ $self->realloc;
};
} elsif ($lr ^ $td) {
@@ -1011,29 +1428,46 @@
($x, $y) = ($ev->{x}, $ev->{y});
- $self->move ($bx + $x - $ox, $by + $y - $oy);
- $self->update;
+ $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 invoke_visibility_change {
+ my ($self, $visible) = @_;
+
+ delete $self->{motion} unless $visible;
+
+ 0
}
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;
@@ -1041,66 +1475,87 @@
my $border = $self->border;
glColor @{ $self->{border_bg} };
- $tex[1]->draw_quad_alpha (0, 0, $w, $border);
- $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
- $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
- $tex[4]->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);
if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
- my $bg = $tex[0];
-
- # TODO: repeat texture not scale
- my $rep_x = $cw / $bg->{w};
- my $rep_y = $ch / $bg->{h};
-
glColor @{ $self->{bg} };
- $bg->{s} = $rep_x;
- $bg->{t} = $rep_y;
- $bg->{wrap_mode} = 1;
+ # TODO: repeat texture not scale
+ # solve this better(?)
+ $bg->{s} = $cw / $bg->{w};
+ $bg->{t} = $ch / $bg->{h};
$bg->draw_quad_alpha ($border, $border, $cw, $ch);
}
glDisable GL_TEXTURE_2D;
- $self->{title}->draw if $self->{title};
+ $child->draw;
- $self->child->draw;
+ if ($self->{title_widget}) {
+ glTranslate 0, $border - $self->{h};
+ $self->{title_widget}->_draw;
+
+ glTranslate 0, - ($border - $self->{h});
+ }
+
+ $self->{close_button}->draw
+ if $self->{close_button};
}
#############################################################################
-package CFClient::UI::Table;
+package CFPlus::UI::Table;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use List::Util qw(max sum);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
$class->SUPER::new (
+ children => [],
col_expand => [],
- @_
+ row_expand => [],
+ @_,
)
}
+sub children {
+ grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
+
+# TODO: store row/col info in child widget and use standard add/del
sub add {
- my ($self, $x, $y, $child) = @_;
+ my ($self) = shift;
- $child->set_parent ($self);
- $self->{children}[$y][$x] = $child;
+ while (@_) {
+ my ($x, $y, $child) = splice @_, 0, 3, ();
+ $child->set_parent ($self);
+ $self->{children}[$y][$x] = $child;
+ }
- $child->check_size;
+ $self->{force_realloc} = 1;
+ $self->{force_size_alloc} = 1;
+ $self->realloc;
}
-sub children {
- grep $_, map @$_, grep $_, @{ $_[0]{children} }
+sub remove {
+ my ($self, $child) = @_;
+
+ for (@{ $self->{children} }) {
+ for (@{ $_ || [] }) {
+ $_ = undef if $_ == $child;
+ }
+ }
}
-# TODO: move to container class maybe? send childs a signal on removal?
+# TODO: move to container class maybe? send children a signal on removal?
sub clear {
my ($self) = @_;
@@ -1112,7 +1567,7 @@
$_->hide;
}
- $self->update;
+ $self->realloc;
}
sub get_wh {
@@ -1148,25 +1603,30 @@
)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
my ($ws, $hs) = $self->get_wh;
- my $req_w = sum @$ws;
- my $req_h = sum @$hs;
+ my $req_w = (sum @$ws) || 1;
+ my $req_h = (sum @$hs) || 1;
- # TODO: nicer code && do row_expand
+ # TODO: nicer code
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;
- CFClient::UI::harmonize $ws;
- CFClient::UI::harmonize $hs;
+ CFPlus::UI::harmonize $ws;
+
+ my @row_expand = @{$self->{row_expand}};
+ @row_expand = (1) x @$ws unless @row_expand;
+ my $row_expand = (sum @row_expand) || 1;
+
+ $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
+
+ CFPlus::UI::harmonize $hs;
my $y;
@@ -1190,6 +1650,7 @@
$y += $row_h;
}
+ 1
}
sub find_widget {
@@ -1218,59 +1679,81 @@
#############################################################################
-package CFClient::UI::HBox;
+package CFPlus::UI::Fixed;
-# TODO: wrap into common Box base class
+use List::Util qw(min max);
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
-sub size_request {
- my ($self) = @_;
+sub add {
+ my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
- my @alloc = map [$_->size_request], @{$self->{children}};
+ $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
+ $self->SUPER::add ($child);
+}
- (
- (List::Util::sum map $_->[0], @alloc),
- (List::Util::max map $_->[1], @alloc),
- )
+sub _scale($$$) {
+ my ($mode, $val, $max) = @_;
+
+ $mode eq "abs" ? $val
+ : $mode eq "rel" ? $val * $max
+ : 0
}
-sub size_allocate {
- my ($self, $w, $h) = @_;
+sub size_request {
+ my ($self) = @_;
- ($h, $w) = ($w, $h);
+ my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
- my $children = $self->{children};
+ # determine overall size by querying abs widgets
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+ if ($pos eq "abs") {
+ $w = _scale $size, $w, $child->{req_w};
+ $h = _scale $size, $h, $child->{req_h};
- my @h = map $_->{req_w}, @$children;
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+ }
+ }
- my $req_h = List::Util::sum @h;
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
- if ($req_h > $h) {
- # ah well, not enough space
- $_ *= $h / $req_h for @h;
- } else {
- my $exp = List::Util::sum map $_->{expand}, @$children;
- $exp ||= 1;
-
- for (0 .. $#$children) {
- my $child = $children->[$_];
+ # now layout remaining widgets
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+ if ($pos ne "abs") {
+ $x = _scale $pos, $x, $W;
+ $y = _scale $pos, $x, $H;
+ $w = _scale $size, $w, $child->{req_w};
+ $h = _scale $size, $h, $child->{req_h};
- my $alloc_h = $h[$_];
- $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
- $h[$_] = $alloc_h;
+ $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+ $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
}
}
- CFClient::UI::harmonize \@h;
+ my $W = $x2 - $x1;
+ my $H = $y2 - $y1;
+
+ ($W, $H)
+}
+
+sub invoke_size_allocate {
+ my ($self, $W, $H) = @_;
- my $y = 0;
- for (0 .. $#$children) {
- my $child = $children->[$_];
- my $h = $h[$_];
- $child->configure ($y, 0, $h, $w);
+ for my $child ($self->visible_children) {
+ my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
- $y += $h;
+ $x = _scale $pos, $x, $W;
+ $y = _scale $pos, $x, $H;
+ $w = _scale $size, $w, $child->{req_w};
+ $h = _scale $size, $h, $child->{req_h};
+
+ $child->configure ($x, $y, $w, $h);
}
1
@@ -1278,57 +1761,59 @@
#############################################################################
-package CFClient::UI::VBox;
-
-# TODO: wrap into common Box base class
+package CFPlus::UI::Box;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
sub size_request {
my ($self) = @_;
- my @alloc = map [$_->size_request], @{$self->{children}};
-
- (
- (List::Util::max map $_->[0], @alloc),
- (List::Util::sum map $_->[1], @alloc),
- )
+ $self->{vertical}
+ ? (
+ (List::Util::max map $_->{req_w}, @{$self->{children}}),
+ (List::Util::sum map $_->{req_h}, @{$self->{children}}),
+ )
+ : (
+ (List::Util::sum map $_->{req_w}, @{$self->{children}}),
+ (List::Util::max map $_->{req_h}, @{$self->{children}}),
+ )
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- Carp::confess "negative size" if $w < 0 || $h < 0;#d#
-
- my $children = $self->{children};
-
- my @h = map $_->{req_h}, @$children;
+ my $space = $self->{vertical} ? $h : $w;
+ my @children = $self->visible_children;
- my $req_h = List::Util::sum @h;
+ my @req;
- if ($req_h > $h) {
- # ah well, not enough space
- $_ *= $h / $req_h for @h;
+ if ($self->{homogeneous}) {
+ @req = ($space / (@children || 1)) x @children;
} else {
- my $exp = List::Util::sum map $_->{expand}, @$children;
- $exp ||= 1;
-
- for (0 .. $#$children) {
- my $child = $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;
+
+ $space = ($space - $req) / $expand; # remaining space to give away
- $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
+ $req[$_] += $space * $children[$_]{expand}
+ for 0 .. $#children;
}
}
- CFClient::UI::harmonize \@h;
+ CFPlus::UI::harmonize \@req;
- my $y = 0;
- for (0 .. $#$children) {
- my $child = $children->[$_];
- my $h = $h[$_];
- $child->configure (0, $y, $w, $h);
+ my $pos = 0;
+ for (0 .. $#children) {
+ my $alloc = $req[$_];
+ $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
- $y += $h;
+ $pos += $alloc;
}
1
@@ -1336,11 +1821,41 @@
#############################################################################
-package CFClient::UI::Label;
+package CFPlus::UI::HBox;
+
+our @ISA = CFPlus::UI::Box::;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ vertical => 0,
+ @_,
+ )
+}
+
+#############################################################################
+
+package CFPlus::UI::VBox;
+
+our @ISA = CFPlus::UI::Box::;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ vertical => 1,
+ @_,
+ )
+}
+
+#############################################################################
+
+package CFPlus::UI::Label;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my ($class, %arg) = @_;
@@ -1353,18 +1868,20 @@
#text => initial text
#markup => initial narkup
#max_w => maximum pixel width
+ #style => 0, # render flags
ellipsise => 3, # end
- layout => (new CFClient::Layout),
+ layout => (new CFPlus::Layout),
fontsize => 1,
align => -1,
valign => -1,
- padding => 2,
+ padding_x => 2,
+ padding_y => 2,
can_events => 0,
%arg
);
if (exists $self->{template}) {
- my $layout = new CFClient::Layout;
+ my $layout = new CFPlus::Layout;
$layout->set_text (delete $self->{template});
$self->{template} = $layout;
}
@@ -1378,16 +1895,6 @@
$self
}
-sub escape($) {
- local $_ = $_[0];
-
- s/&/&/g;
- s/>/>/g;
- s/</g;
-
- $_
-}
-
sub update {
my ($self) = @_;
@@ -1395,17 +1902,24 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
return if $self->{text} eq "T$text";
$self->{text} = "T$text";
- $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
+ delete $self->{size_req};
+ $self->realloc;
$self->update;
- $self->check_size;
}
sub set_markup {
@@ -1416,54 +1930,74 @@
my $rgba = $markup =~ /span.*(?:foreground|background)/;
- $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;
- $self->check_size;
}
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_width ($self->{max_w} || -1);
+ $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 {
+sub baseline_shift {
+ $_[0]{layout}->descent
+}
+
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- delete $self->{texture};
+ delete $self->{ox};
+
+ delete $self->{texture}
+ unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
+
+ 1
}
sub set_fontsize {
my ($self, $fontsize) = @_;
$self->{fontsize} = $fontsize;
+ delete $self->{size_req};
delete $self->{texture};
- $self->update;
- $self->check_size;
+ $self->realloc;
+}
+
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+ delete $self->{texture};
+
+ $self->SUPER::reconfigure;
}
sub _draw {
@@ -1471,7 +2005,7 @@
$self->SUPER::_draw; # draw background, if applicable
- my $tex = $self->{texture} ||= do {
+ my $size = $self->{texture} ||= do {
$self->{layout}->set_foreground (@{$self->{fg}});
$self->{layout}->set_font ($self->{font}) if $self->{font};
$self->{layout}->set_width ($self->{w});
@@ -1479,39 +2013,32 @@
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- my $tex = new_from_layout CFClient::Texture $self->{layout};
-
- $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
- : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
- : ($self->{w} - $tex->{w}) * 0.5);
-
- $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
- : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
- : ($self->{h} - $tex->{h}) * 0.5);
-
- $tex
+ [$self->{layout}->size]
};
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ 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);
+ };
- if ($tex->{format} == GL_ALPHA) {
- glColor @{$self->{fg}};
- $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
- } else {
- $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
- }
+ my $w = List::Util::min $self->{w} + 4, $size->[0];
+ my $h = List::Util::min $self->{h} + 2, $size->[1];
- glDisable GL_TEXTURE_2D;
+ $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
}
#############################################################################
-package CFClient::UI::EntryBase;
+package CFPlus::UI::EntryBase;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -1525,7 +2052,9 @@
can_focus => 1,
valign => 0,
can_events => 1,
+ ellipsise => 0,
#text => ...
+ #hidden => "*",
@_
)
}
@@ -1537,15 +2066,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 {
@@ -1553,8 +2084,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
- $self->update;
- $self->check_size;
}
sub get_text {
@@ -1569,7 +2098,7 @@
($w + 1, $h) # add 1 for cursor
}
-sub key_down {
+sub invoke_key_down {
my ($self, $ev) = @_;
my $mod = $ev->{mod};
@@ -1578,56 +2107,80 @@
my $text = $self->get_text;
+ $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
+
if ($uni == 8) {
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
} elsif ($uni == 127) {
substr $text, $self->{cursor}, 1, "";
- } elsif ($sym == CFClient::SDLK_LEFT) {
+ } elsif ($sym == CFPlus::SDLK_LEFT) {
--$self->{cursor} if $self->{cursor};
- } elsif ($sym == CFClient::SDLK_RIGHT) {
+ } elsif ($sym == CFPlus::SDLK_RIGHT) {
++$self->{cursor} if $self->{cursor} < length $self->{text};
- } elsif ($sym == CFClient::SDLK_HOME) {
+ } elsif ($sym == CFPlus::SDLK_HOME) {
+ # what a hack
+ $self->{cursor} =
+ (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
+ ? length $1
+ : 0;
+ } elsif ($sym == CFPlus::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 == CFClient::SDLK_END) {
- $self->{cursor} = length $text;
} elsif ($uni == 27) {
- $self->_emit ('escape');
- } elsif ($uni) {
+ $self->emit ('escape');
+ } elsif ($uni == 0x0d) {
+ substr $text, $self->{cursor}++, 0, "\012";
+ } elsif ($uni >= 0x20) {
substr $text, $self->{cursor}++, 0, chr $uni;
+ } else {
+ return 0;
}
$self->_set_text ($text);
+
+ $self->realloc;
$self->update;
- $self->check_size;
+
+ 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);
# byte-index to char-index
my $text = $self->{text};
- utf8::encode $text;
- $self->{cursor} = length substr $text, 0, $idx;
+ utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
+ $self->{cursor} = length $text;
$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 {
@@ -1636,14 +2189,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};
@@ -1664,34 +2217,36 @@
@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
}
- glColor @{$self->{fg}};
glBegin GL_LINES;
- glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
- glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+ 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};
glEnd;
}
}
-package CFClient::UI::Entry;
+#############################################################################
+
+package CFPlus::UI::Entry;
-our @ISA = CFClient::UI::EntryBase::;
+our @ISA = CFPlus::UI::EntryBase::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-sub key_down {
+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;
+
$self->{history_pointer} = -1;
$self->{history_saveback} = '';
- $self->_emit (activate => $txt);
+ $self->emit (activate => $txt);
$self->update;
- } elsif ($sym == CFClient::SDLK_UP) {
+ } elsif ($sym == CFPlus::SDLK_UP) {
if ($self->{history_pointer} < 0) {
$self->{history_saveback} = $self->get_text;
}
@@ -1703,7 +2258,7 @@
$self->set_text ($self->{history}->[$self->{history_pointer}]);
}
- } elsif ($sym == CFClient::SDLK_DOWN) {
+ } elsif ($sym == CFPlus::SDLK_DOWN) {
$self->{history_pointer}--;
$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
@@ -1714,28 +2269,69 @@
}
} else {
- $self->SUPER::key_down ($ev);
+ return $self->SUPER::invoke_key_down ($ev)
+ }
+
+ 1
+}
+
+#############################################################################
+
+package CFPlus::UI::TextEdit;
+
+our @ISA = CFPlus::UI::EntryBase::;
+
+use CFPlus::OpenGL;
+
+sub move_cursor_ver {
+ my ($self, $dy) = @_;
+
+ my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+
+ $y += $dy;
+
+ if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+ $self->{cursor} = $index;
+ delete $self->{cur_h};
+ $self->update;
+ return;
+ }
+}
+
+sub invoke_key_down {
+ my ($self, $ev) = @_;
+
+ my $sym = $ev->{sym};
+
+ if ($sym == CFPlus::SDLK_UP) {
+ $self->move_cursor_ver (-1);
+ } elsif ($sym == CFPlus::SDLK_DOWN) {
+ $self->move_cursor_ver (+1);
+ } else {
+ return $self->SUPER::invoke_key_down ($ev)
}
+ 1
}
#############################################################################
-package CFClient::UI::Button;
+package CFPlus::UI::Button;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw(b1_button_active.png);
sub new {
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,
@@ -1746,24 +2342,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;
@@ -1778,21 +2370,22 @@
#############################################################################
-package CFClient::UI::CheckBox;
+package CFPlus::UI::CheckBox;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
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],
@@ -1806,17 +2399,28 @@
sub size_request {
my ($self) = @_;
- ($self->{padding} * 2 + 6) x 2
+ (6) x 2
}
-sub button_down {
+sub toggle {
+ my ($self) = @_;
+
+ $self->{state} = !$self->{state};
+ $self->emit (changed => $self->{state});
+ $self->update;
+}
+
+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}) {
- $self->{state} = !$self->{state};
- $self->_emit (changed => $self->{state});
+ if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
+ && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
+ $self->toggle;
+ } else {
+ return 0
}
+
+ 1
}
sub _draw {
@@ -1824,9 +2428,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 ($w, $h) = @$self{qw(w h)};
- my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
+ my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
@@ -1839,38 +2445,54 @@
#############################################################################
-package CFClient::UI::Image;
+package CFPlus::UI::Image;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
-use CFClient::OpenGL;
-use Carp qw/confess/;
+use CFPlus::OpenGL;
-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} || $self->{tex}
+ or Carp::croak "'path' or 'tex' attributes required";
- my $tex = $self->{tex} = $loaded_images{$self->{image}};
+ $self->{tex} ||= $texture_cache{$self->{path}} ||=
+ new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
- Scalar::Util::weaken $loaded_images{$self->{image}};
+ CFPlus::weaken $texture_cache{$self->{path}};
- $self->{aspect} = $tex->{w} / $tex->{h};
+ $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
$self
}
+sub STORABLE_freeze {
+ my ($self, $cloning) = @_;
+
+ $self->{path}
+ or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
+
+ $self->{path}
+}
+
+sub STORABLE_attach {
+ my ($self, $cloning, $path) = @_;
+
+ $self->new (path => $path)
+}
+
sub size_request {
my ($self) = @_;
- ($self->{tex}->{w}, $self->{tex}->{h})
+ ($self->{tex}{w}, $self->{tex}{h})
}
sub _draw {
@@ -1890,36 +2512,72 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $tex->draw_quad_alpha (0, 0, $w, $h);
+ $tex->draw_quad (0, 0, $w, $h);
glDisable GL_TEXTURE_2D;
}
#############################################################################
-package CFClient::UI::VGauge;
+package CFPlus::UI::ImageButton;
+
+our @ISA = CFPlus::UI::Image::;
+
+use CFPlus::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 CFPlus::UI::VGauge;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
my %tex = (
food => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
],
grace => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
],
hp => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
],
mana => [
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
],
);
@@ -1989,9 +2647,13 @@
my $h1 = $self->{h} * (1 - $ycut1);
my $h2 = $self->{h} * (1 - $ycut2);
+ my $h3 = $self->{h};
+
+ $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
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;
@@ -2016,8 +2678,8 @@
glBindTexture GL_TEXTURE_2D, $t3->{name};
glBegin GL_QUADS;
glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
- glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
- glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
+ glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
+ glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
glEnd;
}
@@ -2028,9 +2690,9 @@
#############################################################################
-package CFClient::UI::Gauge;
+package CFPlus::UI::Gauge;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my ($class, %arg) = @_;
@@ -2042,9 +2704,9 @@
%arg,
);
- $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
- $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
- $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+ $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
}
@@ -2075,16 +2737,16 @@
#############################################################################
-package CFClient::UI::Slider;
+package CFPlus::UI::Slider;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
my @tex =
- map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+ map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
qw(s1_slider.png s1_slider_bg.png);
sub new {
@@ -2101,8 +2763,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,
@@ -2118,9 +2780,12 @@
sub set_range {
my ($self, $range) = @_;
- $self->{range} = $range;
+ ($range, $self->{range}) = ($self->{range}, $range);
- $self->update;
+ if ("@$range" ne "@{$self->{range}}") {
+ $self->update;
+ $self->set_value ($self->{range}[0]);
+ }
}
sub set_value {
@@ -2141,7 +2806,7 @@
@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
if ($value != $old_value) {
- $self->_emit (changed => $value);
+ $self->emit (changed => $value);
$self->update;
}
}
@@ -2149,23 +2814,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) {
@@ -2176,13 +2838,36 @@
$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+ } else {
+ return 0;
}
+
+ 1
+}
+
+sub invoke_mouse_wheel {
+ my ($self, $ev) = @_;
+
+ my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
+
+ my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
+
+ $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
+
+ ! ! $delta
}
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}};
@@ -2198,13 +2883,7 @@
$self->{knob_x} = $value - $knob_w * 0.5;
$self->{knob_w} = $knob_w;
- });
-
- $self->SUPER::update;
-}
-
-sub _draw {
- my ($self) = @_;
+ }
$self->SUPER::_draw ();
@@ -2234,9 +2913,9 @@
#############################################################################
-package CFClient::UI::ValSlider;
+package CFPlus::UI::ValSlider;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
sub new {
my ($class, %arg) = @_;
@@ -2244,8 +2923,8 @@
my $range = delete $arg{range};
my $self = $class->SUPER::new (
- slider => (new CFClient::UI::Slider expand => 1, range => $range),
- entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
+ slider => (new CFPlus::UI::Slider expand => 1, range => $range),
+ entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
to_value => sub { shift },
from_value => sub { shift },
%arg,
@@ -2275,27 +2954,29 @@
#############################################################################
-package CFClient::UI::TextView;
+package CFPlus::UI::TextScroller;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
fontsize => 1,
- can_events => 0,
+ can_events => 1,
+ indent => 0,
#font => default_font
@_,
- layout => (new CFClient::Layout 1),
+ layout => (new CFPlus::Layout),
par => [],
+ max_par => 0,
height => 0,
children => [
- (new CFClient::UI::Empty expand => 1),
- (new CFClient::UI::Slider vertical => 1),
+ (new CFPlus::UI::Empty expand => 1),
+ (new CFPlus::UI::Slider vertical => 1),
],
);
@@ -2311,28 +2992,61 @@
$self->reflow;
}
-sub size_allocate {
+sub size_request {
+ my ($self) = @_;
+
+ my ($empty, $slider) = @{ $self->{children} };
+
+ local $self->{children} = [$empty, $slider];
+ $self->SUPER::size_request
+}
+
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w, $h);
+ my ($empty, $slider, @other) = @{ $self->{children} };
+ $_->configure (@$_{qw(x y req_w req_h)}) for @other;
$self->{layout}->set_font ($self->{font}) if $self->{font};
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- $self->{layout}->set_width ($self->{children}[0]{w});
+ $self->{layout}->set_width ($empty->{w});
+ $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
$self->reflow;
+
+ local $self->{children} = [$empty, $slider];
+ $self->SUPER::invoke_size_allocate ($w, $h)
}
-sub text_size {
- my ($self, $text, $indent) = @_;
+sub invoke_mouse_wheel {
+ my ($self, $ev) = @_;
+
+ return 0 unless $ev->{dy}; # only vertical movements
+
+ $self->{children}[1]->emit (mouse_wheel => $ev);
+
+ 1
+}
+
+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 {
@@ -2349,125 +3063,189 @@
$self->{children}[1]->set_value ($offset);
}
+sub current_paragraph {
+ my ($self) = @_;
+
+ $self->{top_paragraph} - 1
+}
+
+sub scroll_to {
+ my ($self, $para) = @_;
+
+ $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
+
+ $self->{scroll_to} = $para;
+ $self->update;
+}
+
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 = shift;
+
+ for my $para (@_) {
+ $para = {
+ fg => [1, 1, 1, 1],
+ indent => 0,
+ markup => "",
+ widget => [],
+ ref $para ? %$para : (markup => $para),
+ w => 1e10,
+ wrapped => 1,
+ };
- 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];
+ $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
+ push @{$self->{par}}, $para;
}
- $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
+ if (my $max = $self->{max_par}) {
+ shift @{$self->{par}} while @{$self->{par}} > $max;
+ }
+
+ $self->{need_reflow}++;
+ $self->update;
+}
+
+sub scroll_to_bottom {
+ my ($self) = @_;
+
+ $self->{scroll_to} = $#{$self->{par}};
+ $self->update;
}
-sub update {
+sub force_uptodate {
my ($self) = @_;
- $self->SUPER::update;
+ if (delete $self->{need_reflow}) {
+ my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
- return unless $self->{h} > 0;
+ my $height = 0;
- delete $self->{texture};
+ 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;
+
+ $para->{w} = $w + $para->{indent};
+ $para->{h} = $h;
+ $para->{wrapped} = $layout->has_wrapped;
+ }
- $ROOT->on_post_alloc ($self, sub {
- my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+ $para->{y} = $height;
+ $height += $para->{h};
+ }
+
+ $self->{height} = $height;
+ $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
- if (delete $self->{need_reflow}) {
- my $height = 0;
+ delete $self->{texture};
+ }
- my $layout = $self->{layout};
+ if (my $paridx = delete $self->{scroll_to}) {
+ $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
+ }
+}
- $layout->set_height ($self->{fontsize} * $::FONTSIZE);
+sub update {
+ my ($self) = @_;
- for (@{$self->{par}}) {
- if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
- $layout->set_width ($W - $_->[3]);
- $layout->set_markup ($_->[4]);
- my ($w, $h) = $layout->size;
- $_->[0] = $w + $_->[3];
- $_->[1] = $h;
- }
+ $self->SUPER::update;
- $height += $_->[1];
- }
+ return unless $self->{h} > 0;
- $self->{height} = $height;
+ delete $self->{texture};
- $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
-
- delete $self->{texture};
- }
+ $ROOT->on_post_alloc ($self => sub {
+ $self->force_uptodate;
- $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
- glClearColor 0.5, 0.5, 0.5, 0;
+ my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+
+ $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
+ glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
+ package CFPlus::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;
+ my $top_paragraph;
my $top = int $self->{children}[1]{range}[0];
my $y0 = $top;
my $y1 = $top + $H;
- my $y = 0;
+ for my $para (@{$self->{par}}) {
+ my $h = $para->{h};
+ my $y = $para->{y};
- my $layout = $self->{layout};
-
- $layout->set_font ($self->{font}) if $self->{font};
+ if ($y0 < $y + $h && $y < $y1) {
+ my $layout = $self->get_layout ($para);
- glEnable GL_BLEND;
- #TODO# not correct in windows where rgba is forced off
- glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ $layout->render ($para->{indent}, $y - $y0);
- for my $par (@{$self->{par}}) {
- my $h = $par->[1];
+ if (my @w = @{ $para->{widget} }) {
+ my @s = $layout->get_shapes;
- if ($y0 < $y + $h && $y < $y1) {
- $layout->set_foreground (@{ $par->[2] });
- $layout->set_width ($W - $par->[3]);
- $layout->set_markup ($par->[4]);
+ for (@w) {
+ my ($dx, $dy) = splice @s, 0, 2, ();
- my ($w, $h, $data, $format, $internalformat) = $layout->render;
+ $_->{x} = $dx + $para->{indent};
+ $_->{y} = $dy + $y - $y0;
- glRasterPos $par->[3], $y - $y0;
- glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
+ $_->draw;
+ }
+ }
}
- $y += $h;
+ $paridx++;
+ $top_paragraph ||= $paridx if $y >= $top;
}
- glDisable GL_BLEND;
+ $self->{top_paragraph} = $top_paragraph;
};
});
}
+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;
-
}
#############################################################################
-package CFClient::UI::Animator;
+package CFPlus::UI::Animator;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
sub moveto {
my ($self, $x, $y) = @_;
@@ -2505,50 +3283,35 @@
#############################################################################
-package CFClient::UI::Flopper;
+package CFPlus::UI::Flopper;
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- state => 0,
- connect_activate => \&toggle_flopper,
+ state => 0,
+ on_activate => \&toggle_flopper,
@_
);
- if ($self->{state}) {
- $self->{state} = 0;
- $self->toggle_flopper;
- }
-
$self
}
sub toggle_flopper {
my ($self) = @_;
- # TODO: use animation
- if ($self->{state} = !$self->{state}) {
- $CFClient::UI::ROOT->add ($self->{other});
- $self->{other}->move ($self->coord2global (0, $self->{h}));
- $self->_emit ("open");
- } else {
- $CFClient::UI::ROOT->remove ($self->{other});
- $self->_emit ("close");
- }
-
- $self->_emit (changed => $self->{state});
+ $self->{other}->toggle_visibility;
}
#############################################################################
-package CFClient::UI::Tooltip;
+package CFPlus::UI::Tooltip;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
@@ -2562,11 +3325,26 @@
sub set_tooltip_from {
my ($self, $widget) = @_;
- $self->add (new CFClient::UI::Label
- markup => $widget->{tooltip},
+ $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
+ if $widget->{tooltip} =~ /^#(.*)$/;
+
+ 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 CFPlus::UI::Label
+ markup => $tooltip,
max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
fontsize => 0.8,
- fg => [0, 0, 0, 1],
+ style => 1, # FLAG_INVERSE
ellipsise => 0,
font => ($widget->{tooltip_font} || $::FONT_PROP),
);
@@ -2580,10 +3358,32 @@
($w + 4, $h + 4)
}
-sub size_allocate {
+sub invoke_size_allocate {
my ($self, $w, $h) = @_;
- $self->SUPER::size_allocate ($w - 4, $h - 4);
+ $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
+}
+
+sub invoke_visibility_change {
+ my ($self, $visible) = @_;
+
+ return unless $visible;
+
+ $self->{root}->on_post_alloc ("move_$self" => sub {
+ my $widget = $self->{owner}
+ or return;
+
+ if ($widget->{visible}) {
+ my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
+
+ ($x, $y) = $widget->coord2global (-$self->{w}, 0)
+ if $x + $self->{w} > $self->{root}{w};
+
+ $self->move_abs ($x, $y);
+ } else {
+ $self->hide;
+ }
+ });
}
sub _draw {
@@ -2610,44 +3410,80 @@
glEnd;
glTranslate 2 - 0.375, 2 - 0.375;
+
$self->SUPER::_draw;
}
#############################################################################
-package CFClient::UI::Face;
+package CFPlus::UI::Face;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- aspect => 1,
+ size_w => 32,
+ size_h => 8,
+ aspect => 1,
+ can_events => 0,
@_,
);
if ($self->{anim} && $self->{animspeed}) {
- Scalar::Util::weaken (my $widget = $self);
+ CFPlus::weaken (my $widget = $self);
$self->{timer} = Event->timer (
at => $self->{animspeed} * int $::NOW / $self->{animspeed},
hard => 1,
interval => $self->{animspeed},
cb => sub {
+ return unless $::CONN;
+
++$widget->{frame};
- $widget->update;
+ $self->update_face;
+ $self->update;
},
);
+
+ $self->update_face;
}
$self
}
+sub update_face {
+ my ($self) = @_;
+
+ return unless $::CONN;
+
+ if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+ if ($anim && @$anim) {
+ delete $self->{wait_face};
+ $self->{face} = $anim->[ $self->{frame} % @$anim ];
+ }
+ }
+}
+
sub size_request {
- (32, 8)
+ my ($self) = @_;
+
+ if ($::CONN) {
+ if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
+ if (my $tex = $::CONN->{texture}[$faceid]) {
+ return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+ } else {
+ $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+ $self->realloc;
+ });
+ }
+ }
+ }
+
+ ($self->{size_w} || 8, $self->{size_h} || 8)
}
sub update {
@@ -2663,288 +3499,340 @@
return unless $::CONN;
- my $face;
-
- if ($self->{frame}) {
- my $anim = $::CONN->{anim}[$self->{anim}];
+ $self->SUPER::_draw;
- $face = $anim->[ $self->{frame} % @$anim ]
- if $anim && @$anim;
- }
+ my $faceid = $::CONN->{faceid}[$self->{face}]
+ or return;
- my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+ my $tex = $::CONN->{texture}[$faceid];
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::InventoryItem;
+package CFPlus::UI::Buttonbar;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-sub _item_to_desc {
- my ($item) = @_;
+# TODO: should actually wrap buttons and other goodies.
- my $desc =
- $item->{nrof} < 2
- ? $item->{name}
- : "$item->{nrof} × $item->{name_pl}";
+#############################################################################
- $item->{flags} & Crossfire::Protocol::F_OPEN
- and $desc .= " (open)";
- $item->{flags} & Crossfire::Protocol::F_APPLIED
- and $desc .= " (applied)";
- $item->{flags} & Crossfire::Protocol::F_UNPAID
- and $desc .= " (unpaid)";
- $item->{flags} & Crossfire::Protocol::F_MAGIC
- and $desc .= " (magic)";
- $item->{flags} & Crossfire::Protocol::F_CURSED
- and $desc .= " (cursed)";
- $item->{flags} & Crossfire::Protocol::F_DAMNED
- and $desc .= " (damned)";
- $item->{flags} & Crossfire::Protocol::F_LOCKED
- and $desc .= " *";
+package CFPlus::UI::Menu;
- $desc
-}
+our @ISA = CFPlus::UI::Toplevel::;
+
+use CFPlus::OpenGL;
sub new {
my $class = shift;
- my %args = @_;
+ my $self = $class->SUPER::new (
+ items => [],
+ z => 100,
+ @_,
+ );
- my $item = delete $args{item};
+ $self->add ($self->{vbox} = new CFPlus::UI::VBox);
- my $desc = _item_to_desc ($item);
+ for my $item (@{ $self->{items} }) {
+ my ($widget, $cb, $tooltip) = @$item;
- my $self = $class->SUPER::new (
- can_hover => 1,
- can_events => 1,
- tooltip => ((CFClient::UI::Label::escape $desc)
- . "\nleftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu"),
- connect_button_down => sub {
- my ($self, $ev, $x, $y) = @_;
-
- # todo: maybe put examine on 1? but should just be a tooltip :(
- if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
- my $targ = $::CONN->{player}{tag};
+ # handle various types of items, only text for now
+ if (!ref $widget) {
+ if ($widget =~ /\t/) {
+ my ($left, $right) = split /\t/, $widget, 2;
- if ($item->{container} == $::CONN->{player}{tag}) {
- $targ = $main::OPENCONT;
- }
+ $widget = new CFPlus::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),
+ ],
+ ;
+
+ } else {
+ $widget = new CFPlus::UI::Label
+ can_hover => 1,
+ can_events => 1,
+ markup => $widget,
+ tooltip => $tooltip;
+ }
+ }
- $::CONN->send ("move $targ $item->{tag} 0");
- } elsif ($ev->{button} == 1) {
- $::CONN->send ("examine $item->{tag}");
- } elsif ($ev->{button} == 2) {
- $::CONN->send ("apply $item->{tag}");
- } elsif ($ev->{button} == 3) {
- my @menu_items = (
- ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
- ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
- ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
- (
- $item->{flags} & Crossfire::Protocol::F_LOCKED
- ? (
- ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
- )
- : (
- ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
- ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
- )
- ),
- );
+ $self->{item}{$widget} = $item;
- CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
- }
+ $self->{vbox}->add ($widget);
+ }
- 1
- },
- %args
- );
+ $self
+}
+# popup given the event (must be a mouse button down event currently)
+sub popup {
+ my ($self, $ev) = @_;
- $self->add (new CFClient::UI::Face
- can_events => 0,
- face => $item->{face},
- anim => $item->{anim},
- animspeed => $item->{animspeed},
- );
+ $self->emit ("popdown");
- $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
+ # maybe save $GRAB? must be careful about events...
+ $GRAB = $self;
+ $self->{button} = $ev->{button};
- $self->{item} = $item;
+ $self->show;
+ $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+}
- $self->update_item;
+sub invoke_mouse_motion {
+ my ($self, $ev, $x, $y) = @_;
- $self
+ # TODO: should use vbox->find_widget or so
+ $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
+ $self->{hover} = $self->{item}{$HOVER};
+
+ 0
}
-sub update_item {
- my ($self) = @_;
+sub invoke_button_up {
+ my ($self, $ev, $x, $y) = @_;
+
+ if ($ev->{button} == $self->{button}) {
+ undef $GRAB;
+ $self->hide;
- my $desc = _item_to_desc ($self->{item});
+ $self->emit ("popdown");
+ $self->{hover}[1]->() if $self->{hover};
+ } else {
+ return 0
+ }
- $self->{name_lbl}->set_text ($desc);
+ 1
}
#############################################################################
-package CFClient::UI::Inventory;
+package CFPlus::UI::Multiplexer;
-our @ISA = CFClient::UI::ScrolledWindow::;
+our @ISA = CFPlus::UI::Container::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- scrolled => (new CFClient::UI::Table),
@_,
);
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+
$self
}
-sub set_items {
- my ($self, $items) = @_;
+sub add {
+ my ($self, @widgets) = @_;
- $self->{scrolled}->clear;
- return unless $items;
+ $self->SUPER::add (@widgets);
- my @items = sort {
- ($a->{type} <=> $b->{type})
- or ($a->{name} cmp $b->{name})
- } @$items;
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+}
- $self->{real_items} = \@items;
+sub get_current_page {
+ my ($self) = @_;
- for my $item (@items) {
- $item->{item} = $item;
- $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
- $item->update_item ();
- }
+ $self->{current}
+}
- my $i = 0;
- for (@items) {
- $self->{scrolled}->add (0, $i, $_);
- my $nrof = $_->{item}->{nrof} || 1;
- $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
- }
+sub set_current_page {
+ my ($self, $page_or_widget) = @_;
-# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
+ 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->{req_w}, $self->{req_h});
+
+ $self->{current}->size_request
}
-#############################################################################
+sub invoke_size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->{current}->configure (0, 0, $w, $h);
+
+ 1
+}
+
+sub _draw {
+ my ($self) = @_;
-package CFClient::UI::Menu;
+ $self->{current}->draw;
+}
+
+#############################################################################
-our @ISA = CFClient::UI::FancyFrame::;
+package CFPlus::UI::Notebook;
-use CFClient::OpenGL;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my $class = shift;
my $self = $class->SUPER::new (
- items => [],
- z => 100,
+ buttonbar => (new CFPlus::UI::Buttonbar),
+ multiplexer => (new CFPlus::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->add ($self->{vbox} = new CFClient::UI::VBox);
+ $self
+}
- for my $item (@{ $self->{items} }) {
- my ($widget, $cb) = @$item;
+sub add {
+ my ($self, $title, $widget, $tooltip) = @_;
- # 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;
- }
+ CFPlus::weaken $self;
- $self->{item}{$widget} = $item;
+ $self->{buttonbar}->add (new CFPlus::UI::Button
+ markup => $title,
+ tooltip => $tooltip,
+ on_activate => sub { $self->set_current_page ($widget) },
+ );
- $self->{vbox}->add ($widget);
- }
+ $self->{multiplexer}->add ($widget);
+}
+
+sub get_current_page {
+ my ($self) = @_;
+
+ $self->{multiplexer}->get_current_page
+}
+
+sub set_current_page {
+ my ($self, $page) = @_;
+
+ $self->{multiplexer}->set_current_page ($page);
+ $self->emit (page_changed => $self->{multiplexer}{current});
+}
+
+#############################################################################
+
+package CFPlus::UI::Selector;
+
+use utf8;
+
+our @ISA = CFPlus::UI::Button::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ options => [], # [value, title, longdesc], ...
+ value => undef,
+ @_,
+ );
+
+ $self->_set_value ($self->{value});
$self
}
-# popup given the event (must be a mouse button down event currently)
-sub popup {
+sub invoke_button_down {
my ($self, $ev) = @_;
- $self->_emit ("popdown");
+ my @menu_items;
- # maybe save $GRAB? must be careful about events...
- $GRAB = $self;
- $self->{button} = $ev->{button};
+ for (@{ $self->{options} }) {
+ my ($value, $title, $tooltip) = @$_;
- $self->show;
- $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+ push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
+ }
+
+ CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
-sub mouse_motion {
- my ($self, $ev, $x, $y) = @_;
+sub _set_value {
+ my ($self, $value) = @_;
- # TODO: should use vbox->find_widget or so
- $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
- $self->{hover} = $self->{item}{$HOVER};
+ 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 button_up {
- my ($self, $ev, $x, $y) = @_;
+sub set_value {
+ my ($self, $value) = @_;
- if ($ev->{button} == $self->{button}) {
- undef $GRAB;
- $self->hide;
+ return unless $self->{value} ne $value;
- $self->_emit ("popdown");
- $self->{hover}[1]->() if $self->{hover};
- }
+ $self->_set_value ($value);
+ $self->emit (changed => $value);
}
#############################################################################
-package CFClient::UI::Statusbox;
+package CFPlus::UI::Statusbox;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
sub new {
my $class = shift;
- $class->SUPER::new (
+ my $self = $class->SUPER::new (
fontsize => 0.8,
@_,
- )
+ );
+
+ CFPlus::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 $CFPlus::UI::TOOLTIP->{owner}
+ && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
+ values %{ $self->{item} };
while (my ($k, $v) = each %{ $self->{item} }) {
delete $self->{item}{$k} if $v->{timeout} < $NOW;
@@ -2957,11 +3845,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}"
@@ -2972,17 +3862,29 @@
s/\s+/ /g;
}
- new CFClient::UI::Label
+ new CFPlus::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,
- 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;
@@ -2995,7 +3897,9 @@
$text =~ s/^\s+//;
$text =~ s/\s+$//;
- my $timeout = time + ((delete $arg{timeout}) || 60);
+ return unless $text;
+
+ my $timeout = (int time) + ((delete $arg{timeout}) || 60);
my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
@@ -3006,7 +3910,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 {
@@ -3022,7 +3926,9 @@
};
}
- $self->reorder;
+ $ROOT->on_refresh (reorder => sub {
+ $self->reorder;
+ });
}
sub reconfigure {
@@ -3035,59 +3941,73 @@
$self->SUPER::reconfigure;
}
+sub destroy {
+ my ($self) = @_;
+
+ $self->{timer}->cancel;
+
+ $self->SUPER::destroy;
+}
+
#############################################################################
-package CFClient::UI::Root;
+package CFPlus::UI::Root;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
+
+use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub new {
my $class = shift;
- $class->SUPER::new (
+ my $self = $class->SUPER::new (
+ visible => 1,
@_,
- )
-}
+ );
-sub configure {
- my ($self, $x, $y, $w, $h) = @_;
+ CFPlus::weaken ($self->{root} = $self);
- $self->{w} = $w;
- $self->{h} = $h;
+ $self
}
-sub check_size {
+sub size_request {
my ($self) = @_;
- $self->size_allocate ($self->{w}, $self->{h})
- if $self->{w};
+ ($self->{w}, $self->{h})
}
-sub size_request {
- my ($self) = @_;
+sub _to_pixel {
+ my ($coord, $size, $max) = @_;
- ($self->{w}, $self->{h})
+ $coord =
+ $coord eq "center" ? ($max - $size) * 0.5
+ : $coord eq "max" ? $max
+ : $coord;
+
+ $coord = 0 if $coord < 0;
+ $coord = $max - $size if $coord > $max - $size;
+
+ int $coord + 0.5
}
-sub size_allocate {
+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)};
- $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
- if exists $child->{req_x};
+ $X = $child->{force_x} if exists $child->{force_x};
+ $Y = $child->{force_y} if exists $child->{force_y};
- $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
- if exists $child->{req_y};
-
- $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
- $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
+ $X = _to_pixel $X, $W, $self->{w};
+ $Y = _to_pixel $Y, $H, $self->{h};
$child->configure ($X, $Y, $W, $H);
}
+
+ 1
}
sub coord2local {
@@ -3105,26 +4025,14 @@
sub update {
my ($self) = @_;
- $self->check_size;
$::WANT_REFRESH++;
}
sub add {
my ($self, @children) = @_;
- for (my @widgets = @children; my $w = pop @widgets; ) {
- push @widgets, $w->children;
- $w->{root} = $self;
- $w->{visible} = 1;
- }
-
- for my $child (@children) {
- $child->{is_toplevel} = 1;
-
- # integerise window positions
- $child->{x} = int $child->{x};
- $child->{y} = int $child->{y};
- }
+ $_->{is_toplevel} = 1
+ for @children;
$self->SUPER::add (@children);
}
@@ -3134,6 +4042,9 @@
$self->SUPER::remove (@children);
+ delete $self->{is_toplevel}
+ for @children;
+
while (@children) {
my $w = pop @children;
push @children, $w->children;
@@ -3161,47 +4072,98 @@
for values %{delete $self->{refresh_hook}};
}
- if ($self->{check_size}) {
- my @queue = ([], []);
+ if ($self->{realloc}) {
+ my %queue;
+ my @queue;
+ my $widget;
+
+ outer:
+ while () {
+ if (my $realloc = delete $self->{realloc}) {
+ for $widget (values %$realloc) {
+ $widget->{visible} or next; # do not resize invisible widgets
- for (;;) {
- if ($self->{check_size}) {
- # heuristic: check containers last
- push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
- for values %{delete $self->{check_size}}
+ $queue{$widget+0}++ and next; # duplicates are common
+
+ push @{ $queue[$widget->{visible}] }, $widget;
+ }
}
- my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
+ while () {
+ @queue or last outer;
- my ($w, $h) = $widget->{user_w} && $widget->{user_h}
- ? @$widget{qw(user_w user_h)}
- : $widget->size_request;
-
- if (delete $widget->{force_alloc}
- or $w != $widget->{req_w} or $h != $widget->{req_h}) {
- Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
+ $widget = pop @{ $queue[-1] || [] }
+ and last;
+ pop @queue;
+ }
+
+ delete $queue{$widget+0};
+
+ my ($w, $h) = $widget->size_request;
+
+ $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+ $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+
+ $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+ $h = min $widget->{max_h}, $h if exists $widget->{max_h};
+
+ $w = $widget->{force_w} if exists $widget->{force_w};
+ $h = $widget->{force_h} if exists $widget->{force_h};
+
+ if ($widget->{req_w} != $w || $widget->{req_h} != $h
+ || delete $widget->{force_realloc}) {
$widget->{req_w} = $w;
$widget->{req_h} = $h;
- $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+ $self->{size_alloc}{$widget+0} = $widget;
+
+ if (my $parent = $widget->{parent}) {
+ $self->{realloc}{$parent+0} = $parent
+ unless $queue{$parent+0};
- $widget->{parent}->check_size
- if $widget->{parent};
+ $parent->{force_size_alloc} = 1;
+ $self->{size_alloc}{$parent+0} = $parent;
+ }
}
+
+ delete $self->{realloc}{$widget+0};
}
}
- while ($self->{size_alloc}) {
- for (values %{delete $self->{size_alloc}}) {
- my ($widget, $w, $h) = @$_;
+ while (my $size_alloc = delete $self->{size_alloc}) {
+ my @queue = sort { $b->{visible} <=> $a->{visible} }
+ values %$size_alloc;
+
+ while () {
+ my $widget = pop @queue || last;
+
+ my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
$w = 0 if $w < 0;
$h = 0 if $h < 0;
- $widget->{w} = $w;
- $widget->{h} = $h;
- $widget->emit (size_allocate => $w, $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 = int $w + 0.5;
+ $h = int $h + 0.5;
+
+ if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+ $widget->{old_w} = $widget->{w};
+ $widget->{old_h} = $widget->{h};
+
+ $widget->{w} = $w;
+ $widget->{h} = $h;
+
+ $widget->emit (size_allocate => $w, $h);
+ }
}
}
@@ -3210,6 +4172,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;
@@ -3220,15 +4183,22 @@
glMatrixMode GL_MODELVIEW;
glLoadIdentity;
- $self->_draw;
+ {
+ package CFPlus::UI::Base;
+
+ local ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+
+ $self->_draw;
+ }
}
#############################################################################
-package CFClient::UI;
+package CFPlus::UI;
-$ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip z => 900;
+$ROOT = new CFPlus::UI::Root;
+$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
1