--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/25 00:26:19 1.231 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/28 23:28:12 1.253 @@ -7,21 +7,43 @@ 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}) { if (length $widget->{tooltip}) { if ($TOOLTIP->{owner} != $widget) { + $TOOLTIP->hide; + $TOOLTIP->{owner} = $widget; my $tip = $widget->{tooltip}; @@ -30,15 +52,6 @@ $TOOLTIP->set_tooltip_from ($widget); $TOOLTIP->show; - - my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - - ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) - if $x + $TOOLTIP->{w} > $::WIDTH; - - $TOOLTIP->move ($x, $y); - $TOOLTIP->check_size; - $TOOLTIP->update; } return; @@ -157,11 +170,9 @@ $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}; } } @@ -188,13 +199,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->{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 } @@ -207,35 +225,75 @@ sub show { my ($self) = @_; + return if $self->{parent}; $CFClient::UI::ROOT->add ($self); } -sub show_centered { +sub center { 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); + "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); + + $self->realloc if !exists $self->{req_w}; + + $_->set_visible for $self->children; } sub set_invisible { my ($self) = @_; - # broken show/hide model + return unless $self->{visible}; + $_->set_invisible for $self->children; + + delete $self->{root}; delete $self->{visible}; undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; + CFClient::UI::check_tooltip + if $TOOLTIP->{owner} == $self; + $self->focus_out; + + $self->emit (visibility_change => 0); +} + +sub set_visibility { + my ($self, $visible) = @_; + + return if $self->{visible} == $visible; + + $visible ? $self->hide + : $self->show; +} + +sub toggle_visibility { + my ($self) = @_; + + $self->{visible} + ? $self->hide + : $self->show; } sub hide { @@ -260,10 +318,10 @@ 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; + $self->realloc; } sub size_request { @@ -293,7 +351,9 @@ } if ($self->{w} != $w || $self->{h} != $h) { - $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; + return unless $self->{visible}; + + $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; } } @@ -301,13 +361,6 @@ # nothing to be done } -sub reconfigure { - my ($self) = @_; - - $self->check_size (1); - $self->update; -} - sub children { } @@ -321,6 +374,11 @@ 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) { @@ -389,6 +447,69 @@ sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } +sub find_widget { + my ($self, $x, $y) = @_; + + return () unless $self->{can_events}; + + return $self + if $x >= $self->{x} && $x < $self->{x} + $self->{w} + && $y >= $self->{y} && $y < $self->{y} + $self->{h}; + + () +} + +sub set_parent { + my ($self, $parent) = @_; + + Scalar::Util::weaken ($self->{parent} = $parent); + + $self->set_visible if $parent->{visible}; +} + +sub connect { + my ($self, $signal, $cb) = @_; + + push @{ $self->{signal_cb}{$signal} }, $cb; +} + +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 realloc { + my ($self) = @_; + + if ($self->{visible}) { + return if $self->{root}{realloc}{$self}; + + $self->{root}{realloc}{$self} = $self; + $self->{root}->update; + } else { + delete $self->{req_w}; + } +} + +sub update { + my ($self) = @_; + + $self->{parent}->update + if $self->{parent}; +} + sub draw { my ($self) = @_; @@ -419,10 +540,10 @@ 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; @@ -435,63 +556,6 @@ warn "no draw defined for $self\n"; } -sub find_widget { - my ($self, $x, $y) = @_; - - return () unless $self->{can_events}; - - return $self - if $x >= $self->{x} && $x < $self->{x} + $self->{w} - && $y >= $self->{y} && $y < $self->{y} + $self->{h}; - - () -} - -sub set_parent { - my ($self, $parent) = @_; - - Scalar::Util::weaken ($self->{parent} = $parent); - - # TODO: req_w _does_change after ->reconfigure - $self->check_size - unless exists $self->{req_w}; - - $self->show; -} - -sub check_size { - my ($self, $forced) = @_; - - $self->{force_alloc} = 1 if $forced; - $CFClient::UI::ROOT->{check_size}{$self} = $self; -} - -sub update { - my ($self) = @_; - - $self->{parent}->update - if $self->{parent}; -} - -sub connect { - my ($self, $signal, $cb) = @_; - - push @{ $self->{signal_cb}{$signal} }, $cb; -} - -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) = @_; @@ -596,8 +660,7 @@ @{$self->{children}}, @widgets ]; - $self->check_size (1); - $self->update; + $self->realloc; } sub children { @@ -612,8 +675,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; - $self->update; + $self->realloc; } sub clear { @@ -627,8 +689,7 @@ $_->hide; } - $self->check_size; - $self->update; + $self->realloc; } sub find_widget { @@ -691,7 +752,7 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; $self->{children}[0]->configure (0, 0, $w, $h); } @@ -718,10 +779,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; - $self->SUPER::size_allocate ($w, $h); - $self->update; + $self->SUPER::size_allocate ($w, $h, $changed); + $self->update + if $changed; } sub _render { @@ -762,20 +824,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)}; + my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - @$self{qw(child_w child_h)} + $w = 10 if $self->{scroll_x}; + $h = 10 if $self->{scroll_y}; + + ($w, $h) } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; - my ($cw, $ch) = @$self{qw(child_w child_h)}; -# $w = $self->{w}; - $self->child->configure (0, 0, $cw, $ch); + $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; } @@ -836,9 +912,9 @@ my $self; my $slider = new CFClient::UI::Slider - vertical => 1, - range => [0, 0, 1, 0.01], # HACK fix - connect_changed => sub { + vertical => 1, + range => [0, 0, 1, 0.01], # HACK fix + on_changed => sub { $self->{vp}->set_offset (0, $_[1]); }, ; @@ -856,10 +932,20 @@ $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) = @_; + my ($self, $w, $h, $changed) = @_; - $self->SUPER::size_allocate ($w, $h); + $self->SUPER::size_allocate ($w, $h, $changed); my $child = $self->{vp}->child; $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); @@ -923,8 +1009,6 @@ 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], @@ -959,7 +1043,9 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; + + return unless $changed; $h -= List::Util::max 0, $self->border * 2; $w -= List::Util::max 0, $self->border * 2; @@ -993,10 +1079,12 @@ 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->check_size; + $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->realloc; }; } elsif ($lr ^ $td) { @@ -1008,8 +1096,11 @@ ($x, $y) = ($ev->{x}, $ev->{y}); - $self->move ($bx + $x - $ox, $by + $y - $oy); - $self->update; + $self->{user_x} = $bx + $x - $ox; + $self->{user_y} = $by + $y - $oy; + + $self->move ($self->{user_x}, $self->{user_y}); + $self->realloc; }; } } @@ -1080,24 +1171,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; + $self->realloc; } -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } -} - -# 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) = @_; @@ -1109,7 +1200,7 @@ $_->hide; } - $self->update; + $self->realloc; } sub get_wh { @@ -1146,12 +1237,12 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; 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}}; @@ -1215,59 +1306,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 ($self, $w, $h, $changed) = @_; + my $space = $self->{vertical} ? $h : $w; my $children = $self->{children}; - my @h = map $_->{req_w}, @$children; - - my $req_h = List::Util::sum @h; + my @req; - 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 @@ -1275,60 +1366,32 @@ ############################################################################# -package CFClient::UI::VBox; - -# TODO: wrap into common Box base class +package CFClient::UI::HBox; -our @ISA = CFClient::UI::Container::; +our @ISA = CFClient::UI::Box::; -sub size_request { - my ($self) = @_; - - 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; - } - } +############################################################################# - CFClient::UI::harmonize \@h; +package CFClient::UI::VBox; - my $y = 0; - for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure (0, $y, $w, $h); +our @ISA = CFClient::UI::Box::; - $y += $h; - } +sub new { + my $class = shift; - 1 + $class->SUPER::new ( + vertical => 1, + @_, + ) } ############################################################################# @@ -1401,8 +1464,8 @@ $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; $self->{layout}->set_text ($text); + $self->realloc; $self->update; - $self->check_size; } sub set_markup { @@ -1416,8 +1479,8 @@ $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; $self->{layout}->set_markup ($markup); + $self->realloc; $self->update; - $self->check_size; } sub size_request { @@ -1448,9 +1511,10 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; - delete $self->{texture}; + delete $self->{texture} + if $changed; } sub set_fontsize { @@ -1459,8 +1523,7 @@ $self->{fontsize} = $fontsize; delete $self->{texture}; - $self->update; - $self->check_size; + $self->realloc; } sub _draw { @@ -1550,8 +1613,8 @@ $self->{cursor} = length $text; $self->_set_text ($text); - $self->update; - $self->check_size; + + $self->realloc; } sub get_text { @@ -1566,12 +1629,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) = @_; @@ -1600,8 +1657,8 @@ } $self->_set_text ($text); - $self->update; - $self->check_size; + + $self->realloc; } sub focus_in { @@ -2118,12 +2175,15 @@ $self } +sub changed { } + sub set_range { my ($self, $range) = @_; - $self->{range} = $range; + ($range, $self->{range}) = ($self->{range}, $range); - $self->update; + $self->update + if "@$range" ne "@{$self->{range}}"; } sub set_value { @@ -2315,9 +2375,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; + + $self->SUPER::size_allocate ($w, $h, $changed); - $self->SUPER::size_allocate ($w, $h); + return unless $changed; $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); @@ -2516,33 +2578,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; } ############################################################################# @@ -2584,9 +2631,28 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; + + return unless $changed; + + $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); +} + +sub visibility_change { + my ($self, $visible) = @_; + + return unless $visible; + + $self->{root}->on_post_alloc ("move_$self" => sub { + my $widget = $self->{owner}; + + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - $self->SUPER::size_allocate ($w - 4, $h - 4); + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $::WIDTH; + + $self->move ($x, $y); + }); } sub _draw { @@ -2613,6 +2679,7 @@ glEnd; glTranslate 2 - 0.375, 2 - 0.375; + $self->SUPER::_draw; } @@ -2628,7 +2695,8 @@ my $class = shift; my $self = $class->SUPER::new ( - aspect => 1, + aspect => 1, + can_events => 0, @_, ); @@ -2697,118 +2765,6 @@ ############################################################################# -package CFClient::UI::InventoryItem; - -our @ISA = CFClient::UI::HBox::; - -sub _item_to_desc { - my ($item) = @_; - - my $desc = - $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} × $item->{name_pl}"; - - $item->{flags} & Crossfire::Protocol::F_OPEN - and $desc .= " (open)"; - $item->{flags} & Crossfire::Protocol::F_APPLIED - and $desc .= " (applied)"; - $item->{flags} & Crossfire::Protocol::F_UNPAID - and $desc .= " (unpaid)"; - $item->{flags} & Crossfire::Protocol::F_MAGIC - and $desc .= " (magic)"; - $item->{flags} & Crossfire::Protocol::F_CURSED - and $desc .= " (cursed)"; - $item->{flags} & Crossfire::Protocol::F_DAMNED - and $desc .= " (damned)"; - $item->{flags} & Crossfire::Protocol::F_LOCKED - and $desc .= " *"; - - $desc -} - -sub new { - my $class = shift; - - my %args = @_; - - my $item = delete $args{item}; - - my $desc = _item_to_desc ($item); - - my $self = $class->SUPER::new ( - can_hover => 1, - can_events => 1, - tooltip => ((CFClient::UI::Label::escape $desc) - . "\nleftclick - examine\nshift+leftclick - move/pickup/drop\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->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { - my $targ = $::CONN->{player}{tag}; - - if ($item->{container} == $::CONN->{player}{tag}) { - $targ = $main::OPENCONT; - } - - $::CONN->send ("move $targ $item->{tag} 0"); - } elsif ($ev->{button} == 1) { - $::CONN->send ("examine $item->{tag}"); - } elsif ($ev->{button} == 2) { - $::CONN->send ("apply $item->{tag}"); - } elsif ($ev->{button} == 3) { - my @menu_items = ( - ["examine", sub { $::CONN->send ("examine $item->{tag}") }], - ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], - ["apply", sub { $::CONN->send ("apply $item->{tag}") }], - ( - $item->{flags} & Crossfire::Protocol::F_LOCKED - ? ( - ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], - ) - : ( - ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], - ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], - ) - ), - ); - - CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); - } - - 1 - }, - %args - ); - - - $self->add (new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}, - ); - - $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); - - $self->{item} = $item; - - $self->update_item; - - $self -} - -sub update_item { - my ($self) = @_; - - my $desc = _item_to_desc ($self->{item}); - - $self->{name_lbl}->set_text ($desc); -} - -############################################################################# - package CFClient::UI::Inventory; our @ISA = CFClient::UI::ScrolledWindow::; @@ -2817,7 +2773,7 @@ my $class = shift; my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::Table), + scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), @_, ); @@ -2837,25 +2793,16 @@ $self->{real_items} = \@items; + my $row = 0; for my $item (@items) { - $item->{item} = $item; - $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; - $item->update_item (); - } + CFClient::Item::update_widgets $item; - my $i = 0; - for (@items) { - $self->{scrolled}->add (0, $i, $_); - my $nrof = $_->{item}->{nrof} || 1; - $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); - } + $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++; + } } ############################################################################# @@ -2998,6 +2945,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}; @@ -3049,9 +2998,14 @@ sub new { my $class = shift; - $class->SUPER::new ( + my $self = $class->SUPER::new ( + visible => 1, @_, - ) + ); + + Scalar::Util::weaken ($self->{root} = $self); + + $self } sub configure { @@ -3061,10 +3015,12 @@ $self->{h} = $h; } -sub check_size { +sub reconfigure { my ($self) = @_; - $self->size_allocate ($self->{w}, $self->{h}) + $self->SUPER::reconfigure; + + $self->size_allocate ($self->{w}, $self->{h}, 1) if $self->{w}; } @@ -3075,7 +3031,7 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $w, $h, $changed) = @_; for my $child ($self->children) { my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; @@ -3086,6 +3042,8 @@ $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)};#d# def_x, def_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; @@ -3108,19 +3066,12 @@ sub update { my ($self) = @_; - $self->check_size; $::WANT_REFRESH++; } sub add { my ($self, @children) = @_; - for (my @widgets = @children; my $w = pop @widgets; ) { - push @widgets, $w->children; - $w->{root} = $self; - $w->{visible} = 1; - } - for my $child (@children) { $child->{is_toplevel} = 1; @@ -3164,47 +3115,53 @@ for values %{delete $self->{refresh_hook}}; } - if ($self->{check_size}) { - my @queue = ([], []); + if ($self->{realloc}) { + my @queue; + + while () { + if ($self->{realloc}) { + #TODO use array-of-depth approach - for (;;) { - if ($self->{check_size}) { - # heuristic: check containers last - push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ - for values %{delete $self->{check_size}} + @queue = sort { $a->{visible} <=> $b->{visible} } + @queue, values %{delete $self->{realloc}}; } - my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; + my $widget = pop @queue || last; - my ($w, $h) = $widget->{user_w} && $widget->{user_h} - ? @$widget{qw(user_w user_h)} + $widget->{visible} or last; # do not resize invisible widgets + + my ($w, $h) = $widget->{def_w} && $widget->{def_h} + ? @$widget{qw(def_w def_h)} : $widget->size_request; - if (delete $widget->{force_alloc} - or $w != $widget->{req_w} or $h != $widget->{req_h}) { - Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# + Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# - $widget->{req_w} = $w; - $widget->{req_h} = $h; + $widget->{req_w} = $w; + $widget->{req_h} = $h; - $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; + $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; - $widget->{parent}->check_size - if $widget->{parent}; - } + push @queue, $widget->{parent} + if $widget->{parent}; } } - while ($self->{size_alloc}) { - for (values %{delete $self->{size_alloc}}) { - my ($widget, $w, $h) = @$_; + while (my $size_alloc = delete $self->{size_alloc}) { + my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, + values %$size_alloc; + + while () { + my ($widget, $w, $h) = @{ pop @queue or last }; $w = 0 if $w < 0; $h = 0 if $h < 0; + my $changed = $widget->{w} != $w || $widget->{h} != $h; + $widget->{w} = $w; $widget->{h} = $h; - $widget->emit (size_allocate => $w, $h); + + $widget->emit (size_allocate => $w, $h, $changed); } }