--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/03 19:56:05 1.184 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/27 20:46:54 1.243 @@ -1,18 +1,41 @@ package CFClient::UI; +use utf8; use strict; use Scalar::Util (); use List::Util (); use CFClient; +use CFClient::Texture; our ($FOCUS, $HOVER, $GRAB); # various widgets +our $LAYOUT; our $ROOT; our $TOOLTIP; our $BUTTON_STATE; +our %WIDGET; # all widgets, weak-referenced + +sub get_layout { + for (grep { $_->{name} } values %WIDGET) { + $LAYOUT->{$_->{name}} = { + x => $_->{x} / $::WIDTH, + y => $_->{y} / $::HEIGHT, + w => $_->{w} / $::WIDTH, + h => $_->{h} / $::HEIGHT + }; + } + + return $LAYOUT; +} + +sub set_layout { + my ($layout) = @_; + $LAYOUT = $layout; +} + sub check_tooltip { if (!$GRAB) { for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { @@ -25,17 +48,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; @@ -49,12 +72,12 @@ # class methods for events sub feed_sdl_key_down_event { - $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) + $FOCUS->emit (key_down => $_[0]) if $FOCUS; } sub feed_sdl_key_up_event { - $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) + $FOCUS->emit (key_up => $_[0]) if $FOCUS; } @@ -73,10 +96,8 @@ $BUTTON_STATE |= 1 << ($ev->{button} - 1); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); - } + $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; } sub feed_sdl_button_up_event { @@ -87,10 +108,8 @@ $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); - } + $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; @@ -116,10 +135,8 @@ check_tooltip; } - if ($HOVER) { - ($x, $y) = $HOVER->coord2local ($x, $y); - $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); - } + $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + if $HOVER; } # convert position array to integers @@ -135,6 +152,42 @@ } } +sub full_refresh { + # make a copy, otherwise for complains about freed values. + my @widgets = values %WIDGET; + + $_->update + for @widgets; +} + +sub reconfigure_widgets { + # make a copy, otherwise C complains about freed values. + my @widgets = values %WIDGET; + + $_->reconfigure + for @widgets; +} + +# call when resolution changes etc. +sub rescale_widgets { + my ($sx, $sy) = @_; + + for my $widget (values %WIDGET) { + if ($widget->{is_toplevel}) { + $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; + $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; + $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; + $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; + $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; + $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; + $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; + $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; + } + } + + reconfigure_widgets; +} + ############################################################################# package CFClient::UI::Base; @@ -155,11 +208,20 @@ }, $class; for (keys %$self) { - if (/^connect_(.*)$/) { + if (/^on_(.*)$/) { $self->connect ($1 => delete $self->{$_}); } } + Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + + if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { + $self->{user_x} = $layout->{x} * $::WIDTH; + $self->{user_y} = $layout->{y} * $::HEIGHT; + $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; + $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; + } + $self } @@ -172,18 +234,46 @@ sub show { my ($self) = @_; - return if $self->{parent}; $CFClient::UI::ROOT->add ($self); } -sub hide { +sub show_centered { my ($self) = @_; + return if $self->{parent}; + + $self->show; + + $CFClient::UI::ROOT->on_post_alloc ( + "centered $self" => sub { + $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); + }, + ); +} + +sub set_invisible { + my ($self) = @_; + + # broken show/hide model + + delete $self->{root}; + delete $self->{visible}; undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; + CFClient::UI::check_tooltip + if $CFClient::UI::TOOLTIP->{owner} == $self; + + $self->focus_out; +} + +sub hide { + my ($self) = @_; + + $self->set_invisible; + $self->{parent}->remove ($self) if $self->{parent}; } @@ -234,12 +324,7 @@ } if ($self->{w} != $w || $self->{h} != $h) { - $self->{w} = $w; - $self->{h} = $h; - - $self->size_allocate ($w, $h); - $self->update; - $self->emit (size_allocate => $w, $h); + $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; } } @@ -247,17 +332,14 @@ # nothing to be done } -sub children { -} - -# call when resolution changes etc. sub reconfigure { my ($self) = @_; - $_->reconfigure - for $self->children; + $self->check_size (1); + $self->update; +} - $_->check_size; +sub children { } sub set_max_size { @@ -267,30 +349,34 @@ delete $self->{max_h}; $self->{max_h} = $h if $h; } -# return top left coordinates -sub _topleft { - my ($self, $x, $y) = @_; +sub set_tooltip { + my ($self, $tooltip) = @_; + + $tooltip =~ s/^\s+//; + $tooltip =~ s/\s+$//; + + return if $self->{tooltip} eq $tooltip; - $self->{parent} - or Carp::confess "no parent widget in _topleft\n";#d# + $self->{tooltip} = $tooltip; - $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); + 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 { @@ -301,7 +387,7 @@ my $focus = $FOCUS; $FOCUS = $self; - $self->emit (focus_in => $focus); + $self->_emit (focus_in => $focus); $focus->update if $focus; $FOCUS->update; @@ -314,15 +400,18 @@ my $focus = $FOCUS; undef $FOCUS; - $self->emit (focus_out => $focus); + $self->_emit (focus_out => $focus); $focus->update if $focus; #? + + $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus + unless $FOCUS; } sub mouse_motion { } -sub button_up { } -sub key_down { } -sub key_up { } +sub button_up { } +sub key_down { } +sub key_up { } sub button_down { my ($self, $ev, $x, $y) = @_; @@ -366,13 +455,13 @@ 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}; + glVertex 0 , 0; + glVertex $self->{w} - 1, 0; + glVertex $self->{w} - 1, $self->{h} - 1; + glVertex 0 , $self->{h} - 1; 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; } } @@ -398,32 +487,22 @@ my ($self, $parent) = @_; Scalar::Util::weaken ($self->{parent} = $parent); -} -sub check_size { - my ($self) = @_; + $self->{root} = $parent->{root}; + $self->{visible} = $parent->{visible} + 1; - $self->{parent} - or return 1; + # TODO: req_w _does_change after ->reconfigure + $self->check_size + unless exists $self->{req_w}; - my ($w, $h) = $self->{user_w} && $self->{user_h} - ? @$self{qw(user_w user_h)} - : $self->size_request; - - if ($w != $self->{req_w} || $h != $self->{req_h}) { - $self->{req_w} = $w; - $self->{req_h} = $h; - - $self->{parent}->check_size - or $self->size_allocate ( - (List::Util::max $self->{w}, $w), - (List::Util::max $self->{h}, $h), - ); + $self->show; +} - 1 - } else { - 0 - } +sub check_size { + my ($self, $forced) = @_; + + $self->{force_alloc} = 1 if $forced; + $CFClient::UI::ROOT->{check_size}{$self} = $self; } sub update { @@ -439,15 +518,23 @@ push @{ $self->{signal_cb}{$signal} }, $cb; } -sub emit { +sub _emit { my ($self, $signal, @args) = @_; List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} } +sub emit { + my ($self, $signal, @args) = @_; + + $self->_emit ($signal, @args) + || $self->$signal (@args); +} + sub DESTROY { my ($self) = @_; + delete $WIDGET{$self+0}; #$self->deactivate; } @@ -466,8 +553,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], @_ ) } @@ -475,20 +562,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; + } } ############################################################################# @@ -530,18 +623,19 @@ } 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; } @@ -557,7 +651,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; + $self->check_size (1); $self->update; } @@ -658,7 +752,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; } @@ -681,13 +775,6 @@ 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; }; } @@ -699,15 +786,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; + glColor 1, 1, 1, 1; - $tex->draw_quad (0, 0, $w, $h); + $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -717,11 +801,20 @@ our @ISA = CFClient::UI::Window::; +sub new { + my $class = shift; + + $class->SUPER::new ( + scroll_x => 0, + scroll_y => 1, + @_, + ) +} + sub size_request { my ($self) = @_; @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - $self->child->configure (0, 0, @$self{qw(child_w child_h)}); @$self{qw(child_w child_h)} } @@ -729,6 +822,10 @@ sub size_allocate { my ($self, $w, $h) = @_; + $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; + $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; + + $self->child->configure (0, 0, $w, $h); $self->update; } @@ -741,11 +838,20 @@ $self->update; } -# hmm, this does not work for topleft of $self... but we should not aks for that -sub _topleft { +# hmm, this does not work for topleft of $self... but we should not ask for that +sub coord2local { + my ($self, $x, $y) = @_; + + $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) +} + +sub coord2global { my ($self, $x, $y) = @_; - $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_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 { @@ -780,15 +886,15 @@ 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})); + vertical => 1, + range => [0, 0, 1, 0.01], # HACK fix + on_changed => sub { + $self->{vp}->set_offset (0, $_[1]); }, ; $self = $class->SUPER::new ( - vp => (new CFClient::UI::ViewPort), + vp => (new CFClient::UI::ViewPort expand => 1), slider => $slider, @_, ); @@ -800,7 +906,26 @@ $self } -#TODO# update range on size_allocate depeneing on child +sub update { + my ($self) = @_; + + $self->SUPER::update; + + # todo: overwrite size_allocate of child + my $child = $self->{vp}->child; + $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + my $child = $self->{vp}->child; + $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); +} + +#TODO# update range on size_allocate depending on child # update viewport offset on scroll ############################################################################# @@ -814,38 +939,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; } ############################################################################# @@ -866,10 +986,11 @@ # 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.6, - can_events => 1, + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + is_toplevel => 1, + can_events => 1, @_ ); @@ -903,7 +1024,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); @@ -932,9 +1053,11 @@ my $dx = $ev->{x} - $ox; my $dy = $ev->{y} - $oy; + $self->{user_x} = $wx + $dx * $mx; + $self->{user_y} = $wy + $dy * $my; $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->move ($self->{user_x}, $self->{user_y}); $self->check_size; }; @@ -947,7 +1070,9 @@ ($x, $y) = ($ev->{x}, $ev->{y}); - $self->move ($bx + $x - $ox, $by + $y - $oy); + $self->{user_x} = $bx + $x - $ox; + $self->{user_y} = $by + $y - $oy; + $self->move ($self->{user_x}, $self->{user_y}); $self->update; }; } @@ -971,18 +1096,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]; @@ -996,12 +1119,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; @@ -1022,24 +1144,24 @@ $class->SUPER::new ( col_expand => [], - @_ + @_, ) } +sub children { + grep $_, map @$_, grep $_, @{ $_[0]{children} } +} + sub add { my ($self, $x, $y, $child) = @_; $child->set_parent ($self); $self->{children}[$y][$x] = $child; - $child->check_size; -} - -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } + $self->check_size (1); } -# TODO: move to container class maybe? send childs a signal on removal? +# TODO: move to container class maybe? send children a signal on removal? sub clear { my ($self) = @_; @@ -1051,6 +1173,7 @@ $_->hide; } + $self->check_size (1); $self->update; } @@ -1092,8 +1215,8 @@ my ($ws, $hs) = $self->get_wh; - my $req_w = sum @$ws; - my $req_h = sum @$hs; + my $req_w = (sum @$ws) || 1; + my $req_h = (sum @$hs) || 1; # TODO: nicer code && do row_expand my @col_expand = @{$self->{col_expand}}; @@ -1237,6 +1360,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; @@ -1275,7 +1400,7 @@ package CFClient::UI::Label; -our @ISA = CFClient::UI::Base::; +our @ISA = CFClient::UI::DrawBG::; use CFClient::OpenGL; @@ -1284,13 +1409,18 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], + #bg => none + #active_bg => none #font => default_font + #text => initial text + #markup => initial narkup + #max_w => maximum pixel width + ellipsise => 3, # end + layout => (new CFClient::Layout), fontsize => 1, - text => "", align => -1, valign => -1, padding => 2, - layout => new CFClient::Layout, can_events => 0, %arg ); @@ -1301,20 +1431,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/SUPER::update; } -sub reconfigure { - my ($self) = @_; - - delete $self->{texture}; -} - 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->update; $self->check_size; } @@ -1349,9 +1476,11 @@ 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->update; $self->check_size; } @@ -1361,6 +1490,8 @@ $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; @@ -1392,43 +1523,48 @@ $self->{fontsize} = $fontsize; delete $self->{texture}; - $self->check_size; + $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} - }; + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - 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; } ############################################################################# @@ -1451,6 +1587,7 @@ can_focus => 1, valign => 0, can_events => 1, + #text => ... @_ ) } @@ -1470,7 +1607,16 @@ $text =~ s/./*/g if $self->{hidden}; $self->{layout}->set_text ("$text "); - $self->emit (changed => $self->{text}); + $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 { @@ -1485,20 +1631,6 @@ ($w + 1, $h) # add 1 for cursor } -sub size_allocate { - my ($self, $w, $h) = @_; - - $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) = @_; @@ -1508,9 +1640,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}; @@ -1520,14 +1652,15 @@ $self->{cursor} = 0; } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; - } elsif ($sym == 27) { - $self->emit ('escape'); + } elsif ($uni == 27) { + $self->_emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; } $self->_set_text ($text); $self->update; + $self->check_size; } sub focus_in { @@ -1617,7 +1750,7 @@ my $txt = $self->get_text; $self->{history_pointer} = -1; $self->{history_saveback} = ''; - $self->emit (activate => $txt); + $self->_emit (activate => $txt); $self->update; } elsif ($sym == CFClient::SDLK_UP) { @@ -1666,7 +1799,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, @@ -1676,13 +1808,14 @@ ) } +sub activate { } + sub button_up { my ($self, $ev, $x, $y) = @_; - if ($x >= 0 && $x < $self->{w} - && $y >= 0 && $y < $self->{h}) { - $self->emit ("activate"); - } + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; } sub _draw { @@ -1694,16 +1827,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; } @@ -1727,6 +1857,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, @_ @@ -1745,7 +1877,7 @@ if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { $self->{state} = !$self->{state}; - $self->emit (changed => $self->{state}); + $self->_emit (changed => $self->{state}); } } @@ -1760,16 +1892,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; } ############################################################################# @@ -1822,14 +1949,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; } @@ -2028,7 +2152,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 @@ -2036,18 +2160,55 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], active_fg => [0, 0, 0], - range => [0, 0, 100, 10], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + range => [0, 0, 100, 10, 0], req_w => $::WIDTH / 80, req_h => $::WIDTH / 80, vertical => 0, can_hover => 1, - inner_pad => 5, + inner_pad => 0.02, @_ ); + $self->set_value ($self->{range}[0]); + $self->update; + $self } +sub set_range { + my ($self, $range) = @_; + + ($range, $self->{range}) = ($self->{range}, $range); + + $self->update + if "@$range" ne "@{$self->{range}}"; +} + +sub set_value { + my ($self, $value) = @_; + + my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; + + $hi = $lo + 1 if $hi <= $lo; + + $page = $hi - $lo if $page > $hi - $lo; + + $value = $lo if $value < $lo; + $value = $hi - $page if $value > $hi - $page; + + $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit + if $unit; + + @{$self->{range}} = ($value, $lo, $hi, $page, $unit); + + if ($value != $old_value) { + $self->_emit (changed => $value); + $self->update; + } +} + sub size_request { my ($self) = @_; @@ -2061,6 +2222,9 @@ my ($self, $ev, $x, $y) = @_; $self->SUPER::button_down ($ev, $x, $y); + + $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; + $self->mouse_motion ($ev, $x, $y); } @@ -2068,30 +2232,38 @@ 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 - $self->{click}[1]) / ($w * $self->{scale}); - $self->emit (changed => $x); - $self->update; + $self->set_value ($self->{click}[0] + $x * ($hi - $page - $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 $range = ($hi - $page - $lo) || 1e-100; + + my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; + + $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; + $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; + + $value = ($value - $lo) / $range; + $value = $value * $self->{scale} + $self->{offset}; + + $self->{knob_x} = $value - $knob_w * 0.5; + $self->{knob_w} = $knob_w; + }); + + $self->SUPER::update; } sub _draw { @@ -2099,53 +2271,71 @@ $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 + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; - glTranslate 0, -$self->{w}, 0; - - ($w, $h) = ($h, $w); } 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}}; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $hi = $value + 1 if $lo == $hi; + # draw background + $tex[1]->draw_quad_alpha (0, 0, 1, 1); - my $inner_pad_px = $self->_calc_inner_pad_px ($w); - my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + # draw handle + $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); - $page = int $page * $inner_w / ($hi - $lo); - $value = int +($value - $lo) * $inner_w / ($hi - $lo); + glDisable GL_TEXTURE_2D; +} - $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); +package CFClient::UI::ValSlider; - 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; +our @ISA = CFClient::UI::HBox::; - # draw background - $tex[1]->draw_quad (0, 0, $w, $h); +sub new { + my ($class, %arg) = @_; - # draw handle - $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); + my $range = delete $arg{range}; - glDisable GL_BLEND; - glDisable GL_TEXTURE_2D; + my $self = $class->SUPER::new ( + slider => (new CFClient::UI::Slider expand => 1, range => $range), + entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), + to_value => sub { shift }, + from_value => sub { shift }, + %arg, + ); + + $self->{slider}->connect (changed => sub { + my ($self, $value) = @_; + $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); + $self->{parent}->emit (changed => $value); + }); + +# $self->{entry}->connect (changed => sub { +# my ($self, $value) = @_; +# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); +# $self->{parent}->emit (changed => $value); +# }); + + $self->add ($self->{slider}, $self->{entry}); + + $self->{slider}->emit (changed => $self->{slider}{range}[0]); + + $self } +sub set_range { shift->{slider}->set_range (@_) } +sub set_value { shift->{slider}->set_value (@_) } + ############################################################################# package CFClient::UI::TextView; @@ -2163,7 +2353,7 @@ #font => default_font @_, - layout => (new CFClient::Layout), + layout => (new CFClient::Layout 1), par => [], height => 0, children => [ @@ -2184,16 +2374,28 @@ $self->reflow; } -sub text_height { - my ($self, $text) = @_; +sub size_allocate { + my ($self, $w, $h) = @_; + + $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}); + + $self->reflow; +} + +sub text_size { + my ($self, $text, $indent) = @_; my $layout = $self->{layout}; $layout->set_height ($self->{fontsize} * $::FONTSIZE); - $layout->set_width ($self->{children}[0]{w}); - $layout->set_text ($text); + $layout->set_width ($self->{children}[0]{w} - $indent); + $layout->set_markup ($text); - ($layout->size)[1] + $layout->size } sub reflow { @@ -2203,31 +2405,31 @@ $self->update; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub set_offset { + my ($self, $offset) = @_; - $self->SUPER::size_allocate ($w, $h); + # todo: base offset on lines or so, not on pixels + $self->{children}[1]->set_value ($offset); +} - $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - $self->{layout}->set_width ($self->{children}[0]{w}); +sub clear { + my ($self) = @_; - $self->reflow; + $self->{par} = []; + $self->{height} = 0; + $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); } sub add_paragraph { - my ($self, $color, $text) = @_; - - #TODO: intelligently "reformat" paragraph + my ($self, $color, $text, $indent) = @_; - my $height = $self->text_height ($text); - - $self->{height} += $height; - - push @{$self->{par}}, [$height, $color, $text]; + for my $line (split /\n/, $text) { + my ($w, $h) = $self->text_size ($line); + $self->{height} += $h; + push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; + } - $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; - $self->{children}[1]->update; + $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); } sub update { @@ -2239,33 +2441,43 @@ delete $self->{texture}; - $ROOT->on_refresh ($self, sub { + $ROOT->on_post_alloc ($self, sub { + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + if (delete $self->{need_reflow}) { my $height = 0; - $height += $_->[0] = $self->text_height ($_->[2]) - for @{$self->{par}}; + my $layout = $self->{layout}; + + $layout->set_height ($self->{fontsize} * $::FONTSIZE); + + for (@{$self->{par}}) { + if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support + $layout->set_width ($W - $_->[3]); + $layout->set_markup ($_->[4]); + my ($w, $h) = $layout->size; + $_->[0] = $w + $_->[3]; + $_->[1] = $h; + } + + $height += $_->[1]; + } $self->{height} = $height; - $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); delete $self->{texture}; } - $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { - glClearColor 0, 0, 0, 0; + $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { + glClearColor 0.5, 0.5, 0.5, 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; - my $top = int $self->{children}[1]{range}[0]; my $y0 = $top; - my $y1 = $top + $self->{h}; + my $y1 = $top + $H; my $y = 0; @@ -2273,21 +2485,27 @@ $layout->set_font ($self->{font}) if $self->{font}; + glEnable GL_BLEND; + #TODO# not correct in windows where rgba is forced off + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + for my $par (@{$self->{par}}) { - my $h = $par->[0]; + my $h = $par->[1]; if ($y0 < $y + $h && $y < $y1) { - $layout->set_text ($par->[2]); + $layout->set_foreground (@{ $par->[2] }); + $layout->set_width ($W - $par->[3]); + $layout->set_markup ($par->[4]); - glColor @{ $par->[1] }; - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); + my ($w, $h, $data, $format, $internalformat) = $layout->render; + + glRasterPos $par->[3], $y - $y0; + glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; } $y += $h; } - glDisable GL_TEXTURE_2D; glDisable GL_BLEND; }; }); @@ -2296,14 +2514,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 (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; $self->{children}[1]->draw; @@ -2361,8 +2576,8 @@ my $class = shift; my $self = $class->SUPER::new ( - state => 0, - connect_activate => \&toggle_flopper, + state => 0, + on_activate => \&toggle_flopper, @_ ); @@ -2381,13 +2596,13 @@ if ($self->{state} = !$self->{state}) { $CFClient::UI::ROOT->add ($self->{other}); $self->{other}->move ($self->coord2global (0, $self->{h})); - $self->emit ("open"); + $self->_emit ("open"); } else { $CFClient::UI::ROOT->remove ($self->{other}); - $self->emit ("close"); + $self->_emit ("close"); } - $self->emit (changed => $self->{state}); + $self->_emit (changed => $self->{state}); } ############################################################################# @@ -2407,19 +2622,22 @@ ) } -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], + ellipsise => 0, + 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) @@ -2434,7 +2652,6 @@ sub _draw { my ($self) = @_; - glPushMatrix; glTranslate 0.375, 0.375; my ($w, $h) = @$self{qw(w h)}; @@ -2455,9 +2672,7 @@ glVertex $w, 0; glEnd; - glPopMatrix; - - glTranslate 2, 2; + glTranslate 2 - 0.375, 2 - 0.375; $self->SUPER::_draw; } @@ -2472,34 +2687,122 @@ sub new { my $class = shift; - $class->SUPER::new ( - aspect => 1, + my $self = $class->SUPER::new ( + aspect => 1, + can_events => 0, @_, - ) + ); + + if ($self->{anim} && $self->{animspeed}) { + Scalar::Util::weaken (my $widget = $self); + + $self->{timer} = Event->timer ( + at => $self->{animspeed} * int $::NOW / $self->{animspeed}, + hard => 1, + interval => $self->{animspeed}, + cb => sub { + ++$widget->{frame}; + $widget->update; + }, + ); + } + + $self } sub size_request { (32, 8) } +sub update { + my ($self) = @_; + + return unless $self->{visible}; + + $self->SUPER::update; +} + sub _draw { my ($self) = @_; - my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; + return unless $::CONN; + + my $face; + + if ($self->{frame}) { + my $anim = $::CONN->{anim}[$self->{anim}]; + + $face = $anim->[ $self->{frame} % @$anim ] + if $anim && @$anim; + } + + my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; - # 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; } } +sub DESTROY { + my ($self) = @_; + + $self->{timer}->cancel + if $self->{timer}; + + $self->SUPER::DESTROY; +} + +############################################################################# + +package CFClient::UI::Inventory; + +our @ISA = CFClient::UI::ScrolledWindow::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), + @_, + ); + + $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; + + my $row = 0; + 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}); + + $row++; + } +} + +sub size_request { + my ($self) = @_; + ($self->{req_w}, $self->{req_h}); +} + ############################################################################# package CFClient::UI::Menu; @@ -2542,7 +2845,7 @@ sub popup { my ($self, $ev) = @_; - $self->emit ("popdown"); + $self->_emit ("popdown"); # maybe save $GRAB? must be careful about events... $GRAB = $self; @@ -2567,44 +2870,184 @@ undef $GRAB; $self->hide; - $self->emit ("popdown"); + $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}; + + for ($short) { + s/^\s+//; + s/\s+/ /g; + } + + new CFClient::UI::Label + markup => $short, + tooltip => $item->{tooltip}, + tooltip_font => $::FONT_PROP, + tooltip_width => 0.67, + fontsize => $item->{fontsize} || $self->{fontsize}, + max_w => $::WIDTH * 0.44, + fg => $item->{fg}, + 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+$//; + + return unless $text; + + 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; +} + +sub reconfigure { + my ($self) = @_; + + delete $_->{label} + for values %{ $self->{item} || {} }; + + $self->reorder; + $self->SUPER::reconfigure; +} + +############################################################################# + package CFClient::UI::Root; our @ISA = CFClient::UI::Container::; use CFClient::OpenGL; +sub new { + my $class = shift; + + $class->SUPER::new ( + visible => 1, + @_, + ) +} + +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) = @_; -sub configure { - my ($self, $x, $y, $w, $h) = @_; + ($self->{w}, $self->{h}) +} - $self->SUPER::configure ($x, $y, $w, $h); +sub size_allocate { + my ($self, $w, $h) = @_; - for my $child (@{$self->{children}}) { + 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) @@ -2614,148 +3057,124 @@ 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 @widgets = @children; my $w = pop @widgets; ) { + push @widgets, $w->children; + $w->{root} = $self; + $w->{visible} = $self->{visible} + 1; + } - $self->SUPER::add ($child); -} + for my $child (@children) { + $child->{is_toplevel} = 1; -sub on_refresh { - my ($self, $id, $cb) = @_; + # integerise window positions + $child->{x} = int $child->{x}; + $child->{y} = int $child->{y}; + } - $self->{refresh_hook}{$id} = $cb; + $self->SUPER::add (@children); } -sub draw { - my ($self) = @_; - - while (my $rcb = delete $self->{refresh_hook}) { - $_->() for values %$rcb; - } +sub remove { + my ($self, @children) = @_; - glViewport 0, 0, $::WIDTH, $::HEIGHT; - glClearColor +($::CFG->{fow_intensity}) x 3, 1; - glClear GL_COLOR_BUFFER_BIT; + $self->SUPER::remove (@children); - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; - - $self->_draw; + while (@children) { + my $w = pop @children; + push @children, $w->children; + $w->set_invisible; + } } -############################################################################# +sub on_refresh { + my ($self, $id, $cb) = @_; -package CFClient::UI::InventoryItem; + $self->{refresh_hook}{$id} = $cb; +} -our @ISA = CFClient::UI::HBox::; +sub on_post_alloc { + my ($self, $id, $cb) = @_; -sub new { - my $class = shift; + $self->{post_alloc_hook}{$id} = $cb; +} - my %args = @_; +sub draw { + my ($self) = @_; - my $item = $args{item}; + while ($self->{refresh_hook}) { + $_->() + for values %{delete $self->{refresh_hook}}; + } - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; + if ($self->{check_size}) { + my @queue; + for (;;) { + if ($self->{check_size}) { + #TODO use array-of-depth approach - 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) { - 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") }], - ], - )->popup ($ev); + @queue = sort { $a->{visible} <=> $b->{visible} } + @queue, values %{delete $self->{check_size}}; } - 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 -} - -############################################################################# + my $widget = pop @queue || last; -package CFClient::UI::Inventory; + defined $widget->{visible} or last; # do not resize invisible widgets -our @ISA = CFClient::UI::ScrolledWindow::; + my ($w, $h) = $widget->{user_w} && $widget->{user_h} + ? @$widget{qw(user_w user_h)} + : $widget->size_request; -sub new { - my $class = shift; + 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; - my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::VBox), - @_, - ); + $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; - $self -} - -sub set_items { - my ($self, $items) = @_; - - $self->{scrolled}->clear; - return unless $items; + $widget->{parent}->check_size + if $widget->{parent}; + } + } + } - my @items = sort { $a->{type} <=> $b->{type} } @$items; + while ($self->{size_alloc}) { + for (values %{delete $self->{size_alloc}}) { + my ($widget, $w, $h) = @$_; - $self->{real_items} = \@items; + $w = 0 if $w < 0; + $h = 0 if $h < 0; - for my $item (@items) { - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; + $widget->{w} = $w; + $widget->{h} = $h; + $widget->emit (size_allocate => $w, $h); + } + } - $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); + while ($self->{post_alloc_hook}) { + $_->() + for values %{delete $self->{post_alloc_hook}}; } -# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; -} + glViewport 0, 0, $::WIDTH, $::HEIGHT; + glClearColor +($::CFG->{fow_intensity}) x 3, 1; + glClear GL_COLOR_BUFFER_BIT; -sub size_request { - my ($self) = @_; - ($self->{req_w}, $self->{req_h}); + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + + $self->_draw; } ############################################################################# @@ -2763,7 +3182,7 @@ package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1