--- deliantra/Deliantra-Client/DC/UI.pm 2006/06/01 02:59:46 1.265
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/05 22:30:35 1.290
@@ -5,6 +5,7 @@
use Scalar::Util ();
use List::Util ();
+use Event;
use CFClient;
use CFClient::Texture;
@@ -18,39 +19,17 @@
our %WIDGET; # all widgets, weak-referenced
-sub get_layout {
- my $layout;
-
- for (grep { $_->{name} } values %WIDGET) {
- my $win = $layout->{$_->{name}} = { };
-
- $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
- $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
- $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
- $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
-
- $win->{show} = $_->{visible} && $_->{is_toplevel};
- }
-
- $layout
-}
-
-sub set_layout {
- my ($layout) = @_;
-
- $LAYOUT = $layout;
-}
-
-sub check_tooltip {
+our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
if (length $widget->{tooltip}) {
-
if ($TOOLTIP->{owner} != $widget) {
$TOOLTIP->hide;
$TOOLTIP->{owner} = $widget;
+ return if $ENV{CFPLUS_DEBUG} & 8;
+
my $tip = $widget->{tooltip};
$tip = $tip->($widget) if CODE:: eq ref $tip;
@@ -66,6 +45,29 @@
$TOOLTIP->hide;
delete $TOOLTIP->{owner};
+});
+
+sub get_layout {
+ my $layout;
+
+ for (grep { $_->{name} } values %WIDGET) {
+ my $win = $layout->{$_->{name}} = { };
+
+ $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
+ $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
+ $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
+ $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
+
+ $win->{show} = $_->{visible} && $_->{is_toplevel};
+ }
+
+ $layout
+}
+
+sub set_layout {
+ my ($layout) = @_;
+
+ $LAYOUT = $layout;
}
# class methods for events
@@ -89,7 +91,7 @@
$GRAB = $widget;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
$BUTTON_STATE |= 1 << ($ev->{button} - 1);
@@ -114,7 +116,7 @@
$grab->update if $grab;
$GRAB->update if $GRAB;
- check_tooltip;
+ $TOOLTIP_WATCHER->cb->();
}
}
@@ -130,7 +132,7 @@
$hover->update if $hover && $hover->{can_hover};
$HOVER->update if $HOVER && $HOVER->{can_hover};
- check_tooltip;
+ $TOOLTIP_WATCHER->start;
}
$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
@@ -172,8 +174,8 @@
for my $widget (values %WIDGET) {
if ($widget->{is_toplevel}) {
- $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
- $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+ $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+ $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
@@ -182,8 +184,8 @@
$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
- $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
- $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+ $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+ $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
}
}
@@ -278,7 +280,7 @@
undef $GRAB if $GRAB == $self;
undef $HOVER if $HOVER == $self;
- CFClient::UI::check_tooltip
+ $CFClient::UI::TOOLTIP_WATCHER->cb->()
if $TOOLTIP->{owner} == $self;
$self->focus_out;
@@ -372,13 +374,20 @@
}
sub children {
+ # nop
+}
+
+sub visible_children {
+ $_[0]->children
}
sub set_max_size {
my ($self, $w, $h) = @_;
- delete $self->{max_w}; $self->{max_w} = $w if $w;
- delete $self->{max_h}; $self->{max_h} = $h if $h;
+ $self->{max_w} = int $w if defined $w;
+ $self->{max_h} = int $h if defined $h;
+
+ $self->realloc;
}
sub set_tooltip {
@@ -393,7 +402,7 @@
if ($CFClient::UI::TOOLTIP->{owner} == $self) {
delete $CFClient::UI::TOOLTIP->{owner};
- CFClient::UI::check_tooltip;
+ $CFClient::UI::TOOLTIP_WATCHER->cb->();
}
}
@@ -440,22 +449,18 @@
unless $FOCUS;
}
-sub mouse_motion { }
-sub button_up { }
-sub key_down { }
-sub key_up { }
+sub mouse_motion { 0 }
+sub button_up { 0 }
+sub key_down { 0 }
+sub key_up { 0 }
sub button_down {
my ($self, $ev, $x, $y) = @_;
$self->focus_in;
-}
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
-sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
-sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
-sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
-sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
+ 0
+}
sub find_widget {
my ($self, $x, $y) = @_;
@@ -527,27 +532,37 @@
$self->update;
}
+# using global variables seems a bit hacky, but passing through all drawing
+# functions seems pointless.
+our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
+
sub draw {
my ($self) = @_;
return unless $self->{h} && $self->{w};
+ # update screen rectangle
+ local $draw_x = $draw_x + $self->{x};
+ local $draw_y = $draw_y + $self->{y};
+ local $draw_w = $draw_x + $self->{w};
+ local $draw_h = $draw_y + $self->{h};
+
+ # skip widgets that are entirely outside the drawing area
+ return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
+ || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
+
glPushMatrix;
glTranslate $self->{x}, $self->{y}, 0;
- $self->_draw;
- glPopMatrix;
if ($self == $HOVER && $self->{can_hover}) {
- my ($x, $y) = @$self{qw(x y)};
-
- glColor 1, 0.8, 0.5, 0.2;
+ glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
- glVertex $x , $y;
- glVertex $x + $self->{w}, $y;
- glVertex $x + $self->{w}, $y + $self->{h};
- glVertex $x , $y + $self->{h};
+ glVertex 0 , 0;
+ glVertex $self->{w}, 0;
+ glVertex $self->{w}, $self->{h};
+ glVertex 0 , $self->{h};
glEnd;
glDisable GL_BLEND;
}
@@ -555,7 +570,7 @@
if ($ENV{CFPLUS_DEBUG} & 1) {
glPushMatrix;
glColor 1, 1, 0, 1;
- glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+ glTranslate 0.375, 0.375;
glBegin GL_LINE_LOOP;
glVertex 0 , 0;
glVertex $self->{w} - 1, 0;
@@ -565,6 +580,9 @@
glPopMatrix;
#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
+
+ $self->_draw;
+ glPopMatrix;
}
sub _draw {
@@ -612,8 +630,8 @@
my ($w, $h) = @$self{qw(w h)};
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glColor @$color;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor_premultiply @$color;
glBegin GL_QUADS;
glVertex 0 , 0;
@@ -654,14 +672,16 @@
sub new {
my ($class, %arg) = @_;
- my $children = delete $arg{children} || [];
+ my $children = delete $arg{children};
my $self = $class->SUPER::new (
children => [],
can_events => 0,
%arg,
);
- $self->add ($_) for @$children;
+
+ $self->add (@$children)
+ if $children;
$self
}
@@ -719,7 +739,7 @@
my $res;
- for (reverse @{ $self->{children} }) {
+ for (reverse $self->visible_children) {
$res = $_->find_widget ($x, $y)
and return $res;
}
@@ -778,6 +798,8 @@
#############################################################################
+# back-buffered drawing area
+
package CFClient::UI::Window;
our @ISA = CFClient::UI::Bin::;
@@ -805,7 +827,9 @@
}
sub _render {
- $_[0]{children}[0]->draw;
+ my ($self) = @_;
+
+ $self->{children}[0]->draw;
}
sub render_child {
@@ -815,6 +839,13 @@
glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
+ {
+ package CFClient::UI::Base;
+
+ ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+ }
+
$self->_render;
};
}
@@ -822,14 +853,14 @@
sub _draw {
my ($self) = @_;
- my ($w, $h) = ($self->w, $self->h);
+ my ($w, $h) = @$self{qw(w h)};
my $tex = $self->{texture}
or return;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
+ glColor 0, 0, 0, 1;
$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
@@ -915,6 +946,9 @@
sub _render {
my ($self) = @_;
+ local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
+ local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
+
CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
$self->SUPER::_render;
@@ -927,7 +961,9 @@
our @ISA = CFClient::UI::HBox::;
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $child = delete $arg{child};
my $self;
@@ -942,16 +978,21 @@
$self = $class->SUPER::new (
vp => (new CFClient::UI::ViewPort expand => 1),
slider => $slider,
- @_,
+ %arg,
);
- $self->{vp}->add ($self->{scrolled});
- $self->add ($self->{vp});
- $self->add ($self->{slider});
+ $self->SUPER::add ($self->{vp}, $self->{slider});
+ $self->add ($child) if $child;
$self
}
+sub add {
+ my ($self, $widget) = @_;
+
+ $self->{vp}->add ($self->{child} = $widget);
+}
+
sub update {
my ($self) = @_;
@@ -998,8 +1039,8 @@
my ($w, $h) = @$self{qw(w h)};
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glColor @{ $self->{bg} };
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+ glColor_premultiply @{ $self->{bg} };
glBegin GL_QUADS;
glVertex 0 , 0;
@@ -1031,7 +1072,9 @@
qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
sub new {
- my $class = shift;
+ my ($class, %arg) = @_;
+
+ my $title = delete $arg{title};
my $self = $class->SUPER::new (
bg => [1, 1, 1, 1],
@@ -1040,18 +1083,26 @@
can_events => 1,
min_w => 16,
min_h => 16,
- @_
+ %arg,
);
- $self->{title} &&= new CFClient::UI::Label
+ $self->{title} = new CFClient::UI::Label
align => 0,
valign => 1,
- text => $self->{title},
- fontsize => $self->{border};
+ text => $title,
+ fontsize => $self->{border}
+ if defined $title;
$self
}
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+ $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
+}
+
sub border {
int $_[0]{border} * $::FONTSIZE
}
@@ -1059,6 +1110,9 @@
sub size_request {
my ($self) = @_;
+ $self->{title}->size_request
+ if $self->{title};
+
my ($w, $h) = $self->SUPER::size_request;
(
@@ -1070,13 +1124,18 @@
sub size_allocate {
my ($self, $w, $h) = @_;
- $h -= List::Util::max 0, $self->border * 2;
- $w -= List::Util::max 0, $self->border * 2;
+ if ($self->{title}) {
+ $self->{title}{w} = $w;
+ $self->{title}{h} = $h;
+ $self->{title}->size_allocate ($w, $h);
+ }
- $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
- if $self->{title};
+ my $border = $self->border;
- $self->child->configure ($self->border, $self->border, $w, $h);
+ $h -= List::Util::max 0, $border * 2;
+ $w -= List::Util::max 0, $border * 2;
+
+ $self->child->configure ($border, $border, $w, $h);
}
sub button_down {
@@ -1105,8 +1164,8 @@
$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
- $self->realloc;
$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
+ $self->realloc;
};
} elsif ($lr ^ $td) {
@@ -1119,27 +1178,37 @@
($x, $y) = ($ev->{x}, $ev->{y});
$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
+ # HACK: the next line is required to enforce placement
+ $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
};
+ } else {
+ return 0;
}
+
+ 1
}
sub button_up {
my ($self, $ev, $x, $y) = @_;
- delete $self->{motion};
+ !!delete $self->{motion}
}
sub mouse_motion {
my ($self, $ev, $x, $y) = @_;
$self->{motion}->($ev, $x, $y) if $self->{motion};
+
+ !!$self->{motion}
}
sub _draw {
my ($self) = @_;
+ my $child = $self->{children}[0];
+
my ($w, $h ) = ($self->{w}, $self->{h});
- my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
+ my ($cw, $ch) = ($child->{w}, $child->{h});
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
@@ -1164,9 +1233,12 @@
glDisable GL_TEXTURE_2D;
- $self->{title}->draw if $self->{title};
+ $child->draw;
- $self->child->draw;
+ if ($self->{title}) {
+ glTranslate 0, $border - $self->{h};
+ $self->{title}->_draw;
+ }
}
#############################################################################
@@ -1469,6 +1541,13 @@
$self->SUPER::update;
}
+sub realloc {
+ my ($self) = @_;
+
+ delete $self->{ox};
+ $self->SUPER::realloc;
+}
+
sub set_text {
my ($self, $text) = @_;
@@ -1478,6 +1557,7 @@
$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1493,6 +1573,7 @@
$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
$self->{layout}->set_markup ($markup);
+ delete $self->{size_req};
$self->realloc;
$self->update;
}
@@ -1500,32 +1581,38 @@
sub size_request {
my ($self) = @_;
- $self->{layout}->set_font ($self->{font}) if $self->{font};
- $self->{layout}->set_width ($self->{max_w} || -1);
- $self->{layout}->set_ellipsise ($self->{ellipsise});
- $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
- $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+ $self->{size_req} ||= do {
+ $self->{layout}->set_font ($self->{font}) if $self->{font};
+ $self->{layout}->set_width ($self->{max_w} || -1);
+ $self->{layout}->set_ellipsise ($self->{ellipsise});
+ $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+ $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- my ($w, $h) = $self->{layout}->size;
+ my ($w, $h) = $self->{layout}->size;
- if (exists $self->{template}) {
- $self->{template}->set_font ($self->{font}) if $self->{font};
- $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
+ if (exists $self->{template}) {
+ $self->{template}->set_font ($self->{font}) if $self->{font};
+ $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
- my ($w2, $h2) = $self->{template}->size;
+ my ($w2, $h2) = $self->{template}->size;
- $w = List::Util::max $w, $w2;
- $h = List::Util::max $h, $h2;
- }
+ $w = List::Util::max $w, $w2;
+ $h = List::Util::max $h, $h2;
+ }
- ($w, $h)
+ [$w, $h]
+ };
+
+ @{ $self->{size_req} }
}
sub size_allocate {
my ($self, $w, $h) = @_;
+ delete $self->{ox};
+
delete $self->{texture}
- ;#d#
+ unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
}
sub set_fontsize {
@@ -1537,6 +1624,14 @@
$self->realloc;
}
+sub reconfigure {
+ my ($self) = @_;
+
+ delete $self->{size_req};
+
+ $self->SUPER::reconfigure;
+}
+
sub _draw {
my ($self) = @_;
@@ -1550,8 +1645,10 @@
$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
- my $tex = new_from_layout CFClient::Texture $self->{layout};
+ new_from_layout CFClient::Texture $self->{layout}
+ };
+ unless (exists $self->{ox}) {
$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
: ($self->{w} - $tex->{w}) * 0.5);
@@ -1559,17 +1656,16 @@
$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
: ($self->{h} - $tex->{h}) * 0.5);
-
- $tex
};
glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
if ($tex->{format} == GL_ALPHA) {
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
glColor @{$self->{fg}};
$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
} else {
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
}
@@ -1608,15 +1704,17 @@
return if $self->{text} eq $text;
- delete $self->{texture};
-
$self->{last_activity} = $::NOW;
$self->{text} = $text;
$text =~ s/./*/g if $self->{hidden};
$self->{layout}->set_text ("$text ");
+ delete $self->{size_req};
$self->_emit (changed => $self->{text});
+
+ $self->realloc;
+ $self->update;
}
sub set_text {
@@ -1624,8 +1722,6 @@
$self->{cursor} = length $text;
$self->_set_text ($text);
-
- $self->realloc;
}
sub get_text {
@@ -1665,11 +1761,15 @@
$self->_emit ('escape');
} elsif ($uni) {
substr $text, $self->{cursor}++, 0, chr $uni;
+ } else {
+ return 0;
}
$self->_set_text ($text);
$self->realloc;
+
+ 1
}
sub focus_in {
@@ -1694,11 +1794,15 @@
$self->_set_text ($self->{text});
$self->update;
+
+ 1
}
sub mouse_motion {
my ($self, $ev, $x, $y) = @_;
# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+
+ 0
}
sub _draw {
@@ -1707,14 +1811,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};
@@ -1785,9 +1889,10 @@
}
} else {
- $self->SUPER::key_down ($ev);
+ return $self->SUPER::key_down ($ev)
}
+ 1
}
#############################################################################
@@ -1826,16 +1931,14 @@
$self->emit ("activate")
if $x >= 0 && $x < $self->{w}
&& $y >= 0 && $y < $self->{h};
+
+ 1
}
sub _draw {
my ($self) = @_;
- local $self->{fg} = $self->{fg};
-
- if ($GRAB == $self) {
- $self->{fg} = $self->{active_fg};
- }
+ local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -1889,7 +1992,11 @@
&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
$self->{state} = !$self->{state};
$self->_emit (changed => $self->{state});
+ } else {
+ return 0
}
+
+ 1
}
sub _draw {
@@ -2066,7 +2173,8 @@
my $h2 = $self->{h} * (1 - $ycut2);
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+ GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2237,7 +2345,7 @@
$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
- $self->mouse_motion ($ev, $x, $y);
+ $self->mouse_motion ($ev, $x, $y)
}
sub mouse_motion {
@@ -2251,13 +2359,24 @@
$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+ } else {
+ return 0;
}
+
+ 1
}
sub update {
my ($self) = @_;
- $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+ delete $self->{knob_w};
+ $self->SUPER::update;
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ unless ($self->{knob_w}) {
$self->set_value ($self->{range}[0]);
my ($value, $lo, $hi, $page) = @{$self->{range}};
@@ -2273,13 +2392,7 @@
$self->{knob_x} = $value - $knob_w * 0.5;
$self->{knob_w} = $knob_w;
- });
-
- $self->SUPER::update;
-}
-
-sub _draw {
- my ($self) = @_;
+ }
$self->SUPER::_draw ();
@@ -2483,7 +2596,7 @@
}
$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
- glClearColor 0.5, 0.5, 0.5, 0;
+ glClearColor 0, 0, 0, 0;
glClear GL_COLOR_BUFFER_BIT;
my $top = int $self->{children}[1]{range}[0];
@@ -2528,8 +2641,8 @@
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
- $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+ glColor 0, 0, 0, 1;
+ $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
glDisable GL_TEXTURE_2D;
$self->{children}[1]->draw;
@@ -2766,7 +2879,7 @@
if ($tex) {
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- glColor 1, 1, 1, 1;
+ glColor 0, 0, 0, 1;
$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
}
@@ -2783,6 +2896,14 @@
#############################################################################
+package CFClient::UI::Buttonbar;
+
+our @ISA = CFClient::UI::HBox::;
+
+# TODO: should actualyl wrap buttons and other goodies.
+
+#############################################################################
+
package CFClient::UI::Menu;
our @ISA = CFClient::UI::FancyFrame::;
@@ -2839,6 +2960,8 @@
# TODO: should use vbox->find_widget or so
$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
$self->{hover} = $self->{item}{$HOVER};
+
+ 0
}
sub button_up {
@@ -2850,7 +2973,119 @@
$self->_emit ("popdown");
$self->{hover}[1]->() if $self->{hover};
+ } else {
+ return 0
}
+
+ 1
+}
+
+#############################################################################
+
+package CFClient::UI::Multiplexer;
+
+our @ISA = CFClient::UI::Container::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ @_,
+ );
+
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+
+ $self
+}
+
+sub add {
+ my ($self, @widgets) = @_;
+
+ $self->SUPER::add (@widgets);
+
+ $self->{current} = $self->{children}[0]
+ if @{ $self->{children} };
+}
+
+sub set_current_page {
+ my ($self, $page_or_widget) = @_;
+
+ my $widget = ref $page_or_widget
+ ? $page_or_widget
+ : $self->{children}[$page_or_widget];
+
+ $self->{current} = $widget;
+ $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+
+ $self->_emit (page_changed => $self->{current});
+
+ $self->realloc;
+}
+
+sub visible_children {
+ $_[0]{current}
+}
+
+sub size_request {
+ my ($self) = @_;
+
+ $self->{current}->size_request
+}
+
+sub size_allocate {
+ my ($self, $w, $h) = @_;
+
+ $self->{current}->configure (0, 0, $w, $h);
+}
+
+sub _draw {
+ my ($self) = @_;
+
+ $self->{current}->draw;
+}
+
+#############################################################################
+
+package CFClient::UI::Notebook;
+
+our @ISA = CFClient::UI::VBox::;
+
+sub new {
+ my $class = shift;
+
+ my $self = $class->SUPER::new (
+ buttonbar => (new CFClient::UI::Buttonbar),
+ multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+ # filter => # will be put between multiplexer and $self
+ @_,
+ );
+
+ $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+ $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+
+ $self
+}
+
+sub add {
+ my ($self, $title, $widget, $tooltip) = @_;
+
+ Scalar::Util::weaken $self;
+
+ $self->{buttonbar}->add (new CFClient::UI::Button
+ markup => $title,
+ tooltip => $tooltip,
+ on_activate => sub { $self->set_current_page ($widget) },
+ );
+
+ $self->{multiplexer}->add ($widget);
+}
+
+sub set_current_page {
+ my ($self, $page) = @_;
+
+ $self->{multiplexer}->set_current_page ($page);
+ $self->_emit (page_changed => $self->{multiplexer}{current});
}
#############################################################################
@@ -2862,15 +3097,26 @@
sub new {
my $class = shift;
- $class->SUPER::new (
+ my $self = $class->SUPER::new (
fontsize => 0.8,
@_,
- )
+ );
+
+ Scalar::Util::weaken (my $this = $self);
+
+ $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+
+ $self
}
sub reorder {
my ($self) = @_;
- my $NOW = time;
+ my $NOW = Time::HiRes::time;
+
+ # freeze display when hovering over any label
+ return if $CFClient::UI::TOOLTIP->{owner}
+ && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+ values %{ $self->{item} };
while (my ($k, $v) = each %{ $self->{item} }) {
delete $self->{item}{$k} if $v->{timeout} < $NOW;
@@ -2883,11 +3129,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}"
@@ -2905,10 +3153,22 @@
tooltip_width => 0.67,
fontsize => $item->{fontsize} || $self->{fontsize},
max_w => $::WIDTH * 0.44,
- fg => $item->{fg},
+ fg => [@{ $item->{fg} }],
can_events => 1,
can_hover => 1
};
+
+ if ((my $diff = $item->{timeout} - $NOW) < 2) {
+ $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
+ $label->update;
+ $label->set_max_size (undef, $label->{req_h} * $diff)
+ if $diff < 1;
+ $self->{timer}->interval (1/30);
+ } else {
+ $label->{fg}[3] = $item->{fg}[3] || 1;
+ }
+
+ push @widgets, $label;
}
$self->clear;
@@ -2923,7 +3183,7 @@
return unless $text;
- my $timeout = time + ((delete $arg{timeout}) || 60);
+ my $timeout = (int time) + ((delete $arg{timeout}) || 60);
my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
@@ -2963,6 +3223,14 @@
$self->SUPER::reconfigure;
}
+sub DESTROY {
+ my ($self) = @_;
+
+ $self->{timer}->cancel;
+
+ $self->SUPER::DESTROY;
+}
+
#############################################################################
package CFClient::UI::Inventory;
@@ -2973,7 +3241,7 @@
my $class = shift;
my $self = $class->SUPER::new (
- scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+ child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
@_,
);
@@ -2983,7 +3251,7 @@
sub set_items {
my ($self, $items) = @_;
- $self->{scrolled}->clear;
+ $self->{child}->clear;
return unless $items;
my @items = sort {
@@ -2997,9 +3265,9 @@
for my $item (@items) {
CFClient::Item::update_widgets $item;
- $self->{scrolled}->add (0, $row, $item->{face_widget});
- $self->{scrolled}->add (1, $row, $item->{desc_widget});
- $self->{scrolled}->add (2, $row, $item->{weight_widget});
+ $self->{child}->add (0, $row, $item->{face_widget});
+ $self->{child}->add (1, $row, $item->{desc_widget});
+ $self->{child}->add (2, $row, $item->{weight_widget});
$row++;
}
@@ -3107,7 +3375,12 @@
$self->set_command_list ($rec);
}
-# if $commit is true, the binding will be set after the user entered a key combo
+
+sub ask_for_bind_and_commit {
+ my ($self) = @_;
+ $self->ask_for_bind (1);
+}
+
sub ask_for_bind {
my ($self, $commit) = @_;
@@ -3201,56 +3474,83 @@
package CFClient::UI::SpellList;
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFClient::UI::Table::;
sub new {
my $class = shift;
- my $self = $class->SUPER::new (binding => [], commands => [], @_);
+ my $self = $class->SUPER::new (
+ binding => [],
+ commands => [],
+ @_,
+ )
+}
- $self->add (new CFClient::UI::ScrolledWindow
- scrolled => $self->{spellbox} = new CFClient::UI::Table);
+my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Level. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
+my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Spell points / Grace points. Amount of spell or grace points used by each invocation.");
+my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+ "Damage. The amount of damage the spell deals when it hits.");
- $self;
-}
+sub rebuild_spell_list {
+ my ($self) = @_;
-# XXX: Do sorting? Argl...
-sub add_spell {
- my ($self, $spell) = @_;
- $self->{spells}->{$spell->{name}} = $spell;
+ $CFClient::UI::ROOT->on_refresh ($self => sub {
+ $self->clear;
- $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
- face => $spell->{face},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message});
+ $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
+ $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
+ $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
+ $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
- $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
- text => $spell->{name},
- can_hover => 1,
- can_events => 1,
- tooltip => $spell->{message},
- expand => 1);
+ my $row = 0;
+
+ for (sort { $a cmp $b } keys %{ $self->{spell} }) {
+ my $spell = $self->{spell}{$_};
+
+ $row++;
+
+ $self->add (0, $row, new CFClient::UI::Face
+ face => $spell->{face},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $spell->{message},
+ );
- $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
- text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
- $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
- expand => 1);
-
- $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
- text => "bind to key",
- on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
+ $self->add (1, $row, new CFClient::UI::Label
+ expand => 1,
+ text => $spell->{name},
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $spell->{message},
+ );
+
+ $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
+ $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
+ $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
+
+ # TODO: should be done via popup
+ $self->add (5, $row, new CFClient::UI::Button
+ text => "bind",
+ tooltip => "bind spell readying (cast command) to key",
+ on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
+ );
+ }
+ });
}
-sub rebuild_spell_list {
- my ($self) = @_;
- $self->{tbl_idx} = 0;
- $self->add_spell ($_) for values %{$self->{spells}};
+sub add_spell {
+ my ($self, $spell) = @_;
+
+ $self->{spell}->{$spell->{name}} = $spell;
+ $self->rebuild_spell_list;
}
sub remove_spell {
my ($self, $spell) = @_;
- delete $self->{spells}->{$spell->{name}};
+
+ delete $self->{spell}->{$spell->{name}};
$self->rebuild_spell_list;
}
@@ -3260,6 +3560,8 @@
our @ISA = CFClient::UI::Container::;
+use List::Util qw(min max);
+
use CFClient::OpenGL;
sub new {
@@ -3374,26 +3676,40 @@
}
if ($self->{realloc}) {
+ my %queue;
my @queue;
+ my $widget;
+ outer:
while () {
- if ($self->{realloc}) {
- #TODO use array-of-depth approach
+ if (my $realloc = delete $self->{realloc}) {
+ for $widget (values %$realloc) {
+ $widget->{visible} or next; # do not resize invisible widgets
- use sort 'stable';
+ $queue{$widget+0}++ and next; # duplicates are common
- @queue = sort { $a->{visible} <=> $b->{visible} }
- @queue, values %{delete $self->{realloc}};
+ push @{ $queue[$widget->{visible}] }, $widget;
+ }
}
- my $widget = pop @queue || last;
+ while () {
+ @queue or last outer;
- $widget->{visible} or last; # do not resize invisible widgets
+ $widget = pop @{ $queue[-1] || [] }
+ and last;
+
+ pop @queue;
+ }
+
+ delete $queue{$widget+0};
my ($w, $h) = $widget->size_request;
- $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
- $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+ $w = 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};
@@ -3406,8 +3722,9 @@
$self->{size_alloc}{$widget+0} = $widget;
if (my $parent = $widget->{parent}) {
- $self->{realloc}{$parent+0} = $parent;
- #unshift @queue, $parent;
+ $self->{realloc}{$parent+0} = $parent
+ unless $queue{$parent+0};
+
$parent->{force_size_alloc} = 1;
$self->{size_alloc}{$parent+0} = $parent;
}
@@ -3433,6 +3750,9 @@
$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;
@@ -3457,6 +3777,13 @@
glMatrixMode GL_MODELVIEW;
glLoadIdentity;
+ {
+ package CFClient::UI::Base;
+
+ ($draw_x, $draw_y, $draw_w, $draw_h) =
+ (0, 0, $self->{w}, $self->{h});
+ }
+
$self->_draw;
}