--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/17 14:55:14 1.212 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/23 22:35:16 1.311 @@ -5,40 +5,37 @@ use Scalar::Util (); use List::Util (); +use Event; 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 check_tooltip { +our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { if (!$GRAB) { for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { if (length $widget->{tooltip}) { - if ($TOOLTIP->{owner} != $widget) { + $TOOLTIP->hide; + $TOOLTIP->{owner} = $widget; + return if $ENV{CFPLUS_DEBUG} & 8; + my $tip = $widget->{tooltip}; $tip = $tip->($widget) if CODE:: eq ref $tip; $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; @@ -48,16 +45,39 @@ $TOOLTIP->hide; delete $TOOLTIP->{owner}; +}); + +sub get_layout { + my $layout; + + for (grep { $_->{name} } values %WIDGET) { + my $win = $layout->{$_->{name}} = { }; + + $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; + $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; + $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; + $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; + + $win->{show} = $_->{visible} && $_->{is_toplevel}; + } + + $layout +} + +sub set_layout { + my ($layout) = @_; + + $LAYOUT = $layout; } # class methods for events 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; } @@ -71,15 +91,13 @@ $GRAB = $widget; $GRAB->update if $GRAB; - check_tooltip; + $TOOLTIP_WATCHER->cb->(); } $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 { @@ -90,17 +108,15 @@ $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; $grab->update if $grab; $GRAB->update if $GRAB; - check_tooltip; + $TOOLTIP_WATCHER->cb->(); } } @@ -116,13 +132,11 @@ $hover->update if $hover && $hover->{can_hover}; $HOVER->update if $HOVER && $HOVER->{can_hover}; - check_tooltip; + $TOOLTIP_WATCHER->start; } - 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 @@ -138,24 +152,45 @@ } } +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->{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}; - } + if ($widget->{is_toplevel}) { + $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; + $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; + + $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; + $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; + $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; + $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; + $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; + $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; - $widget->reconfigure; + $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; + $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; + + } } + + reconfigure_widgets; } ############################################################################# @@ -170,20 +205,34 @@ my $class = shift; my $self = bless { - x => 0, - y => 0, + x => "center", + y => "center", z => 0, + w => undef, + h => undef, can_events => 1, @_ }, $class; + Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + 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->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; + $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; + $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; + $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; + + $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; + $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; + + $self->show if $layout->{show}; + } $self } @@ -203,21 +252,72 @@ $CFClient::UI::ROOT->add ($self); } -sub hide { +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) = @_; + return unless $self->{visible}; + + $_->set_invisible for $self->children; + + delete $self->{visible}; + delete $self->{root}; + undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; + $CFClient::UI::TOOLTIP_WATCHER->cb->() + if $TOOLTIP->{owner} == $self; + + $self->emit ("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 { + my ($self) = @_; + + $self->set_invisible; + $self->{parent}->remove ($self) if $self->{parent}; } -sub move { +sub move_abs { my ($self, $x, $y, $z) = @_; - $self->{x} = int $x; - $self->{y} = int $y; + $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x; + $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y; $self->{z} = $z if defined $z; $self->update; @@ -226,10 +326,10 @@ sub set_size { my ($self, $w, $h) = @_; - $self->{user_w} = $w; - $self->{user_h} = $h; + $self->{force_w} = $w; + $self->{force_h} = $h; - $self->check_size; + $self->realloc; } sub size_request { @@ -237,61 +337,71 @@ Carp::confess "size_request is abstract"; } +sub baseline_shift { + 0 +} + sub configure { my ($self, $x, $y, $w, $h) = @_; if ($self->{aspect}) { - my $w2 = List::Util::min $w, int $h * $self->{aspect}; - my $h2 = List::Util::min $h, int $w / $self->{aspect}; + my ($ow, $oh) = ($w, $h); - # use alignment to adjust x, y + $w = List::Util::min $w, int $h * $self->{aspect}; + $h = List::Util::min $h, int $w / $self->{aspect}; - $x += int +($w - $w2) * 0.5; - $y += int +($h - $h2) * 0.5; + # use alignment to adjust x, y - ($w, $h) = ($w2, $h2); + $x += int 0.5 * ($ow - $w); + $y += int 0.5 * ($oh - $h); } - if ($self->{x} != $x || $self->{y} != $y) { + if ($self->{x} ne $x || $self->{y} ne $y) { $self->{x} = $x; $self->{y} = $y; $self->update; } - if ($self->{w} != $w || $self->{h} != $h) { - $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; - } -} + if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) { + return unless $self->{visible}; -sub size_allocate { - # nothing to be done -} + $self->{alloc_w} = $w; + $self->{alloc_h} = $h; -sub reconfigure { - my ($self) = @_; - - $self->check_size (1); - $self->update; + $self->{root}{size_alloc}{$self+0} = $self; + } } sub children { + # nop +} + +sub visible_children { + $_[0]->children } sub set_max_size { my ($self, $w, $h) = @_; - delete $self->{max_w}; $self->{max_w} = $w if $w; - delete $self->{max_h}; $self->{max_h} = $h if $h; + $self->{max_w} = int $w if defined $w; + $self->{max_h} = int $h if defined $h; + + $self->realloc; } sub set_tooltip { 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; + $CFClient::UI::TOOLTIP_WATCHER->cb->(); } } @@ -309,7 +419,7 @@ $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } -sub focus_in { +sub invoke_focus_in { my ($self) = @_; return if $FOCUS == $self; @@ -317,85 +427,59 @@ my $focus = $FOCUS; $FOCUS = $self; - $self->emit (focus_in => $focus); - $focus->update if $focus; $FOCUS->update; + + 0 } -sub focus_out { +sub invoke_focus_out { my ($self) = @_; return unless $FOCUS == $self; my $focus = $FOCUS; undef $FOCUS; - $self->emit (focus_out => $focus); - $focus->update if $focus; #? -} - -sub mouse_motion { } -sub button_up { } -sub key_down { } -sub key_up { } -sub button_down { - my ($self, $ev, $x, $y) = @_; + $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus + unless $FOCUS; - $self->focus_in; + 0 } -sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } -sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } -sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } -sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } -sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } - -sub draw { +sub grab_focus { my ($self) = @_; - return unless $self->{h} && $self->{w}; + $self->emit ("focus_in"); +} - glPushMatrix; - glTranslate $self->{x}, $self->{y}, 0; - $self->_draw; - glPopMatrix; +sub invoke_mouse_motion { 1 } +sub invoke_button_up { 1 } +sub invoke_key_down { 1 } +sub invoke_key_up { 1 } - if ($self == $HOVER && $self->{can_hover}) { - my ($x, $y) = @$self{qw(x y)}; +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; - glColor 1, 0.8, 0.5, 0.2; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glBegin GL_QUADS; - glVertex $x , $y; - glVertex $x + $self->{w}, $y; - glVertex $x + $self->{w}, $y + $self->{h}; - glVertex $x , $y + $self->{h}; - glEnd; - glDisable GL_BLEND; - } + $self->grab_focus; - if ($ENV{PCLIENT_DEBUG}) { - glPushMatrix; - 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}; - glEnd; - glPopMatrix; - #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; - } + 1 } -sub _draw { - my ($self) = @_; +sub connect { + my ($self, $signal, $cb) = @_; - warn "no draw defined for $self\n"; + push @{ $self->{signal_cb}{$signal} }, $cb; +} + +sub emit { + my ($self, $signal, @args) = @_; + + #d##TODO# stop propagating at first true, do not use sum + (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before + || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure + || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent } sub find_widget { @@ -414,17 +498,21 @@ 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->set_visible if $parent->{visible}; } -sub check_size { - my ($self, $forced) = @_; +sub realloc { + my ($self) = @_; + + if ($self->{visible}) { + return if $self->{root}{realloc}{$self+0}; - $self->{force_alloc} = 1 if $forced; - $CFClient::UI::ROOT->{check_size}{$self} = $self; + $self->{root}{realloc}{$self+0} = $self; + $self->{root}->update; + } else { + delete $self->{req_w}; + delete $self->{req_h}; + } } sub update { @@ -434,23 +522,79 @@ if $self->{parent}; } -sub connect { - my ($self, $signal, $cb) = @_; +sub reconfigure { + my ($self) = @_; - push @{ $self->{signal_cb}{$signal} }, $cb; + $self->realloc; + $self->update; } -sub emit { - my ($self, $signal, @args) = @_; +# using global variables seems a bit hacky, but passing through all drawing +# functions seems pointless. +our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn + +sub draw { + my ($self) = @_; + + return unless $self->{h} && $self->{w}; + + # update screen rectangle + local $draw_x = $draw_x + $self->{x}; + local $draw_y = $draw_y + $self->{y}; + local $draw_w = $draw_x + $self->{w}; + local $draw_h = $draw_y + $self->{h}; + + # skip widgets that are entirely outside the drawing area + return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) + || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); + + glPushMatrix; + glTranslate $self->{x}, $self->{y}, 0; + + if ($self == $HOVER && $self->{can_hover}) { + glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2; + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex $self->{w}, 0; + glVertex $self->{w}, $self->{h}; + glVertex 0 , $self->{h}; + glEnd; + glDisable GL_BLEND; + } + + if ($ENV{CFPLUS_DEBUG} & 1) { + glPushMatrix; + glColor 1, 1, 0, 1; + glTranslate 0.375, 0.375; + glBegin GL_LINE_LOOP; + 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; + } - List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} + $self->_draw; + glPopMatrix; +} + +sub _draw { + my ($self) = @_; + + warn "no draw defined for $self\n"; } sub DESTROY { my ($self) = @_; delete $WIDGET{$self+0}; - #$self->deactivate; + + eval { $self->destroy }; + warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; } ############################################################################# @@ -485,8 +629,8 @@ my ($w, $h) = @$self{qw(w h)}; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @$color; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @$color; glBegin GL_QUADS; glVertex 0 , 0; @@ -511,7 +655,9 @@ } sub size_request { - (0, 0) + my ($self) = @_; + + ($self->{w} + 0, $self->{h} + 0) } sub draw { } @@ -525,14 +671,16 @@ sub new { my ($class, %arg) = @_; - my $children = delete $arg{children} || []; + my $children = delete $arg{children}; my $self = $class->SUPER::new ( children => [], can_events => 0, %arg, ); - $self->add ($_) for @$children; + + $self->add (@$children) + if $children; $self } @@ -550,8 +698,7 @@ @{$self->{children}}, @widgets ]; - $self->check_size (1); - $self->update; + $self->realloc; } sub children { @@ -566,8 +713,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; - $self->update; + $self->realloc; } sub clear { @@ -581,8 +727,7 @@ $_->hide; } - $self->check_size; - $self->update; + $self->realloc; } sub find_widget { @@ -593,7 +738,7 @@ my $res; - for (reverse @{ $self->{children} }) { + for (reverse $self->visible_children) { $res = $_->find_widget ($x, $y) and return $res; } @@ -624,8 +769,7 @@ sub add { my ($self, $child) = @_; - $self->{children} = []; - + $self->SUPER::remove ($_) for @{ $self->{children} }; $self->SUPER::add ($child); } @@ -644,14 +788,18 @@ $_[0]{children}[0]->size_request } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; $self->{children}[0]->configure (0, 0, $w, $h); + + 1 } ############################################################################# +# back-buffered drawing area + package CFClient::UI::Window; our @ISA = CFClient::UI::Bin::; @@ -671,15 +819,18 @@ $self->SUPER::update; } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); $self->update; + + $self->SUPER::invoke_size_allocate ($w, $h) } sub _render { - $_[0]{children}[0]->draw; + my ($self) = @_; + + $self->{children}[0]->draw; } sub render_child { @@ -689,21 +840,21 @@ glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; + { + package CFClient::UI::Base; + + ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + } + $self->_render; -# 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; }; } sub _draw { my ($self) = @_; - my ($w, $h) = ($self->w, $self->h); + my ($w, $h) = @$self{qw(w h)}; my $tex = $self->{texture} or return; @@ -723,19 +874,39 @@ 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->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 { +sub invoke_size_allocate { my ($self, $w, $h) = @_; + my $child = $self->child; + + $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; + $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; + + $self->child->configure (0, 0, $w, $h); $self->update; + + 1 } sub set_offset { @@ -778,6 +949,9 @@ sub _render { my ($self) = @_; + local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; + local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; + CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; $self->SUPER::_render; @@ -790,31 +964,57 @@ our @ISA = CFClient::UI::HBox::; sub new { - my $class = shift; + my ($class, %arg) = @_; + + my $child = delete $arg{child}; 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, - @_, + %arg, ); - $self->{vp}->add ($self->{scrolled}); - $self->add ($self->{vp}); - $self->add ($self->{slider}); + $self->SUPER::add ($self->{vp}, $self->{slider}); + $self->add ($child) if $child; $self } +sub add { + my ($self, $widget) = @_; + + $self->{vp}->add ($self->{child} = $widget); +} + +sub update { + my ($self) = @_; + + $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 invoke_size_allocate { + my ($self, $w, $h) = @_; + + my $child = $self->{vp}->child; + $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); + + $self->SUPER::invoke_size_allocate ($w, $h) +} + #TODO# update range on size_allocate depending on child # update viewport offset on scroll @@ -842,8 +1042,8 @@ my ($w, $h) = @$self{qw(w h)}; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @{ $self->{bg} }; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @{ $self->{bg} }; glBegin GL_QUADS; glVertex 0 , 0; @@ -866,33 +1066,54 @@ use CFClient::OpenGL; -my @tex = +my $bg = + new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", + mipmap => 1, wrap => 1; + +my @border = map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); + qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); sub new { - my $class = shift; - - # TODO: user_x, user_y, overwrite moveto? + my ($class, %arg) = @_; my $self = $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => 0.6, - toplevel => 1, - can_events => 1, - @_ + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + can_events => 1, + min_w => 16, + min_h => 16, + %arg, ); - $self->{title} &&= new CFClient::UI::Label + $self->{title_widget} = new CFClient::UI::Label align => 0, valign => 1, text => $self->{title}, - fontsize => $self->{border}; + fontsize => $self->{border}, + if exists $self->{title}; + + if ($self->{has_close_button}) { + $self->{close_button} = + new CFClient::UI::ImageButton + path => 'x1_close.png', + on_activate => sub { $self->hide }; + + $self->CFClient::UI::Container::add ($self->{close_button}); + } $self } +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; + $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; +} + sub border { int $_[0]{border} * $::FONTSIZE } @@ -900,6 +1121,12 @@ sub size_request { my ($self) = @_; + $self->{title_widget}->size_request + if $self->{title_widget}; + + $self->{close_button}->size_request + if $self->{close_button}; + my ($w, $h) = $self->SUPER::size_request; ( @@ -908,19 +1135,29 @@ ) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $h -= List::Util::max 0, $self->border * 2; - $w -= List::Util::max 0, $self->border * 2; + if ($self->{title_widget}) { + $self->{title_widget}{w} = $w; + $self->{title_widget}{h} = $h; + $self->{title_widget}->invoke_size_allocate ($w, $h); + } + + my $border = $self->border; + + $h -= List::Util::max 0, $border * 2; + $w -= List::Util::max 0, $border * 2; - $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) - if $self->{title}; + $self->child->configure ($border, $border, $w, $h); - $self->child->configure ($self->border, $self->border, $w, $h); + $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) + if $self->{close_button}; + + 1 } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; my ($w, $h) = @$self{qw(w h)}; @@ -943,10 +1180,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->check_size; + $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); + $self->{force_h} = $bh + $dy * ($my ? -1 : 1); + + $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); + $self->realloc; }; } elsif ($lr ^ $td) { @@ -958,29 +1196,38 @@ ($x, $y) = ($ev->{x}, $ev->{y}); - $self->move ($bx + $x - $ox, $by + $y - $oy); - $self->update; + $self->move_abs ($bx + $x - $ox, $by + $y - $oy); + # HACK: the next line is required to enforce placement + $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h}); }; + } else { + return 0; } + + 1 } -sub button_up { +sub invoke_button_up { my ($self, $ev, $x, $y) = @_; - delete $self->{motion}; + ! ! delete $self->{motion} } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; $self->{motion}->($ev, $x, $y) if $self->{motion}; + + ! ! $self->{motion} } sub _draw { my ($self) = @_; + my $child = $self->{children}[0]; + my ($w, $h ) = ($self->{w}, $self->{h}); - my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); + my ($cw, $ch) = ($child->{w}, $child->{h}); glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; @@ -988,31 +1235,34 @@ my $border = $self->border; glColor @{ $self->{border_bg} }; - $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); + $border[0]->draw_quad_alpha (0, 0, $w, $border); + $border[1]->draw_quad_alpha (0, $border, $border, $ch); + $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); + $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); if (@{$self->{bg}} < 4 || $self->{bg}[3]) { - my $bg = $tex[0]; - - # TODO: repeat texture not scale - my $rep_x = $cw / $bg->{w}; - my $rep_y = $ch / $bg->{h}; - glColor @{ $self->{bg} }; - $bg->{s} = $rep_x; - $bg->{t} = $rep_y; - $bg->{wrap_mode} = 1; + # TODO: repeat texture not scale + # solve this better(?) + $bg->{s} = $cw / $bg->{w}; + $bg->{t} = $ch / $bg->{h}; $bg->draw_quad_alpha ($border, $border, $cw, $ch); } glDisable GL_TEXTURE_2D; - $self->{title}->draw if $self->{title}; + $child->draw; + + if ($self->{title_widget}) { + glTranslate 0, $border - $self->{h}; + $self->{title_widget}->_draw; + + glTranslate 0, - ($border - $self->{h}); + } - $self->child->draw; + $self->{close_button}->draw + if $self->{close_button}; } ############################################################################# @@ -1030,24 +1280,30 @@ $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} } +sub remove { + my ($self, $child) = @_; + + # TODO: not yet implemented } -# 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) = @_; @@ -1059,7 +1315,7 @@ $_->hide; } - $self->update; + $self->realloc; } sub get_wh { @@ -1095,13 +1351,13 @@ ) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; 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}}; @@ -1137,6 +1393,7 @@ $y += $row_h; } + 1 } sub find_widget { @@ -1165,59 +1422,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 { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - ($h, $w) = ($w, $h); - - my $children = $self->{children}; + my $space = $self->{vertical} ? $h : $w; + my @children = $self->visible_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; - my $alloc_h = $h[$_]; - $alloc_h += ($h - $req_h) * $child->{expand} / $exp; - $h[$_] = $alloc_h; + 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 + + $req[$_] += $space * $children[$_]{expand} + for 0 .. $#children; } } - CFClient::UI::harmonize \@h; + CFClient::UI::harmonize \@req; - my $y = 0; - for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure ($y, 0, $h, $w); + my $pos = 0; + for (0 .. $#children) { + my $alloc = $req[$_]; + $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); - $y += $h; + $pos += $alloc; } 1 @@ -1225,60 +1482,32 @@ ############################################################################# -package CFClient::UI::VBox; +package CFClient::UI::HBox; -# TODO: wrap into common Box base class +our @ISA = CFClient::UI::Box::; -our @ISA = CFClient::UI::Container::; - -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, + @_, + ) } ############################################################################# @@ -1299,11 +1528,14 @@ #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, valign => -1, - padding => 2, + padding_x => 2, + padding_y => 2, can_events => 0, %arg ); @@ -1340,6 +1572,13 @@ $self->SUPER::update; } +sub realloc { + my ($self) = @_; + + delete $self->{ox}; + $self->SUPER::realloc; +} + sub set_text { my ($self, $text) = @_; @@ -1349,8 +1588,9 @@ $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; $self->{layout}->set_text ($text); + delete $self->{size_req}; + $self->realloc; $self->update; - $self->check_size; } sub set_markup { @@ -1364,39 +1604,52 @@ $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; $self->{layout}->set_markup ($markup); + delete $self->{size_req}; + $self->realloc; $self->update; - $self->check_size; } sub size_request { my ($self) = @_; - $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_width ($self->{max_w} || -1); - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{size_req} ||= do { + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_width ($self->{max_w} || -1); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - my ($w, $h) = $self->{layout}->size; + my ($w, $h) = $self->{layout}->size; - if (exists $self->{template}) { - $self->{template}->set_font ($self->{font}) if $self->{font}; - $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); + if (exists $self->{template}) { + $self->{template}->set_font ($self->{font}) if $self->{font}; + $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); - my ($w2, $h2) = $self->{template}->size; + my ($w2, $h2) = $self->{template}->size; - $w = List::Util::max $w, $w2; - $h = List::Util::max $h, $h2; - } + $w = List::Util::max $w, $w2; + $h = List::Util::max $h, $h2; + } - ( - $w + $self->{padding} * 2, - $h + $self->{padding} * 2, - ) + [$w, $h] + }; + + @{ $self->{size_req} } +} + +sub baseline_shift { + $_[0]{layout}->descent } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - delete $self->{texture}; + delete $self->{ox}; + + delete $self->{texture} + unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; + + 1 } sub set_fontsize { @@ -1405,8 +1658,15 @@ $self->{fontsize} = $fontsize; delete $self->{texture}; - $self->update; - $self->check_size; + $self->realloc; +} + +sub reconfigure { + my ($self) = @_; + + delete $self->{size_req}; + + $self->SUPER::reconfigure; } sub _draw { @@ -1418,29 +1678,35 @@ $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}; + new_from_layout CFClient::Texture $self->{layout} + }; - $self->{ox} = int ($self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + unless (exists $self->{ox}) { + $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} : ($self->{w} - $tex->{w}) * 0.5); - $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} + $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} + : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} : ($self->{h} - $tex->{h}) * 0.5); - - $tex }; glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + my $w = List::Util::min $self->{w} + 4, $tex->{w}; + my $h = List::Util::min $self->{h} + 2, $tex->{h}; if ($tex->{format} == GL_ALPHA) { + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; glColor @{$self->{fg}}; - $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); + $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h); } else { - $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h); } glDisable GL_TEXTURE_2D; @@ -1466,6 +1732,8 @@ can_focus => 1, valign => 0, can_events => 1, + #text => ... + #hidden => "*", @_ ) } @@ -1477,15 +1745,17 @@ return if $self->{text} eq $text; - delete $self->{texture}; - $self->{last_activity} = $::NOW; $self->{text} = $text; $text =~ s/./*/g if $self->{hidden}; $self->{layout}->set_text ("$text "); + delete $self->{size_req}; $self->emit (changed => $self->{text}); + + $self->realloc; + $self->update; } sub set_text { @@ -1493,8 +1763,6 @@ $self->{cursor} = length $text; $self->_set_text ($text); - $self->update; - $self->check_size; } sub get_text { @@ -1509,13 +1777,7 @@ ($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 { +sub invoke_key_down { my ($self, $ev) = @_; my $mod = $ev->{mod}; @@ -1540,25 +1802,29 @@ $self->emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; + } else { + return 0; } $self->_set_text ($text); - $self->update; - $self->check_size; + + $self->realloc; + + 1 } -sub focus_in { +sub invoke_focus_in { my ($self) = @_; $self->{last_activity} = $::NOW; - $self->SUPER::focus_in; + $self->SUPER::invoke_focus_in } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - $self->SUPER::button_down ($ev, $x, $y); + $self->SUPER::invoke_button_down ($ev, $x, $y); my $idx = $self->{layout}->xy_to_index ($x, $y); @@ -1569,11 +1835,15 @@ $self->_set_text ($self->{text}); $self->update; + + 1 } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; # printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# + + 1 } sub _draw { @@ -1582,14 +1852,14 @@ local $self->{fg} = $self->{fg}; if ($FOCUS == $self) { - glColor @{$self->{active_bg}}; + glColor_premultiply @{$self->{active_bg}}; $self->{fg} = $self->{active_fg}; } else { - glColor @{$self->{bg}}; + glColor_premultiply @{$self->{bg}}; } glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glBegin GL_QUADS; glVertex 0 , 0; glVertex 0 , $self->{h}; @@ -1624,7 +1894,7 @@ use CFClient::OpenGL; -sub key_down { +sub invoke_key_down { my ($self, $ev) = @_; my $sym = $ev->{sym}; @@ -1632,6 +1902,7 @@ if ($sym == 13) { unshift @{$self->{history}}, my $txt = $self->get_text; + $self->{history_pointer} = -1; $self->{history_saveback} = ''; $self->emit (activate => $txt); @@ -1660,9 +1931,10 @@ } } else { - $self->SUPER::key_down ($ev); + return $self->SUPER::invoke_key_down ($ev) } + 1 } ############################################################################# @@ -1681,7 +1953,8 @@ my $class = shift; $class->SUPER::new ( - padding => 4, + padding_x => 4, + padding_y => 4, fg => [1, 1, 1], active_fg => [0, 0, 1], can_hover => 1, @@ -1692,23 +1965,20 @@ ) } -sub button_up { +sub invoke_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}; + + 1 } sub _draw { my ($self) = @_; - local $self->{fg} = $self->{fg}; - - if ($GRAB == $self) { - $self->{fg} = $self->{active_fg}; - } + local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg}; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; @@ -1723,6 +1993,42 @@ ############################################################################# +package CFClient::UI::ImageButton; + +our @ISA = CFClient::UI::Image::; + +use CFClient::OpenGL; + +my %textures; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + padding_x => 4, + padding_y => 4, + fg => [1, 1, 1], + active_fg => [0, 0, 1], + can_hover => 1, + align => 0, + valign => 0, + can_events => 1, + @_ + ); +} + +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; + + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; + + 1 +} + +############################################################################# + package CFClient::UI::CheckBox; our @ISA = CFClient::UI::DrawBG::; @@ -1737,7 +2043,8 @@ my $class = shift; $class->SUPER::new ( - padding => 2, + padding_x => 2, + padding_y => 2, fg => [1, 1, 1], active_fg => [1, 1, 0], bg => [0, 0, 0, 0.2], @@ -1751,17 +2058,21 @@ sub size_request { my ($self) = @_; - ($self->{padding} * 2 + 6) x 2 + (6) x 2 } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} - && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { + if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} + && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { $self->{state} = !$self->{state}; $self->emit (changed => $self->{state}); + } else { + return 0 } + + 1 } sub _draw { @@ -1769,9 +2080,11 @@ $self->SUPER::_draw; - glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; + glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; - my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; + my ($w, $h) = @$self{qw(w h)}; + + my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; @@ -1789,25 +2102,26 @@ our @ISA = CFClient::UI::Base::; use CFClient::OpenGL; -use Carp qw/confess/; -our %loaded_images; +our %texture_cache; sub new { my $class = shift; - my $self = $class->SUPER::new (can_events => 0, @_); - - $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; + my $self = $class->SUPER::new ( + can_events => 0, + @_, + ); - $loaded_images{$self->{image}} ||= - new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; + $self->{path} + or Carp::croak "required attribute 'path' not set"; - my $tex = $self->{tex} = $loaded_images{$self->{image}}; + $self->{tex} = $texture_cache{$self->{path}} ||= + new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; - Scalar::Util::weaken $loaded_images{$self->{image}}; + Scalar::Util::weaken $texture_cache{$self->{path}}; - $self->{aspect} = $tex->{w} / $tex->{h}; + $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; $self } @@ -1815,7 +2129,7 @@ sub size_request { my ($self) = @_; - ($self->{tex}->{w}, $self->{tex}->{h}) + ($self->{tex}{w}, $self->{tex}{h}) } sub _draw { @@ -1936,7 +2250,8 @@ my $h2 = $self->{h} * (1 - $ycut2); glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, + GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; @@ -2045,12 +2360,12 @@ active_fg => [0, 0, 0], bg => [0, 0, 0, 0.2], active_bg => [1, 1, 1, 0.5], - range => [0, 0, 100, 10], - req_w => $::WIDTH / 80, - req_h => $::WIDTH / 80, + range => [0, 0, 100, 10, 0], + min_w => $::WIDTH / 80, + min_h => $::WIDTH / 80, vertical => 0, can_hover => 1, - inner_pad => .05, + inner_pad => 0.02, @_ ); @@ -2060,6 +2375,17 @@ $self } +sub set_range { + my ($self, $range) = @_; + + ($range, $self->{range}) = ($self->{range}, $range); + + if ("@$range" ne "@{$self->{range}}") { + $self->update; + $self->set_value ($self->{range}[0]); + } +} + sub set_value { my ($self, $value) = @_; @@ -2067,14 +2393,14 @@ $hi = $lo + 1 if $hi <= $lo; - $value = $lo if $value < $lo; - $value = $hi if $value > $hi; + $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; - $page = $hi - $lo if $page > $hi - $lo; - @{$self->{range}} = ($value, $lo, $hi, $page, $unit); if ($value != $old_value) { @@ -2086,20 +2412,20 @@ sub size_request { my ($self) = @_; - my $w = $self->{req_w}; - my $h = $self->{req_h}; - - $self->{vertical} ? ($h, $w) : ($w, $h) + ($self->{req_w}, $self->{req_h}) } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - $self->SUPER::button_down ($ev, $x, $y); - $self->mouse_motion ($ev, $x, $y); + $self->SUPER::invoke_button_down ($ev, $x, $y); + + $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; + + $self->invoke_mouse_motion ($ev, $x, $y) } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; if ($GRAB == $self) { @@ -2107,41 +2433,43 @@ my (undef, $lo, $hi, $page) = @{$self->{range}}; - $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; + $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); - $self->set_value ($x * ($hi - $lo) + $lo); + $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); + } else { + return 0; } + + 1 } sub update { my ($self) = @_; - $CFClient::UI::ROOT->on_post_alloc ($self => sub { - $self->set_value ($self->{range}[0]); - - my ($value, $lo, $hi, $page) = @{$self->{range}}; - - my $inner_w = 1 - 2 * $self->{inner_pad}; + delete $self->{knob_w}; + $self->SUPER::update; +} - $self->{scale} = ($inner_w / ($hi - $lo)) || 1; +sub _draw { + my ($self) = @_; - $page = $self->{scale} * $page || 10 / ($self->{w} || 1); - $value = $self->{scale} * ($value - $lo); + unless ($self->{knob_w}) { + $self->set_value ($self->{range}[0]); - $value = $self->{inner_pad} + ($value - $page * 0.5); + my ($value, $lo, $hi, $page) = @{$self->{range}}; + my $range = ($hi - $page - $lo) || 1e-100; - $value = 0 if $value < 0; - $page = 1 - $value if $value + $page > 1; + my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; - $self->{knob_x} = $value; - $self->{knob_w} = $page; - }); + $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; + $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; - $self->SUPER::update; -} + $value = ($value - $lo) / $range; + $value = $value * $self->{scale} + $self->{offset}; -sub _draw { - my ($self) = @_; + $self->{knob_x} = $value - $knob_w * 0.5; + $self->{knob_w} = $knob_w; + } $self->SUPER::_draw (); @@ -2150,8 +2478,8 @@ if ($self->{vertical}) { # draw a vertical slider like a rotated horizontal slider + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; - glTranslate 0, 1, 0; } my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; @@ -2171,7 +2499,48 @@ ############################################################################# -package CFClient::UI::TextView; +package CFClient::UI::ValSlider; + +our @ISA = CFClient::UI::HBox::; + +sub new { + my ($class, %arg) = @_; + + my $range = delete $arg{range}; + + 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::TextScroller; our @ISA = CFClient::UI::HBox::; @@ -2183,6 +2552,7 @@ my $self = $class->SUPER::new ( fontsize => 1, can_events => 0, + indent => 0, #font => default_font @_, @@ -2207,16 +2577,47 @@ $self->reflow; } -sub text_height { - my ($self, $text) = @_; +sub visible_children { + my ($self) = @_; + + @{$self->{children}}[0,1] +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + my ($empty, $slider, @other) = @{ $self->{children} }; + $_->configure (@$_{qw(x y req_w req_h)}) for @other; + + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{layout}->set_width ($empty->{w}); + $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); + + $self->reflow; + + $self->SUPER::invoke_size_allocate ($w, $h) +} + +sub get_layout { + my ($self, $para) = @_; my $layout = $self->{layout}; + $layout->set_font ($self->{font}) if $self->{font}; + $layout->set_foreground (@{$para->{fg}}); $layout->set_height ($self->{fontsize} * $::FONTSIZE); - $layout->set_width ($self->{children}[0]{w}); - $layout->set_markup ($text); - - ($layout->size)[1] + $layout->set_width ($self->{children}[0]{w} - $para->{indent}); + $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); + $layout->set_markup ($para->{markup}); + + $layout->set_shapes ( + map + +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), + @{$para->{widget}} + ); + + $layout } sub reflow { @@ -2226,31 +2627,50 @@ $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; + my (undef, undef, @other) = @{ $self->{children} }; + $self->remove ($_) for @other; + + $self->{par} = []; + $self->{height} = 0; + $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); } sub add_paragraph { - my ($self, $color, $text) = @_; + my ($self, $color, $para, $indent) = @_; - #TODO: intelligently "reformat" paragraph + my ($text, @w) = ref $para ? @$para : $para; - my $height = $self->text_height ($text); + $para = { + w => 1e10, + wrapped => 1, + fg => $color, + indent => $indent, + markup => $text, + widget => \@w, + }; + + $self->add (@w) if @w; + push @{$self->{par}}, $para; - $self->{height} += $height; + $self->{need_reflow}++; + $self->update; +} - push @{$self->{par}}, [$height, $color, $text]; +sub scroll_to_bottom { + my ($self) = @_; - $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; - $self->{children}[1]->update; + $self->{scroll_to_bottom} = 1; + $self->update; } sub update { @@ -2262,68 +2682,104 @@ delete $self->{texture}; - $ROOT->on_post_alloc ($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}}; + for my $para (@{$self->{par}}) { + if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { + my $layout = $self->get_layout ($para); + my ($w, $h) = $layout->size; + + $para->{w} = $w + $para->{indent}; + $para->{h} = $h; + $para->{wrapped} = $layout->has_wrapped; + } + + $height += $para->{h}; + } $self->{height} = $height; - $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; - + $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); + delete $self->{texture}; } - $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { + if (delete $self->{scroll_to_bottom}) { + $self->{children}[1]->set_value (1e10); + } + + $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { glClearColor 0, 0, 0, 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; - my $layout = $self->{layout}; - - $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]; + for my $para (@{$self->{par}}) { + my $h = $para->{h}; if ($y0 < $y + $h && $y < $y1) { - $layout->set_foreground (@{ $par->[1] }); - $layout->set_markup ($par->[2]); - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); + my $layout = $self->get_layout ($para); + + my ($w, $h, $data, $format, $internalformat) = $layout->render; + + glRasterPos $para->{indent}, $y - $y0; + glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; + + if (my @w = @{ $para->{widget} }) { + my @s = $layout->get_shapes; + + for (@w) { + my ($dx, $dy) = splice @s, 0, 2, (); + + $_->{x} = $dx + $para->{indent}; + $_->{y} = $dy + $y - $y0; + + $_->draw; + } + } } $y += $h; } - glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; }; }); } +sub reconfigure { + my ($self) = @_; + + $self->SUPER::reconfigure; + + $_->{w} = 1e10 for @{ $self->{par} }; + $self->reflow; +} + sub _draw { my ($self) = @_; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 1, 1, 1, 1; + glColor 0, 0, 0, 1; $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); glDisable GL_TEXTURE_2D; $self->{children}[1]->draw; - } ############################################################################# @@ -2378,33 +2834,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; } ############################################################################# @@ -2427,12 +2868,25 @@ sub set_tooltip_from { my ($self, $widget) = @_; + my $tooltip = $widget->{tooltip}; + + if ($ENV{CFPLUS_DEBUG} & 2) { + $tooltip .= "\n\n" . (ref $widget) . "\n" + . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" + . "req $widget->{req_w} $widget->{req_h}\n" + . "visible $widget->{visible}"; + } + + $tooltip =~ s/^\n+//; + $tooltip =~ s/\n+$//; + $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 => $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), ); } @@ -2444,10 +2898,28 @@ ($w + 4, $h + 4) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w - 4, $h - 4); + $self->SUPER::invoke_size_allocate ($w - 4, $h - 4) +} + +sub invoke_visibility_change { + my ($self, $visible) = @_; + + return unless $visible; + + $self->{root}->on_post_alloc ("move_$self" => sub { + my $widget = $self->{owner} + or return; + + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); + + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $self->{root}{w}; + + $self->move_abs ($x, $y); + }); } sub _draw { @@ -2474,6 +2946,7 @@ glEnd; glTranslate 2 - 0.375, 2 - 0.375; + $self->SUPER::_draw; } @@ -2488,252 +2961,326 @@ 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; - glColor 1, 1, 1, 1; + glColor 0, 0, 0, 1; $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; } } +sub destroy { + my ($self) = @_; + + $self->{timer}->cancel + if $self->{timer}; + + $self->SUPER::destroy; +} + ############################################################################# -package CFClient::UI::InventoryItem; +package CFClient::UI::Buttonbar; our @ISA = CFClient::UI::HBox::; -sub _item_to_desc { - my ($item) = @_; +# TODO: should actualyl wrap buttons and other goodies. - 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 .= " *"; +package CFClient::UI::Menu; - $desc -} +our @ISA = CFClient::UI::FancyFrame::; + +use CFClient::OpenGL; sub new { my $class = shift; - my %args = @_; + my $self = $class->SUPER::new ( + items => [], + z => 100, + @_, + ); - my $item = delete $args{item}; + $self->add ($self->{vbox} = new CFClient::UI::VBox); - my $desc = _item_to_desc ($item); + for my $item (@{ $self->{items} }) { + my ($widget, $cb, $tooltip) = @$item; - 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) { - my $targ = $::CONN->{player}{tag}; + # handle various types of items, only text for now + if (!ref $widget) { + $widget = new CFClient::UI::Label + can_hover => 1, + can_events => 1, + markup => $widget, + tooltip => $tooltip + } - if ($item->{container} == $::CONN->{player}{tag}) { - $targ = $main::OPENCONT; - } + $self->{item}{$widget} = $item; - $::CONN->send ("move $targ $item->{tag} 0"); - } 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 $item->{tag}") }], - ["apply", sub { $::CONN->send ("apply $item->{tag}") }], - ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], - [ - $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", - sub { $::CONN->send ("lock $item->{tag}") }, - ], - ); + $self->{vbox}->add ($widget); + } - CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); - } + $self +} - 1 - }, - %args - ); +# popup given the event (must be a mouse button down event currently) +sub popup { + my ($self, $ev) = @_; + $self->emit ("popdown"); - $self->add (new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}, - ); + # maybe save $GRAB? must be careful about events... + $GRAB = $self; + $self->{button} = $ev->{button}; - $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); + $self->show; + $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); +} - $self->{item} = $item; +sub invoke_mouse_motion { + my ($self, $ev, $x, $y) = @_; - $self->update_item; + # TODO: should use vbox->find_widget or so + $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); + $self->{hover} = $self->{item}{$HOVER}; - $self + 0 } -sub update_item { - my ($self) = @_; +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; - my $desc = _item_to_desc ($self->{item}); + if ($ev->{button} == $self->{button}) { + undef $GRAB; + $self->hide; - $self->{name_lbl}->set_text ($desc); + $self->emit ("popdown"); + $self->{hover}[1]->() if $self->{hover}; + } else { + return 0 + } + + 1 } ############################################################################# -package CFClient::UI::Inventory; +package CFClient::UI::Multiplexer; -our @ISA = CFClient::UI::ScrolledWindow::; +our @ISA = CFClient::UI::Container::; sub new { my $class = shift; my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::VBox), @_, ); + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; + $self } -sub set_items { - my ($self, $items) = @_; +sub add { + my ($self, @widgets) = @_; - $self->{scrolled}->clear; - return unless $items; + $self->SUPER::add (@widgets); - my @items = sort { - ($a->{type} <=> $b->{type}) - or ($a->{name} cmp $b->{name}) - } @$items; + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; +} - $self->{real_items} = \@items; +sub set_current_page { + my ($self, $page_or_widget) = @_; - for my $item (@items) { - $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; - $item->update_item (); - } + my $widget = ref $page_or_widget + ? $page_or_widget + : $self->{children}[$page_or_widget]; + + $self->{current} = $widget; + $self->{current}->configure (0, 0, $self->{w}, $self->{h}); + + $self->emit (page_changed => $self->{current}); - $self->{scrolled}->add (@items); + $self->realloc; +} -# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; +sub visible_children { + $_[0]{current} } sub size_request { my ($self) = @_; - ($self->{req_w}, $self->{req_h}); + + $self->{current}->size_request } -############################################################################# +sub invoke_size_allocate { + my ($self, $w, $h) = @_; -package CFClient::UI::Menu; + $self->{current}->configure (0, 0, $w, $h); -our @ISA = CFClient::UI::FancyFrame::; + 1 +} -use CFClient::OpenGL; +sub _draw { + my ($self) = @_; + + $self->{current}->draw; +} + +############################################################################# + +package CFClient::UI::Notebook; + +our @ISA = CFClient::UI::VBox::; sub new { my $class = shift; my $self = $class->SUPER::new ( - items => [], - z => 100, + buttonbar => (new CFClient::UI::Buttonbar), + multiplexer => (new CFClient::UI::Multiplexer expand => 1), + # filter => # will be put between multiplexer and $self @_, ); + + $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; + $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); - $self->add ($self->{vbox} = new CFClient::UI::VBox); + $self +} - for my $item (@{ $self->{items} }) { - my ($widget, $cb) = @$item; +sub add { + my ($self, $title, $widget, $tooltip) = @_; - # handle various types of items, only text for now - if (!ref $widget) { - $widget = new CFClient::UI::Label - can_hover => 1, - can_events => 1, - text => $widget; - } + Scalar::Util::weaken $self; - $self->{item}{$widget} = $item; + $self->{buttonbar}->add (new CFClient::UI::Button + markup => $title, + tooltip => $tooltip, + on_activate => sub { $self->set_current_page ($widget) }, + ); - $self->{vbox}->add ($widget); - } + $self->{multiplexer}->add ($widget); +} + +sub set_current_page { + my ($self, $page) = @_; + + $self->{multiplexer}->set_current_page ($page); + $self->emit (page_changed => $self->{multiplexer}{current}); +} + +############################################################################# + +package CFClient::UI::Combobox; + +use utf8; + +our @ISA = CFClient::UI::Button::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + options => [], # [value, title, longdesc], ... + value => undef, + @_, + ); + + $self->_set_value ($self->{value}); $self } -# popup given the event (must be a mouse button down event currently) -sub popup { +sub invoke_button_down { my ($self, $ev) = @_; - $self->emit ("popdown"); + my @menu_items; - # maybe save $GRAB? must be careful about events... - $GRAB = $self; - $self->{button} = $ev->{button}; + for (@{ $self->{options} }) { + my ($value, $title, $tooltip) = @$_; - $self->show; - $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); + push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; + } + + CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); } -sub mouse_motion { - my ($self, $ev, $x, $y) = @_; +sub _set_value { + my ($self, $value) = @_; - # TODO: should use vbox->find_widget or so - $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); - $self->{hover} = $self->{item}{$HOVER}; + my ($item) = grep $_->[0] eq $value, @{ $self->{options} } + or return; + + $self->{value} = $item->[0]; + $self->set_markup ("$item->[1] ⇓"); + $self->set_tooltip ($item->[2]); } -sub button_up { - my ($self, $ev, $x, $y) = @_; +sub set_value { + my ($self, $value) = @_; - if ($ev->{button} == $self->{button}) { - undef $GRAB; - $self->hide; + return unless $self->{value} ne $value; - $self->emit ("popdown"); - $self->{hover}[1]->() if $self->{hover}; - } + $self->_set_value ($value); + $self->emit (changed => $value); } ############################################################################# @@ -2745,15 +3292,26 @@ sub new { my $class = shift; - $class->SUPER::new ( + my $self = $class->SUPER::new ( fontsize => 0.8, @_, - ) + ); + + Scalar::Util::weaken (my $this = $self); + + $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); + + $self } sub reorder { my ($self) = @_; - my $NOW = time; + my $NOW = Time::HiRes::time; + + # freeze display when hovering over any label + return if $CFClient::UI::TOOLTIP->{owner} + && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, + values %{ $self->{item} }; while (my ($k, $v) = each %{ $self->{item} }) { delete $self->{item}{$k} if $v->{timeout} < $NOW; @@ -2766,23 +3324,21 @@ or $b->{id} <=> $a->{id} } values %{ $self->{item} }; + $self->{timer}->interval (1); + my $count = 10 + 1; for my $item (@items) { last unless --$count; - push @widgets, $item->{label} ||= do { + my $label = $item->{label} ||= do { # TODO: doesn't handle markup well (read as: at all) my $short = $item->{count} > 1 ? "$item->{count} × $item->{text}" : $item->{text}; - my $fontsize = $item->{fontsize} || $self->{fontsize}; - for ($short) { s/^\s+//; s/\s+/ /g; - my $len = int 40 / $fontsize; - substr $_, $len, length, "…" if $len < length; } new CFClient::UI::Label @@ -2790,11 +3346,24 @@ tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, tooltip_width => 0.67, - fontsize => $fontsize, - fg => $item->{fg}, + fontsize => $item->{fontsize} || $self->{fontsize}, + max_w => $::WIDTH * 0.44, + fg => [@{ $item->{fg} }], can_events => 1, can_hover => 1 }; + + if ((my $diff = $item->{timeout} - $NOW) < 2) { + $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; + $label->update; + $label->set_max_size (undef, $label->{req_h} * $diff) + if $diff < 1; + $self->{timer}->interval (1/30); + } else { + $label->{fg}[3] = $item->{fg}[3] || 1; + } + + push @widgets, $label; } $self->clear; @@ -2807,7 +3376,9 @@ $text =~ s/^\s+//; $text =~ s/\s+$//; - my $timeout = time + ((delete $arg{timeout}) || 60); + return unless $text; + + my $timeout = (int time) + ((delete $arg{timeout}) || 60); my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; @@ -2818,7 +3389,7 @@ $item->{count} = 1; $item->{text} = $item->{tooltip} = $text; } - $item->{id} = ++$self->{id}; + $item->{id} += 0.2;#d# $item->{timeout} = $timeout; delete $item->{label}; } else { @@ -2837,34 +3408,417 @@ $self->reorder; } +sub reconfigure { + my ($self) = @_; + + delete $_->{label} + for values %{ $self->{item} || {} }; + + $self->reorder; + $self->SUPER::reconfigure; +} + +sub destroy { + my ($self) = @_; + + $self->{timer}->cancel; + + $self->SUPER::destroy; +} + ############################################################################# -package CFClient::UI::Root; +package CFClient::UI::Inventory; -our @ISA = CFClient::UI::Container::; +our @ISA = CFClient::UI::ScrolledWindow::; -use CFClient::OpenGL; +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + child => (new CFClient::UI::Table col_expand => [0, 1, 0]), + @_, + ); + + $self +} + +sub set_items { + my ($self, $items) = @_; + + $self->{child}->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->{child}->add (0, $row, $item->{face_widget}); + $self->{child}->add (1, $row, $item->{desc_widget}); + $self->{child}->add (2, $row, $item->{weight_widget}); + + $row++; + } +} + +############################################################################# + +package CFClient::UI::BindEditor; + +our @ISA = CFClient::UI::FancyFrame::; sub new { my $class = shift; - $class->SUPER::new ( + my $self = $class->SUPER::new (binding => [], commands => [], @_); + + $self->add (my $vb = new CFClient::UI::VBox); + + + $vb->add ($self->{rec_btn} = new CFClient::UI::Button + text => "start recording", + tooltip => "Start/Stops recording of actions." + ."All subsequent actions after the recording started will be captured." + ."The actions are displayed after the record was stopped." + ."To bind the action you have to click on the 'Bind' button", + on_activate => sub { + unless ($self->{recording}) { + $self->start; + } else { + $self->stop; + } + }); + + $vb->add (new CFClient::UI::Label text => "Actions:"); + $vb->add ($self->{cmdbox} = new CFClient::UI::VBox); + + $vb->add (new CFClient::UI::Label text => "Bound to: "); + $vb->add (my $hb = new CFClient::UI::HBox); + $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1); + $hb->add (new CFClient::UI::Button + text => "bind", + tooltip => "This opens a query where you have to press the key combination to bind the recorded actions", + on_activate => sub { + $self->ask_for_bind; + }); + + $vb->add (my $hb = new CFClient::UI::HBox); + $hb->add (new CFClient::UI::Button + text => "ok", + expand => 1, + tooltip => "This closes the binding editor and saves the binding", + on_activate => sub { + $self->hide; + $self->commit; + }); + + $hb->add (new CFClient::UI::Button + text => "cancel", + expand => 1, + tooltip => "This closes the binding editor without saving", + on_activate => sub { + $self->hide; + $self->{binding_cancel}->() + if $self->{binding_cancel}; + }); + + $self->update_binding_widgets; + + $self +} + +sub cfg_bind { + my ($self, $mod, $sym, $cmds) = @_; + $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds; + ::update_bindings (); +} + +sub cfg_unbind { + my ($self, $mod, $sym, $cmds) = @_; + delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; + ::update_bindings (); +} + +sub commit { + my ($self) = @_; + my ($mod, $sym, $cmds) = $self->get_binding; + if ($sym != 0 && @$cmds > 0) { + $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) + ."'. Don't forget 'Save Config'!"); + $self->{binding_change}->($mod, $sym, $cmds) + if $self->{binding_change}; + } else { + $::STATUSBOX->add ("No action bound, no key or action specified!"); + $self->{binding_cancel}->() + if $self->{binding_cancel}; + } +} + +sub start { + my ($self) = @_; + + $self->{rec_btn}->set_text ("stop recording"); + $self->{recording} = 1; + $self->clear_command_list; + $::CONN->start_record if $::CONN; +} + +sub stop { + my ($self) = @_; + + $self->{rec_btn}->set_text ("start recording"); + $self->{recording} = 0; + + my $rec; + $rec = $::CONN->stop_record if $::CONN; + return unless ref $rec eq 'ARRAY'; + $self->set_command_list ($rec); +} + + +sub ask_for_bind_and_commit { + my ($self) = @_; + $self->ask_for_bind (1); +} + +sub ask_for_bind { + my ($self, $commit, $end_cb) = @_; + + CFClient::Binder::open_binding_dialog (sub { + my ($mod, $sym) = @_; + $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? + $self->update_binding_widgets; + $self->commit if $commit; + $end_cb->() if $end_cb; + }); +} + +# $mod and $sym are the modifiers and key symbol +# $cmds is a array ref of strings (the commands) +# $cb is the callback that is executed on OK +# $ccb is the callback that is executed on CANCEL and +# when the binding was unsuccessful on OK +sub set_binding { + my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_; + + $self->clear_command_list; + $self->{recording} = 0; + $self->{rec_btn}->set_text ("start recording"); + + $self->{binding} = [$mod, $sym]; + $self->{commands} = $cmds; + + $self->{binding_change} = $cb; + $self->{binding_cancel} = $ccb; + + $self->update_binding_widgets; +} + +# this is a shortcut method that asks for a binding +# and then just binds it. +sub do_quick_binding { + my ($self, $cmds, $end_cb) = @_; + $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) }); + $self->ask_for_bind (1, $end_cb); +} + +sub update_binding_widgets { + my ($self) = @_; + my ($mod, $sym, $cmds) = $self->get_binding; + $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym)); + $self->set_command_list ($cmds); +} + +sub get_binding { + my ($self) = @_; + return ( + $self->{binding}->[0], + $self->{binding}->[1], + [ grep { defined $_ } @{$self->{commands}} ] + ); +} + +sub clear_command_list { + my ($self) = @_; + $self->{cmdbox}->clear (); +} + +sub set_command_list { + my ($self, $cmds) = @_; + + $self->{cmdbox}->clear (); + $self->{commands} = $cmds; + + my $idx = 0; + + for (@$cmds) { + $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox); + + my $i = $idx; + $hb->add (new CFClient::UI::Label text => $_); + $hb->add (new CFClient::UI::Button + text => "delete", + tooltip => "Deletes the action from the record", + on_activate => sub { + $self->{cmdbox}->remove ($hb); + $cmds->[$i] = undef; + }); + + + $idx++ + } +} + +############################################################################# + +package CFClient::UI::SpellList; + +our @ISA = CFClient::UI::Table::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + binding => [], + commands => [], @_, ) } -sub configure { - my ($self, $x, $y, $w, $h) = @_; +my $TOOLTIP_ALL = "\n\nLeft click - ready spell\nMiddle click - invoke spell\nRight click - further options"; + +my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip => + "Name. The name of the spell.$TOOLTIP_ALL"); +my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip => + "Skill. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL"); +my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Level. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL"); +my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Spell points / Grace points. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL"); +my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Damage. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); + +sub rebuild_spell_list { + my ($self) = @_; + + $CFClient::UI::ROOT->on_refresh ($self => sub { + $self->clear; + + return unless $::CONN; + + $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); + $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); + $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); + $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); + $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); + + my $row = 0; + + for (sort { $a cmp $b } keys %{ $self->{spell} }) { + my $spell = $self->{spell}{$_}; + + $row++; + + my $spell_cb = sub { + my ($widget, $ev) = @_; + + if ($ev->{button} == 1) { + $::CONN->user_send ("cast $spell->{name}"); + } elsif ($ev->{button} == 2) { + $::CONN->user_send ("invoke $spell->{name}"); + } elsif ($ev->{button} == 3) { + (new CFClient::UI::Menu + items => [ + ["bind cast $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], + ["bind invoke $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], + ], + )->popup ($ev); + } else { + return 0; + } + + 1 + }; + + my $tooltip = "$spell->{message}$TOOLTIP_ALL"; - $self->{w} = $w; - $self->{h} = $h; + #TODO: add path info to tooltip + #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); + + $self->add (0, $row, new CFClient::UI::Face + face => $spell->{face}, + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + on_button_down => $spell_cb, + ); + + $self->add (1, $row, new CFClient::UI::Label + expand => 1, + text => $spell->{name}, + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + on_button_down => $spell_cb, + ); + + $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); + $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); + $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); + $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); + } + }); } -sub check_size { +sub add_spell { + my ($self, $spell) = @_; + + $self->{spell}->{$spell->{name}} = $spell; + $self->rebuild_spell_list; +} + +sub remove_spell { + my ($self, $spell) = @_; + + delete $self->{spell}->{$spell->{name}}; + $self->rebuild_spell_list; +} + +sub clear_spells { my ($self) = @_; - $self->size_allocate ($self->{w}, $self->{h}) - if $self->{w}; + $self->{spell} = {}; + $self->rebuild_spell_list; +} + +############################################################################# + +package CFClient::UI::Root; + +our @ISA = CFClient::UI::Container::; + +use List::Util qw(min max); + +use CFClient::OpenGL; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + visible => 1, + @_, + ); + + Scalar::Util::weaken ($self->{root} = $self); + + $self } sub size_request { @@ -2873,29 +3827,36 @@ ($self->{w}, $self->{h}) } -sub size_allocate { - my ($self, $w, $h) = @_; +sub _to_pixel { + my ($coord, $size, $max) = @_; + + $coord = + $coord eq "center" ? ($max - $size) * 0.5 + : $coord eq "max" ? $max + : $coord; - my $old_w = $self->{old_w}; $self->{old_w} = $w; - my $old_h = $self->{old_h}; $self->{old_h} = $h; + $coord = 0 if $coord < 0; + $coord = $max - $size if $coord > $max - $size; - CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h - if $old_w && $old_h && ($old_w != $w || $old_h != $h); + int $coord + 0.5 +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; for my $child ($self->children) { my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_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 = $child->{force_x} if exists $child->{force_x}; + $Y = $child->{force_y} if exists $child->{force_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; + $X = _to_pixel $X, $W, $self->{w}; + $Y = _to_pixel $Y, $H, $self->{h}; $child->configure ($X, $Y, $W, $H); } + + 1 } sub coord2local { @@ -2913,24 +3874,33 @@ sub update { my ($self) = @_; - $self->check_size; $::WANT_REFRESH++; } sub add { my ($self, @children) = @_; - for my $child (@children) { - $child->{toplevel} = 1; - - # integerise window positions - $child->{x} = int $child->{x}; - $child->{y} = int $child->{y}; - } + $_->{is_toplevel} = 1 + for @children; $self->SUPER::add (@children); } +sub remove { + my ($self, @children) = @_; + + $self->SUPER::remove (@children); + + delete $self->{is_toplevel} + for @children; + + while (@children) { + my $w = pop @children; + push @children, $w->children; + $w->set_invisible; + } +} + sub on_refresh { my ($self, $id, $cb) = @_; @@ -2951,48 +3921,89 @@ for values %{delete $self->{refresh_hook}}; } - if ($self->{check_size}) { - my @queue = ([], []); + if ($self->{realloc}) { + my %queue; + my @queue; + my $widget; + + outer: + while () { + if (my $realloc = delete $self->{realloc}) { + for $widget (values %$realloc) { + $widget->{visible} or next; # do not resize invisible widgets + + $queue{$widget+0}++ and next; # duplicates are common - for (;;) { - if ($self->{check_size}) { - # heuristic: check containers last - push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ - for values %{delete $self->{check_size}} + push @{ $queue[$widget->{visible}] }, $widget; + } } - my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; + while () { + @queue or last outer; - my ($w, $h) = $widget->{user_w} && $widget->{user_h} - ? @$widget{qw(user_w user_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# + $widget = pop @{ $queue[-1] || [] } + and last; + pop @queue; + } + + delete $queue{$widget+0}; + + my ($w, $h) = $widget->size_request; + + $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; + $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; + + $w = min $widget->{max_w}, $w if exists $widget->{max_w}; + $h = min $widget->{max_h}, $h if exists $widget->{max_h}; + + $w = $widget->{force_w} if exists $widget->{force_w}; + $h = $widget->{force_h} if exists $widget->{force_h}; + + if ($widget->{req_w} != $w || $widget->{req_h} != $h + || delete $widget->{force_realloc}) { $widget->{req_w} = $w; $widget->{req_h} = $h; - $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; + $self->{size_alloc}{$widget+0} = $widget; + + if (my $parent = $widget->{parent}) { + $self->{realloc}{$parent+0} = $parent + unless $queue{$parent+0}; - $widget->{parent}->check_size - if $widget->{parent}; + $parent->{force_size_alloc} = 1; + $self->{size_alloc}{$parent+0} = $parent; + } } + + delete $self->{realloc}{$widget+0}; } } - 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->{visible} <=> $a->{visible} } + values %$size_alloc; + + while () { + my $widget = pop @queue || last; + + my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; $w = 0 if $w < 0; $h = 0 if $h < 0; - $widget->{w} = $w; - $widget->{h} = $h; - $widget->size_allocate ($w, $h); - $widget->emit (size_allocate => $w, $h); + $w = int $w + 0.5; + $h = int $h + 0.5; + + if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { + $widget->{old_w} = $widget->{w}; + $widget->{old_h} = $widget->{h}; + + $widget->{w} = $w; + $widget->{h} = $h; + + $widget->emit (size_allocate => $w, $h); + } } } @@ -3001,16 +4012,24 @@ for values %{delete $self->{post_alloc_hook}}; } + glViewport 0, 0, $::WIDTH, $::HEIGHT; glClearColor +($::CFG->{fow_intensity}) x 3, 1; glClear GL_COLOR_BUFFER_BIT; glMatrixMode GL_PROJECTION; glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; glMatrixMode GL_MODELVIEW; glLoadIdentity; + { + package CFClient::UI::Base; + + ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + } + $self->_draw; } @@ -3019,7 +4038,7 @@ package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1