--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/29 01:53:23 1.254 +++ deliantra/Deliantra-Client/DC/UI.pm 2007/12/28 15:05:33 1.458 @@ -1,13 +1,13 @@ -package CFClient::UI; +package DC::UI; use utf8; use strict; -use Scalar::Util (); use List::Util (); -use CFClient; -use CFClient::Texture; +use DC; +use DC::Pod; +use DC::Texture; our ($FOCUS, $HOVER, $GRAB); # various widgets @@ -18,38 +18,21 @@ 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; -} +our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub { + $_[0]->stop; -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->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; $TOOLTIP->hide; $TOOLTIP->{owner} = $widget; + $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; - my $tip = $widget->{tooltip}; + return if $ENV{CFPLUS_DEBUG} & 8; - $tip = $tip->($widget) if CODE:: eq ref $tip; - $TOOLTIP->set_tooltip_from ($widget); $TOOLTIP->show; } @@ -60,7 +43,31 @@ } $TOOLTIP->hide; + $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 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 @@ -74,42 +81,67 @@ if $FOCUS; } +sub check_hover { + my ($widget) = @_; + + if ($widget != $HOVER) { + my $hover = $HOVER; $HOVER = $widget; + + $hover->update if $hover && $hover->{can_hover}; + $HOVER->update if $HOVER && $HOVER->{can_hover}; + + $TOOLTIP_WATCHER->again; + } +} + sub feed_sdl_button_down_event { my ($ev) = @_; my ($x, $y) = ($ev->{x}, $ev->{y}); - if (!$BUTTON_STATE) { + $BUTTON_STATE |= 1 << ($ev->{button} - 1); + + unless ($GRAB) { my $widget = $ROOT->find_widget ($x, $y); $GRAB = $widget; $GRAB->update if $GRAB; - check_tooltip; + $TOOLTIP_WATCHER->invoke; } - $BUTTON_STATE |= 1 << ($ev->{button} - 1); + if ($GRAB) { + if ($ev->{button} == 4 || $ev->{button} == 5) { + # mousewheel + my $delta = $ev->{button} * 2 - 9; + my $shift = $ev->{mod} & DC::KMOD_SHIFT; - $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) - if $GRAB; + $ev->{dx} = $shift ? $delta : 0; + $ev->{dy} = $shift ? 0 : $delta; + + $GRAB->emit (mouse_wheel => $ev); + } else { + $GRAB->emit (button_down => $ev) + } + } } sub feed_sdl_button_up_event { my ($ev) = @_; - my ($x, $y) = ($ev->{x}, $ev->{y}); - my $widget = $GRAB || $ROOT->find_widget ($x, $y); + my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y}); $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) - if $GRAB; + $GRAB->emit (button_up => $ev) + if $GRAB && $ev->{button} != 4 && $ev->{button} != 5; - if (!$BUTTON_STATE) { + unless ($BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; $GRAB->update if $GRAB; - check_tooltip; + check_hover $widget; + $TOOLTIP_WATCHER->invoke; } } @@ -119,16 +151,9 @@ my $widget = $GRAB || $ROOT->find_widget ($x, $y); - if ($widget != $HOVER) { - my $hover = $HOVER; $HOVER = $widget; - - $hover->update if $hover && $hover->{can_hover}; - $HOVER->update if $HOVER && $HOVER->{can_hover}; + check_hover $widget; - check_tooltip; - } - - $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + $HOVER->emit (mouse_motion => $ev) if $HOVER; } @@ -167,12 +192,19 @@ for my $widget (values %WIDGET) { if ($widget->{is_toplevel}) { - $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; - $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; - $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; - $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; - $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; - $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; + $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->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; + $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; + } } @@ -181,36 +213,51 @@ ############################################################################# -package CFClient::UI::Base; +package DC::UI::Event; + +sub xy { + $_[1]->coord2local ($_[0]{x}, $_[0]{y}) +} + +############################################################################# + +package DC::UI::Base; use strict; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; my $self = bless { - x => 0, - y => 0, + x => "center", + y => "center", z => 0, + w => undef, + h => undef, can_events => 1, @_ }, $class; + DC::weaken ($DC::UI::WIDGET{$self+0} = $self); + for (keys %$self) { if (/^on_(.*)$/) { $self->connect ($1 => delete $self->{$_}); } } - Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) { + $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x}; + $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y}; + $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w}; + $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h}; - 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->{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 @@ -220,27 +267,20 @@ my ($self) = @_; $self->hide; + $self->emit ("destroy"); %$self = (); } -sub show { - my ($self) = @_; - - return if $self->{parent}; - - $CFClient::UI::ROOT->add ($self); +sub TO_JSON { + { "\fw" => $_[0]{s_id} } } -sub center { +sub show { my ($self) = @_; - $CFClient::UI::ROOT->on_post_alloc ( - "center_$self" => sub { - $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5); - }, - ); + return if $self->{parent}; - $self->update; + $DC::UI::ROOT->add ($self); } sub set_visible { @@ -265,17 +305,16 @@ $_->set_invisible for $self->children; - delete $self->{root}; delete $self->{visible}; + delete $self->{root}; undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; - CFClient::UI::check_tooltip + $DC::UI::TOOLTIP_WATCHER->invoke if $TOOLTIP->{owner} == $self; - $self->focus_out; - + $self->emit ("focus_out"); $self->emit (visibility_change => 0); } @@ -284,8 +323,8 @@ return if $self->{visible} == $visible; - $visible ? $self->hide - : $self->show; + $visible ? $self->show + : $self->hide; } sub toggle_visibility { @@ -301,15 +340,18 @@ $self->set_invisible; - $self->{parent}->remove ($self) - if $self->{parent}; + # extra $parent copy for 5.8.8+ bug workaround + # (otherwise $_[0] in remove gets freed + if (my $parent = $self->{parent}) { + $parent->remove ($self); + } } -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; @@ -318,57 +360,77 @@ sub set_size { my ($self, $w, $h) = @_; - $self->{def_w} = $w; - $self->{def_h} = $h; + $self->{force_w} = $w; + $self->{force_h} = $h; $self->realloc; } +# traverse the widget chain up to find the maximum "physical" size constraints +sub get_max_wh { + my ($self) = @_; + + return $self->{parent}->get_max_wh + if $self->{parent}; + + ($::WIDTH, $::HEIGHT) +} + sub size_request { require Carp; 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, DC::ceil $h * $self->{aspect}; + $h = List::Util::min $h, DC::ceil $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) { + if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) { return unless $self->{visible}; - $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; + $self->{alloc_w} = $w; + $self->{alloc_h} = $h; + + $self->{root}{size_alloc}{$self+0} = $self; } } -sub size_allocate { - # nothing to be done +sub children { + # nop } -sub children { +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 { @@ -381,9 +443,9 @@ $self->{tooltip} = $tooltip; - if ($CFClient::UI::TOOLTIP->{owner} == $self) { - delete $CFClient::UI::TOOLTIP->{owner}; - CFClient::UI::check_tooltip; + if ($DC::UI::TOOLTIP->{owner} == $self) { + delete $DC::UI::TOOLTIP->{owner}; + $DC::UI::TOOLTIP_WATCHER->invoke; } } @@ -391,6 +453,8 @@ sub coord2local { my ($self, $x, $y) = @_; + return (undef, undef) unless $self->{parent}; + $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } @@ -398,108 +462,128 @@ sub coord2global { my ($self, $x, $y) = @_; + return (undef, undef) unless $self->{parent}; + $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } -sub focus_in { +sub invoke_focus_in { my ($self) = @_; return if $FOCUS == $self; return unless $self->{can_focus}; - my $focus = $FOCUS; $FOCUS = $self; + $FOCUS = $self; - $self->_emit (focus_in => $focus); + $self->update; - $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); + undef $FOCUS; - $focus->update if $focus; #? + $self->update; - $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus + $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus unless $FOCUS; -} - -sub mouse_motion { } -sub button_up { } -sub key_down { } -sub key_up { } - -sub button_down { - my ($self, $ev, $x, $y) = @_; - $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 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 grab_focus { + my ($self) = @_; - () + $FOCUS->emit ("focus_out") if $FOCUS; + $self->emit ("focus_in"); } -sub set_parent { - my ($self, $parent) = @_; +sub invoke_mouse_motion { 0 } +sub invoke_button_up { 0 } +sub invoke_key_down { 0 } +sub invoke_key_up { 0 } +sub invoke_mouse_wheel { 0 } - Scalar::Util::weaken ($self->{parent} = $parent); +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; - $self->set_visible if $parent->{visible}; + $self->grab_focus; + + 0 } sub connect { my ($self, $signal, $cb) = @_; push @{ $self->{signal_cb}{$signal} }, $cb; + + defined wantarray and DC::guard { + @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, + @{ $self->{signal_cb}{$signal} }; + } } -sub _emit { - my ($self, $signal, @args) = @_; +sub disconnect_all { + my ($self, $signal) = @_; - List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} + delete $self->{signal_cb}{$signal}; } +my %has_coords = ( + button_down => 1, + button_up => 1, + mouse_motion => 1, + mouse_wheel => 1, +); + sub emit { my ($self, $signal, @args) = @_; - $self->_emit ($signal, @args) - || $self->$signal (@args); + # I do not really like this solution, but I do not like duplication + # and needlessly verbose code, either. + my @append + = $has_coords{$signal} + ? $args[0]->xy ($self) + : (); + + #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# + + for my $cb ( + @{$self->{signal_cb}{$signal} || []}, # before + ($self->can ("invoke_$signal") || sub { 1 }), # closure + ) { + return $cb->($self, @args, @append) || next; + } + + # parent + $self->{parent} && $self->{parent}->emit ($signal, @args) } -sub visibility_change { - #my ($self, $visible) = @_; +#sub find_widget { +# in .xs + +sub set_parent { + my ($self, $parent) = @_; + + DC::weaken ($self->{parent} = $parent); + $self->set_visible if $parent->{visible}; } sub realloc { my ($self) = @_; if ($self->{visible}) { - return if $self->{root}{realloc}{$self}; + return if $self->{root}{realloc}{$self+0}; - $self->{root}{realloc}{$self} = $self; + $self->{root}{realloc}{$self+0} = $self; $self->{root}->update; } else { delete $self->{req_w}; + delete $self->{req_h}; } } @@ -510,45 +594,19 @@ if $self->{parent}; } -sub draw { +sub reconfigure { my ($self) = @_; - return unless $self->{h} && $self->{w}; - - glPushMatrix; - glTranslate $self->{x}, $self->{y}, 0; - $self->_draw; - glPopMatrix; - - if ($self == $HOVER && $self->{can_hover}) { - my ($x, $y) = @$self{qw(x y)}; + $self->realloc; + $self->update; +} - 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; - } +# 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 - 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} - 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; - } -} +#sub draw { +#CFPlus.xs sub _draw { my ($self) = @_; @@ -559,24 +617,27 @@ sub DESTROY { my ($self) = @_; + return if DC::in_destruct; + + local $@; + eval { $self->destroy }; + warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; + delete $WIDGET{$self+0}; - #$self->deactivate; } ############################################################################# -package CFClient::UI::DrawBG; +package DC::UI::DrawBG; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Base::; use strict; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; - # range [value, low, high, page] - $class->SUPER::new ( #bg => [0, 0, 0, 0.2], #active_bg => [1, 1, 1, 0.5], @@ -595,25 +656,18 @@ my ($w, $h) = @$self{qw(w h)}; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @$color; - - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; - + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @$color; + glRect 0, 0, $w, $h; glDisable GL_BLEND; } } ############################################################################# -package CFClient::UI::Empty; +package DC::UI::Empty; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Base::; sub new { my ($class, %arg) = @_; @@ -621,38 +675,51 @@ } sub size_request { - (0, 0) + my ($self) = @_; + + ($self->{w} + 0, $self->{h} + 0) } sub draw { } ############################################################################# -package CFClient::UI::Container; +package DC::UI::Container; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Base::; 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 && @$children; $self } +sub realloc { + my ($self) = @_; + + $self->{force_realloc} = 1; + $self->{force_size_alloc} = 1; + $self->SUPER::realloc; +} + sub add { my ($self, @widgets) = @_; $_->set_parent ($self) for @widgets; + # TODO: only do this in widgets that need it, e.g. root, fixed use sort 'stable'; $self->{children} = [ @@ -661,6 +728,10 @@ ]; $self->realloc; + + $self->emit (c_add => \@widgets); + + map $_+0, @widgets } sub children { @@ -668,12 +739,15 @@ } sub remove { - my ($self, $child) = @_; + my ($self, @widgets) = @_; - delete $child->{parent}; - $child->hide; + $self->emit (c_remove => \@widgets); - $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; + for my $child (@widgets) { + delete $child->{parent}; + $child->hide; + $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; + } $self->realloc; } @@ -681,7 +755,7 @@ sub clear { my ($self) = @_; - my $children = delete $self->{children}; + my $children = $self->{children}; $self->{children} = []; for (@$children) { @@ -700,7 +774,7 @@ my $res; - for (reverse @{ $self->{children} }) { + for (reverse $self->visible_children) { $res = $_->find_widget ($x, $y) and return $res; } @@ -711,19 +785,19 @@ sub _draw { my ($self) = @_; - $_->draw for @{$self->{children}}; + $_->draw for $self->visible_children; } ############################################################################# -package CFClient::UI::Bin; +package DC::UI::Bin; -our @ISA = CFClient::UI::Container::; +our @ISA = DC::UI::Container::; sub new { my ($class, %arg) = @_; - my $child = (delete $arg{child}) || new CFClient::UI::Empty::; + my $child = (delete $arg{child}) || new DC::UI::Empty::; $class->SUPER::new (children => [$child], %arg) } @@ -731,8 +805,7 @@ sub add { my ($self, $child) = @_; - $self->{children} = []; - + $self->clear; $self->SUPER::add ($child); } @@ -741,7 +814,7 @@ $self->SUPER::remove ($widget); - $self->{children} = [new CFClient::UI::Empty] + $self->{children} = [new DC::UI::Empty] unless @{$self->{children}}; } @@ -751,19 +824,22 @@ $_[0]{children}[0]->size_request } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +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; +package DC::UI::Window; -our @ISA = CFClient::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my ($class, %arg) = @_; @@ -778,51 +854,60 @@ $self->SUPER::update; } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + $self->update; - $self->SUPER::size_allocate ($w, $h, $changed); - $self->update - if $changed; + $self->SUPER::invoke_size_allocate ($w, $h) } sub _render { - $_[0]{children}[0]->draw; + my ($self) = @_; + + $self->{children}[0]->draw; } sub render_child { my ($self) = @_; - $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; - $self->_render; + { + package DC::UI::Base; + + local ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + + $self->_render; + } }; } sub _draw { my ($self) = @_; - my ($w, $h) = ($self->w, $self->h); - my $tex = $self->{texture} or return; 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_premultiplied (0, 0, $w, $h); + $tex->draw_quad_alpha_premultiplied (0, 0); glDisable GL_TEXTURE_2D; } ############################################################################# -package CFClient::UI::ViewPort; +package DC::UI::ViewPort; -our @ISA = CFClient::UI::Window::; +use List::Util qw(min max); + +our @ISA = DC::UI::Window::; sub new { my $class = shift; @@ -837,31 +922,59 @@ sub size_request { my ($self) = @_; - my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; + my ($w, $h) = @{$self->child}{qw(req_w req_h)}; - $w = 10 if $self->{scroll_x}; - $h = 10 if $self->{scroll_y}; + $w = 1 if $self->{scroll_x}; + $h = 1 if $self->{scroll_y}; ($w, $h) } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; - $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; - $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; + 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 { my ($self, $x, $y) = @_; - $self->{view_x} = int $x; - $self->{view_y} = int $y; + my $x = max 0, min $self->child->{w} - $self->{w}, int $x; + my $y = max 0, min $self->child->{h} - $self->{h}, int $y; - $self->update; + if ($x != $self->{view_x} or $y != $self->{view_y}) { + $self->{view_x} = $x; + $self->{view_y} = $y; + + $self->emit (changed => $x, $y); + $self->update; + } +} + +sub set_center { + my ($self, $x, $y) = @_; + + $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5); +} + +sub make_visible { + my ($self, $x, $y, $border) = @_; + + if ( $x < $self->{view_x} + $self->{w} * $border + || $x > $self->{view_x} + $self->{w} * (1 - $border) + || $y < $self->{view_y} + $self->{h} * $border + || $y > $self->{view_y} + $self->{h} * (1 - $border) + ) { + $self->set_center ($x, $y); + } } # hmm, this does not work for topleft of $self... but we should not ask for that @@ -886,81 +999,210 @@ if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} && $y >= $self->{y} && $y < $self->{y} + $self->{h} ) { - $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) + $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) } else { - $self->CFClient::UI::Base::find_widget ($x, $y) + $self->DC::UI::Base::find_widget ($x, $y) } } sub _render { my ($self) = @_; - CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; + local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x}; + local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y}; + + DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; $self->SUPER::_render; } ############################################################################# -package CFClient::UI::ScrolledWindow; +package DC::UI::ScrolledWindow; -our @ISA = CFClient::UI::HBox::; +our @ISA = DC::UI::Table::; sub new { - my $class = shift; + my ($class, %arg) = @_; + + my $child = delete $arg{child}; my $self; - my $slider = new CFClient::UI::Slider + my $hslider = new DC::UI::Slider + c_col => 0, + c_row => 1, + vertical => 0, + range => [0, 0, 1, 0.01], # HACK fix + on_changed => sub { + $self->{hpos} = $_[1]; + $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); + }, + ; + + my $vslider = new DC::UI::Slider + c_col => 1, + c_row => 0, vertical => 1, range => [0, 0, 1, 0.01], # HACK fix on_changed => sub { - $self->{vp}->set_offset (0, $_[1]); + $self->{vpos} = $_[1]; + $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); }, ; $self = $class->SUPER::new ( - vp => (new CFClient::UI::ViewPort expand => 1), - slider => $slider, - @_, + scroll_x => 0, + scroll_y => 1, + can_events => 1, + hslider => $hslider, + vslider => $vslider, + col_expand => [1, 0], + row_expand => [1, 0], + %arg, ); - $self->{vp}->add ($self->{scrolled}); - $self->add ($self->{vp}); - $self->add ($self->{slider}); + $self->{vp} = new DC::UI::ViewPort + c_col => 0, + c_row => 0, + expand => 1, + scroll_x => $self->{scroll_x}, + scroll_y => $self->{scroll_y}, + on_changed => sub { + my ($vp, $x, $y) = @_; + + $vp->{parent}{hslider}->set_value ($x); + $vp->{parent}{vslider}->set_value ($y); + + 0 + }, + on_size_allocate => sub { + my ($vp, $w, $h) = @_; + $vp->{parent}->update_slider; + 0 + }, + ; + + $self->SUPER::add ($self->{vp}); + + $self->add ($child) if $child; $self } -sub update { +sub add { + my ($self, $widget) = @_; + + $self->{vp}->add ($self->{child} = $widget); +} + +sub set_offset { shift->{vp}->set_offset (@_) } +sub set_center { shift->{vp}->set_center (@_) } +sub make_visible { shift->{vp}->make_visible (@_) } + +sub update_slider { my ($self) = @_; - $self->SUPER::update; + my $child = ($self->{vp} or return)->child; + + if ($self->{scroll_x}) { + my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w}); + $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); + + my $visible = $w1 > $w2; + if ($visible != $self->{hslider_visible}) { + $self->{hslider_visible} = $visible; + $visible ? $self->SUPER::add ($self->{hslider}) + : $self->SUPER::remove ($self->{hslider}); + } + } + + if ($self->{scroll_y}) { + my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h}); + $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); + + my $visible = $h1 > $h2; + if ($visible != $self->{vslider_visible}) { + $self->{vslider_visible} = $visible; + $visible ? $self->SUPER::add ($self->{vslider}) + : $self->SUPER::remove ($self->{vslider}); + } + } +} + +sub start_dragging { + my ($self, $ev) = @_; + + $self->grab_focus; + + my $ox = $self->{vp}{view_x}; + my $oy = $self->{vp}{view_y}; + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + $ox -= $ev->{xrel}; + $oy -= $ev->{yrel}; + + $self->{vp}->set_offset ($ox, $oy); + }; +} + +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; + $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; + + 1 +} + +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; - # 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]); + if ($ev->{button} == 2) { + $self->start_dragging ($ev); + return 1; + } + + 0 } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; + + if (delete $self->{motion}) { + return 1; + } + + 0 +} + +sub invoke_mouse_motion { + my ($self, $ev, $x, $y) = @_; - $self->SUPER::size_allocate ($w, $h, $changed); + if ($self->{motion}) { + $self->{motion}->($ev, $x, $y); + return 1; + } - my $child = $self->{vp}->child; - $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); + 0 } -#TODO# update range on size_allocate depending on child -# update viewport offset on scroll +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + $self->update_slider; + $self->SUPER::invoke_size_allocate ($w, $h) +} ############################################################################# -package CFClient::UI::Frame; +package DC::UI::Frame; -our @ISA = CFClient::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -978,16 +1220,9 @@ my ($w, $h) = @$self{qw(w h)}; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @{ $self->{bg} }; - - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; - + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @{ $self->{bg} }; + glRect 0, 0, $w, $h; glDisable GL_BLEND; } @@ -996,44 +1231,186 @@ ############################################################################# -package CFClient::UI::FancyFrame; +package DC::UI::FancyFrame; -our @ISA = CFClient::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFClient::OpenGL; +use DC::OpenGL; -my @tex = - 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); +sub new { + my ($class, %arg) = @_; + + if ((exists $arg{label}) && !ref $arg{label}) { + $arg{label} = new DC::UI::Label + align => 1, + valign => 0, + text => $arg{label}, + fontsize => ($arg{border} || 0.8) * 0.75; + } + + my $self = $class->SUPER::new ( + # label => "", + fg => [0.6, 0.3, 0.1], + border => 0.8, + style => 'single', + %arg, + ); + + $self +} + +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + $self->DC::UI::Container::add ($self->{label}) if $self->{label}; +} + +sub border { + int $_[0]{border} * $::FONTSIZE +} + +sub size_request { + my ($self) = @_; + + ($self->{label_w}, undef) = $self->{label}->size_request + if $self->{label}; + + my ($w, $h) = $self->SUPER::size_request; + + ( + $w + $self->border * 2, + $h + $self->border * 2, + ) +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + my $border = $self->border; + + $w -= List::Util::max 0, $border * 2; + $h -= List::Util::max 0, $border * 2; + + if (my $label = $self->{label}) { + $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2; + $label->{h} = List::Util::min $h, $border; + $label->invoke_size_allocate ($label->{w}, $label->{h}); + } + + $self->child->configure ($border, $border, $w, $h); + + 1 +} + +sub _draw { + my ($self) = @_; + + my $child = $self->{children}[0]; + + my $border = $self->border; + my ($w, $h) = ($self->{w}, $self->{h}); + + $child->draw; + + glColor @{$self->{fg}}; + glBegin GL_LINE_STRIP; + glVertex $border * 1.5 , $border * 0.5 + 0.5; + glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; + glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; + glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; + glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5; + glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5; + glEnd; + + if ($self->{label}) { + glTranslate $border * 2, 0; + $self->{label}->_draw; + } +} + +############################################################################# + +package DC::UI::Toplevel; + +our @ISA = DC::UI::Bin::; + +use DC::OpenGL; + +my $bg = + new_from_file DC::Texture DC::find_rcfile "d1_bg.png", + mipmap => 1, wrap => 1; + +my @border = + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } + qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); + +my @icon = + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } + qw(x1_move.png x1_resize.png); sub new { - my $class = shift; + my ($class, %arg) = @_; my $self = $class->SUPER::new ( bg => [1, 1, 1, 1], border_bg => [1, 1, 1, 1], border => 0.6, - is_toplevel => 1, can_events => 1, - @_ + min_w => 64, + min_h => 32, + %arg, ); - $self->{title} &&= new CFClient::UI::Label + $self->{title_widget} = new DC::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 DC::UI::ImageButton + path => 'x1_close.png', + on_activate => sub { $self->emit ("delete") }; + + $self->DC::UI::Container::add ($self->{close_button}); + } $self } +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button}; + $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; +} + sub border { int $_[0]{border} * $::FONTSIZE } +sub get_max_wh { + my ($self) = @_; + + return ($self->{w}, $self->{h}) + if $self->{visible} && $self->{w}; + + $self->SUPER::get_max_wh +} + 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; ( @@ -1042,21 +1419,37 @@ ) } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; - return unless $changed; + 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, $self->border * 2; - $w -= List::Util::max 0, $self->border * 2; + $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_delete { + my ($self) = @_; + + $self->hide; + + 1 +} + +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; my ($w, $h) = @$self{qw(w h)}; @@ -1079,11 +1472,10 @@ my $dx = $ev->{x} - $ox; my $dy = $ev->{y} - $oy; - $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->{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; }; @@ -1096,32 +1488,46 @@ ($x, $y) = ($ev->{x}, $ev->{y}); - $self->{user_x} = $bx + $x - $ox; - $self->{user_y} = $by + $y - $oy; - - $self->move ($self->{user_x}, $self->{user_y}); - $self->realloc; + $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 invoke_visibility_change { + my ($self, $visible) = @_; + + delete $self->{motion} unless $visible; + + 0 } 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; @@ -1129,78 +1535,96 @@ 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); + + # move + my $w2 = ($w - $border) * .5; + my $h2 = ($h - $border) * .5; + $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); + $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); + $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); + + # resize + $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); + $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) + unless $self->{has_close_button}; + $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); + $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $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; - $self->child->draw; + glTranslate 0, - ($border - $self->{h}); + } + + $self->{close_button}->draw + if $self->{close_button}; } ############################################################################# -package CFClient::UI::Table; +package DC::UI::Table; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Container::; use List::Util qw(max sum); -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; $class->SUPER::new ( col_expand => [], + row_expand => [], @_, ) } -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } -} - sub add { - my ($self, $x, $y, $child) = @_; + my ($self, @widgets) = @_; - $child->set_parent ($self); - $self->{children}[$y][$x] = $child; + for my $child (@widgets) { + $child->{c_rowspan} ||= 1; + $child->{c_colspan} ||= 1; + } - $self->realloc; + $self->SUPER::add (@widgets); } -# TODO: move to container class maybe? send children a signal on removal? -sub clear { - my ($self) = @_; +sub add_at { + my $self = shift; - my @children = $self->children; - delete $self->{children}; - - for (@children) { - delete $_->{parent}; - $_->hide; + my @widgets; + + while (@_) { + my ($col, $row, $child) = splice @_, 0, 3, (); + + $child->{c_row} = $row; + $child->{c_col} = $col; + + push @widgets, $child; } - $self->realloc; + $self->add (@widgets); } sub get_wh { @@ -1208,17 +1632,27 @@ my (@w, @h); - for my $y (0 .. $#{$self->{children}}) { - my $row = $self->{children}[$y] - or next; - - for my $x (0 .. $#$row) { - my $widget = $row->[$x] - or next; - my ($w, $h) = @$widget{qw(req_w req_h)}; + my @children = $self->children; + + # first pass, columns + for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) { + my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; + + my $sw = sum @w[$c .. $c + $cs - 1]; - $w[$x] = max $w[$x], $w; - $h[$y] = max $h[$y], $h; + if ($w > $sw) { + $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; + } + } + + # second pass, rows + for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { + my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; + + my $sh = sum @h[$r .. $r + $rs - 1]; + + if ($h > $sh) { + $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; } } @@ -1236,127 +1670,167 @@ ) } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; my ($ws, $hs) = $self->get_wh; my $req_w = (sum @$ws) || 1; my $req_h = (sum @$hs) || 1; - # TODO: nicer code && do row_expand + # now linearly scale the rows/columns to the allocated size my @col_expand = @{$self->{col_expand}}; @col_expand = (1) x @$ws unless @col_expand; my $col_expand = (sum @col_expand) || 1; - # linearly scale sizes $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; - $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; - CFClient::UI::harmonize $ws; - CFClient::UI::harmonize $hs; + DC::UI::harmonize $ws; - my $y; + my @row_expand = @{$self->{row_expand}}; + @row_expand = (1) x @$ws unless @row_expand; + my $row_expand = (sum @row_expand) || 1; - for my $r (0 .. $#{$self->{children}}) { - my $row = $self->{children}[$r] - or next; + $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; - my $x = 0; - my $row_h = $hs->[$r]; - - for my $c (0 .. $#$row) { - my $col_w = $ws->[$c]; + DC::UI::harmonize $hs; - if (my $widget = $row->[$c]) { - $widget->configure ($x, $y, $col_w, $row_h); - } + my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } + my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } - $x += $col_w; - } + for my $widget ($self->children) { + my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)}; - $y += $row_h; + $widget->configure ( + $x[$c], $y[$r], + $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], + ); } + 1 } -sub find_widget { - my ($self, $x, $y) = @_; +############################################################################# - $x -= $self->{x}; - $y -= $self->{y}; +package DC::UI::Fixed; - my $res; +use List::Util qw(min max); - for (grep $_, map @$_, grep $_, @{ $self->{children} }) { - $res = $_->find_widget ($x, $y) - and return $res; - } +our @ISA = DC::UI::Container::; - $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) +sub _scale($$$) { + my ($rel, $val, $max) = @_; + + $rel ? $val * $max : $val } -sub _draw { +sub size_request { my ($self) = @_; - for (grep $_, @{$self->{children}}) { - $_->draw for grep $_, @$_; + my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); + + # determine overall size by querying abs widgets + for my $child ($self->visible_children) { + unless ($child->{c_rel}) { + my $x = $child->{c_x}; + my $y = $child->{c_y}; + + $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; + $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; + } + } + + my $W = $x2 - $x1; + my $H = $y2 - $y1; + + # now layout remaining widgets + for my $child ($self->visible_children) { + if ($child->{c_rel}) { + my $x = _scale $child->{c_rel}, $child->{c_x}, $W; + my $y = _scale $child->{c_rel}, $child->{c_y}, $H; + + $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; + $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; + } } + + my $W = $x2 - $x1; + my $H = $y2 - $y1; + + ($W, $H) +} + +sub invoke_size_allocate { + my ($self, $W, $H) = @_; + + for my $child ($self->visible_children) { + my $x = _scale $child->{c_rel}, $child->{c_x}, $W; + my $y = _scale $child->{c_rel}, $child->{c_y}, $H; + + $x += $child->{c_halign} * $child->{req_w}; + $y += $child->{c_valign} * $child->{req_h}; + + $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h}); + } + + 1 } ############################################################################# -package CFClient::UI::Box; +package DC::UI::Box; -our @ISA = CFClient::UI::Container::; +our @ISA = DC::UI::Container::; sub size_request { my ($self) = @_; + my @children = $self->visible_children; + $self->{vertical} ? ( - (List::Util::max map $_->{req_w}, @{$self->{children}}), - (List::Util::sum map $_->{req_h}, @{$self->{children}}), + (List::Util::max map $_->{req_w}, @children), + (List::Util::sum map $_->{req_h}, @children), ) : ( - (List::Util::sum map $_->{req_w}, @{$self->{children}}), - (List::Util::max map $_->{req_h}, @{$self->{children}}), + (List::Util::sum map $_->{req_w}, @children), + (List::Util::max map $_->{req_h}, @children), ) } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; my $space = $self->{vertical} ? $h : $w; - my $children = $self->{children}; + my @children = $self->visible_children; my @req; if ($self->{homogeneous}) { - @req = ($space / (@$children || 1)) x @$children; + @req = ($space / (@children || 1)) x @children; } else { - @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$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; + 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; + $req[$_] += $space * $children[$_]{expand} + for 0 .. $#children; } } - CFClient::UI::harmonize \@req; + DC::UI::harmonize \@req; my $pos = 0; - for (0 .. $#$children) { + for (0 .. $#children) { my $alloc = $req[$_]; - $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); + $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); $pos += $alloc; } @@ -1366,9 +1840,9 @@ ############################################################################# -package CFClient::UI::HBox; +package DC::UI::HBox; -our @ISA = CFClient::UI::Box::; +our @ISA = DC::UI::Box::; sub new { my $class = shift; @@ -1381,9 +1855,9 @@ ############################################################################# -package CFClient::UI::VBox; +package DC::UI::VBox; -our @ISA = CFClient::UI::Box::; +our @ISA = DC::UI::Box::; sub new { my $class = shift; @@ -1396,11 +1870,11 @@ ############################################################################# -package CFClient::UI::Label; +package DC::UI::Label; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my ($class, %arg) = @_; @@ -1413,18 +1887,20 @@ #text => initial text #markup => initial narkup #max_w => maximum pixel width + #style => 0, # render flags ellipsise => 3, # end - layout => (new CFClient::Layout), + layout => (new DC::Layout), fontsize => 1, align => -1, valign => -1, - padding => 2, + padding_x => 2, + padding_y => 2, can_events => 0, %arg ); if (exists $self->{template}) { - my $layout = new CFClient::Layout; + my $layout = new DC::Layout; $layout->set_text (delete $self->{template}); $self->{template} = $layout; } @@ -1438,21 +1914,24 @@ $self } -sub escape($) { - local $_ = $_[0]; +sub update { + my ($self) = @_; - s/&/&/g; - s/>/>/g; - s/{texture}; + $self->SUPER::update; +} - $_ +sub realloc { + my ($self) = @_; + + delete $self->{ox}; + $self->SUPER::realloc; } -sub update { +sub clear { my ($self) = @_; - delete $self->{texture}; - $self->SUPER::update; + $self->set_text (""); } sub set_text { @@ -1461,9 +1940,9 @@ return if $self->{text} eq "T$text"; $self->{text} = "T$text"; - $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; $self->{layout}->set_text ($text); + delete $self->{size_req}; $self->realloc; $self->update; } @@ -1476,9 +1955,9 @@ my $rgba = $markup =~ /span.*(?:foreground|background)/; - $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; $self->{layout}->set_markup ($markup); + delete $self->{size_req}; $self->realloc; $self->update; } @@ -1486,52 +1965,74 @@ 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_ellipsise ($self->{ellipsise}); - $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{size_req} ||= do { + my ($max_w, $max_h) = $self->get_max_wh; - my ($w, $h) = $self->{layout}->size; + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_width ($self->{max_w} || $max_w || -1); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->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 ($w, $h) = $self->{layout}->size; - my ($w2, $h2) = $self->{template}->size; + if (exists $self->{template}) { + $self->{template}->set_font ($self->{font}) if $self->{font}; + $self->{template}->set_width ($self->{max_w} || -1); + $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); - $w = List::Util::max $w, $w2; - $h = List::Util::max $h, $h2; - } + my ($w2, $h2) = $self->{template}->size; - ( - $w + $self->{padding} * 2, - $h + $self->{padding} * 2, - ) + $w = List::Util::max $w, $w2; + $h = List::Util::max $h, $h2; + } + + [$w, $h] + }; + + @{ $self->{size_req} } +} + +sub baseline_shift { + $_[0]{layout}->descent } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + delete $self->{ox}; delete $self->{texture} - if $changed; + unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; + + 1 } sub set_fontsize { my ($self, $fontsize) = @_; $self->{fontsize} = $fontsize; + delete $self->{size_req}; delete $self->{texture}; $self->realloc; } +sub reconfigure { + my ($self) = @_; + + delete $self->{size_req}; + delete $self->{texture}; + + $self->SUPER::reconfigure; +} + sub _draw { my ($self) = @_; $self->SUPER::_draw; # draw background, if applicable - my $tex = $self->{texture} ||= do { + my $size = $self->{texture} ||= do { $self->{layout}->set_foreground (@{$self->{fg}}); $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{w}); @@ -1539,39 +2040,48 @@ $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - my $tex = new_from_layout CFClient::Texture $self->{layout}; - - $self->{ox} = int ($self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} - : ($self->{w} - $tex->{w}) * 0.5); - - $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} - : ($self->{h} - $tex->{h}) * 0.5); - - $tex + [$self->{layout}->size] }; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + unless (exists $self->{ox}) { + $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} + : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} + : ($self->{w} - $size->[0]) * 0.5); + + $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} + : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} + : ($self->{h} - $size->[1]) * 0.5); - if ($tex->{format} == GL_ALPHA) { - glColor @{$self->{fg}}; - $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); - } else { - $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); - } + $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); + }; - glDisable GL_TEXTURE_2D; -} +# unless ($self->{list}) { +# $self->{list} = DC::OpenGL::glGenList; +# DC::OpenGL::glNewList $self->{list}; +# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); +# DC::OpenGL::glEndList; +# } +# +# DC::OpenGL::glCallList $self->{list}; + + $self->{layout}->draw; +} + +#sub destroy { +# my ($self) = @_; +# +# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list}; +# +# $self->SUPER::destroy; +#} ############################################################################# -package CFClient::UI::EntryBase; +package DC::UI::EntryBase; -our @ISA = CFClient::UI::Label::; +our @ISA = DC::UI::Label::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -1579,13 +2089,19 @@ $class->SUPER::new ( fg => [1, 1, 1], bg => [0, 0, 0, 0.2], - active_bg => [1, 1, 1, 0.5], - active_fg => [0, 0, 0], + outline => [0.6, 0.3, 0.1], + active_bg => [0, 0, 1, .2], + active_fg => [1, 1, 1], + active_outline => [1, 1, 0], can_hover => 1, can_focus => 1, valign => 0, can_events => 1, + ellipsise => 0, + padding_x => 4, + padding_y => 2, #text => ... + #hidden => "*", @_ ) } @@ -1597,15 +2113,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->emit (changed => $self->{text}); + + $self->realloc; + $self->update; } sub set_text { @@ -1613,8 +2131,6 @@ $self->{cursor} = length $text; $self->_set_text ($text); - - $self->realloc; } sub get_text { @@ -1629,7 +2145,7 @@ ($w + 1, $h) # add 1 for cursor } -sub key_down { +sub invoke_key_down { my ($self, $ev) = @_; my $mod = $ev->{mod}; @@ -1638,56 +2154,80 @@ my $text = $self->get_text; + $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; + if ($uni == 8) { substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; } elsif ($uni == 127) { substr $text, $self->{cursor}, 1, ""; - } elsif ($sym == CFClient::SDLK_LEFT) { + } elsif ($sym == DC::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; - } elsif ($sym == CFClient::SDLK_RIGHT) { + } elsif ($sym == DC::SDLK_RIGHT) { ++$self->{cursor} if $self->{cursor} < length $self->{text}; - } elsif ($sym == CFClient::SDLK_HOME) { + } elsif ($sym == DC::SDLK_HOME) { + # what a hack + $self->{cursor} = + (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ + ? length $1 + : 0; + } elsif ($sym == DC::SDLK_END) { + # uh, again + $self->{cursor} = + (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ + ? $self->{cursor} + length $1 + : length $self->{text}; + } elsif ($uni == 21) { # ctrl-u + $text = ""; $self->{cursor} = 0; - } elsif ($sym == CFClient::SDLK_END) { - $self->{cursor} = length $text; } elsif ($uni == 27) { - $self->_emit ('escape'); - } elsif ($uni) { + $self->emit ('escape'); + } elsif ($uni == 0x0d) { + substr $text, $self->{cursor}++, 0, "\012"; + } elsif ($uni >= 0x20) { substr $text, $self->{cursor}++, 0, chr $uni; + } else { + return 0; } $self->_set_text ($text); $self->realloc; + $self->update; + + 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); # byte-index to char-index my $text = $self->{text}; - utf8::encode $text; - $self->{cursor} = length substr $text, 0, $idx; + utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text; + $self->{cursor} = length $text; $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 { @@ -1696,20 +2236,15 @@ 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; - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $self->{h}; - glVertex $self->{w}, $self->{h}; - glVertex $self->{w}, 0; - glEnd; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glRect 0, 0, $self->{w}, $self->{h}; glDisable GL_BLEND; $self->SUPER::_draw; @@ -1721,37 +2256,54 @@ my $text = substr $self->{text}, 0, $self->{cursor}; utf8::encode $text; - @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) + @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); } - glColor @{$self->{fg}}; + glColor_premultiply @{$self->{active_fg}}; glBegin GL_LINES; - glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; - glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; + glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy}; + glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h}; + glEnd; + + glLineWidth 3; + glColor @{$self->{active_outline}}; + glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; + glLineWidth 1; + + } else { + glColor @{$self->{outline}}; + glBegin GL_LINE_STRIP; + glVertex .5, $self->{h} * .5; + glVertex .5, $self->{h} - 2.5; + glVertex $self->{w} - .5, $self->{h} - 2.5; + glVertex $self->{w} - .5, $self->{h} * .5; glEnd; } } -package CFClient::UI::Entry; +############################################################################# + +package DC::UI::Entry; -our @ISA = CFClient::UI::EntryBase::; +our @ISA = DC::UI::EntryBase::; -use CFClient::OpenGL; +use DC::OpenGL; -sub key_down { +sub invoke_key_down { my ($self, $ev) = @_; my $sym = $ev->{sym}; - if ($sym == 13) { + if ($ev->{uni} == 0x0d || $sym == 13) { unshift @{$self->{history}}, my $txt = $self->get_text; + $self->{history_pointer} = -1; $self->{history_saveback} = ''; - $self->_emit (activate => $txt); + $self->emit (activate => $txt); $self->update; - } elsif ($sym == CFClient::SDLK_UP) { + } elsif ($sym == DC::SDLK_UP) { if ($self->{history_pointer} < 0) { $self->{history_saveback} = $self->get_text; } @@ -1763,7 +2315,7 @@ $self->set_text ($self->{history}->[$self->{history_pointer}]); } - } elsif ($sym == CFClient::SDLK_DOWN) { + } elsif ($sym == DC::SDLK_DOWN) { $self->{history_pointer}--; $self->{history_pointer} = -1 if $self->{history_pointer} < 0; @@ -1774,30 +2326,77 @@ } } else { - $self->SUPER::key_down ($ev); + return $self->SUPER::invoke_key_down ($ev) + } + + 1 +} + +############################################################################# + +package DC::UI::TextEdit; + +our @ISA = DC::UI::EntryBase::; + +use DC::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + padding_y => 4, + + @_ + ) +} + +sub move_cursor_ver { + my ($self, $dy) = @_; + + my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); + + $line += $dy; + + if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) { + $self->{cursor} = $index; + delete $self->{cur_h}; + $self->update; + return; + } +} + +sub invoke_key_down { + my ($self, $ev) = @_; + + my $sym = $ev->{sym}; + + if ($sym == DC::SDLK_UP) { + $self->move_cursor_ver (-1); + } elsif ($sym == DC::SDLK_DOWN) { + $self->move_cursor_ver (+1); + } else { + return $self->SUPER::invoke_key_down ($ev) } + 1 } ############################################################################# -package CFClient::UI::Button; +package DC::UI::ButtonBin; -our @ISA = CFClient::UI::Label::; +our @ISA = DC::UI::Bin::; -use CFClient::OpenGL; +use DC::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw(b1_button_active.png); + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } + qw(b1_button_inactive.png b1_button_active.png); sub new { my $class = shift; $class->SUPER::new ( - padding => 4, - fg => [1, 1, 1], - active_fg => [0, 0, 1], can_hover => 1, align => 0, valign => 0, @@ -1806,30 +2405,80 @@ ) } -sub activate { } - -sub button_up { +sub invoke_button_up { my ($self, $ev, $x, $y) = @_; $self->emit ("activate") if $x >= 0 && $x < $self->{w} && $y >= 0 && $y < $self->{h}; + + 1 } sub _draw { my ($self) = @_; - local $self->{fg} = $self->{fg}; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glColor 0, 0, 0, 1; - if ($GRAB == $self) { - $self->{fg} = $self->{active_fg}; - } + my $tex = $tex[$GRAB == $self]; + $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); + + glDisable GL_TEXTURE_2D; + + $self->SUPER::_draw; +} + +############################################################################# + +package DC::UI::Button; + +our @ISA = DC::UI::Label::; + +use DC::OpenGL; + +my @tex = + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } + qw(b1_button_inactive.png b1_button_active.png); + +sub new { + my $class = shift; + + $class->SUPER::new ( + padding_x => 8, + padding_y => 4, + fg => [1.0, 1.0, 1.0], + active_fg => [0.8, 0.8, 0.8], + 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 +} + +sub _draw { + my ($self) = @_; + + local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg}; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 0, 0, 0, 1; - $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); + my $tex = $tex[$GRAB == $self]; + $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; @@ -1838,21 +2487,22 @@ ############################################################################# -package CFClient::UI::CheckBox; +package DC::UI::CheckBox; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } qw(c1_checkbox_bg.png c1_checkbox_active.png); -use CFClient::OpenGL; +use DC::OpenGL; sub new { 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], @@ -1866,17 +2516,28 @@ sub size_request { my ($self) = @_; - ($self->{padding} * 2 + 6) x 2 + (6) x 2 } -sub button_down { +sub toggle { + my ($self) = @_; + + $self->{state} = !$self->{state}; + $self->emit (changed => $self->{state}); + $self->update; +} + +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}) { - $self->{state} = !$self->{state}; - $self->_emit (changed => $self->{state}); + if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} + && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { + $self->toggle; + } else { + return 0 } + + 1 } sub _draw { @@ -1884,9 +2545,11 @@ $self->SUPER::_draw; - glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; + glTranslate $self->{padding_x}, $self->{padding_y}, 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} }; @@ -1899,38 +2562,55 @@ ############################################################################# -package CFClient::UI::Image; +package DC::UI::Image; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Base::; -use CFClient::OpenGL; -use Carp qw/confess/; +use DC::OpenGL; -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, + scale => 1, + @_, + ); - $loaded_images{$self->{image}} ||= - new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; + $self->{path} || $self->{tex} + or Carp::croak "'path' or 'tex' attributes required"; - my $tex = $self->{tex} = $loaded_images{$self->{image}}; + $self->{tex} ||= $texture_cache{$self->{path}} ||= + new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1; - Scalar::Util::weaken $loaded_images{$self->{image}}; + DC::weaken $texture_cache{$self->{path}}; - $self->{aspect} = $tex->{w} / $tex->{h}; + $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; $self } +sub STORABLE_freeze { + my ($self, $cloning) = @_; + + $self->{path} + or die "cannot serialise DC::UI::Image on non-loadable images\n"; + + $self->{path} +} + +sub STORABLE_attach { + my ($self, $cloning, $path) = @_; + + $self->new (path => $path) +} + sub size_request { my ($self) = @_; - ($self->{tex}->{w}, $self->{tex}->{h}) + (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) } sub _draw { @@ -1957,29 +2637,71 @@ ############################################################################# -package CFClient::UI::VGauge; +package DC::UI::ImageButton; + +our @ISA = DC::UI::Image::; + +use DC::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_down { + my ($self, $ev, $x, $y) = @_; + + 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 DC::UI::VGauge; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::Base::; use List::Util qw(min max); -use CFClient::OpenGL; +use DC::OpenGL; my %tex = ( food => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ ], grace => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ ], hp => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ ], mana => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 } qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ ], ); @@ -2049,9 +2771,13 @@ my $h1 = $self->{h} * (1 - $ycut1); my $h2 = $self->{h} * (1 - $ycut2); + my $h3 = $self->{h}; + + $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3); 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; @@ -2076,8 +2802,8 @@ glBindTexture GL_TEXTURE_2D, $t3->{name}; glBegin GL_QUADS; glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; - glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; - glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; + glTexCoord 0 , $t3->{t}; glVertex 0 , $h3; + glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3; glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; glEnd; } @@ -2088,9 +2814,147 @@ ############################################################################# -package CFClient::UI::Gauge; +package DC::UI::Progress; -our @ISA = CFClient::UI::VBox::; +our @ISA = DC::UI::Label::; + +use DC::OpenGL; + +sub new { + my ($class, %arg) = @_; + + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + bg => [0, 0, 1, 0.2], + bar => [0.7, 0.5, 0.1, 0.8], + outline => [0.4, 0.3, 0], + fontsize => 0.9, + valign => 0, + align => 0, + can_events => 1, + ellipsise => 1, + label => "%d%%", + %arg, + ); + + $self->set_value ($arg{value} || -1); + + $self +} + +sub set_label { + my ($self, $label) = @_; + + return if $self->{label} eq $label; + $self->{label} = $label; + + $self->DC::UI::Progress::set_value (0 + delete $self->{value}); +} + +sub set_value { + my ($self, $value) = @_; + + if ($self->{value} ne $value) { + $self->{value} = $value; + + if ($value < 0) { + $self->set_text ("-"); + } else { + $self->set_text (sprintf $self->{label}, $value * 100); + } + + $self->update; + } +} + +sub _draw { + my ($self) = @_; + + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + + if ($self->{value} >= 0) { + my $s = int 2 + ($self->{w} - 4) * $self->{value}; + + glColor_premultiply @{$self->{bar}}; + glRect 2, 2, $s, $self->{h} - 2; + glColor_premultiply @{$self->{bg}}; + glRect $s, 2, $self->{w} - 2, $self->{h} - 2; + } + + glColor_premultiply @{$self->{outline}}; + glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; + + glDisable GL_BLEND; + + { + local $self->{bg}; # do not draw background + $self->SUPER::_draw; + } +} + +############################################################################# + +package DC::UI::ExperienceProgress; + +our @ISA = DC::UI::Progress::; + +sub new { + my ($class, %arg) = @_; + + my $self = $class->SUPER::new ( + tooltip => sub { + my ($self) = @_; + + sprintf "level %d\n%s points\n%s next level\n%s to go", + $self->{lvl}, + ::formsep ($self->{exp}), + ::formsep ($self->{nxt}), + ::formsep ($self->{nxt} - $self->{exp}), + }, + %arg + ); + + $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } + if $::CONN; + + $self +} + +sub DESTROY { + my ($self) = @_; + + delete $::CONN->{on_exp_update}{$self+0} + if $::CONN; + + $self->SUPER::DESTROY; +} + +sub set_value { + my ($self, $lvl, $exp) = @_; + + $self->{lvl} = $lvl; + $self->{exp} = $exp; + + my $v = -1; + + if ($::CONN && (my $table = $::CONN->{exp_table})) { + my $l0 = $table->[$lvl - 1]; + my $l1 = $table->[$lvl]; + + $self->{nxt} = $l1; + + $v = ($exp - $l0) / ($l1 - $l0); + } + + $self->SUPER::set_value ($v); +} + +############################################################################# + +package DC::UI::Gauge; + +our @ISA = DC::UI::VBox::; sub new { my ($class, %arg) = @_; @@ -2102,9 +2966,9 @@ %arg, ); - $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); - $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); - $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); + $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999"); + $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); + $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999"); $self } @@ -2135,16 +2999,16 @@ ############################################################################# -package CFClient::UI::Slider; +package DC::UI::Slider; use strict; -use CFClient::OpenGL; +use DC::OpenGL; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file DC::Texture DC::find_rcfile $_ } qw(s1_slider.png s1_slider_bg.png); sub new { @@ -2161,8 +3025,8 @@ bg => [0, 0, 0, 0.2], active_bg => [1, 1, 1, 0.5], range => [0, 0, 100, 10, 0], - req_w => $::WIDTH / 80, - req_h => $::WIDTH / 80, + min_w => $::WIDTH / 80, + min_h => $::WIDTH / 80, vertical => 0, can_hover => 1, inner_pad => 0.02, @@ -2175,15 +3039,15 @@ $self } -sub changed { } - sub set_range { my ($self, $range) = @_; ($range, $self->{range}) = ($self->{range}, $range); - $self->update - if "@$range" ne "@{$self->{range}}"; + if ("@$range" ne "@{$self->{range}}") { + $self->update; + $self->set_value ($self->{range}[0]); + } } sub set_value { @@ -2204,7 +3068,7 @@ @{$self->{range}} = ($value, $lo, $hi, $page, $unit); if ($value != $old_value) { - $self->_emit (changed => $value); + $self->emit (changed => $value); $self->update; } } @@ -2212,23 +3076,22 @@ 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->SUPER::invoke_button_down ($ev, $x, $y); $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; - $self->mouse_motion ($ev, $x, $y); + $self->invoke_mouse_motion ($ev, $x, $y); + + 1 } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; if ($GRAB == $self) { @@ -2239,13 +3102,36 @@ $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); + } else { + return 0; } + + 1 +} + +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; + + my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2; + + $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); + + 1 } sub update { my ($self) = @_; - $CFClient::UI::ROOT->on_post_alloc ($self => sub { + delete $self->{knob_w}; + $self->SUPER::update; +} + +sub _draw { + my ($self) = @_; + + unless ($self->{knob_w}) { $self->set_value ($self->{range}[0]); my ($value, $lo, $hi, $page) = @{$self->{range}}; @@ -2261,13 +3147,7 @@ $self->{knob_x} = $value - $knob_w * 0.5; $self->{knob_w} = $knob_w; - }); - - $self->SUPER::update; -} - -sub _draw { - my ($self) = @_; + } $self->SUPER::_draw (); @@ -2297,9 +3177,9 @@ ############################################################################# -package CFClient::UI::ValSlider; +package DC::UI::ValSlider; -our @ISA = CFClient::UI::HBox::; +our @ISA = DC::UI::HBox::; sub new { my ($class, %arg) = @_; @@ -2307,8 +3187,8 @@ 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}), + slider => (new DC::UI::Slider expand => 1, range => $range), + entry => (new DC::UI::Label text => "", template => delete $arg{template}), to_value => sub { shift }, from_value => sub { shift }, %arg, @@ -2338,27 +3218,29 @@ ############################################################################# -package CFClient::UI::TextView; +package DC::UI::TextScroller; -our @ISA = CFClient::UI::HBox::; +our @ISA = DC::UI::HBox::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; my $self = $class->SUPER::new ( fontsize => 1, - can_events => 0, + can_events => 1, + indent => 0, #font => default_font @_, - layout => (new CFClient::Layout 1), + layout => (new DC::Layout), par => [], + max_par => 0, height => 0, children => [ - (new CFClient::UI::Empty expand => 1), - (new CFClient::UI::Slider vertical => 1), + (new DC::UI::Empty expand => 1), + (new DC::UI::Slider vertical => 1), ], ); @@ -2374,30 +3256,61 @@ $self->reflow; } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +sub size_request { + my ($self) = @_; + + my ($empty, $slider) = $self->visible_children; + + local $self->{children} = [$empty, $slider]; + $self->SUPER::size_request +} - $self->SUPER::size_allocate ($w, $h, $changed); +sub invoke_size_allocate { + my ($self, $w, $h) = @_; - return unless $changed; + 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 ($self->{children}[0]{w}); + $self->{layout}->set_width ($empty->{w}); + $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); $self->reflow; + + local $self->{children} = [$empty, $slider]; + $self->SUPER::invoke_size_allocate ($w, $h) } -sub text_size { - my ($self, $text, $indent) = @_; +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + return 0 unless $ev->{dy}; # only vertical movements + + $self->{children}[1]->emit (mouse_wheel => $ev); + + 1 +} + +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} - $indent); - $layout->set_markup ($text); - - $layout->size + $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 { @@ -2414,125 +3327,190 @@ $self->{children}[1]->set_value ($offset); } +sub current_paragraph { + my ($self) = @_; + + $self->{top_paragraph} - 1 +} + +sub scroll_to { + my ($self, $para) = @_; + + $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; + + $self->{scroll_to} = $para; + $self->update; +} + sub clear { my ($self) = @_; + 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, $indent) = @_; + my $self = shift; + + for my $para (@_) { + $para = { + fg => [1, 1, 1, 1], + indent => 0, + markup => "", + widget => [], + ref $para ? %$para : (markup => $para), + w => 1e10, + wrapped => 1, + }; + + $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; + push @{$self->{par}}, $para; + } - for my $line (split /\n/, $text) { - my ($w, $h) = $self->text_size ($line); - $self->{height} += $h; - push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; + if (my $max = $self->{max_par}) { + shift @{$self->{par}} while @{$self->{par}} > $max; } - $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); + $self->{need_reflow}++; + $self->update; } -sub update { +sub scroll_to_bottom { my ($self) = @_; - $self->SUPER::update; - - return unless $self->{h} > 0; + $self->{scroll_to} = $#{$self->{par}}; + $self->update; +} - delete $self->{texture}; +sub force_uptodate { + my ($self) = @_; - $ROOT->on_post_alloc ($self, sub { + if (delete $self->{need_reflow}) { my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; - if (delete $self->{need_reflow}) { - my $height = 0; + my $height = 0; - my $layout = $self->{layout}; + 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; + } - $layout->set_height ($self->{fontsize} * $::FONTSIZE); + $para->{y} = $height; + $height += $para->{h}; + } - for (@{$self->{par}}) { - if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support - $layout->set_width ($W - $_->[3]); - $layout->set_markup ($_->[4]); - my ($w, $h) = $layout->size; - $_->[0] = $w + $_->[3]; - $_->[1] = $h; - } + $self->{height} = $height; + $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); - $height += $_->[1]; - } + delete $self->{texture}; + } - $self->{height} = $height; + if (my $paridx = delete $self->{scroll_to}) { + $self->{children}[1]->set_value ($self->{par}[$paridx]{y}); + } +} - $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); - - delete $self->{texture}; - } +sub update { + my ($self) = @_; + + $self->SUPER::update; + + return unless $self->{h} > 0; + + delete $self->{texture}; - $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { - glClearColor 0.5, 0.5, 0.5, 0; + $ROOT->on_post_alloc ($self => sub { + $self->force_uptodate; + + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + + $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub { + glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; + package DC::UI::Base; + local ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + + my $top = int $self->{children}[1]{range}[0]; + + my $paridx = 0; + my $top_paragraph; my $top = int $self->{children}[1]{range}[0]; my $y0 = $top; my $y1 = $top + $H; - my $y = 0; - - my $layout = $self->{layout}; + for my $para (@{$self->{par}}) { + my $h = $para->{h}; + my $y = $para->{y}; - $layout->set_font ($self->{font}) if $self->{font}; + if ($y0 < $y + $h && $y < $y1) { + my $layout = $self->get_layout ($para); - glEnable GL_BLEND; - #TODO# not correct in windows where rgba is forced off - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + $layout->render ($para->{indent}, $y - $y0); + $layout->draw; - for my $par (@{$self->{par}}) { - my $h = $par->[1]; + if (my @w = @{ $para->{widget} }) { + my @s = $layout->get_shapes; - if ($y0 < $y + $h && $y < $y1) { - $layout->set_foreground (@{ $par->[2] }); - $layout->set_width ($W - $par->[3]); - $layout->set_markup ($par->[4]); + for (@w) { + my ($dx, $dy) = splice @s, 0, 2, (); - my ($w, $h, $data, $format, $internalformat) = $layout->render; + $_->{x} = $dx + $para->{indent}; + $_->{y} = $dy + $y - $y0; - glRasterPos $par->[3], $y - $y0; - glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; + $_->draw; + } + } } - $y += $h; + $paridx++; + $top_paragraph ||= $paridx if $y >= $top; } - glDisable GL_BLEND; + $self->{top_paragraph} = $top_paragraph; }; }); } +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; - $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + 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; - } ############################################################################# -package CFClient::UI::Animator; +package DC::UI::Animator; -use CFClient::OpenGL; +use DC::OpenGL; -our @ISA = CFClient::UI::Bin::; +our @ISA = DC::UI::Bin::; sub moveto { my ($self, $x, $y) = @_; @@ -2570,9 +3548,9 @@ ############################################################################# -package CFClient::UI::Flopper; +package DC::UI::Flopper; -our @ISA = CFClient::UI::Button::; +our @ISA = DC::UI::Button::; sub new { my $class = shift; @@ -2594,11 +3572,11 @@ ############################################################################# -package CFClient::UI::Tooltip; +package DC::UI::Tooltip; -our @ISA = CFClient::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -2612,11 +3590,27 @@ sub set_tooltip_from { my ($self, $widget) = @_; - $self->add (new CFClient::UI::Label - markup => $widget->{tooltip}, + my $tip = $widget->{tooltip}; + $tip = $tip->($widget) if "CODE" eq ref $tip; + + $tip = DC::Pod::section_label tooltip => $1 + if $tip =~ /^#(.*)$/; + + if ($ENV{CFPLUS_DEBUG} & 2) { + $tip .= "\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}"; + } + + $tip =~ s/^\n+//; + $tip =~ s/\n+$//; + + $self->add (new DC::UI::Label + markup => $tip, max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, fontsize => 0.8, - fg => [0, 0, 0, 1], + style => 1, # FLAG_INVERSE ellipsise => 0, font => ($widget->{tooltip_font} || $::FONT_PROP), ); @@ -2630,15 +3624,13 @@ ($w + 4, $h + 4) } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; - - return unless $changed; +sub invoke_size_allocate { + my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); + $self->SUPER::invoke_size_allocate ($w - 4, $h - 4) } -sub visibility_change { +sub invoke_visibility_change { my ($self, $visible) = @_; return unless $visible; @@ -2647,79 +3639,128 @@ my $widget = $self->{owner} or return; - my ($x, $y) = $widget->coord2global ($widget->{w}, 0); + if ($widget->{visible}) { + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - ($x, $y) = $widget->coord2global (-$self->{w}, 0) - if $x + $self->{w} > $::WIDTH; + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $self->{root}{w}; - $self->move ($x, $y); + $self->move_abs ($x, $y); + } else { + $self->hide; + } }); } sub _draw { my ($self) = @_; - glTranslate 0.375, 0.375; - my ($w, $h) = @$self{qw(w h)}; glColor 1, 0.8, 0.4; - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; + glRect 0, 0, $w, $h; glColor 0, 0, 0; - glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; + glRect_lineloop .5, .5, $w + .5, $h + .5; - glTranslate 2 - 0.375, 2 - 0.375; + glTranslate 2, 2; $self->SUPER::_draw; } ############################################################################# -package CFClient::UI::Face; +package DC::UI::Face; -our @ISA = CFClient::UI::Base::; +our @ISA = DC::UI::DrawBG::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; my $self = $class->SUPER::new ( + size_w => 32, + size_h => 8, aspect => 1, can_events => 0, @_, ); if ($self->{anim} && $self->{animspeed}) { - Scalar::Util::weaken (my $widget = $self); + DC::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->{animspeed} = List::Util::max 0.05, $self->{animspeed}; + $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub { + return unless $::CONN; + + my $w = $widget + or return; + + ++$w->{frame}; + $w->update_face; + + # somehow, $widget can go away + $w->update; + $w->update_timer; + }; + + $self->update_face; + $self->update_timer; } $self } +sub update_timer { + my ($self) = @_; + + return unless $self->{timer}; + + if ($self->{visible}) { + $self->{timer}->start; + } else { + $self->{timer}->stop; + } +} + +sub update_face { + my ($self) = @_; + + if ($::CONN) { + if (my $anim = $::CONN->{anim}[$self->{anim}]) { + if ($anim && @$anim) { + $self->{face} = $anim->[ $self->{frame} % @$anim ]; + delete $self->{face_change_cb}; + + if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) { + unless ($tex->{name} || $tex->{loading}) { + $tex->upload (sub { $self->reconfigure }); + } + } + } + } + } +} + sub size_request { - (32, 8) + my ($self) = @_; + + if ($::CONN) { + if (my $faceid = $::CONN->{face}[$self->{face}]{id}) { + if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) { + if ($tex->{name}) { + return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); + } elsif (!$tex->{loading}) { + $tex->upload (sub { $self->reconfigure }); + } + } + + $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure }); + } + } + + ($self->{size_w} || 8, $self->{size_h} || 8) } sub update { @@ -2730,89 +3771,52 @@ $self->SUPER::update; } -sub _draw { +sub invoke_visibility_change { my ($self) = @_; - return unless $::CONN; + $self->update_timer; - my $face; + 0 +} - if ($self->{frame}) { - my $anim = $::CONN->{anim}[$self->{anim}]; +sub _draw { + my ($self) = @_; - $face = $anim->[ $self->{frame} % @$anim ] - if $anim && @$anim; - } - - my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; + $self->SUPER::_draw; - if ($tex) { + if (my $tex = $self->{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 { +sub destroy { my ($self) = @_; - $self->{timer}->cancel + (delete $self->{timer})->cancel if $self->{timer}; - $self->SUPER::DESTROY; + $self->SUPER::destroy; } ############################################################################# -package CFClient::UI::Inventory; - -our @ISA = CFClient::UI::ScrolledWindow::; - -sub new { - my $class = shift; - - my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), - @_, - ); - - $self -} - -sub set_items { - my ($self, $items) = @_; - - $self->{scrolled}->clear; - return unless $items; - - my @items = sort { - ($a->{type} <=> $b->{type}) - or ($a->{name} cmp $b->{name}) - } @$items; - - $self->{real_items} = \@items; - - my $row = 0; - for my $item (@items) { - CFClient::Item::update_widgets $item; +package DC::UI::Buttonbar; - $self->{scrolled}->add (0, $row, $item->{face_widget}); - $self->{scrolled}->add (1, $row, $item->{desc_widget}); - $self->{scrolled}->add (2, $row, $item->{weight_widget}); +our @ISA = DC::UI::HBox::; - $row++; - } -} +# TODO: should actually wrap buttons and other goodies. ############################################################################# -package CFClient::UI::Menu; +package DC::UI::Menu; -our @ISA = CFClient::UI::FancyFrame::; +our @ISA = DC::UI::Toplevel::; -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -2823,17 +3827,33 @@ @_, ); - $self->add ($self->{vbox} = new CFClient::UI::VBox); + $self->add ($self->{vbox} = new DC::UI::VBox); for my $item (@{ $self->{items} }) { - my ($widget, $cb) = @$item; + my ($widget, $cb, $tooltip) = @$item; # 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; + if ($widget =~ /\t/) { + my ($left, $right) = split /\t/, $widget, 2; + + $widget = new DC::UI::HBox + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + children => [ + (new DC::UI::Label markup => $left, expand => 1), + (new DC::UI::Label markup => $right, align => +1), + ], + ; + + } else { + $widget = new DC::UI::Label + can_hover => 1, + can_events => 1, + markup => $widget, + tooltip => $tooltip; + } } $self->{item}{$widget} = $item; @@ -2848,59 +3868,333 @@ sub popup { my ($self, $ev) = @_; - $self->_emit ("popdown"); + $self->emit ("popdown"); # maybe save $GRAB? must be careful about events... $GRAB = $self; $self->{button} = $ev->{button}; $self->show; - $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); + $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; # TODO: should use vbox->find_widget or so $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); $self->{hover} = $self->{item}{$HOVER}; + + 0 } -sub button_up { +sub invoke_button_up { my ($self, $ev, $x, $y) = @_; if ($ev->{button} == $self->{button}) { undef $GRAB; $self->hide; - $self->_emit ("popdown"); + $self->emit ("popdown"); $self->{hover}[1]->() if $self->{hover}; + } else { + return 0 } + + 1 } ############################################################################# -package CFClient::UI::Statusbox; +package DC::UI::Multiplexer; -our @ISA = CFClient::UI::VBox::; +our @ISA = DC::UI::Container::; sub new { my $class = shift; - $class->SUPER::new ( + my $self = $class->SUPER::new ( + @_, + ); + + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; + + $self +} + +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; +} + +sub get_current_page { + my ($self) = @_; + + $self->{current} +} + +sub set_current_page { + my ($self, $page_or_widget) = @_; + + 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->realloc; +} + +sub visible_children { + $_[0]{current} +} + +sub size_request { + my ($self) = @_; + + $self->{current}->size_request +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + $self->{current}->configure (0, 0, $w, $h); + + 1 +} + +sub _draw { + my ($self) = @_; + + $self->{current}->draw; +} + +############################################################################# + +package DC::UI::Notebook; + +use DC::OpenGL; + +our @ISA = DC::UI::VBox::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + buttonbar => (new DC::UI::Buttonbar), + multiplexer => (new DC::UI::Multiplexer expand => 1), + active_outline => [.7, .7, 0.2], + # 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}); + + { + Scalar::Util::weaken (my $wself = $self); + + $self->{multiplexer}->connect (c_add => sub { + my ($mplex, $widgets) = @_; + + for my $child (@$widgets) { + Scalar::Util::weaken $child; + $child->{c_tab_} ||= do { + my $tab = + (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base") + ? $child->{c_tab} + : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; + + $tab->connect (activate => sub { + $wself->set_current_page ($child); + }); + + $tab + }; + + $self->{buttonbar}->add ($child->{c_tab_}); + } + }); + + $self->{multiplexer}->connect (c_remove => sub { + my ($mplex, $widgets) = @_; + + for my $child (@$widgets) { + $wself->{buttonbar}->remove ($child->{c_tab_}); + } + }); + } + + $self +} + +sub add { + my ($self, @widgets) = @_; + + $self->{multiplexer}->add (@widgets) +} + +sub remove { + my ($self, @widgets) = @_; + + $self->{multiplexer}->remove (@widgets) +} + +sub pages { + my ($self) = @_; + $self->{multiplexer}->children +} + +sub add_tab { + my ($self, $title, $widget, $tooltip) = @_; + + $title = [$title, $tooltip] unless ref $title; + $widget->{c_tab} = $title; + + $self->add ($widget); +} + +sub get_current_page { + my ($self) = @_; + + $self->{multiplexer}->get_current_page +} + +sub set_current_page { + my ($self, $page) = @_; + + $self->{multiplexer}->set_current_page ($page); + $self->emit (page_changed => $self->{multiplexer}{current}); +} + +sub _draw { + my ($self) = @_; + + $self->SUPER::_draw (); + + if (my $cur = $self->{multiplexer}{current}) { + if ($cur = $cur->{c_tab_}) { + glTranslate $self->{buttonbar}{x} + $cur->{x}, + $self->{buttonbar}{y} + $cur->{y}; + glLineWidth 3; + #glEnable GL_BLEND; + #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor @{$self->{active_outline}}; + glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5; + glLineWidth 1; + #glDisable GL_BLEND; + } + } +} + +############################################################################# + +package DC::UI::Selector; + +use utf8; + +our @ISA = DC::UI::Button::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + options => [], # [value, title, longdesc], ... + value => undef, + @_, + ); + + $self->_set_value ($self->{value}); + + $self +} + +sub invoke_button_down { + my ($self, $ev) = @_; + + my @menu_items; + + for (@{ $self->{options} }) { + my ($value, $title, $tooltip) = @$_; + + push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; + } + + DC::UI::Menu->new (items => \@menu_items)->popup ($ev); +} + +sub _set_value { + my ($self, $value) = @_; + + my ($item) = grep $_->[0] eq $value, @{ $self->{options} }; + $item ||= $self->{options}[0] + or return; + + $self->{value} = $item->[0]; + $self->set_markup ("$item->[1] ⇓"); +# $self->set_tooltip ($item->[2]); +} + +sub set_value { + my ($self, $value) = @_; + + return unless $self->{value} ne $value; + + $self->_set_value ($value); + $self->emit (changed => $value); +} + +sub set_options { + my ($self, $options) = @_; + + $self->{options} = $options; + $self->_set_value ($self->{value}); +} + +############################################################################# + +package DC::UI::Statusbox; + +our @ISA = DC::UI::VBox::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( fontsize => 0.8, @_, - ) + ); + + DC::weaken (my $this = $self); + + $self->{timer} = EV::timer 1, 1, 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 $DC::UI::TOOLTIP->{owner} + && grep $DC::UI::TOOLTIP->{owner} == $_->{label}, + values %{ $self->{item} }; while (my ($k, $v) = each %{ $self->{item} }) { delete $self->{item}{$k} if $v->{timeout} < $NOW; } + $self->{timer}->set (1, 1); + my @widgets; my @items = sort { @@ -2912,7 +4206,7 @@ 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}" @@ -2923,17 +4217,29 @@ s/\s+/ /g; } - new CFClient::UI::Label + new DC::UI::Label markup => $short, tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, tooltip_width => 0.67, fontsize => $item->{fontsize} || $self->{fontsize}, max_w => $::WIDTH * 0.44, - fg => $item->{fg}, + 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}->set (1/30, 1/30); + } else { + $label->{fg}[3] = $item->{fg}[3] || 1; + } + + push @widgets, $label; } $self->clear; @@ -2948,7 +4254,7 @@ return unless $text; - my $timeout = time + ((delete $arg{timeout}) || 60); + my $timeout = (int time) + ((delete $arg{timeout}) || 60); my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; @@ -2959,7 +4265,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 { @@ -2975,7 +4281,9 @@ }; } - $self->reorder; + $ROOT->on_refresh (reorder => sub { + $self->reorder; + }); } sub reconfigure { @@ -2988,13 +4296,23 @@ $self->SUPER::reconfigure; } +sub destroy { + my ($self) = @_; + + $self->{timer}->cancel; + + $self->SUPER::destroy; +} + ############################################################################# -package CFClient::UI::Root; +package DC::UI::Root; -our @ISA = CFClient::UI::Container::; +our @ISA = DC::UI::Container::; + +use List::Util qw(min max); -use CFClient::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -3004,52 +4322,47 @@ @_, ); - Scalar::Util::weaken ($self->{root} = $self); + DC::weaken ($self->{root} = $self); $self } -sub configure { - my ($self, $x, $y, $w, $h) = @_; +sub size_request { + my ($self) = @_; - $self->{w} = $w; - $self->{h} = $h; + ($self->{w}, $self->{h}) } -sub reconfigure { - my ($self) = @_; - - $self->SUPER::reconfigure; +sub _to_pixel { + my ($coord, $size, $max) = @_; - $self->size_allocate ($self->{w}, $self->{h}, 1) - if $self->{w}; -} + $coord = + $coord eq "center" ? ($max - $size) * 0.5 + : $coord eq "max" ? $max + : $coord; -sub size_request { - my ($self) = @_; + $coord = 0 if $coord < 0; + $coord = $max - $size if $coord > $max - $size; - ($self->{w}, $self->{h}) + int $coord + 0.5 } -sub size_allocate { - my ($self, $w, $h, $changed) = @_; +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}; + $X = $child->{force_x} if exists $child->{force_x}; + $Y = $child->{force_y} if exists $child->{force_y}; - $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; + $X = _to_pixel $X, $W, $self->{w}; + $Y = _to_pixel $Y, $H, $self->{h}; $child->configure ($X, $Y, $W, $H); } + + 1 } sub coord2local { @@ -3067,19 +4380,14 @@ sub update { my ($self) = @_; - $::WANT_REFRESH++; + $::WANT_REFRESH = 1; } sub add { my ($self, @children) = @_; - for my $child (@children) { - $child->{is_toplevel} = 1; - - # integerise window positions - $child->{x} = int $child->{x}; - $child->{y} = int $child->{y}; - } + $_->{is_toplevel} = 1 + for @children; $self->SUPER::add (@children); } @@ -3089,6 +4397,9 @@ $self->SUPER::remove (@children); + delete $self->{is_toplevel} + for @children; + while (@children) { my $w = pop @children; push @children, $w->children; @@ -3116,53 +4427,95 @@ for values %{delete $self->{refresh_hook}}; } - if ($self->{realloc}) { + while ($self->{realloc}) { + my %queue; my @queue; + my $widget; + outer: while () { - if ($self->{realloc}) { - #TODO use array-of-depth approach + if (my $realloc = delete $self->{realloc}) { + for $widget (values %$realloc) { + $widget->{visible} or next; # do not resize invisible widgets - @queue = sort { $a->{visible} <=> $b->{visible} } - @queue, values %{delete $self->{realloc}}; + $queue{$widget+0}++ and next; # duplicates are common + + push @{ $queue[$widget->{visible}] }, $widget; + } } - my $widget = pop @queue || last; + while () { + @queue or last outer; - $widget->{visible} or last; # do not resize invisible widgets + $widget = pop @{ $queue[-1] || [] } + and last; + + pop @queue; + } - my ($w, $h) = $widget->{def_w} && $widget->{def_h} - ? @$widget{qw(def_w def_h)} - : $widget->size_request; + delete $queue{$widget+0}; - Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# - - $widget->{req_w} = $w; - $widget->{req_h} = $h; + 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; - $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; + $w = min $widget->{max_w}, $w if exists $widget->{max_w}; + $h = min $widget->{max_h}, $h if exists $widget->{max_h}; - push @queue, $widget->{parent} - if $widget->{parent}; + $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+0} = $widget; + + if (my $parent = $widget->{parent}) { + $self->{realloc}{$parent+0} = $parent + unless $queue{$parent+0}; + + $parent->{force_size_alloc} = 1; + $self->{size_alloc}{$parent+0} = $parent; + } + } + + delete $self->{realloc}{$widget+0}; } - } - while (my $size_alloc = delete $self->{size_alloc}) { - my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, - values %$size_alloc; + while (my $size_alloc = delete $self->{size_alloc}) { + my @queue = sort { $a->{visible} <=> $b->{visible} } + values %$size_alloc; - while () { - my ($widget, $w, $h) = @{ pop @queue or last }; + while () { + my $widget = pop @queue || last; - $w = 0 if $w < 0; - $h = 0 if $h < 0; + my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; - my $changed = $widget->{w} != $w || $widget->{h} != $h; + $w = max $widget->{min_w}, $w; + $h = max $widget->{min_h}, $h; - $widget->{w} = $w; - $widget->{h} = $h; +# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; +# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; - $widget->emit (size_allocate => $w, $h, $changed); + $w = min $widget->{max_w}, $w if exists $widget->{max_w}; + $h = min $widget->{max_h}, $h if exists $widget->{max_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); + } + } } } @@ -3181,15 +4534,22 @@ glMatrixMode GL_MODELVIEW; glLoadIdentity; - $self->_draw; + { + package DC::UI::Base; + + local ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + + $self->_draw; + } } ############################################################################# -package CFClient::UI; +package DC::UI; -$ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip z => 900; +$ROOT = new DC::UI::Root; +$TOOLTIP = new DC::UI::Tooltip z => 900; 1