--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/09 22:27:53 1.191
+++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/17 14:55:14 1.212
@@ -1,5 +1,6 @@
package CFClient::UI;
+use utf8;
use strict;
use Scalar::Util ();
@@ -13,6 +14,8 @@
our $TOOLTIP;
our $BUTTON_STATE;
+our %WIDGET; # all widgets, weak-referenced
+
sub check_tooltip {
if (!$GRAB) {
for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
@@ -25,17 +28,17 @@
$tip = $tip->($widget) if CODE:: eq ref $tip;
- $TOOLTIP->set_markup ($widget->{tooltip});
-
+ $TOOLTIP->set_tooltip_from ($widget);
$TOOLTIP->show;
my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
- if ($x + $TOOLTIP->{w} > $::WIDTH) {
- ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
- }
+ ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
+ if $x + $TOOLTIP->{w} > $::WIDTH;
$TOOLTIP->move ($x, $y);
+ $TOOLTIP->check_size;
+ $TOOLTIP->update;
}
return;
@@ -135,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;
@@ -160,6 +183,8 @@
}
}
+ Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+
$self
}
@@ -242,21 +267,16 @@
# nothing to be done
}
-sub children {
-}
-
-# call when resolution changes etc.
sub reconfigure {
my ($self) = @_;
- $_->reconfigure
- for $self->children;
-
- $self->check_size;
- $self->size_allocate ($self->{w}, $self->{h});
+ $self->check_size (1);
$self->update;
}
+sub children {
+}
+
sub set_max_size {
my ($self, $w, $h) = @_;
@@ -264,6 +284,17 @@
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) = @_;
@@ -357,7 +388,7 @@
glVertex 0 , $self->{h};
glEnd;
glPopMatrix;
- CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+ #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
}
}
@@ -382,13 +413,17 @@
sub set_parent {
my ($self, $parent) = @_;
- $self->{_tree_depth} = $parent->{_tree_depth} + 1;
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) = @_;
+ my ($self, $forced) = @_;
+ $self->{force_alloc} = 1 if $forced;
$CFClient::UI::ROOT->{check_size}{$self} = $self;
}
@@ -414,6 +449,7 @@
sub DESTROY {
my ($self) = @_;
+ delete $WIDGET{$self+0};
#$self->deactivate;
}
@@ -432,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],
@_
)
}
@@ -441,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;
+ }
}
#############################################################################
@@ -508,9 +550,7 @@
@{$self->{children}}, @widgets
];
- $_->check_size
- for @widgets;
-
+ $self->check_size (1);
$self->update;
}
@@ -627,7 +667,7 @@
sub update {
my ($self) = @_;
- $ROOT->on_refresh ($self => sub { $self->render_child });
+ $ROOT->on_post_alloc ($self => sub { $self->render_child });
$self->SUPER::update;
}
@@ -668,15 +708,12 @@
my $tex = $self->{texture}
or return;
- glEnable GL_BLEND;
- glBlendFunc GL_ONE, 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;
}
@@ -778,7 +815,7 @@
$self
}
-#TODO# update range on size_allocate depeneing on child
+#TODO# update range on size_allocate depending on child
# update viewport offset on scroll
#############################################################################
@@ -792,38 +829,33 @@
sub new {
my $class = shift;
- my $self = $class->SUPER::new (
- bg => [1, 1, 1, 1],
- border_bg => [1, 1, 1, 1],
- border => 0.8,
- @_
- );
-
- $self
+ $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;
}
#############################################################################
@@ -847,6 +879,7 @@
bg => [1, 1, 1, 1],
border_bg => [1, 1, 1, 1],
border => 0.6,
+ toplevel => 1,
can_events => 1,
@_
);
@@ -881,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);
@@ -949,18 +982,16 @@
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);
+ $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];
@@ -974,12 +1005,11 @@
$bg->{s} = $rep_x;
$bg->{t} = $rep_y;
$bg->{wrap_mode} = 1;
- $bg->draw_quad ($border, $border, $cw, $ch);
-
- glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
+ $bg->draw_quad_alpha ($border, $border, $cw, $ch);
}
+ glDisable GL_TEXTURE_2D;
+
$self->{title}->draw if $self->{title};
$self->child->draw;
@@ -1215,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;
@@ -1253,7 +1285,7 @@
package CFClient::UI::Label;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFClient::UI::DrawBG::;
use CFClient::OpenGL;
@@ -1262,13 +1294,16 @@
my $self = $class->SUPER::new (
fg => [1, 1, 1],
+ #bg => none
+ #active_bg => none
#font => default_font
+ #text => initial text
+ #markup => initial narkup
+ layout => (new CFClient::Layout),
fontsize => 1,
- text => "",
align => -1,
valign => -1,
padding => 2,
- layout => new CFClient::Layout,
can_events => 0,
%arg
);
@@ -1279,20 +1314,23 @@
$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 {
- local $_ = $_[1];
+sub escape($) {
+ local $_ = $_[0];
s/&/&/g;
s/>/>/g;
s/{text} eq "T$text";
$self->{text} = "T$text";
+ $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
$self->{layout}->set_text ($text);
$self->update;
@@ -1320,6 +1359,9 @@
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);
$self->update;
@@ -1370,36 +1412,38 @@
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
+ };
+
+ glEnable GL_TEXTURE_2D;
+ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
- $tex->draw_quad ($self->{ox}, $self->{oy});
+ 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;
}
#############################################################################
@@ -1444,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}
}
@@ -1462,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) = @_;
@@ -1479,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};
@@ -1491,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;
@@ -1499,6 +1544,7 @@
$self->_set_text ($text);
$self->update;
+ $self->check_size;
}
sub focus_in {
@@ -1637,7 +1683,6 @@
$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,
@@ -1665,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;
}
@@ -1698,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,
@_
@@ -1731,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;
}
#############################################################################
@@ -1793,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;
}
@@ -1999,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
@@ -2007,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 => $::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) = @_;
@@ -2039,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 {
@@ -2070,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;
}
@@ -2134,7 +2186,7 @@
#font => default_font
@_,
- layout => (new CFClient::Layout),
+ layout => (new CFClient::Layout 1),
par => [],
height => 0,
children => [
@@ -2162,7 +2214,7 @@
$layout->set_height ($self->{fontsize} * $::FONTSIZE);
$layout->set_width ($self->{children}[0]{w});
- $layout->set_text ($text);
+ $layout->set_markup ($text);
($layout->size)[1]
}
@@ -2210,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;
@@ -2228,8 +2280,6 @@
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;
@@ -2248,18 +2298,17 @@
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;
};
});
}
@@ -2267,14 +2316,11 @@
sub _draw {
my ($self) = @_;
- glEnable GL_BLEND;
- glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glEnable GL_TEXTURE_2D;
glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
glColor 1, 1, 1, 1;
- $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+ $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
$self->{children}[1]->draw;
@@ -2378,19 +2424,21 @@
)
}
-sub set_markup {
- my ($self, $text) = @_;
+sub set_tooltip_from {
+ my ($self, $widget) = @_;
- $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
- $self->{label}->set_markup ($text);
- $self->add ($self->{label});
+ $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) = @_;
- $self->child->set_max_size ($::WIDTH * 0.3);
-
my ($w, $h) = @{$self->child}{qw(req_w req_h)};
($w + 4, $h + 4)
@@ -2405,7 +2453,6 @@
sub _draw {
my ($self) = @_;
- glPushMatrix;
glTranslate 0.375, 0.375;
my ($w, $h) = @$self{qw(w h)};
@@ -2426,9 +2473,7 @@
glVertex $w, 0;
glEnd;
- glPopMatrix;
-
- glTranslate 2, 2;
+ glTranslate 2 - 0.375, 2 - 0.375;
$self->SUPER::_draw;
}
@@ -2461,14 +2506,11 @@
# TODO animation
if ($tex) {
- 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 1, 1, 1, 1;
- $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+ $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
glDisable GL_TEXTURE_2D;
- glDisable GL_BLEND;
}
}
@@ -2478,62 +2520,105 @@
our @ISA = CFClient::UI::HBox::;
+sub _item_to_desc {
+ my ($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 .= " *";
+
+ $desc
+}
+
sub new {
my $class = shift;
my %args = @_;
- my $item = $args{item};
-
- my $desc = $item->{nrof} < 2
- ? $item->{name}
- : "$item->{nrof} $item->{name_pl}";
+ my $item = delete $args{item};
+ my $desc = _item_to_desc ($item);
my $self = $class->SUPER::new (
can_hover => 1,
can_events => 1,
- tooltip => (CFClient::UI::Label->escape ($desc)
+ 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");
+ my $targ = $::CONN->{player}{tag};
+
+ if ($item->{container} == $::CONN->{player}{tag}) {
+ $targ = $main::OPENCONT;
+ }
+
+ $::CONN->send ("move $targ $item->{tag} 0");
} elsif ($ev->{button} == 2) {
$::CONN->send ("apply $item->{tag}");
} elsif ($ev->{button} == 3) {
- CFClient::UI::Menu->new (
- items => [
- ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
- [
- $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
- sub { $::CONN->send ("lock $item->{tag}") },
- ],
- ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
- ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
- ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
+ 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}") },
],
- )->popup ($ev);
+ );
+
+ CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
}
1
},
%args
);
- $self->add(new CFClient::UI::Face
+
+
+ $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);
+ animspeed => $item->{animspeed},
+ );
+
+ $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
+
+ $self->{item} = $item;
+
+ $self->update_item;
$self
}
+sub update_item {
+ my ($self) = @_;
+
+ my $desc = _item_to_desc ($self->{item});
+
+ $self->{name_lbl}->set_text ($desc);
+}
+
#############################################################################
package CFClient::UI::Inventory;
@@ -2557,18 +2642,20 @@
$self->{scrolled}->clear;
return unless $items;
- my @items = sort { $a->{type} <=> $b->{type} } @$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}";
-
- $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
+ $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
+ $item->update_item ();
}
+ $self->{scrolled}->add (@items);
+
# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
}
@@ -2651,6 +2738,107 @@
#############################################################################
+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::;
@@ -2688,32 +2876,26 @@
sub size_allocate {
my ($self, $w, $h) = @_;
- my $old_w = $self->{old_w};
- my $old_h = $self->{old_h};
+ my $old_w = $self->{old_w}; $self->{old_w} = $w;
+ my $old_h = $self->{old_h}; $self->{old_h} = $h;
- if ($old_w && $old_h) {
- for my $child ($self->children) {
- $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
- $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
- $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
- $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
- $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
- $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
- $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
- $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
- }
- }
+ 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;
+ $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);
}
-
- $self->{old_w} = $w;
- $self->{old_h} = $h;
}
sub coord2local {
@@ -2736,13 +2918,17 @@
}
sub add {
- my ($self, $child) = @_;
+ my ($self, @children) = @_;
- # integerise 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 {
@@ -2751,9 +2937,20 @@
$self->{refresh_hook}{$id} = $cb;
}
+sub on_post_alloc {
+ my ($self, $id, $cb) = @_;
+
+ $self->{post_alloc_hook}{$id} = $cb;
+}
+
sub draw {
my ($self) = @_;
+ while ($self->{refresh_hook}) {
+ $_->()
+ for values %{delete $self->{refresh_hook}};
+ }
+
if ($self->{check_size}) {
my @queue = ([], []);
@@ -2770,11 +2967,14 @@
? @$widget{qw(user_w user_h)}
: $widget->size_request;
- if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
+ 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}, $widget->{h}];
+ $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
$widget->{parent}->check_size
if $widget->{parent};
@@ -2786,6 +2986,9 @@
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);
@@ -2793,9 +2996,9 @@
}
}
- while ($self->{refresh_hook}) {
+ while ($self->{post_alloc_hook}) {
$_->()
- for values %{delete $self->{refresh_hook}};
+ for values %{delete $self->{post_alloc_hook}};
}
glViewport 0, 0, $::WIDTH, $::HEIGHT;