--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/23 00:57:39 1.151
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/17 10:14:52 1.210
@@ -1,5 +1,6 @@
package CFClient::UI;
+use utf8;
use strict;
use Scalar::Util ();
@@ -13,16 +14,31 @@
our $TOOLTIP;
our $BUTTON_STATE;
+our %WIDGET; # all widgets, weak-referenced
+
sub check_tooltip {
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
- if (exists $widget->{tooltip}) {
+ if (length $widget->{tooltip}) {
if ($TOOLTIP->{owner} != $widget) {
$TOOLTIP->{owner} = $widget;
- $TOOLTIP->set_text ($widget->{tooltip});
- $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
+
+ my $tip = $widget->{tooltip};
+
+ $tip = $tip->($widget) if CODE:: eq ref $tip;
+
+ $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;
@@ -36,11 +52,13 @@
# class methods for events
sub feed_sdl_key_down_event {
- $FOCUS->key_down ($_[0]) if $FOCUS;
+ $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
+ if $FOCUS;
}
sub feed_sdl_key_up_event {
- $FOCUS->key_up ($_[0]) if $FOCUS;
+ $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
+ if $FOCUS;
}
sub feed_sdl_button_down_event {
@@ -58,7 +76,10 @@
$BUTTON_STATE |= 1 << ($ev->{button} - 1);
- $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+ if ($GRAB) {
+ ($x, $y) = $GRAB->coord2local ($x, $y);
+ $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
+ }
}
sub feed_sdl_button_up_event {
@@ -69,7 +90,10 @@
$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
- $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+ if ($GRAB) {
+ ($x, $y) = $GRAB->coord2local ($x, $y);
+ $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
+ }
if (!$BUTTON_STATE) {
my $grab = $GRAB; undef $GRAB;
@@ -95,7 +119,10 @@
check_tooltip;
}
- $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
+ if ($HOVER) {
+ ($x, $y) = $HOVER->coord2local ($x, $y);
+ $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
+ }
}
# convert position array to integers
@@ -111,6 +138,26 @@
}
}
+# call when resolution changes etc.
+sub rescale_widgets {
+ my ($sx, $sy) = @_;
+
+ for my $widget (values %WIDGET) {
+ if ($widget->{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->reconfigure;
+ }
+}
+
#############################################################################
package CFClient::UI::Base;
@@ -123,9 +170,9 @@
my $class = shift;
my $self = bless {
- x => 0,
- y => 0,
- z => 0,
+ x => 0,
+ y => 0,
+ z => 0,
can_events => 1,
@_
}, $class;
@@ -136,9 +183,18 @@
}
}
+ Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+
$self
}
+sub destroy {
+ my ($self) = @_;
+
+ $self->hide;
+ %$self = ();
+}
+
sub show {
my ($self) = @_;
@@ -150,9 +206,11 @@
sub hide {
my ($self) = @_;
- return unless $self->{parent};
+ undef $GRAB if $GRAB == $self;
+ undef $HOVER if $HOVER == $self;
- $self->{parent}->remove ($self);
+ $self->{parent}->remove ($self)
+ if $self->{parent};
}
sub move {
@@ -165,8 +223,13 @@
$self->update;
}
-sub needs_redraw {
- 0
+sub set_size {
+ my ($self, $w, $h) = @_;
+
+ $self->{user_w} = $w;
+ $self->{user_h} = $h;
+
+ $self->check_size;
}
sub size_request {
@@ -196,11 +259,7 @@
}
if ($self->{w} != $w || $self->{h} != $h) {
- $self->{w} = $w;
- $self->{h} = $h;
-
- $self->size_allocate ($w, $h);
- $self->update;
+ $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
}
}
@@ -208,27 +267,46 @@
# nothing to be done
}
-# return top left coordinates
-sub _topleft {
- my ($self, $x, $y) = @_;
+sub reconfigure {
+ my ($self) = @_;
+
+ $self->check_size (1);
+ $self->update;
+}
- $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
+sub 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;
+}
+
+sub set_tooltip {
+ my ($self, $tooltip) = @_;
+
+ $self->{tooltip} = $tooltip;
+
+ if ($CFClient::UI::TOOLTIP->{owner} == $self) {
+ delete $CFClient::UI::TOOLTIP->{owner};
+ CFClient::UI::check_tooltip;
+ }
}
# translate global coordinates to local coordinate system
sub coord2local {
my ($self, $x, $y) = @_;
- my ($X, $Y) = $self->_topleft;
- ($x - $X, $y - $Y)
+ $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
}
# translate local coordinates to global coordinate system
sub coord2global {
my ($self, $x, $y) = @_;
- my ($X, $Y) = $self->_topleft;
- ($x + $X, $y + $Y)
+ $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
}
sub focus_in {
@@ -298,6 +376,20 @@
glEnd;
glDisable GL_BLEND;
}
+
+ 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;
+ }
}
sub _draw {
@@ -322,21 +414,17 @@
my ($self, $parent) = @_;
Scalar::Util::weaken ($self->{parent} = $parent);
+
+ # TODO: req_w _does_change after ->reconfigure
+ $self->check_size
+ unless exists $self->{req_w};
}
sub check_size {
- my ($self) = @_;
-
- return unless $self->{parent};
-
- my ($w, $h) = $self->size_request;
+ my ($self, $forced) = @_;
- if ($w != $self->{req_w} || $h != $self->{req_h}) {
- $self->{req_w} = $w;
- $self->{req_h} = $h;
-
- $self->{parent}->check_size;
- }
+ $self->{force_alloc} = 1 if $forced;
+ $CFClient::UI::ROOT->{check_size}{$self} = $self;
}
sub update {
@@ -355,14 +443,13 @@
sub emit {
my ($self, $signal, @args) = @_;
- for my $cb (@{$self->{signal_cb}{$signal} || []}) {
- $cb->($self, @args);
- }
+ List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
}
sub DESTROY {
my ($self) = @_;
+ delete $WIDGET{$self+0};
#$self->deactivate;
}
@@ -381,8 +468,8 @@
# range [value, low, high, page]
$class->SUPER::new (
- bg => [0, 0, 0, 0.2],
- active_bg => [1, 1, 1, 0.5],
+ #bg => [0, 0, 0, 0.2],
+ #active_bg => [1, 1, 1, 0.5],
@_
)
}
@@ -390,20 +477,26 @@
sub _draw {
my ($self) = @_;
- my ($w, $h) = @$self{qw(w h)};
+ my $color = $FOCUS == $self && $self->{active_bg}
+ ? $self->{active_bg}
+ : $self->{bg};
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
+ if ($color && (@$color < 4 || $color->[3])) {
+ my ($w, $h) = @$self{qw(w h)};
- glBegin GL_QUADS;
- glVertex 0 , 0;
- glVertex 0 , $h;
- glVertex $w, $h;
- glVertex $w, 0;
- glEnd;
+ glEnable GL_BLEND;
+ glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glColor @$color;
- glDisable GL_BLEND;
+ glBegin GL_QUADS;
+ glVertex 0 , 0;
+ glVertex 0 , $h;
+ glVertex $w, $h;
+ glVertex $w, 0;
+ glEnd;
+
+ glDisable GL_BLEND;
+ }
}
#############################################################################
@@ -434,31 +527,42 @@
my $children = delete $arg{children} || [];
- my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
+ my $self = $class->SUPER::new (
+ children => [],
+ can_events => 0,
+ %arg,
+ );
$self->add ($_) for @$children;
$self
}
sub add {
- my ($self, $child) = @_;
+ my ($self, @widgets) = @_;
- $child->set_parent ($self);
+ $_->set_parent ($self)
+ for @widgets;
use sort 'stable';
$self->{children} = [
sort { $a->{z} <=> $b->{z} }
- @{$self->{children}}, $child
+ @{$self->{children}}, @widgets
];
- $child->check_size;
+ $self->check_size (1);
+ $self->update;
+}
+
+sub children {
+ @{ $_[0]{children} }
}
sub remove {
my ($self, $child) = @_;
delete $child->{parent};
+ $child->hide;
$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
@@ -466,6 +570,21 @@
$self->update;
}
+sub clear {
+ my ($self) = @_;
+
+ my $children = delete $self->{children};
+ $self->{children} = [];
+
+ for (@$children) {
+ delete $_->{parent};
+ $_->hide;
+ }
+
+ $self->check_size;
+ $self->update;
+}
+
sub find_widget {
my ($self, $x, $y) = @_;
@@ -548,27 +667,37 @@
sub update {
my ($self) = @_;
- # we want to do this delayed...
- $self->render_chld;
+ $ROOT->on_post_alloc ($self => sub { $self->render_child });
$self->SUPER::update;
}
-sub render_chld {
- my ($self) = @_;
+sub size_allocate {
+ my ($self, $w, $h) = @_;
- $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
- glClearColor 0, 0, 0, 1;
- glClear GL_COLOR_BUFFER_BIT;
- $self->child->draw;
- };
+ $self->SUPER::size_allocate ($w, $h);
+ $self->update;
}
-sub size_allocate {
- my ($self, $w, $h) = @_;
+sub _render {
+ $_[0]{children}[0]->draw;
+}
- $self->child->configure (0, 0, $w, $h);
+sub render_child {
+ my ($self) = @_;
- $self->render_chld;
+ $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+ glClearColor 0, 0, 0, 0;
+ glClear GL_COLOR_BUFFER_BIT;
+
+ $self->_render;
+# glColorMask 1, 1, 1, 0;
+# glEnable GL_BLEND;
+# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
+# glRasterPos 0, 0;
+# glCopyPixels 0, 0, $self->{w}, $self->{h};
+# glDisable GL_BLEND;
+# glColorMask 1, 1, 1, 1;
+ };
}
sub _draw {
@@ -579,14 +708,12 @@
my $tex = $self->{texture}
or return;
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glColor 0, 0, 0, 1;
- $tex->draw_quad (0, 0, $w, $h);
+ $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
- glDisable GL_BLEND;
glDisable GL_TEXTURE_2D;
}
@@ -596,86 +723,139 @@
our @ISA = CFClient::UI::Window::;
-sub new { die }
-
sub size_request {
my ($self) = @_;
@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
- $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
+ $self->child->configure (0, 0, @$self{qw(child_w child_h)});
@$self{qw(child_w child_h)}
}
-sub _draw {
- my ($self) = @_;
+sub size_allocate {
+ my ($self, $w, $h) = @_;
- $self->{children}[1]->draw;
+ $self->update;
}
+sub set_offset {
+ my ($self, $x, $y) = @_;
-#############################################################################
+ $self->{view_x} = int $x;
+ $self->{view_y} = int $y;
-package CFClient::UI::Frame;
+ $self->update;
+}
-our @ISA = CFClient::UI::Bin::;
+# hmm, this does not work for topleft of $self... but we should not ask for that
+sub coord2local {
+ my ($self, $x, $y) = @_;
-use CFClient::OpenGL;
+ $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
+}
+
+sub coord2global {
+ my ($self, $x, $y) = @_;
+
+ $x = List::Util::min $self->{w}, $x - $self->{view_x};
+ $y = List::Util::min $self->{h}, $y - $self->{view_y};
+
+ $self->SUPER::coord2global ($x, $y)
+}
+
+sub find_widget {
+ my ($self, $x, $y) = @_;
+
+ if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
+ && $y >= $self->{y} && $y < $self->{y} + $self->{h}
+ ) {
+ $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
+ } else {
+ $self->CFClient::UI::Base::find_widget ($x, $y)
+ }
+}
+
+sub _render {
+ my ($self) = @_;
+
+ CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+
+ $self->SUPER::_render;
+}
+
+#############################################################################
+
+package CFClient::UI::ScrolledWindow;
+
+our @ISA = CFClient::UI::HBox::;
sub new {
my $class = shift;
- my $self = $class->SUPER::new (
- bg => [1, 1, 1, 1],
- border_bg => [1, 1, 1, 1],
- border => 0.8,
- @_
+ 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] * ($self->{vp}{child_h} - $self->{vp}{h}));
+ },
+ ;
+
+ $self = $class->SUPER::new (
+ vp => (new CFClient::UI::ViewPort),
+ slider => $slider,
+ @_,
);
+ $self->{vp}->add ($self->{scrolled});
+ $self->add ($self->{vp});
+ $self->add ($self->{slider});
+
$self
}
-sub set_size {
- my ($self, $w, $h) = @_;
- $self->{req_w} = $w;
- $self->{req_h} = $h;
- $self->check_size;
-}
+#TODO# update range on size_allocate depending on child
+# update viewport offset on scroll
-sub size_request {
- my ($self) = @_;
- ($self->{req_w}, $self->{req_h})
-}
+#############################################################################
-sub size_allocate {
- my ($self, $w, $h) = @_;
- $self->{w} = $w;
- $self->{h} = $h;
- $self->child->configure (0, 0, $w, $h);
+package CFClient::UI::Frame;
+
+our @ISA = CFClient::UI::Bin::;
+
+use CFClient::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ bg => undef,
+ @_,
+ )
}
sub _draw {
my ($self) = @_;
- my ($w, $h) = ($self->{w}, $self->{h});
+ if ($self->{bg}) {
+ my ($w, $h) = @$self{qw(w h)};
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glEnable GL_BLEND;
+ glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glColor @{ $self->{bg} };
-# glBegin GL_QUADS;
-# glColor 0, 0, 0, 0;
-# glVertex 0 , 0;
-# glVertex 0 , $h;
-# glVertex $w, $h;
-# glVertex $w, 0;
-# glEnd;
+ glBegin GL_QUADS;
+ glVertex 0 , 0;
+ glVertex 0 , $h;
+ glVertex $w, $h;
+ glVertex $w, 0;
+ glEnd;
+ glDisable GL_BLEND;
+ }
- $self->child->draw;
- glDisable GL_BLEND;
- glDisable GL_TEXTURE_2D;
+ $self->SUPER::_draw;
}
#############################################################################
@@ -696,9 +876,10 @@
# TODO: user_x, user_y, overwrite moveto?
my $self = $class->SUPER::new (
- bg => [1, 1, 1, 1],
- border_bg => [1, 1, 1, 1],
- border => 0.8,
+ bg => [1, 1, 1, 1],
+ border_bg => [1, 1, 1, 1],
+ border => 0.6,
+ toplevel => 1,
can_events => 1,
@_
);
@@ -707,7 +888,7 @@
align => 0,
valign => 1,
text => $self->{title},
- fontsize => 1;
+ fontsize => $self->{border};
$self
}
@@ -719,8 +900,6 @@
sub size_request {
my ($self) = @_;
- return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
-
my ($w, $h) = $self->SUPER::size_request;
(
@@ -735,7 +914,7 @@
$h -= List::Util::max 0, $self->border * 2;
$w -= List::Util::max 0, $self->border * 2;
- $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
+ $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
if $self->{title};
$self->child->configure ($self->border, $self->border, $w, $h);
@@ -744,27 +923,33 @@
sub button_down {
my ($self, $ev, $x, $y) = @_;
+ my ($w, $h) = @$self{qw(w h)};
my $border = $self->border;
- if ($x < $self->{w} && $x >= $self->{w} - $border
- && $y < $self->{h} && $y >= $self->{h} - $border) {
+ my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
+ my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
+ if ($lr & $td) {
+ my ($wx, $wy) = ($self->{x}, $self->{y});
my ($ox, $oy) = ($ev->{x}, $ev->{y});
my ($bw, $bh) = ($self->{w}, $self->{h});
+ my $mx = $x < $border;
+ my $my = $y < $border;
+
$self->{motion} = sub {
my ($ev, $x, $y) = @_;
- ($x, $y) = ($ev->{x}, $ev->{y});
+ my $dx = $ev->{x} - $ox;
+ my $dy = $ev->{y} - $oy;
- $self->{user_w} = $bw + $x - $ox;
- $self->{user_h} = $bh + $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;
};
- } elsif ($x >= 0 && $x < $self->{w}
- && $y >= 0 && $y < $border) {
-
+ } elsif ($lr ^ $td) {
my ($ox, $oy) = ($ev->{x}, $ev->{y});
my ($bx, $by) = ($self->{x}, $self->{y});
@@ -797,36 +982,36 @@
my ($w, $h ) = ($self->{w}, $self->{h});
my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
my $border = $self->border;
glColor @{ $self->{border_bg} };
- $tex[1]->draw_quad (0, 0, $w, $border);
- $tex[3]->draw_quad (0, $border, $border, $ch);
- $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
- $tex[4]->draw_quad (0, $h - $border, $w, $border);
-
- 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;
- $bg->draw_quad ($border, $border, $cw, $ch);
+ $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);
+
+ 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;
+ $bg->draw_quad_alpha ($border, $border, $cw, $ch);
+ }
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
$self->{title}->draw if $self->{title};
+
$self->child->draw;
}
@@ -858,11 +1043,22 @@
$child->check_size;
}
+sub children {
+ grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
+
# TODO: move to container class maybe? send childs a signal on removal?
sub clear {
my ($self) = @_;
+ my @children = $self->children;
delete $self->{children};
+
+ for (@children) {
+ delete $_->{parent};
+ $_->hide;
+ }
+
$self->update;
}
@@ -1049,6 +1245,8 @@
sub 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;
@@ -1087,7 +1285,7 @@
package CFClient::UI::Label;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFClient::UI::DrawBG::;
use CFClient::OpenGL;
@@ -1095,13 +1293,17 @@
my ($class, %arg) = @_;
my $self = $class->SUPER::new (
- fg => [1, 1, 1],
- fontsize => 1,
- text => "",
- align => -1,
- valign => -1,
- padding => 2,
- layout => new CFClient::Layout,
+ fg => [1, 1, 1],
+ #bg => none
+ #active_bg => none
+ #font => default_font
+ #text => initial text
+ #markup => initial narkup
+ layout => (new CFClient::Layout),
+ fontsize => 1,
+ align => -1,
+ valign => -1,
+ padding => 2,
can_events => 0,
%arg
);
@@ -1112,51 +1314,71 @@
$self->{template} = $layout;
}
- $self->set_text (delete $self->{text}) if exists $self->{text};
- $self->set_markup (delete $self->{markup}) if exists $self->{markup};
+ if (exists $self->{markup}) {
+ $self->set_markup (delete $self->{markup});
+ } else {
+ $self->set_text (delete $self->{text});
+ }
$self
}
-sub escape_text {
- local $_ = $_[1];
+sub escape($) {
+ local $_ = $_[0];
s/&/&/g;
s/>/>/g;
s/{texture};
+ $self->SUPER::update;
}
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->{texture};
- $self->check_size;
$self->update;
+ $self->check_size;
}
sub set_markup {
my ($self, $markup) = @_;
+ return if $self->{text} eq "M$markup";
+ $self->{text} = "M$markup";
+
+ 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->{texture};
- $self->check_size;
$self->update;
+ $self->check_size;
}
sub size_request {
my ($self) = @_;
- $self->{layout}->set_width;
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
+ $self->{layout}->set_width ($self->{max_w} || -1);
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
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);
my ($w2, $h2) = $self->{template}->size;
@@ -1181,41 +1403,47 @@
my ($self, $fontsize) = @_;
$self->{fontsize} = $fontsize;
+ delete $self->{texture};
+
+ $self->update;
$self->check_size;
}
sub _draw {
my ($self) = @_;
+ $self->SUPER::_draw; # draw background, if applicable
+
my $tex = $self->{texture} ||= do {
+ $self->{layout}->set_foreground (@{$self->{fg}});
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
$self->{layout}->set_width ($self->{w});
$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
- new_from_layout CFClient::Texture $self->{layout}
- };
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ my $tex = new_from_layout CFClient::Texture $self->{layout};
- glColor @{$self->{fg}};
+ $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
+ : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+ : ($self->{w} - $tex->{w}) * 0.5);
- $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);
- $self->{oy} = int (
- $self->{valign} < 0 ? $self->{padding}
- : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
- : ($self->{h} - $tex->{h}) * 0.5
- );
+ $tex
+ };
- $tex->draw_quad ($self->{ox}, $self->{oy});
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+ 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});
+ }
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
}
#############################################################################
@@ -1230,13 +1458,13 @@
my $class = shift;
$class->SUPER::new (
- fg => [1, 1, 1],
- bg => [0, 0, 0, 0.2],
- active_bg => [1, 1, 1, 0.5],
- active_fg => [0, 0, 0],
- can_hover => 1,
- can_focus => 1,
- valign => 0,
+ fg => [1, 1, 1],
+ bg => [0, 0, 0, 0.2],
+ active_bg => [1, 1, 1, 0.5],
+ active_fg => [0, 0, 0],
+ can_hover => 1,
+ can_focus => 1,
+ valign => 0,
can_events => 1,
@_
)
@@ -1260,6 +1488,15 @@
$self->emit (changed => $self->{text});
}
+sub set_text {
+ my ($self, $text) = @_;
+
+ $self->{cursor} = length $text;
+ $self->_set_text ($text);
+ $self->update;
+ $self->check_size;
+}
+
sub get_text {
$_[0]{text}
}
@@ -1278,14 +1515,6 @@
$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
}
-sub set_text {
- my ($self, $text) = @_;
-
- $self->{cursor} = length $text;
- $self->_set_text ($text);
- $self->update;
-}
-
sub key_down {
my ($self, $ev) = @_;
@@ -1295,9 +1524,9 @@
my $text = $self->get_text;
- if ($sym == 8) {
+ if ($uni == 8) {
substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
- } elsif ($sym == 127) {
+ } elsif ($uni == 127) {
substr $text, $self->{cursor}, 1, "";
} elsif ($sym == CFClient::SDLK_LEFT) {
--$self->{cursor} if $self->{cursor};
@@ -1307,7 +1536,7 @@
$self->{cursor} = 0;
} elsif ($sym == CFClient::SDLK_END) {
$self->{cursor} = length $text;
- } elsif ($sym == 27) {
+ } elsif ($uni == 27) {
$self->emit ('escape');
} elsif ($uni) {
substr $text, $self->{cursor}++, 0, chr $uni;
@@ -1315,6 +1544,7 @@
$self->_set_text ($text);
$self->update;
+ $self->check_size;
}
sub focus_in {
@@ -1400,9 +1630,35 @@
my $sym = $ev->{sym};
if ($sym == 13) {
- $self->emit (activate => $self->get_text);
+ unshift @{$self->{history}},
+ my $txt = $self->get_text;
+ $self->{history_pointer} = -1;
+ $self->{history_saveback} = '';
+ $self->emit (activate => $txt);
$self->update;
+ } elsif ($sym == CFClient::SDLK_UP) {
+ if ($self->{history_pointer} < 0) {
+ $self->{history_saveback} = $self->get_text;
+ }
+ if (@{$self->{history} || []} > 0) {
+ $self->{history_pointer}++;
+ if ($self->{history_pointer} >= @{$self->{history} || []}) {
+ $self->{history_pointer} = @{$self->{history} || []} - 1;
+ }
+ $self->set_text ($self->{history}->[$self->{history_pointer}]);
+ }
+
+ } elsif ($sym == CFClient::SDLK_DOWN) {
+ $self->{history_pointer}--;
+ $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
+
+ if ($self->{history_pointer} >= 0) {
+ $self->set_text ($self->{history}->[$self->{history_pointer}]);
+ } else {
+ $self->set_text ($self->{history_saveback});
+ }
+
} else {
$self->SUPER::key_down ($ev);
}
@@ -1425,13 +1681,12 @@
my $class = shift;
$class->SUPER::new (
- padding => 4,
- fg => [1, 1, 1],
- bg => [1, 1, 1, 0.2],
- active_fg => [0, 0, 1],
- can_hover => 1,
- align => 0,
- valign => 0,
+ padding => 4,
+ fg => [1, 1, 1],
+ active_fg => [0, 0, 1],
+ can_hover => 1,
+ align => 0,
+ valign => 0,
can_events => 1,
@_
)
@@ -1455,16 +1710,13 @@
$self->{fg} = $self->{active_fg};
}
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 0, 0, 0, 1;
- $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
+ $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
$self->SUPER::_draw;
}
@@ -1488,6 +1740,8 @@
padding => 2,
fg => [1, 1, 1],
active_fg => [1, 1, 0],
+ bg => [0, 0, 0, 0.2],
+ active_bg => [1, 1, 1, 0.5],
state => 0,
can_hover => 1,
@_
@@ -1521,16 +1775,11 @@
glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
- glEnable GL_BLEND;
- glEnable GL_TEXTURE_2D;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-
my $tex = $self->{state} ? $tex[1] : $tex[0];
- $tex->draw_quad (0, 0, $s, $s);
-
+ glEnable GL_TEXTURE_2D;
+ $tex->draw_quad_alpha (0, 0, $s, $s);
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
}
#############################################################################
@@ -1583,14 +1832,11 @@
($w, $h) = ($h, $w);
}
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $tex->draw_quad (0, 0, $w, $h);
+ $tex->draw_quad_alpha (0, 0, $w, $h);
- glDisable GL_BLEND;
glDisable GL_TEXTURE_2D;
}
@@ -1600,6 +1846,8 @@
our @ISA = CFClient::UI::Base::;
+use List::Util qw(min max);
+
use CFClient::OpenGL;
my %tex = (
@@ -1609,7 +1857,7 @@
],
grace => [
map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
- qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
+ 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 }
@@ -1617,7 +1865,7 @@
],
mana => [
map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
- qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
+ qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
],
);
@@ -1646,7 +1894,10 @@
sub set_max {
my ($self, $max) = @_;
+ return if $self->{max_val} == $max;
+
$self->{max_val} = $max;
+ $self->update;
}
sub set_value {
@@ -1655,9 +1906,9 @@
$self->set_max ($max)
if defined $max;
- $max = $self->{max_val};
- $self->{val} = $val;
+ return if $self->{val} == $val;
+ $self->{val} = $val;
$self->update;
}
@@ -1665,6 +1916,7 @@
my ($self) = @_;
my $tex = $tex{$self->{type}};
+ my ($t1, $t2, $t3) = @$tex;
my ($w, $h) = ($self->{w}, $self->{h});
@@ -1676,35 +1928,45 @@
}
my $ycut = $self->{val} / ($self->{max_val} || 1);
- $ycut = 1 if $self->{val} > $self->{max_val};
- my $t1 = $tex->[0];
- my $t2 = $tex->[1];
+ my $ycut1 = max 0, min 1, $ycut;
+ my $ycut2 = max 0, min 1, $ycut - 1;
+
+ my $h1 = $self->{h} * (1 - $ycut1);
+ my $h2 = $self->{h} * (1 - $ycut2);
glEnable GL_BLEND;
glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- my $h1 = $self->{h} - $ycut * $self->{h};
- my $h2 = $ycut * $self->{h};
-
glBindTexture GL_TEXTURE_2D, $t1->{name};
glBegin GL_QUADS;
- glTexCoord 0 , 0; glVertex 0 , 0;
- glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
- glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
- glTexCoord $t1->{s}, 0; glVertex $w, 0;
+ glTexCoord 0 , 0; glVertex 0 , 0;
+ glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
+ glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
+ glTexCoord $t1->{s}, 0; glVertex $w, 0;
glEnd;
+ my $ycut1 = List::Util::min 1, $ycut;
glBindTexture GL_TEXTURE_2D, $t2->{name};
glBegin GL_QUADS;
- glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
- glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2;
- glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2;
- glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
+ glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
+ glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
+ glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
+ glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
glEnd;
+ if ($t3) {
+ 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 $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
+ glEnd;
+ }
+
glDisable GL_BLEND;
glDisable GL_TEXTURE_2D;
}
@@ -1719,12 +1981,14 @@
my ($class, %arg) = @_;
my $self = $class->SUPER::new (
- tooltip => $arg{type},
+ tooltip => $arg{type},
+ can_hover => 1,
+ can_events => 1,
%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);
+ $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
@@ -1737,6 +2001,13 @@
$self->{max} ->set_fontsize ($fsize);
}
+sub set_max {
+ my ($self, $max) = @_;
+
+ $self->{gauge}->set_max ($max);
+ $self->{max}->set_text ($max);
+}
+
sub set_value {
my ($self, $val, $max) = @_;
@@ -1747,13 +2018,6 @@
$self->{value}->set_text ($val);
}
-sub set_max {
- my ($self, $max) = @_;
-
- $self->{gauge}->set_max ($max);
- $self->{max}->set_text ($max);
-}
-
#############################################################################
package CFClient::UI::Slider;
@@ -1771,7 +2035,7 @@
sub new {
my $class = shift;
- # range [value, low, high, page]
+ # range [value, low, high, page, unit]
# TODO: 0-width page
# TODO: req_w/h are wrong with vertical
@@ -1779,18 +2043,46 @@
my $self = $class->SUPER::new (
fg => [1, 1, 1],
active_fg => [0, 0, 0],
+ bg => [0, 0, 0, 0.2],
+ active_bg => [1, 1, 1, 0.5],
range => [0, 0, 100, 10],
- req_w => 20,
- req_h => 20,
+ req_w => $::WIDTH / 80,
+ req_h => $::WIDTH / 80,
vertical => 0,
can_hover => 1,
- inner_pad => 5,
+ inner_pad => .05,
@_
);
+ $self->set_value ($self->{range}[0]);
+ $self->update;
+
$self
}
+sub set_value {
+ my ($self, $value) = @_;
+
+ my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
+
+ $hi = $lo + 1 if $hi <= $lo;
+
+ $value = $lo if $value < $lo;
+ $value = $hi if $value > $hi;
+
+ $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
+ if $unit;
+
+ $page = $hi - $lo if $page > $hi - $lo;
+
+ @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
+
+ if ($value != $old_value) {
+ $self->emit (changed => $value);
+ $self->update;
+ }
+}
+
sub size_request {
my ($self) = @_;
@@ -1811,30 +2103,41 @@
my ($self, $ev, $x, $y) = @_;
if ($GRAB == $self) {
- my ($value, $lo, $hi, $page) = @{$self->{range}};
-
my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
- my $inner_pad_px = $self->_calc_inner_pad_px ($w);
- my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
+ my (undef, $lo, $hi, $page) = @{$self->{range}};
- $x -= $inner_pad_px; # substract the padding
- $x = $x * ($hi - $lo) / $inner_w + $lo;
- $x = $lo if $x < $lo;
- $x = $hi - $page if $x > $hi - $page;
- $self->{range}[0] = $x;
+ $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
- $self->emit (changed => $x);
- $self->update;
+ $self->set_value ($x * ($hi - $lo) + $lo);
}
}
-# the inner_* stuff is for generating a padding for the slider handle,
-# so that the handle doesn't leave the texture. This calculation isn't 100%
-# correct propably, but it does the job for now
-sub _calc_inner_pad_px {
- my ($self, $w) = @_;
- ($w / 100) * $self->{inner_pad} # % to pixels
+sub update {
+ my ($self) = @_;
+
+ $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+ $self->set_value ($self->{range}[0]);
+
+ my ($value, $lo, $hi, $page) = @{$self->{range}};
+
+ my $inner_w = 1 - 2 * $self->{inner_pad};
+
+ $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
+
+ $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
+ $value = $self->{scale} * ($value - $lo);
+
+ $value = $self->{inner_pad} + ($value - $page * 0.5);
+
+ $value = 0 if $value < 0;
+ $page = 1 - $value if $value + $page > 1;
+
+ $self->{knob_x} = $value;
+ $self->{knob_w} = $page;
+ });
+
+ $self->SUPER::update;
}
sub _draw {
@@ -1842,50 +2145,27 @@
$self->SUPER::_draw ();
- my ($w, $h) = @$self{qw(w h)};
+ glScale $self->{w}, $self->{h};
if ($self->{vertical}) {
# draw a vertical slider like a rotated horizontal slider
glRotate 90, 0, 0, 1;
- glTranslate 0, -$self->{w}, 0;
-
- ($w, $h) = ($h, $w);
+ glTranslate 0, 1, 0;
}
my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
- my ($value, $lo, $hi, $page) = @{$self->{range}};
-
- $hi = $value + 1 if $lo == $hi;
-
- my $inner_pad_px = $self->_calc_inner_pad_px ($w);
- my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
-
- $page = int $page * $inner_w / ($hi - $lo);
- $value = int +($value - $lo) * $inner_w / ($hi - $lo);
-
- $w -= $page;
- $page &= ~1;
- glTranslate $page * 0.5, 0, 0;
- $page ||= 2;
-
- my $knob_a = $inner_pad_px + ($value - $page * 0.5);
- my $knob_b = $inner_pad_px + ($value + $page * 0.5);
-
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
# draw background
- $tex[1]->draw_quad (0, 0, $w, $h);
+ $tex[1]->draw_quad_alpha (0, 0, 1, 1);
# draw handle
- $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
+ $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
- glDisable GL_BLEND;
glDisable GL_TEXTURE_2D;
}
@@ -1901,21 +2181,21 @@
my $class = shift;
my $self = $class->SUPER::new (
- fontsize => 1,
+ fontsize => 1,
+ can_events => 0,
+ #font => default_font
@_,
-
- layout => (new CFClient::Layout),
- par => [],
- height => 0,
- children => [
+
+ layout => (new CFClient::Layout 1),
+ par => [],
+ height => 0,
+ children => [
(new CFClient::UI::Empty expand => 1),
(new CFClient::UI::Slider vertical => 1),
],
);
- $self->{children}[1]->connect (changed => sub {
- $self->update;
- });
+ $self->{children}[1]->connect (changed => sub { $self->update });
$self
}
@@ -1933,8 +2213,8 @@
my $layout = $self->{layout};
$layout->set_height ($self->{fontsize} * $::FONTSIZE);
- $layout->set_width ($self->{w});
- $layout->set_text ($text);
+ $layout->set_width ($self->{children}[0]{w});
+ $layout->set_markup ($text);
($layout->size)[1]
}
@@ -1951,6 +2231,7 @@
$self->SUPER::size_allocate ($w, $h);
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
$self->{layout}->set_width ($self->{children}[0]{w});
@@ -1981,7 +2262,7 @@
delete $self->{texture};
- $ROOT->on_refresh ($self, sub {
+ $ROOT->on_post_alloc ($self, sub {
if (delete $self->{need_reflow}) {
my $height = 0;
@@ -1995,12 +2276,10 @@
delete $self->{texture};
}
- $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
- glClearColor 0, 0, 0, 1;
+ $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
+ glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
- glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2013,22 +2292,23 @@
my $layout = $self->{layout};
+ $layout->set_font ($self->{font}) if $self->{font};
+
for my $par (@{$self->{par}}) {
my $h = $par->[0];
if ($y0 < $y + $h && $y < $y1) {
- $layout->set_text ($par->[2]);
+ $layout->set_foreground (@{ $par->[1] });
+ $layout->set_markup ($par->[2]);
- glColor @{ $par->[1] };
my ($W, $H) = $layout->size;
- CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+ CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
}
$y += $h;
}
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
};
});
}
@@ -2036,12 +2316,11 @@
sub _draw {
my ($self) = @_;
- if ($self->{texture}) {
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
- glDisable GL_TEXTURE_2D;
- }
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glColor 1, 1, 1, 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;
@@ -2099,9 +2378,8 @@
my $class = shift;
my $self = $class->SUPER::new (
- state => 0,
+ state => 0,
connect_activate => \&toggle_flopper,
- can_events => 1,
@_
);
@@ -2131,37 +2409,480 @@
#############################################################################
+package CFClient::UI::Tooltip;
+
+our @ISA = CFClient::UI::Bin::;
+
+use CFClient::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ @_,
+ can_events => 0,
+ )
+}
+
+sub set_tooltip_from {
+ my ($self, $widget) = @_;
+
+ $self->add (new CFClient::UI::Label
+ markup => $widget->{tooltip},
+ max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+ fontsize => 0.8,
+ fg => [0, 0, 0, 1],
+ font => ($widget->{tooltip_font} || $::FONT_PROP),
+ );
+}
+
+sub size_request {
+ my ($self) = @_;
+
+ my ($w, $h) = @{$self->child}{qw(req_w req_h)};
+
+ ($w + 4, $h + 4)
+}
+
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->SUPER::size_allocate ($w - 4, $h - 4);
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ glTranslate 0.375, 0.375;
+
+ my ($w, $h) = @$self{qw(w h)};
+
+ glColor 1, 0.8, 0.4;
+ glBegin GL_QUADS;
+ glVertex 0 , 0;
+ glVertex 0 , $h;
+ glVertex $w, $h;
+ glVertex $w, 0;
+ glEnd;
+
+ glColor 0, 0, 0;
+ glBegin GL_LINE_LOOP;
+ glVertex 0 , 0;
+ glVertex 0 , $h;
+ glVertex $w, $h;
+ glVertex $w, 0;
+ glEnd;
+
+ glTranslate 2 - 0.375, 2 - 0.375;
+ $self->SUPER::_draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Face;
+
+our @ISA = CFClient::UI::Base::;
+
+use CFClient::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ aspect => 1,
+ @_,
+ )
+}
+
+sub size_request {
+ (32, 8)
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ return unless $::CONN;#d# manage and cache textures differently
+ my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+
+ # TODO animation
+ if ($tex) {
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+ glColor 1, 1, 1, 1;
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+ glDisable GL_TEXTURE_2D;
+ }
+}
+
+#############################################################################
+
+package CFClient::UI::InventoryItem;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+ my $class = shift;
+
+ my %args = @_;
+
+ my $item = delete $args{item};
+
+ 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 .= " *";
+
+ my $self = $class->SUPER::new (
+ can_hover => 1,
+ can_events => 1,
+ tooltip => ((CFClient::UI::Label::escape $desc)
+ . "\nleftclick - pick up\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->{button} == 1) {
+ $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
+ } 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 $item->{tag}") }],
+ ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
+ ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
+ [
+ $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
+ sub { $::CONN->send ("lock ". () ."$item->{tag}") },
+ ],
+ );
+
+ CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+ }
+
+ 1
+ },
+ %args
+ );
+
+ $self->add (new CFClient::UI::Face
+ can_events => 0,
+ face => $item->{face},
+ anim => $item->{anim},
+ animspeed => $item->{animspeed},
+ );
+
+ $self->add (new CFClient::UI::Label
+ can_events => 0,
+ text => $desc,
+ );
+
+ $self
+}
+
+#############################################################################
+
+package CFClient::UI::Inventory;
+
+our @ISA = CFClient::UI::ScrolledWindow::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ scrolled => (new CFClient::UI::VBox),
+ @_,
+ );
+
+ $self
+}
+
+sub set_items {
+ my ($self, $items) = @_;
+
+ $self->{scrolled}->clear;
+ return unless $items;
+
+ my @items = sort {
+ ($a->{type} <=> $b->{type})
+ or ($a->{name} cmp $b->{name})
+ } @$items;
+
+ $self->{real_items} = \@items;
+
+ for my $item (@items) {
+ my $desc = $item->{nrof} < 2
+ ? $item->{name}
+ : "$item->{nrof} $item->{name_pl}";
+
+ $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
+ }
+
+ $self->{scrolled}->add (@items);
+
+# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
+}
+
+sub size_request {
+ my ($self) = @_;
+ ($self->{req_w}, $self->{req_h});
+}
+
+#############################################################################
+
+package CFClient::UI::Menu;
+
+our @ISA = CFClient::UI::FancyFrame::;
+
+use CFClient::OpenGL;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ items => [],
+ z => 100,
+ @_,
+ );
+
+ $self->add ($self->{vbox} = new CFClient::UI::VBox);
+
+ for my $item (@{ $self->{items} }) {
+ my ($widget, $cb) = @$item;
+
+ # handle various types of items, only text for now
+ if (!ref $widget) {
+ $widget = new CFClient::UI::Label
+ can_hover => 1,
+ can_events => 1,
+ text => $widget;
+ }
+
+ $self->{item}{$widget} = $item;
+
+ $self->{vbox}->add ($widget);
+ }
+
+ $self
+}
+
+# popup given the event (must be a mouse button down event currently)
+sub popup {
+ my ($self, $ev) = @_;
+
+ $self->emit ("popdown");
+
+ # maybe save $GRAB? must be careful about events...
+ $GRAB = $self;
+ $self->{button} = $ev->{button};
+
+ $self->show;
+ $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+}
+
+sub mouse_motion {
+ my ($self, $ev, $x, $y) = @_;
+
+ # TODO: should use vbox->find_widget or so
+ $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
+ $self->{hover} = $self->{item}{$HOVER};
+}
+
+sub button_up {
+ my ($self, $ev, $x, $y) = @_;
+
+ if ($ev->{button} == $self->{button}) {
+ undef $GRAB;
+ $self->hide;
+
+ $self->emit ("popdown");
+ $self->{hover}[1]->() if $self->{hover};
+ }
+}
+
+#############################################################################
+
+package CFClient::UI::Statusbox;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ fontsize => 0.8,
+ @_,
+ )
+}
+
+sub reorder {
+ my ($self) = @_;
+ my $NOW = time;
+
+ while (my ($k, $v) = each %{ $self->{item} }) {
+ delete $self->{item}{$k} if $v->{timeout} < $NOW;
+ }
+
+ my @widgets;
+
+ my @items = sort {
+ $a->{pri} <=> $b->{pri}
+ or $b->{id} <=> $a->{id}
+ } values %{ $self->{item} };
+
+ my $count = 10 + 1;
+ for my $item (@items) {
+ last unless --$count;
+
+ push @widgets, $item->{label} ||= do {
+ # TODO: doesn't handle markup well (read as: at all)
+ my $short = $item->{count} > 1
+ ? "$item->{count} × $item->{text}"
+ : $item->{text};
+
+ my $fontsize = $item->{fontsize} || $self->{fontsize};
+
+ for ($short) {
+ s/^\s+//;
+ s/\s+/ /g;
+ my $len = int 40 / $fontsize;
+ substr $_, $len, length, "…" if $len < length;
+ }
+
+ new CFClient::UI::Label
+ markup => $short,
+ tooltip => $item->{tooltip},
+ tooltip_font => $::FONT_PROP,
+ tooltip_width => 0.67,
+ fontsize => $fontsize,
+ fg => $item->{fg},
+ can_events => 1,
+ can_hover => 1
+ };
+ }
+
+ $self->clear;
+ $self->SUPER::add (reverse @widgets);
+}
+
+sub add {
+ my ($self, $text, %arg) = @_;
+
+ $text =~ s/^\s+//;
+ $text =~ s/\s+$//;
+
+ my $timeout = time + ((delete $arg{timeout}) || 60);
+
+ my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
+
+ if (my $item = $self->{item}{$group}) {
+ if ($item->{text} eq $text) {
+ $item->{count}++;
+ } else {
+ $item->{count} = 1;
+ $item->{text} = $item->{tooltip} = $text;
+ }
+ $item->{id} = ++$self->{id};
+ $item->{timeout} = $timeout;
+ delete $item->{label};
+ } else {
+ $self->{item}{$group} = {
+ id => ++$self->{id},
+ text => $text,
+ timeout => $timeout,
+ tooltip => $text,
+ fg => [0.8, 0.8, 0.8, 0.8],
+ pri => 0,
+ count => 1,
+ %arg,
+ };
+ }
+
+ $self->reorder;
+}
+
+#############################################################################
+
package CFClient::UI::Root;
our @ISA = CFClient::UI::Container::;
use CFClient::OpenGL;
+sub new {
+ my $class = shift;
+
+ $class->SUPER::new (
+ @_,
+ )
+}
+
+sub configure {
+ my ($self, $x, $y, $w, $h) = @_;
+
+ $self->{w} = $w;
+ $self->{h} = $h;
+}
+
sub check_size {
my ($self) = @_;
- $self->configure (0, 0, $::WIDTH, $::HEIGHT);
+ $self->size_allocate ($self->{w}, $self->{h})
+ if $self->{w};
}
sub size_request {
- ($::WIDTH, $::HEIGHT)
+ my ($self) = @_;
+
+ ($self->{w}, $self->{h})
}
-sub configure {
- my ($self, $x, $y, $w, $h) = @_;
+sub size_allocate {
+ my ($self, $w, $h) = @_;
- $self->SUPER::configure ($x, $y, $w, $h);
+ my $old_w = $self->{old_w}; $self->{old_w} = $w;
+ my $old_h = $self->{old_h}; $self->{old_h} = $h;
- for my $child (@{$self->{children}}) {
+ CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
+ if $old_w && $old_h && ($old_w != $w || $old_h != $h);
+
+ for my $child ($self->children) {
my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
- $X = List::Util::max 0, List::Util::min $w - $W, $X;
- $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
- $child->configure ($X, $Y, $W,$H);
+ $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
+ if exists $child->{req_x};
+
+ $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;
+
+ $child->configure ($X, $Y, $W, $H);
}
}
-sub _topleft {
+sub coord2local {
+ my ($self, $x, $y) = @_;
+
+ ($x, $y)
+}
+
+sub coord2global {
my ($self, $x, $y) = @_;
($x, $y)
@@ -2171,17 +2892,21 @@
my ($self) = @_;
$self->check_size;
- ::refresh ();
+ $::WANT_REFRESH++;
}
sub add {
- my ($self, $child) = @_;
+ my ($self, @children) = @_;
- # integerize window positions
- $child->{x} = int $child->{x};
- $child->{y} = int $child->{y};
+ for my $child (@children) {
+ $child->{toplevel} = 1;
- $self->SUPER::add ($child);
+ # integerise window positions
+ $child->{x} = int $child->{x};
+ $child->{y} = int $child->{y};
+ }
+
+ $self->SUPER::add (@children);
}
sub on_refresh {
@@ -2190,11 +2915,68 @@
$self->{refresh_hook}{$id} = $cb;
}
-sub draw {
+sub on_post_alloc {
+ my ($self, $id, $cb) = @_;
+
+ $self->{post_alloc_hook}{$id} = $cb;
+}
+
+sub draw {
my ($self) = @_;
- while (my $rcb = delete $self->{refresh_hook}) {
- $_->() for values %$rcb;
+ while ($self->{refresh_hook}) {
+ $_->()
+ for values %{delete $self->{refresh_hook}};
+ }
+
+ if ($self->{check_size}) {
+ my @queue = ([], []);
+
+ for (;;) {
+ if ($self->{check_size}) {
+ # heuristic: check containers last
+ push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
+ for values %{delete $self->{check_size}}
+ }
+
+ my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
+
+ 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->{req_w} = $w;
+ $widget->{req_h} = $h;
+
+ $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+
+ $widget->{parent}->check_size
+ if $widget->{parent};
+ }
+ }
+ }
+
+ while ($self->{size_alloc}) {
+ for (values %{delete $self->{size_alloc}}) {
+ my ($widget, $w, $h) = @$_;
+
+ $w = 0 if $w < 0;
+ $h = 0 if $h < 0;
+
+ $widget->{w} = $w;
+ $widget->{h} = $h;
+ $widget->size_allocate ($w, $h);
+ $widget->emit (size_allocate => $w, $h);
+ }
+ }
+
+ while ($self->{post_alloc_hook}) {
+ $_->()
+ for values %{delete $self->{post_alloc_hook}};
}
glViewport 0, 0, $::WIDTH, $::HEIGHT;
@@ -2215,7 +2997,7 @@
package CFClient::UI;
$ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0;
+$TOOLTIP = new CFClient::UI::Tooltip;
1