--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/13 23:17:49 1.201 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/28 01:37:45 1.248 @@ -7,13 +7,35 @@ 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}) { @@ -31,9 +53,8 @@ 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; @@ -51,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; } @@ -75,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 { @@ -89,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; @@ -118,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 @@ -137,6 +152,40 @@ } } +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->{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}; + } + } + + reconfigure_widgets; +} + ############################################################################# package CFClient::UI::Base; @@ -157,14 +206,33 @@ }, $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->{req_x} = $layout->{x} * $::WIDTH; + $self->{req_y} = $layout->{y} * $::HEIGHT; + $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; + $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; + } + $self } +sub toggle_visibility { + my ($self) = @_; + + if ($self->{visible}) { + $self->hide; + } else { + $self->show; + } +} + sub destroy { my ($self) = @_; @@ -180,12 +248,55 @@ $CFClient::UI::ROOT->add ($self); } -sub hide { +sub center { my ($self) = @_; + $CFClient::UI::ROOT->on_post_alloc ( + "center_$self" => sub { + $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5); + }, + ); + + $self->update; +} + +sub set_visible { + my ($self) = @_; + + return if $self->{visible}; + + $self->{root} = $self->{parent}{root}; + $self->{visible} = $self->{parent}{visible} + 1; + + $self->emit (visibility_change => 1); +} + +sub set_invisible { + my ($self) = @_; + + return unless $self->{visible}; + + # 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; + + $self->emit (visibility_change => 0); +} + +sub hide { + my ($self) = @_; + + $self->set_invisible; + $self->{parent}->remove ($self) if $self->{parent}; } @@ -203,8 +314,8 @@ sub set_size { my ($self, $w, $h) = @_; - $self->{user_w} = $w; - $self->{user_h} = $h; + $self->{def_w} = $w; + $self->{def_h} = $h; $self->check_size; } @@ -244,20 +355,16 @@ # 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; } +sub children { +} + sub set_max_size { my ($self, $w, $h) = @_; @@ -265,6 +372,22 @@ delete $self->{max_h}; $self->{max_h} = $h if $h; } +sub set_tooltip { + my ($self, $tooltip) = @_; + + $tooltip =~ s/^\s+//; + $tooltip =~ s/\s+$//; + + return if $self->{tooltip} eq $tooltip; + + $self->{tooltip} = $tooltip; + + if ($CFClient::UI::TOOLTIP->{owner} == $self) { + delete $CFClient::UI::TOOLTIP->{owner}; + CFClient::UI::check_tooltip; + } +} + # translate global coordinates to local coordinate system sub coord2local { my ($self, $x, $y) = @_; @@ -287,7 +410,7 @@ my $focus = $FOCUS; $FOCUS = $self; - $self->emit (focus_in => $focus); + $self->_emit (focus_in => $focus); $focus->update if $focus; $FOCUS->update; @@ -300,15 +423,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) = @_; @@ -352,13 +478,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; } } @@ -385,9 +511,9 @@ Scalar::Util::weaken ($self->{parent} = $parent); - # TODO: req_w _does_change after ->reconfigure - $self->check_size - unless exists $self->{req_w}; + $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible}; + + $self->check_size; } sub check_size { @@ -410,15 +536,27 @@ 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 visibility_change { + #my ($self, $visible) = @_; +} + sub DESTROY { my ($self) = @_; + delete $WIDGET{$self+0}; #$self->deactivate; } @@ -437,8 +575,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], @_ ) } @@ -446,20 +584,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; + } } ############################################################################# @@ -529,7 +673,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; + $self->check_size (1); $self->update; } @@ -653,13 +797,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; }; } @@ -673,7 +810,7 @@ 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_alpha_premultiplied (0, 0, $w, $h); @@ -686,18 +823,34 @@ 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)}); + my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; + + $w = 10 if $self->{scroll_x}; + $h = 10 if $self->{scroll_y}; - @$self{qw(child_w child_h)} + ($w, $h) } sub size_allocate { 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; } @@ -758,15 +911,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, @_, ); @@ -778,6 +931,25 @@ $self } +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 @@ -836,13 +1008,12 @@ sub new { my $class = shift; - # 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, @_ ); @@ -876,7 +1047,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); @@ -905,9 +1076,11 @@ my $dx = $ev->{x} - $ox; my $dy = $ev->{y} - $oy; - $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); - $self->{user_h} = $bh + $dy * ($my ? -1 : 1); - $self->move ($wx + $dx * $mx, $wy + $dy * $my); + $self->{user_x} = $wx + $dx * $mx; + $self->{user_y} = $wy + $dy * $my; + $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); + $self->{def_h} = $bh + $dy * ($my ? -1 : 1); + $self->move ($self->{user_x}, $self->{user_y}); $self->check_size; }; @@ -920,7 +1093,10 @@ ($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; }; } @@ -992,24 +1168,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) = @_; @@ -1021,6 +1197,7 @@ $_->hide; } + $self->check_size (1); $self->update; } @@ -1062,8 +1239,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}}; @@ -1127,59 +1304,59 @@ ############################################################################# -package CFClient::UI::HBox; - -# TODO: wrap into common Box base class +package CFClient::UI::Box; our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; - my @alloc = map [$_->size_request], @{$self->{children}}; - - ( - (List::Util::sum map $_->[0], @alloc), - (List::Util::max map $_->[1], @alloc), - ) + $self->{vertical} + ? ( + (List::Util::max map $_->{req_w}, @{$self->{children}}), + (List::Util::sum map $_->{req_h}, @{$self->{children}}), + ) + : ( + (List::Util::sum map $_->{req_w}, @{$self->{children}}), + (List::Util::max map $_->{req_h}, @{$self->{children}}), + ) } sub size_allocate { my ($self, $w, $h) = @_; - ($h, $w) = ($w, $h); - + my $space = $self->{vertical} ? $h : $w; my $children = $self->{children}; - my @h = map $_->{req_w}, @$children; + my @req; - my $req_h = List::Util::sum @h; - - if ($req_h > $h) { - # ah well, not enough space - $_ *= $h / $req_h for @h; + if ($self->{homogeneous}) { + @req = ($space / (@$children || 1)) x @$children; } else { - my $exp = List::Util::sum map $_->{expand}, @$children; - $exp ||= 1; - - for (0 .. $#$children) { - my $child = $children->[$_]; + @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; + my $req = List::Util::sum @req; + + if ($req > $space) { + # ah well, not enough space + $_ *= $space / $req for @req; + } else { + my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; + + $space = ($space - $req) / $expand; # remaining space to give away - my $alloc_h = $h[$_]; - $alloc_h += ($h - $req_h) * $child->{expand} / $exp; - $h[$_] = $alloc_h; + $req[$_] += $space * $children->[$_]{expand} + for 0 .. $#$children; } } - CFClient::UI::harmonize \@h; + CFClient::UI::harmonize \@req; - my $y = 0; + my $pos = 0; for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure ($y, 0, $h, $w); + my $alloc = $req[$_]; + $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); - $y += $h; + $pos += $alloc; } 1 @@ -1187,67 +1364,39 @@ ############################################################################# -package CFClient::UI::VBox; - -# TODO: wrap into common Box base class - -our @ISA = CFClient::UI::Container::; +package CFClient::UI::HBox; -sub size_request { - my ($self) = @_; +our @ISA = CFClient::UI::Box::; - my @alloc = map [$_->size_request], @{$self->{children}}; +sub new { + my $class = shift; - ( - (List::Util::max map $_->[0], @alloc), - (List::Util::sum map $_->[1], @alloc), + $class->SUPER::new ( + vertical => 0, + @_, ) } -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; - - my $req_h = List::Util::sum @h; - - if ($req_h > $h) { - # ah well, not enough space - $_ *= $h / $req_h for @h; - } else { - my $exp = List::Util::sum map $_->{expand}, @$children; - $exp ||= 1; - - for (0 .. $#$children) { - my $child = $children->[$_]; +############################################################################# - $h[$_] += ($h - $req_h) * $child->{expand} / $exp; - } - } +package CFClient::UI::VBox; - CFClient::UI::harmonize \@h; +our @ISA = CFClient::UI::Box::; - my $y = 0; - for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure (0, $y, $w, $h); - - $y += $h; - } +sub new { + my $class = shift; - 1 + $class->SUPER::new ( + vertical => 1, + @_, + ) } ############################################################################# package CFClient::UI::Label; -our @ISA = CFClient::UI::Base::; +our @ISA = CFClient::UI::DrawBG::; use CFClient::OpenGL; @@ -1256,9 +1405,13 @@ 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, align => -1, @@ -1283,14 +1436,14 @@ $self } -sub escape { - local $_ = $_[1]; +sub escape($) { + local $_ = $_[0]; s/&/&/g; s/>/>/g; s/{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; @@ -1372,21 +1527,25 @@ 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); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); my $tex = new_from_layout CFClient::Texture $self->{layout}; - $self->{ox} = int $self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} - : ($self->{w} - $tex->{w}) * 0.5; - - $self->{oy} = int $self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} - : ($self->{h} - $tex->{h}) * 0.5; + $self->{ox} = int ($self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5); + + $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} + : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} + : ($self->{h} - $tex->{h}) * 0.5); $tex }; @@ -1424,6 +1583,7 @@ can_focus => 1, valign => 0, can_events => 1, + #text => ... @_ ) } @@ -1443,7 +1603,7 @@ $text =~ s/./*/g if $self->{hidden}; $self->{layout}->set_text ("$text "); - $self->emit (changed => $self->{text}); + $self->_emit (changed => $self->{text}); } sub set_text { @@ -1451,8 +1611,8 @@ $self->{cursor} = length $text; $self->_set_text ($text); - $self->check_size; $self->update; + $self->check_size; } sub get_text { @@ -1467,12 +1627,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 key_down { my ($self, $ev) = @_; @@ -1495,13 +1649,14 @@ } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; } elsif ($uni == 27) { - $self->emit ('escape'); + $self->_emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; } $self->_set_text ($text); $self->update; + $self->check_size; } sub focus_in { @@ -1591,7 +1746,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) { @@ -1640,7 +1795,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, @@ -1650,13 +1804,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 { @@ -1698,6 +1853,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, @_ @@ -1716,7 +1873,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}); } } @@ -1991,7 +2148,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 @@ -1999,18 +2156,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) = @_; @@ -2024,6 +2218,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); } @@ -2031,30 +2228,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 { @@ -2062,50 +2267,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_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; +our @ISA = CFClient::UI::HBox::; - # draw background - $tex[1]->draw_quad_alpha (0, 0, $w, $h); +sub new { + my ($class, %arg) = @_; - # draw handle - $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); + my $range = delete $arg{range}; - 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; @@ -2144,16 +2370,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_width ($self->{children}[0]{w} - $indent); $layout->set_markup ($text); - ($layout->size)[1] + $layout->size } sub reflow { @@ -2163,31 +2401,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 $height = $self->text_height ($text); + my ($self, $color, $text, $indent) = @_; - $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 { @@ -2200,30 +2438,42 @@ delete $self->{texture}; $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_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; @@ -2231,21 +2481,28 @@ $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_foreground (@{ $par->[1] }); - $layout->set_markup ($par->[2]); + $layout->set_foreground (@{ $par->[2] }); + $layout->set_width ($W - $par->[3]); + $layout->set_markup ($par->[4]); - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (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; }; }); } @@ -2256,7 +2513,7 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 1, 1, 1, 1; - $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); glDisable GL_TEXTURE_2D; $self->{children}[1]->draw; @@ -2315,33 +2572,18 @@ my $class = shift; my $self = $class->SUPER::new ( - state => 0, - connect_activate => \&toggle_flopper, + state => 0, + on_activate => \&toggle_flopper, @_ ); - if ($self->{state}) { - $self->{state} = 0; - $self->toggle_flopper; - } - $self } sub toggle_flopper { my ($self) = @_; - # TODO: use animation - if ($self->{state} = !$self->{state}) { - $CFClient::UI::ROOT->add ($self->{other}); - $self->{other}->move ($self->coord2global (0, $self->{h})); - $self->emit ("open"); - } else { - $CFClient::UI::ROOT->remove ($self->{other}); - $self->emit ("close"); - } - - $self->emit (changed => $self->{state}); + $self->{other}->toggle_visibility; } ############################################################################# @@ -2365,11 +2607,12 @@ my ($self, $widget) = @_; $self->add (new CFClient::UI::Label - markup => $widget->{tooltip}, - max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, - fontsize => 0.8, - fg => [0, 0, 0, 1], - font => ($widget->{tooltip_font} || $::FONT_PROP), + 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), ); } @@ -2425,23 +2668,57 @@ 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) = @_; - return unless $::CONN;#d# manage and cache textures differently - 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_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; @@ -2451,70 +2728,13 @@ } } -############################################################################# - -package CFClient::UI::InventoryItem; - -our @ISA = CFClient::UI::HBox::; - -sub new { - my $class = shift; - - my %args = @_; - - my $item = delete $args{item}; - - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; - - - 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); - } - - 1 - }, - %args - ); - - $self->add (new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}, - ); +sub DESTROY { + my ($self) = @_; - $self->add (new CFClient::UI::Label - can_events => 0, - text => $desc, - ); + $self->{timer}->cancel + if $self->{timer}; - $self + $self->SUPER::DESTROY; } ############################################################################# @@ -2527,7 +2747,7 @@ my $class = shift; my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::VBox), + scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), @_, ); @@ -2547,22 +2767,16 @@ $self->{real_items} = \@items; + my $row = 0; for my $item (@items) { - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; - - $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; - } + CFClient::Item::update_widgets $item; - $self->{scrolled}->add (@items); + $self->{scrolled}->add (0, $row, $item->{face_widget}); + $self->{scrolled}->add (1, $row, $item->{desc_widget}); + $self->{scrolled}->add (2, $row, $item->{weight_widget}); -# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; -} - -sub size_request { - my ($self) = @_; - ($self->{req_w}, $self->{req_h}); + $row++; + } } ############################################################################# @@ -2607,7 +2821,7 @@ sub popup { my ($self, $ev) = @_; - $self->emit ("popdown"); + $self->_emit ("popdown"); # maybe save $GRAB? must be careful about events... $GRAB = $self; @@ -2632,7 +2846,7 @@ undef $GRAB; $self->hide; - $self->emit ("popdown"); + $self->_emit ("popdown"); $self->{hover}[1]->() if $self->{hover}; } } @@ -2643,6 +2857,15 @@ our @ISA = CFClient::UI::VBox::; +sub new { + my $class = shift; + + $class->SUPER::new ( + fontsize => 0.8, + @_, + ) +} + sub reorder { my ($self) = @_; my $NOW = time; @@ -2670,9 +2893,7 @@ for ($short) { s/^\s+//; - s/\012.*/…/s; - my $len = int 40 / $item->{fontsize}; - substr $_, $len, length, "…" if $len < length; + s/\s+/ /g; } new CFClient::UI::Label @@ -2680,8 +2901,9 @@ tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, tooltip_width => 0.67, - fontsize => $item->{fontsize}, - color => $item->{color}, + fontsize => $item->{fontsize} || $self->{fontsize}, + max_w => $::WIDTH * 0.44, + fg => $item->{fg}, can_events => 1, can_hover => 1 }; @@ -2697,6 +2919,8 @@ $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}; @@ -2717,8 +2941,7 @@ text => $text, timeout => $timeout, tooltip => $text, - fontsize => 0.8, - color => [0.8, 0.8, 0.8, 0.8], + fg => [0.8, 0.8, 0.8, 0.8], pri => 0, count => 1, %arg, @@ -2728,6 +2951,16 @@ $self->reorder; } +sub reconfigure { + my ($self) = @_; + + delete $_->{label} + for values %{ $self->{item} || {} }; + + $self->reorder; + $self->SUPER::reconfigure; +} + ############################################################################# package CFClient::UI::Root; @@ -2740,6 +2973,7 @@ my $class = shift; $class->SUPER::new ( + visible => 1, @_, ) } @@ -2767,32 +3001,22 @@ sub size_allocate { my ($self, $w, $h) = @_; - my $old_w = $self->{old_w}; - my $old_h = $self->{old_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}; - } - } - 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}; + + delete @$child{qw(req_x 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 { @@ -2815,13 +3039,35 @@ } 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->{is_toplevel} = 1; + + # integerise window positions + $child->{x} = int $child->{x}; + $child->{y} = int $child->{y}; + } + + $self->SUPER::add (@children); + + for (my @widgets = @children; my $w = pop @widgets; ) { + push @widgets, $w->children; + $w->set_visible; + } - $self->SUPER::add ($child); +} + +sub remove { + my ($self, @children) = @_; + + $self->SUPER::remove (@children); + + while (@children) { + my $w = pop @children; + push @children, $w->children; + $w->set_invisible; + } } sub on_refresh { @@ -2845,19 +3091,22 @@ } if ($self->{check_size}) { - my @queue = ([], []); + my @queue; for (;;) { if ($self->{check_size}) { - # heuristic: check containers last - push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ - for values %{delete $self->{check_size}} + #TODO use array-of-depth approach + + @queue = sort { $a->{visible} <=> $b->{visible} } + @queue, values %{delete $self->{check_size}}; } - my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; + my $widget = pop @queue || last; + + defined $widget->{visible} or last; # do not resize invisible widgets - my ($w, $h) = $widget->{user_w} && $widget->{user_h} - ? @$widget{qw(user_w user_h)} + my ($w, $h) = $widget->{def_w} && $widget->{def_h} + ? @$widget{qw(def_w def_h)} : $widget->size_request; if (delete $widget->{force_alloc} @@ -2884,7 +3133,6 @@ $widget->{w} = $w; $widget->{h} = $h; - $widget->size_allocate ($w, $h); $widget->emit (size_allocate => $w, $h); } } @@ -2900,7 +3148,7 @@ glMatrixMode GL_PROJECTION; glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; glMatrixMode GL_MODELVIEW; glLoadIdentity; @@ -2912,7 +3160,7 @@ package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1