--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/03 19:56:05 1.184 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/07/05 03:01:01 1.323 @@ -1,41 +1,41 @@ package CFClient::UI; +use utf8; use strict; use Scalar::Util (); use List::Util (); +use Event; use CFClient; +use CFClient::Texture; our ($FOCUS, $HOVER, $GRAB); # various widgets +our $LAYOUT; our $ROOT; our $TOOLTIP; our $BUTTON_STATE; -sub check_tooltip { +our %WIDGET; # all widgets, weak-referenced + +our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { if (!$GRAB) { for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { if (length $widget->{tooltip}) { - if ($TOOLTIP->{owner} != $widget) { + $TOOLTIP->hide; + $TOOLTIP->{owner} = $widget; + return if $ENV{CFPLUS_DEBUG} & 8; + my $tip = $widget->{tooltip}; $tip = $tip->($widget) if CODE:: eq ref $tip; - $TOOLTIP->set_markup ($widget->{tooltip}); - + $TOOLTIP->set_tooltip_from ($widget); $TOOLTIP->show; - - my ($x, $y) = $widget->coord2global ($widget->{w}, 0); - - if ($x + $TOOLTIP->{w} > $::WIDTH) { - ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); - } - - $TOOLTIP->move ($x, $y); } return; @@ -45,16 +45,39 @@ $TOOLTIP->hide; delete $TOOLTIP->{owner}; +}); + +sub get_layout { + my $layout; + + for (grep { $_->{name} } values %WIDGET) { + my $win = $layout->{$_->{name}} = { }; + + $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; + $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; + $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; + $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; + + $win->{show} = $_->{visible} && $_->{is_toplevel}; + } + + $layout +} + +sub set_layout { + my ($layout) = @_; + + $LAYOUT = $layout; } # class methods for events sub feed_sdl_key_down_event { - $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) + $FOCUS->emit (key_down => $_[0]) if $FOCUS; } sub feed_sdl_key_up_event { - $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) + $FOCUS->emit (key_up => $_[0]) if $FOCUS; } @@ -68,15 +91,13 @@ $GRAB = $widget; $GRAB->update if $GRAB; - check_tooltip; + $TOOLTIP_WATCHER->cb->(); } $BUTTON_STATE |= 1 << ($ev->{button} - 1); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); - } + $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; } sub feed_sdl_button_up_event { @@ -87,17 +108,15 @@ $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); - } + $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; $GRAB->update if $GRAB; - check_tooltip; + $TOOLTIP_WATCHER->cb->(); } } @@ -113,13 +132,11 @@ $hover->update if $hover && $hover->{can_hover}; $HOVER->update if $HOVER && $HOVER->{can_hover}; - check_tooltip; + $TOOLTIP_WATCHER->start; } - if ($HOVER) { - ($x, $y) = $HOVER->coord2local ($x, $y); - $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); - } + $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + if $HOVER; } # convert position array to integers @@ -135,6 +152,47 @@ } } +sub full_refresh { + # make a copy, otherwise for complains about freed values. + my @widgets = values %WIDGET; + + $_->update + for @widgets; +} + +sub reconfigure_widgets { + # make a copy, otherwise C complains about freed values. + my @widgets = values %WIDGET; + + $_->reconfigure + for @widgets; +} + +# call when resolution changes etc. +sub rescale_widgets { + my ($sx, $sy) = @_; + + for my $widget (values %WIDGET) { + if ($widget->{is_toplevel}) { + $widget->{x} += int $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.]+$/; + + } + } + + reconfigure_widgets; +} + ############################################################################# package CFClient::UI::Base; @@ -147,19 +205,35 @@ my $class = shift; my $self = bless { - x => 0, - y => 0, + x => "center", + y => "center", z => 0, + w => undef, + h => undef, can_events => 1, @_ }, $class; + Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + for (keys %$self) { - if (/^connect_(.*)$/) { + if (/^on_(.*)$/) { $self->connect ($1 => delete $self->{$_}); } } + if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { + $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; + $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; + $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; + $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; + + $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; + $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; + + $self->show if $layout->{show}; + } + $self } @@ -178,21 +252,72 @@ $CFClient::UI::ROOT->add ($self); } -sub hide { +sub set_visible { + my ($self) = @_; + + return if $self->{visible}; + + $self->{root} = $self->{parent}{root}; + $self->{visible} = $self->{parent}{visible} + 1; + + $self->emit (visibility_change => 1); + + $self->realloc if !exists $self->{req_w}; + + $_->set_visible for $self->children; +} + +sub set_invisible { my ($self) = @_; + return unless $self->{visible}; + + $_->set_invisible for $self->children; + + delete $self->{visible}; + delete $self->{root}; + undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; + $CFClient::UI::TOOLTIP_WATCHER->cb->() + if $TOOLTIP->{owner} == $self; + + $self->emit ("focus_out"); + $self->emit (visibility_change => 0); +} + +sub set_visibility { + my ($self, $visible) = @_; + + return if $self->{visible} == $visible; + + $visible ? $self->hide + : $self->show; +} + +sub toggle_visibility { + my ($self) = @_; + + $self->{visible} + ? $self->hide + : $self->show; +} + +sub hide { + my ($self) = @_; + + $self->set_invisible; + $self->{parent}->remove ($self) if $self->{parent}; } -sub move { +sub move_abs { my ($self, $x, $y, $z) = @_; - $self->{x} = int $x; - $self->{y} = int $y; + $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x; + $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y; $self->{z} = $z if defined $z; $self->update; @@ -201,10 +326,10 @@ sub set_size { my ($self, $w, $h) = @_; - $self->{user_w} = $w; - $self->{user_h} = $h; + $self->{force_w} = $w; + $self->{force_h} = $h; - $self->check_size; + $self->realloc; } sub size_request { @@ -212,174 +337,149 @@ Carp::confess "size_request is abstract"; } +sub baseline_shift { + 0 +} + sub configure { my ($self, $x, $y, $w, $h) = @_; if ($self->{aspect}) { - my $w2 = List::Util::min $w, int $h * $self->{aspect}; - my $h2 = List::Util::min $h, int $w / $self->{aspect}; + my ($ow, $oh) = ($w, $h); - # use alignment to adjust x, y + $w = List::Util::min $w, int $h * $self->{aspect}; + $h = List::Util::min $h, int $w / $self->{aspect}; - $x += int +($w - $w2) * 0.5; - $y += int +($h - $h2) * 0.5; + # use alignment to adjust x, y - ($w, $h) = ($w2, $h2); + $x += int 0.5 * ($ow - $w); + $y += int 0.5 * ($oh - $h); } - if ($self->{x} != $x || $self->{y} != $y) { + if ($self->{x} ne $x || $self->{y} ne $y) { $self->{x} = $x; $self->{y} = $y; $self->update; } - if ($self->{w} != $w || $self->{h} != $h) { - $self->{w} = $w; - $self->{h} = $h; + if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) { + return unless $self->{visible}; - $self->size_allocate ($w, $h); - $self->update; - $self->emit (size_allocate => $w, $h); - } -} + $self->{alloc_w} = $w; + $self->{alloc_h} = $h; -sub size_allocate { - # nothing to be done + $self->{root}{size_alloc}{$self+0} = $self; + } } sub children { + # nop } -# call when resolution changes etc. -sub reconfigure { - my ($self) = @_; - - $_->reconfigure - for $self->children; - - $_->check_size; +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; } -# return top left coordinates -sub _topleft { - my ($self, $x, $y) = @_; +sub set_tooltip { + my ($self, $tooltip) = @_; + + $tooltip =~ s/^\s+//; + $tooltip =~ s/\s+$//; + + return if $self->{tooltip} eq $tooltip; - $self->{parent} - or Carp::confess "no parent widget in _topleft\n";#d# + $self->{tooltip} = $tooltip; - $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); + if ($CFClient::UI::TOOLTIP->{owner} == $self) { + delete $CFClient::UI::TOOLTIP->{owner}; + $CFClient::UI::TOOLTIP_WATCHER->cb->(); + } } # translate global coordinates to local coordinate system sub coord2local { my ($self, $x, $y) = @_; - my ($X, $Y) = $self->_topleft; - ($x - $X, $y - $Y) + $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } # translate local coordinates to global coordinate system sub coord2global { my ($self, $x, $y) = @_; - my ($X, $Y) = $self->_topleft; - ($x + $X, $y + $Y) + $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } -sub focus_in { +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; + undef $FOCUS; - $self->emit (focus_out => $focus); + $self->update; - $focus->update if $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 { } + 0 +} -sub button_down { - my ($self, $ev, $x, $y) = @_; +sub grab_focus { + my ($self) = @_; - $self->focus_in; + $FOCUS->emit ("focus_out") if $FOCUS; + $self->emit ("focus_in"); } -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 invoke_mouse_motion { 1 } +sub invoke_button_up { 1 } +sub invoke_key_down { 1 } +sub invoke_key_up { 1 } -sub draw { - my ($self) = @_; +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; - return unless $self->{h} && $self->{w}; + $self->grab_focus; - glPushMatrix; - glTranslate $self->{x}, $self->{y}, 0; - $self->_draw; - glPopMatrix; - - if ($self == $HOVER && $self->{can_hover}) { - my ($x, $y) = @$self{qw(x y)}; + 1 +} - 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; - } +sub connect { + my ($self, $signal, $cb) = @_; - if ($ENV{PCLIENT_DEBUG}) { - glPushMatrix; - glColor 1, 1, 0, 1; - glTranslate $self->{x} + 0.375, $self->{y} + 0.375; - glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex $self->{w}, 0; - glVertex $self->{w}, $self->{h}; - glVertex 0 , $self->{h}; - glEnd; - glPopMatrix; - CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; - } + push @{ $self->{signal_cb}{$signal} }, $cb; } -sub _draw { - my ($self) = @_; +sub emit { + my ($self, $signal, @args) = @_; - warn "no draw defined for $self\n"; + #d##TODO# stop propagating at first true, do not use sum + (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before + || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure + || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent } sub find_widget { @@ -398,31 +498,20 @@ my ($self, $parent) = @_; Scalar::Util::weaken ($self->{parent} = $parent); + $self->set_visible if $parent->{visible}; } -sub check_size { +sub realloc { my ($self) = @_; - $self->{parent} - or return 1; - - my ($w, $h) = $self->{user_w} && $self->{user_h} - ? @$self{qw(user_w user_h)} - : $self->size_request; + if ($self->{visible}) { + return if $self->{root}{realloc}{$self+0}; - if ($w != $self->{req_w} || $h != $self->{req_h}) { - $self->{req_w} = $w; - $self->{req_h} = $h; - - $self->{parent}->check_size - or $self->size_allocate ( - (List::Util::max $self->{w}, $w), - (List::Util::max $self->{h}, $h), - ); - - 1 + $self->{root}{realloc}{$self+0} = $self; + $self->{root}->update; } else { - 0 + delete $self->{req_w}; + delete $self->{req_h}; } } @@ -433,22 +522,77 @@ if $self->{parent}; } -sub connect { - my ($self, $signal, $cb) = @_; +sub reconfigure { + my ($self) = @_; - push @{ $self->{signal_cb}{$signal} }, $cb; + $self->realloc; + $self->update; } -sub emit { - my ($self, $signal, @args) = @_; +# using global variables seems a bit hacky, but passing through all drawing +# functions seems pointless. +our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn + +sub draw { + my ($self) = @_; + + return unless $self->{h} && $self->{w}; + + # update screen rectangle + local $draw_x = $draw_x + $self->{x}; + local $draw_y = $draw_y + $self->{y}; + + # skip widgets that are entirely outside the drawing area + return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) + || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); + + glPushMatrix; + glTranslate $self->{x}, $self->{y}, 0; + + if ($self == $HOVER && $self->{can_hover}) { + glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2; + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex $self->{w}, 0; + glVertex $self->{w}, $self->{h}; + glVertex 0 , $self->{h}; + glEnd; + glDisable GL_BLEND; + } - List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} + if ($ENV{CFPLUS_DEBUG} & 1) { + glPushMatrix; + glColor 1, 1, 0, 1; + glTranslate 0.375, 0.375; + glBegin GL_LINE_LOOP; + glVertex 0 , 0; + glVertex $self->{w} - 1, 0; + glVertex $self->{w} - 1, $self->{h} - 1; + glVertex 0 , $self->{h} - 1; + glEnd; + glPopMatrix; + #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; + } + + $self->_draw; + glPopMatrix; +} + +sub _draw { + my ($self) = @_; + + warn "no draw defined for $self\n"; } sub DESTROY { my ($self) = @_; - #$self->deactivate; + delete $WIDGET{$self+0}; + + eval { $self->destroy }; + warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; } ############################################################################# @@ -466,8 +610,8 @@ # range [value, low, high, page] $class->SUPER::new ( - bg => [0, 0, 0, 0.2], - active_bg => [1, 1, 1, 0.5], + #bg => [0, 0, 0, 0.2], + #active_bg => [1, 1, 1, 0.5], @_ ) } @@ -475,20 +619,26 @@ sub _draw { my ($self) = @_; - my ($w, $h) = @$self{qw(w h)}; + my $color = $FOCUS == $self && $self->{active_bg} + ? $self->{active_bg} + : $self->{bg}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; + if ($color && (@$color < 4 || $color->[3])) { + my ($w, $h) = @$self{qw(w h)}; - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @$color; - glDisable GL_BLEND; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + + glDisable GL_BLEND; + } } ############################################################################# @@ -503,7 +653,9 @@ } sub size_request { - (0, 0) + my ($self) = @_; + + ($self->{w} + 0, $self->{h} + 0) } sub draw { } @@ -517,32 +669,34 @@ sub new { my ($class, %arg) = @_; - my $children = delete $arg{children} || []; + my $children = delete $arg{children}; my $self = $class->SUPER::new ( children => [], can_events => 0, %arg, ); - $self->add ($_) for @$children; + + $self->add (@$children) + if $children; $self } sub add { - my ($self, $child) = @_; + my ($self, @widgets) = @_; - $child->set_parent ($self); + $_->set_parent ($self) + for @widgets; use sort 'stable'; $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $child + @{$self->{children}}, @widgets ]; - $child->check_size; - $self->update; + $self->realloc; } sub children { @@ -557,8 +711,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; - $self->update; + $self->realloc; } sub clear { @@ -572,8 +725,7 @@ $_->hide; } - $self->check_size; - $self->update; + $self->realloc; } sub find_widget { @@ -584,7 +736,7 @@ my $res; - for (reverse @{ $self->{children} }) { + for (reverse $self->visible_children) { $res = $_->find_widget ($x, $y) and return $res; } @@ -615,8 +767,7 @@ sub add { my ($self, $child) = @_; - $self->{children} = []; - + $self->SUPER::remove ($_) for @{ $self->{children} }; $self->SUPER::add ($child); } @@ -635,14 +786,18 @@ $_[0]{children}[0]->size_request } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; $self->{children}[0]->configure (0, 0, $w, $h); + + 1 } ############################################################################# +# back-buffered drawing area + package CFClient::UI::Window; our @ISA = CFClient::UI::Bin::; @@ -658,19 +813,22 @@ sub update { my ($self) = @_; - $ROOT->on_refresh ($self => sub { $self->render_child }); + $ROOT->on_post_alloc ($self => sub { $self->render_child }); $self->SUPER::update; } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); $self->update; + + $self->SUPER::invoke_size_allocate ($w, $h) } sub _render { - $_[0]{children}[0]->draw; + my ($self) = @_; + + $self->{children}[0]->draw; } sub render_child { @@ -680,34 +838,31 @@ glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; + { + package CFClient::UI::Base; + + ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + } + $self->_render; -# glColorMask 1, 1, 1, 0; -# glEnable GL_BLEND; -# glBlendFunc GL_SRC_ALPHA, GL_ZERO; -# glRasterPos 0, 0; -# glCopyPixels 0, 0, $self->{w}, $self->{h}; -# glDisable GL_BLEND; -# glColorMask 1, 1, 1, 1; }; } sub _draw { my ($self) = @_; - my ($w, $h) = ($self->w, $self->h); + my ($w, $h) = @$self{qw(w h)}; my $tex = $self->{texture} or return; - glEnable GL_BLEND; - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 0, 0, 0, 1; - $tex->draw_quad (0, 0, $w, $h); + $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -717,19 +872,39 @@ our @ISA = CFClient::UI::Window::; +sub new { + my $class = shift; + + $class->SUPER::new ( + scroll_x => 0, + scroll_y => 1, + @_, + ) +} + sub size_request { my ($self) = @_; - @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - $self->child->configure (0, 0, @$self{qw(child_w child_h)}); + my ($w, $h) = @{$self->child}{qw(req_w req_h)}; - @$self{qw(child_w child_h)} + $w = 10 if $self->{scroll_x}; + $h = 10 if $self->{scroll_y}; + + ($w, $h) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; + my $child = $self->child; + + $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; + $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; + + $self->child->configure (0, 0, $w, $h); $self->update; + + 1 } sub set_offset { @@ -741,11 +916,20 @@ $self->update; } -# hmm, this does not work for topleft of $self... but we should not aks for that -sub _topleft { +# hmm, this does not work for topleft of $self... but we should not ask for that +sub coord2local { my ($self, $x, $y) = @_; - $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) + $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) +} + +sub coord2global { + my ($self, $x, $y) = @_; + + $x = List::Util::min $self->{w}, $x - $self->{view_x}; + $y = List::Util::min $self->{h}, $y - $self->{view_y}; + + $self->SUPER::coord2global ($x, $y) } sub find_widget { @@ -763,6 +947,9 @@ sub _render { my ($self) = @_; + local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; + local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; + CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; $self->SUPER::_render; @@ -775,33 +962,61 @@ our @ISA = CFClient::UI::HBox::; sub new { - my $class = shift; + my ($class, %arg) = @_; + + my $child = delete $arg{child}; my $self; my $slider = new CFClient::UI::Slider - vertical => 1, - range => [0, 0, 1, 0.01], # HACK fix - connect_changed => sub { - $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); + vertical => 1, + range => [0, 0, 1, 0.01], # HACK fix + on_changed => sub { + $self->{vp}->set_offset (0, $_[1]); }, ; $self = $class->SUPER::new ( - vp => (new CFClient::UI::ViewPort), + vp => (new CFClient::UI::ViewPort expand => 1), slider => $slider, - @_, + %arg, ); - $self->{vp}->add ($self->{scrolled}); - $self->add ($self->{vp}); - $self->add ($self->{slider}); + $self->SUPER::add ($self->{vp}, $self->{slider}); + $self->add ($child) if $child; $self } -#TODO# update range on size_allocate depeneing on child -# update viewport offset on scroll +#TODO# update range on size_allocate depending on child + +sub add { + my ($self, $widget) = @_; + + $self->{vp}->add ($self->{child} = $widget); +} + +sub update_slider { + my ($self) = @_; + + $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); +} + +sub update { + my ($self) = @_; + + $self->SUPER::update; + + $self->update_slider; +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + $self->update_slider; + + $self->SUPER::invoke_size_allocate ($w, $h) +} ############################################################################# @@ -814,38 +1029,33 @@ sub new { my $class = shift; - my $self = $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => 0.8, - @_ - ); - - $self + $class->SUPER::new ( + bg => undef, + @_, + ) } sub _draw { my ($self) = @_; - my ($w, $h) = ($self->{w}, $self->{h}); + if ($self->{bg}) { + my ($w, $h) = @$self{qw(w h)}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glColor_premultiply @{ $self->{bg} }; -# glBegin GL_QUADS; -# glColor 0, 0, 0, 0; -# glVertex 0 , 0; -# glVertex 0 , $h; -# glVertex $w, $h; -# glVertex $w, 0; -# glEnd; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + glDisable GL_BLEND; + } - $self->child->draw; - glDisable GL_BLEND; - glDisable GL_TEXTURE_2D; + $self->SUPER::_draw; } ############################################################################# @@ -856,32 +1066,54 @@ use CFClient::OpenGL; -my @tex = +my $bg = + new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", + mipmap => 1, wrap => 1; + +my @border = map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); + qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); sub new { - my $class = shift; - - # TODO: user_x, user_y, overwrite moveto? + my ($class, %arg) = @_; my $self = $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => 0.6, - can_events => 1, - @_ + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + can_events => 1, + min_w => 16, + min_h => 16, + %arg, ); - $self->{title} &&= new CFClient::UI::Label + $self->{title_widget} = new CFClient::UI::Label align => 0, valign => 1, text => $self->{title}, - fontsize => $self->{border}; + fontsize => $self->{border}, + if exists $self->{title}; + + if ($self->{has_close_button}) { + $self->{close_button} = + new CFClient::UI::ImageButton + path => 'x1_close.png', + on_activate => sub { $self->emit ("delete") }; + + $self->CFClient::UI::Container::add ($self->{close_button}); + } $self } +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; + $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; +} + sub border { int $_[0]{border} * $::FONTSIZE } @@ -889,6 +1121,12 @@ sub size_request { my ($self) = @_; + $self->{title_widget}->size_request + if $self->{title_widget}; + + $self->{close_button}->size_request + if $self->{close_button}; + my ($w, $h) = $self->SUPER::size_request; ( @@ -897,19 +1135,37 @@ ) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $h -= List::Util::max 0, $self->border * 2; - $w -= List::Util::max 0, $self->border * 2; + if ($self->{title_widget}) { + $self->{title_widget}{w} = $w; + $self->{title_widget}{h} = $h; + $self->{title_widget}->invoke_size_allocate ($w, $h); + } + + my $border = $self->border; + + $h -= List::Util::max 0, $border * 2; + $w -= List::Util::max 0, $border * 2; + + $self->child->configure ($border, $border, $w, $h); - $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) - if $self->{title}; + $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) + if $self->{close_button}; - $self->child->configure ($self->border, $self->border, $w, $h); + 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)}; @@ -932,10 +1188,11 @@ my $dx = $ev->{x} - $ox; my $dy = $ev->{y} - $oy; - $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); - $self->{user_h} = $bh + $dy * ($my ? -1 : 1); - $self->move ($wx + $dx * $mx, $wy + $dy * $my); - $self->check_size; + $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); + $self->{force_h} = $bh + $dy * ($my ? -1 : 1); + + $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); + $self->realloc; }; } elsif ($lr ^ $td) { @@ -947,64 +1204,73 @@ ($x, $y) = ($ev->{x}, $ev->{y}); - $self->move ($bx + $x - $ox, $by + $y - $oy); - $self->update; + $self->move_abs ($bx + $x - $ox, $by + $y - $oy); + # HACK: the next line is required to enforce placement + $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h}); }; + } else { + return 0; } + + 1 } -sub button_up { +sub invoke_button_up { my ($self, $ev, $x, $y) = @_; - delete $self->{motion}; + ! ! delete $self->{motion} } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; $self->{motion}->($ev, $x, $y) if $self->{motion}; + + ! ! $self->{motion} } sub _draw { my ($self) = @_; + my $child = $self->{children}[0]; + my ($w, $h ) = ($self->{w}, $self->{h}); - my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); + my ($cw, $ch) = ($child->{w}, $child->{h}); - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; my $border = $self->border; glColor @{ $self->{border_bg} }; - $tex[1]->draw_quad (0, 0, $w, $border); - $tex[3]->draw_quad (0, $border, $border, $ch); - $tex[2]->draw_quad ($w - $border, $border, $border, $ch); - $tex[4]->draw_quad (0, $h - $border, $w, $border); + $border[0]->draw_quad_alpha (0, 0, $w, $border); + $border[1]->draw_quad_alpha (0, $border, $border, $ch); + $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); + $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); if (@{$self->{bg}} < 4 || $self->{bg}[3]) { - my $bg = $tex[0]; + glColor @{ $self->{bg} }; # TODO: repeat texture not scale - my $rep_x = $cw / $bg->{w}; - my $rep_y = $ch / $bg->{h}; + # solve this better(?) + $bg->{s} = $cw / $bg->{w}; + $bg->{t} = $ch / $bg->{h}; + $bg->draw_quad_alpha ($border, $border, $cw, $ch); + } - glColor @{ $self->{bg} }; + glDisable GL_TEXTURE_2D; - $bg->{s} = $rep_x; - $bg->{t} = $rep_y; - $bg->{wrap_mode} = 1; - $bg->draw_quad ($border, $border, $cw, $ch); + $child->draw; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; - } + if ($self->{title_widget}) { + glTranslate 0, $border - $self->{h}; + $self->{title_widget}->_draw; - $self->{title}->draw if $self->{title}; + glTranslate 0, - ($border - $self->{h}); + } - $self->child->draw; + $self->{close_button}->draw + if $self->{close_button}; } ############################################################################# @@ -1022,24 +1288,30 @@ $class->SUPER::new ( col_expand => [], - @_ + @_, ) } +sub children { + grep $_, map @$_, grep $_, @{ $_[0]{children} } +} + sub add { my ($self, $x, $y, $child) = @_; $child->set_parent ($self); $self->{children}[$y][$x] = $child; - $child->check_size; + $self->realloc; } -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } +sub remove { + my ($self, $child) = @_; + + # TODO: not yet implemented } -# TODO: move to container class maybe? send childs a signal on removal? +# TODO: move to container class maybe? send children a signal on removal? sub clear { my ($self) = @_; @@ -1051,7 +1323,7 @@ $_->hide; } - $self->update; + $self->realloc; } sub get_wh { @@ -1087,13 +1359,13 @@ ) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; my ($ws, $hs) = $self->get_wh; - my $req_w = sum @$ws; - my $req_h = sum @$hs; + my $req_w = (sum @$ws) || 1; + my $req_h = (sum @$hs) || 1; # TODO: nicer code && do row_expand my @col_expand = @{$self->{col_expand}}; @@ -1129,6 +1401,7 @@ $y += $row_h; } + 1 } sub find_widget { @@ -1157,59 +1430,59 @@ ############################################################################# -package CFClient::UI::HBox; - -# TODO: wrap into common Box base class +package CFClient::UI::Box; our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; - my @alloc = map [$_->size_request], @{$self->{children}}; - - ( - (List::Util::sum map $_->[0], @alloc), - (List::Util::max map $_->[1], @alloc), - ) + $self->{vertical} + ? ( + (List::Util::max map $_->{req_w}, @{$self->{children}}), + (List::Util::sum map $_->{req_h}, @{$self->{children}}), + ) + : ( + (List::Util::sum map $_->{req_w}, @{$self->{children}}), + (List::Util::max map $_->{req_h}, @{$self->{children}}), + ) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - ($h, $w) = ($w, $h); + my $space = $self->{vertical} ? $h : $w; + my @children = $self->visible_children; - my $children = $self->{children}; + my @req; - my @h = map $_->{req_w}, @$children; - - my $req_h = List::Util::sum @h; - - if ($req_h > $h) { - # ah well, not enough space - $_ *= $h / $req_h for @h; + if ($self->{homogeneous}) { + @req = ($space / (@children || 1)) x @children; } else { - my $exp = List::Util::sum map $_->{expand}, @$children; - $exp ||= 1; - - for (0 .. $#$children) { - my $child = $children->[$_]; + @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children; + my $req = List::Util::sum @req; + + if ($req > $space) { + # ah well, not enough space + $_ *= $space / $req for @req; + } else { + my $expand = (List::Util::sum map $_->{expand}, @children) || 1; + + $space = ($space - $req) / $expand; # remaining space to give away - my $alloc_h = $h[$_]; - $alloc_h += ($h - $req_h) * $child->{expand} / $exp; - $h[$_] = $alloc_h; + $req[$_] += $space * $children[$_]{expand} + for 0 .. $#children; } } - CFClient::UI::harmonize \@h; + CFClient::UI::harmonize \@req; - my $y = 0; - for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure ($y, 0, $h, $w); + my $pos = 0; + for (0 .. $#children) { + my $alloc = $req[$_]; + $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); - $y += $h; + $pos += $alloc; } 1 @@ -1217,65 +1490,39 @@ ############################################################################# -package CFClient::UI::VBox; - -# TODO: wrap into common Box base class - -our @ISA = CFClient::UI::Container::; +package CFClient::UI::HBox; -sub size_request { - my ($self) = @_; +our @ISA = CFClient::UI::Box::; - my @alloc = map [$_->size_request], @{$self->{children}}; +sub new { + my $class = shift; - ( - (List::Util::max map $_->[0], @alloc), - (List::Util::sum map $_->[1], @alloc), + $class->SUPER::new ( + vertical => 0, + @_, ) } -sub size_allocate { - my ($self, $w, $h) = @_; - - my $children = $self->{children}; - - my @h = map $_->{req_h}, @$children; - - my $req_h = List::Util::sum @h; - - if ($req_h > $h) { - # ah well, not enough space - $_ *= $h / $req_h for @h; - } else { - my $exp = List::Util::sum map $_->{expand}, @$children; - $exp ||= 1; - - for (0 .. $#$children) { - my $child = $children->[$_]; - - $h[$_] += ($h - $req_h) * $child->{expand} / $exp; - } - } +############################################################################# - CFClient::UI::harmonize \@h; +package CFClient::UI::VBox; - my $y = 0; - for (0 .. $#$children) { - my $child = $children->[$_]; - my $h = $h[$_]; - $child->configure (0, $y, $w, $h); +our @ISA = CFClient::UI::Box::; - $y += $h; - } +sub new { + my $class = shift; - 1 + $class->SUPER::new ( + vertical => 1, + @_, + ) } ############################################################################# package CFClient::UI::Label; -our @ISA = CFClient::UI::Base::; +our @ISA = CFClient::UI::DrawBG::; use CFClient::OpenGL; @@ -1284,13 +1531,19 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], + #bg => none + #active_bg => none #font => default_font + #text => initial text + #markup => initial narkup + #max_w => maximum pixel width + ellipsise => 3, # end + layout => (new CFClient::Layout), fontsize => 1, - text => "", align => -1, valign => -1, - padding => 2, - layout => new CFClient::Layout, + padding_x => 2, + padding_y => 2, can_events => 0, %arg ); @@ -1301,20 +1554,23 @@ $self->{template} = $layout; } - $self->set_text (delete $self->{text}) if exists $self->{text}; - $self->set_markup (delete $self->{markup}) if exists $self->{markup}; + if (exists $self->{markup}) { + $self->set_markup (delete $self->{markup}); + } else { + $self->set_text (delete $self->{text}); + } $self } -sub escape { - local $_ = $_[1]; +sub escape($) { + local $_ = $_[0]; s/&/&/g; s/>/>/g; s/SUPER::update; } -sub reconfigure { +sub realloc { my ($self) = @_; - delete $self->{texture}; + delete $self->{ox}; + $self->SUPER::realloc; } sub set_text { @@ -1338,9 +1595,9 @@ $self->{layout}->set_text ($text); - delete $self->{texture}; + delete $self->{size_req}; + $self->realloc; $self->update; - $self->check_size; } sub set_markup { @@ -1349,86 +1606,108 @@ return if $self->{text} eq "M$markup"; $self->{text} = "M$markup"; + my $rgba = $markup =~ /span.*(?:foreground|background)/; + $self->{layout}->set_markup ($markup); - delete $self->{texture}; + delete $self->{size_req}; + $self->realloc; $self->update; - $self->check_size; } sub size_request { my ($self) = @_; - $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_width ($self->{max_w} || -1); - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{size_req} ||= do { + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_width ($self->{max_w} || -1); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + + my ($w, $h) = $self->{layout}->size; + + 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); - 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_height ($self->{fontsize} * $::FONTSIZE); + $w = List::Util::max $w, $w2; + $h = List::Util::max $h, $h2; + } - my ($w2, $h2) = $self->{template}->size; + [$w, $h] + }; - $w = List::Util::max $w, $w2; - $h = List::Util::max $h, $h2; - } + @{ $self->{size_req} } +} - ( - $w + $self->{padding} * 2, - $h + $self->{padding} * 2, - ) +sub baseline_shift { + $_[0]{layout}->descent } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - delete $self->{texture}; + delete $self->{ox}; + + delete $self->{texture} + unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; + + 1 } sub set_fontsize { my ($self, $fontsize) = @_; $self->{fontsize} = $fontsize; + delete $self->{size_req}; delete $self->{texture}; - $self->check_size; - $self->update; + + $self->realloc; +} + +sub reconfigure { + my ($self) = @_; + + delete $self->{size_req}; + delete $self->{texture}; + + $self->SUPER::reconfigure; } sub _draw { my ($self) = @_; - my $tex = $self->{texture} ||= do { + $self->SUPER::_draw; # draw background, if applicable + + 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}); - $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); - new_from_layout CFClient::Texture $self->{layout} - }; - - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - glColor @{$self->{fg}}; - - $self->{ox} = int ( - $self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} - : ($self->{w} - $tex->{w}) * 0.5 - ); + [$self->{layout}->size] + }; - $self->{oy} = int ( - $self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} - : ($self->{h} - $tex->{h}) * 0.5 - ); + 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); + }; - $tex->draw_quad ($self->{ox}, $self->{oy}); + my $w = List::Util::min $self->{w} + 4, $size->[0]; + my $h = List::Util::min $self->{h} + 2, $size->[1]; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + $self->{layout}->render ($self->{ox}, $self->{oy}); } ############################################################################# @@ -1451,6 +1730,8 @@ can_focus => 1, valign => 0, can_events => 1, + #text => ... + #hidden => "*", @_ ) } @@ -1462,15 +1743,24 @@ return if $self->{text} eq $text; - delete $self->{texture}; - $self->{last_activity} = $::NOW; $self->{text} = $text; $text =~ s/./*/g if $self->{hidden}; $self->{layout}->set_text ("$text "); + delete $self->{size_req}; $self->emit (changed => $self->{text}); + + $self->realloc; + $self->update; +} + +sub set_text { + my ($self, $text) = @_; + + $self->{cursor} = length $text; + $self->_set_text ($text); } sub get_text { @@ -1485,21 +1775,7 @@ ($w + 1, $h) # add 1 for cursor } -sub size_allocate { - my ($self, $w, $h) = @_; - - $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text -} - -sub set_text { - my ($self, $text) = @_; - - $self->{cursor} = length $text; - $self->_set_text ($text); - $self->update; -} - -sub key_down { +sub invoke_key_down { my ($self, $ev) = @_; my $mod = $ev->{mod}; @@ -1508,9 +1784,9 @@ my $text = $self->get_text; - if ($sym == 8) { + if ($uni == 8) { substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; - } elsif ($sym == 127) { + } elsif ($uni == 127) { substr $text, $self->{cursor}, 1, ""; } elsif ($sym == CFClient::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; @@ -1520,28 +1796,33 @@ $self->{cursor} = 0; } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; - } elsif ($sym == 27) { + } elsif ($uni == 27) { $self->emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; + } else { + return 0; } $self->_set_text ($text); - $self->update; + + $self->realloc; + + 1 } -sub focus_in { +sub invoke_focus_in { my ($self) = @_; $self->{last_activity} = $::NOW; - $self->SUPER::focus_in; + $self->SUPER::invoke_focus_in } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - $self->SUPER::button_down ($ev, $x, $y); + $self->SUPER::invoke_button_down ($ev, $x, $y); my $idx = $self->{layout}->xy_to_index ($x, $y); @@ -1552,11 +1833,15 @@ $self->_set_text ($self->{text}); $self->update; + + 1 } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; # printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# + + 1 } sub _draw { @@ -1565,14 +1850,14 @@ local $self->{fg} = $self->{fg}; if ($FOCUS == $self) { - glColor @{$self->{active_bg}}; + glColor_premultiply @{$self->{active_bg}}; $self->{fg} = $self->{active_fg}; } else { - glColor @{$self->{bg}}; + glColor_premultiply @{$self->{bg}}; } glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glBegin GL_QUADS; glVertex 0 , 0; glVertex 0 , $self->{h}; @@ -1607,7 +1892,7 @@ use CFClient::OpenGL; -sub key_down { +sub invoke_key_down { my ($self, $ev) = @_; my $sym = $ev->{sym}; @@ -1615,6 +1900,7 @@ if ($sym == 13) { unshift @{$self->{history}}, my $txt = $self->get_text; + $self->{history_pointer} = -1; $self->{history_saveback} = ''; $self->emit (activate => $txt); @@ -1643,9 +1929,10 @@ } } else { - $self->SUPER::key_down ($ev); + return $self->SUPER::invoke_key_down ($ev) } + 1 } ############################################################################# @@ -1664,9 +1951,9 @@ my $class = shift; $class->SUPER::new ( - padding => 4, + padding_x => 4, + padding_y => 4, fg => [1, 1, 1], - bg => [1, 1, 1, 0.2], active_fg => [0, 0, 1], can_hover => 1, align => 0, @@ -1676,40 +1963,70 @@ ) } -sub button_up { +sub invoke_button_up { my ($self, $ev, $x, $y) = @_; - if ($x >= 0 && $x < $self->{w} - && $y >= 0 && $y < $self->{h}) { - $self->emit ("activate"); - } + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; + + 1 } sub _draw { my ($self) = @_; - local $self->{fg} = $self->{fg}; - - if ($GRAB == $self) { - $self->{fg} = $self->{active_fg}; - } + local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 0, 0, 0, 1; - $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); + $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; $self->SUPER::_draw; } ############################################################################# +package CFClient::UI::ImageButton; + +our @ISA = CFClient::UI::Image::; + +use CFClient::OpenGL; + +my %textures; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + padding_x => 4, + padding_y => 4, + fg => [1, 1, 1], + active_fg => [0, 0, 1], + can_hover => 1, + align => 0, + valign => 0, + can_events => 1, + @_ + ); +} + +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; + + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; + + 1 +} + +############################################################################# + package CFClient::UI::CheckBox; our @ISA = CFClient::UI::DrawBG::; @@ -1724,9 +2041,12 @@ 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], + active_bg => [1, 1, 1, 0.5], state => 0, can_hover => 1, @_ @@ -1736,17 +2056,28 @@ sub size_request { my ($self) = @_; - ($self->{padding} * 2 + 6) x 2 + (6) x 2 +} + +sub toggle { + my ($self) = @_; + + $self->{state} = !$self->{state}; + $self->emit (changed => $self->{state}); + $self->update; } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} - && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { - $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 { @@ -1754,22 +2085,19 @@ $self->SUPER::_draw; - glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; + glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; + + my ($w, $h) = @$self{qw(w h)}; - my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; + my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; - glEnable GL_BLEND; - glEnable GL_TEXTURE_2D; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - my $tex = $self->{state} ? $tex[1] : $tex[0]; - $tex->draw_quad (0, 0, $s, $s); - + glEnable GL_TEXTURE_2D; + $tex->draw_quad_alpha (0, 0, $s, $s); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; } ############################################################################# @@ -1779,25 +2107,26 @@ our @ISA = CFClient::UI::Base::; use CFClient::OpenGL; -use Carp qw/confess/; -our %loaded_images; +our %texture_cache; sub new { my $class = shift; - my $self = $class->SUPER::new (can_events => 0, @_); - - $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; + my $self = $class->SUPER::new ( + can_events => 0, + @_, + ); - $loaded_images{$self->{image}} ||= - new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; + $self->{path} + or Carp::croak "required attribute 'path' not set"; - my $tex = $self->{tex} = $loaded_images{$self->{image}}; + $self->{tex} = $texture_cache{$self->{path}} ||= + new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; - Scalar::Util::weaken $loaded_images{$self->{image}}; + Scalar::Util::weaken $texture_cache{$self->{path}}; - $self->{aspect} = $tex->{w} / $tex->{h}; + $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; $self } @@ -1805,7 +2134,7 @@ sub size_request { my ($self) = @_; - ($self->{tex}->{w}, $self->{tex}->{h}) + ($self->{tex}{w}, $self->{tex}{h}) } sub _draw { @@ -1822,14 +2151,11 @@ ($w, $h) = ($h, $w); } - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $tex->draw_quad (0, 0, $w, $h); + $tex->draw_quad_alpha (0, 0, $w, $h); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -1927,9 +2253,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; @@ -1954,8 +2284,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; } @@ -2028,7 +2358,7 @@ sub new { my $class = shift; - # range [value, low, high, page] + # range [value, low, high, page, unit] # TODO: 0-width page # TODO: req_w/h are wrong with vertical @@ -2036,119 +2366,189 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], active_fg => [0, 0, 0], - range => [0, 0, 100, 10], - req_w => $::WIDTH / 80, - req_h => $::WIDTH / 80, + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + range => [0, 0, 100, 10, 0], + min_w => $::WIDTH / 80, + min_h => $::WIDTH / 80, vertical => 0, can_hover => 1, - inner_pad => 5, + inner_pad => 0.02, @_ ); + $self->set_value ($self->{range}[0]); + $self->update; + $self } +sub set_range { + my ($self, $range) = @_; + + ($range, $self->{range}) = ($self->{range}, $range); + + if ("@$range" ne "@{$self->{range}}") { + $self->update; + $self->set_value ($self->{range}[0]); + } +} + +sub set_value { + my ($self, $value) = @_; + + my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; + + $hi = $lo + 1 if $hi <= $lo; + + $page = $hi - $lo if $page > $hi - $lo; + + $value = $lo if $value < $lo; + $value = $hi - $page if $value > $hi - $page; + + $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit + if $unit; + + @{$self->{range}} = ($value, $lo, $hi, $page, $unit); + + if ($value != $old_value) { + $self->emit (changed => $value); + $self->update; + } +} + sub size_request { my ($self) = @_; - my $w = $self->{req_w}; - my $h = $self->{req_h}; - - $self->{vertical} ? ($h, $w) : ($w, $h) + ($self->{req_w}, $self->{req_h}) } -sub button_down { +sub invoke_button_down { my ($self, $ev, $x, $y) = @_; - $self->SUPER::button_down ($ev, $x, $y); - $self->mouse_motion ($ev, $x, $y); + $self->SUPER::invoke_button_down ($ev, $x, $y); + + $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; + + $self->invoke_mouse_motion ($ev, $x, $y) } -sub mouse_motion { +sub invoke_mouse_motion { my ($self, $ev, $x, $y) = @_; if ($GRAB == $self) { - my ($value, $lo, $hi, $page) = @{$self->{range}}; - my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); - my $inner_pad_px = $self->_calc_inner_pad_px ($w); - my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + my (undef, $lo, $hi, $page) = @{$self->{range}}; - $x -= $inner_pad_px; # substract the padding - $x = $x * ($hi - $lo) / $inner_w + $lo; - $x = $lo if $x < $lo; - $x = $hi - $page if $x > $hi - $page; - $self->{range}[0] = $x; + $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); - $self->emit (changed => $x); - $self->update; + $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); + } else { + return 0; } + + 1 } -# the inner_* stuff is for generating a padding for the slider handle, -# so that the handle doesn't leave the texture. This calculation isn't 100% -# correct propably, but it does the job for now -sub _calc_inner_pad_px { - my ($self, $w) = @_; - ($w / 100) * $self->{inner_pad} # % to pixels +sub update { + my ($self) = @_; + + 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}}; + my $range = ($hi - $page - $lo) || 1e-100; + + my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; + + $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; + $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; + + $value = ($value - $lo) / $range; + $value = $value * $self->{scale} + $self->{offset}; + + $self->{knob_x} = $value - $knob_w * 0.5; + $self->{knob_w} = $knob_w; + } + $self->SUPER::_draw (); - my ($w, $h) = @$self{qw(w h)}; + glScale $self->{w}, $self->{h}; if ($self->{vertical}) { # draw a vertical slider like a rotated horizontal slider + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; - glTranslate 0, -$self->{w}, 0; - - ($w, $h) = ($h, $w); } my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; - my ($value, $lo, $hi, $page) = @{$self->{range}}; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $hi = $value + 1 if $lo == $hi; + # draw background + $tex[1]->draw_quad_alpha (0, 0, 1, 1); - my $inner_pad_px = $self->_calc_inner_pad_px ($w); - my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + # draw handle + $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); - $page = int $page * $inner_w / ($hi - $lo); - $value = int +($value - $lo) * $inner_w / ($hi - $lo); + glDisable GL_TEXTURE_2D; +} - $w -= $page; - $page &= ~1; - glTranslate $page * 0.5, 0, 0; - $page ||= 2; +############################################################################# - my $knob_a = $inner_pad_px + ($value - $page * 0.5); - my $knob_b = $inner_pad_px + ($value + $page * 0.5); +package CFClient::UI::ValSlider; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; +our @ISA = CFClient::UI::HBox::; - # draw background - $tex[1]->draw_quad (0, 0, $w, $h); +sub new { + my ($class, %arg) = @_; - # draw handle - $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); + my $range = delete $arg{range}; - glDisable GL_BLEND; - glDisable GL_TEXTURE_2D; + my $self = $class->SUPER::new ( + slider => (new CFClient::UI::Slider expand => 1, range => $range), + entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), + to_value => sub { shift }, + from_value => sub { shift }, + %arg, + ); + + $self->{slider}->connect (changed => sub { + my ($self, $value) = @_; + $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); + $self->{parent}->emit (changed => $value); + }); + +# $self->{entry}->connect (changed => sub { +# my ($self, $value) = @_; +# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); +# $self->{parent}->emit (changed => $value); +# }); + + $self->add ($self->{slider}, $self->{entry}); + + $self->{slider}->emit (changed => $self->{slider}{range}[0]); + + $self } +sub set_range { shift->{slider}->set_range (@_) } +sub set_value { shift->{slider}->set_value (@_) } + ############################################################################# -package CFClient::UI::TextView; +package CFClient::UI::TextScroller; our @ISA = CFClient::UI::HBox::; @@ -2160,6 +2560,7 @@ my $self = $class->SUPER::new ( fontsize => 1, can_events => 0, + indent => 0, #font => default_font @_, @@ -2184,16 +2585,51 @@ $self->reflow; } -sub text_height { - my ($self, $text) = @_; +sub size_request { + my ($self) = @_; + + my ($empty, $slider) = @{ $self->{children} }; + + local $self->{children} = [$empty, $slider]; + $self->SUPER::size_request +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + my ($empty, $slider, @other) = @{ $self->{children} }; + $_->configure (@$_{qw(x y req_w req_h)}) for @other; + + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{layout}->set_width ($empty->{w}); + $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); + + $self->reflow; + + local $self->{children} = [$empty, $slider]; + $self->SUPER::invoke_size_allocate ($w, $h) +} + +sub get_layout { + my ($self, $para) = @_; my $layout = $self->{layout}; + $layout->set_font ($self->{font}) if $self->{font}; + $layout->set_foreground (@{$para->{fg}}); $layout->set_height ($self->{fontsize} * $::FONTSIZE); - $layout->set_width ($self->{children}[0]{w}); - $layout->set_text ($text); - - ($layout->size)[1] + $layout->set_width ($self->{children}[0]{w} - $para->{indent}); + $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); + $layout->set_markup ($para->{markup}); + + $layout->set_shapes ( + map + +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), + @{$para->{widget}} + ); + + $layout } sub reflow { @@ -2203,31 +2639,50 @@ $self->update; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub set_offset { + my ($self, $offset) = @_; - $self->SUPER::size_allocate ($w, $h); + # todo: base offset on lines or so, not on pixels + $self->{children}[1]->set_value ($offset); +} - $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - $self->{layout}->set_width ($self->{children}[0]{w}); +sub clear { + my ($self) = @_; - $self->reflow; + my (undef, undef, @other) = @{ $self->{children} }; + $self->remove ($_) for @other; + + $self->{par} = []; + $self->{height} = 0; + $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); } sub add_paragraph { - my ($self, $color, $text) = @_; + my ($self, $color, $para, $indent) = @_; - #TODO: intelligently "reformat" paragraph + my ($text, @w) = ref $para ? @$para : $para; - my $height = $self->text_height ($text); + $para = { + w => 1e10, + wrapped => 1, + fg => $color, + indent => $indent, + markup => $text, + widget => \@w, + }; - $self->{height} += $height; + $self->add (@w) if @w; + push @{$self->{par}}, $para; - push @{$self->{par}}, [$height, $color, $text]; + $self->{need_reflow}++; + $self->update; +} + +sub scroll_to_bottom { + my ($self) = @_; - $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; - $self->{children}[1]->update; + $self->{scroll_to_bottom} = 1; + $self->update; } sub update { @@ -2239,74 +2694,95 @@ delete $self->{texture}; - $ROOT->on_refresh ($self, sub { + $ROOT->on_post_alloc ($self => sub { + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + if (delete $self->{need_reflow}) { my $height = 0; - $height += $_->[0] = $self->text_height ($_->[2]) - for @{$self->{par}}; + for my $para (@{$self->{par}}) { + if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { + my $layout = $self->get_layout ($para); + my ($w, $h) = $layout->size; + + $para->{w} = $w + $para->{indent}; + $para->{h} = $h; + $para->{wrapped} = $layout->has_wrapped; + } + + $height += $para->{h}; + } $self->{height} = $height; - $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; - + $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); + delete $self->{texture}; } - $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { + if (delete $self->{scroll_to_bottom}) { + $self->{children}[1]->set_value (1e10); + } + + $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - my $top = int $self->{children}[1]{range}[0]; my $y0 = $top; - my $y1 = $top + $self->{h}; + my $y1 = $top + $H; my $y = 0; - my $layout = $self->{layout}; + for my $para (@{$self->{par}}) { + my $h = $para->{h}; - $layout->set_font ($self->{font}) if $self->{font}; + if ($y0 < $y + $h && $y < $y1) { - for my $par (@{$self->{par}}) { - my $h = $par->[0]; + my $layout = $self->get_layout ($para); - if ($y0 < $y + $h && $y < $y1) { - $layout->set_text ($par->[2]); + $layout->render ($para->{indent}, $y - $y0); - glColor @{ $par->[1] }; - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); + if (my @w = @{ $para->{widget} }) { + my @s = $layout->get_shapes; + + for (@w) { + my ($dx, $dy) = splice @s, 0, 2, (); + + $_->{x} = $dx + $para->{indent}; + $_->{y} = $dy + $y - $y0; + + $_->draw; + } + } } $y += $h; } - - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; }; }); } +sub reconfigure { + my ($self) = @_; + + $self->SUPER::reconfigure; + + $_->{w} = 1e10 for @{ $self->{par} }; + $self->reflow; +} + sub _draw { my ($self) = @_; - glEnable GL_BLEND; - glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 1, 1, 1, 1; - $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + 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; - glDisable GL_BLEND; $self->{children}[1]->draw; - } ############################################################################# @@ -2361,33 +2837,18 @@ my $class = shift; my $self = $class->SUPER::new ( - state => 0, - connect_activate => \&toggle_flopper, + state => 0, + on_activate => \&toggle_flopper, @_ ); - if ($self->{state}) { - $self->{state} = 0; - $self->toggle_flopper; - } - $self } sub toggle_flopper { my ($self) = @_; - # TODO: use animation - if ($self->{state} = !$self->{state}) { - $CFClient::UI::ROOT->add ($self->{other}); - $self->{other}->move ($self->coord2global (0, $self->{h})); - $self->emit ("open"); - } else { - $CFClient::UI::ROOT->remove ($self->{other}); - $self->emit ("close"); - } - - $self->emit (changed => $self->{state}); + $self->{other}->toggle_visibility; } ############################################################################# @@ -2407,34 +2868,66 @@ ) } -sub set_markup { - my ($self, $text) = @_; +sub set_tooltip_from { + my ($self, $widget) = @_; + + my $tooltip = $widget->{tooltip}; - $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; - $self->{label}->set_markup ($text); - $self->add ($self->{label}); + if ($ENV{CFPLUS_DEBUG} & 2) { + $tooltip .= "\n\n" . (ref $widget) . "\n" + . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" + . "req $widget->{req_w} $widget->{req_h}\n" + . "visible $widget->{visible}"; + } + + $tooltip =~ s/^\n+//; + $tooltip =~ s/\n+$//; + + $self->add (new CFClient::UI::Label + markup => $tooltip, + max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, + fontsize => 0.8, + fg => [0, 0, 0, 1], + ellipsise => 0, + font => ($widget->{tooltip_font} || $::FONT_PROP), + ); } sub size_request { my ($self) = @_; - $self->child->set_max_size ($::WIDTH * 0.3); - my ($w, $h) = @{$self->child}{qw(req_w req_h)}; ($w + 4, $h + 4) } -sub size_allocate { +sub invoke_size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w - 4, $h - 4); + $self->SUPER::invoke_size_allocate ($w - 4, $h - 4) +} + +sub invoke_visibility_change { + my ($self, $visible) = @_; + + return unless $visible; + + $self->{root}->on_post_alloc ("move_$self" => sub { + my $widget = $self->{owner} + or return; + + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); + + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $self->{root}{w}; + + $self->move_abs ($x, $y); + }); } sub _draw { my ($self) = @_; - glPushMatrix; glTranslate 0.375, 0.375; my ($w, $h) = @$self{qw(w h)}; @@ -2455,9 +2948,8 @@ glVertex $w, 0; glEnd; - glPopMatrix; + glTranslate 2 - 0.375, 2 - 0.375; - glTranslate 2, 2; $self->SUPER::_draw; } @@ -2472,34 +2964,83 @@ sub new { my $class = shift; - $class->SUPER::new ( - aspect => 1, + my $self = $class->SUPER::new ( + aspect => 1, + can_events => 0, @_, - ) + ); + + if ($self->{anim} && $self->{animspeed}) { + Scalar::Util::weaken (my $widget = $self); + + $self->{timer} = Event->timer ( + at => $self->{animspeed} * int $::NOW / $self->{animspeed}, + hard => 1, + interval => $self->{animspeed}, + cb => sub { + ++$widget->{frame}; + $widget->update; + }, + ); + } + + $self } sub size_request { (32, 8) } +sub update { + my ($self) = @_; + + return unless $self->{visible}; + + $self->SUPER::update; +} + sub _draw { my ($self) = @_; - my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; + return unless $::CONN; + + my $face; + + if ($self->{frame}) { + my $anim = $::CONN->{anim}[$self->{anim}]; + + $face = $anim->[ $self->{frame} % @$anim ] + if $anim && @$anim; + } + + my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; - # TODO animation if ($tex) { - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 1, 1, 1, 1; - $tex->draw_quad (0, 0, $self->{w}, $self->{h}); + glColor 0, 0, 0, 1; + $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; } } +sub destroy { + my ($self) = @_; + + $self->{timer}->cancel + if $self->{timer}; + + $self->SUPER::destroy; +} + +############################################################################# + +package CFClient::UI::Buttonbar; + +our @ISA = CFClient::UI::HBox::; + +# TODO: should actualyl wrap buttons and other goodies. + ############################################################################# package CFClient::UI::Menu; @@ -2520,14 +3061,30 @@ $self->add ($self->{vbox} = new CFClient::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 CFClient::UI::HBox + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + children => [ + (new CFClient::UI::Label markup => $left, expand => 1), + (new CFClient::UI::Label markup => $right, align => +1), + ], + ; + + } else { + $widget = new CFClient::UI::Label + can_hover => 1, + can_events => 1, + markup => $widget, + tooltip => $tooltip; + } } $self->{item}{$widget} = $item; @@ -2549,18 +3106,20 @@ $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}) { @@ -2569,163 +3128,347 @@ $self->emit ("popdown"); $self->{hover}[1]->() if $self->{hover}; + } else { + return 0 } + + 1 } ############################################################################# -package CFClient::UI::Root; +package CFClient::UI::Multiplexer; our @ISA = CFClient::UI::Container::; -use CFClient::OpenGL; +sub new { + my $class = shift; -sub check_size { - my ($self) = @_; + my $self = $class->SUPER::new ( + @_, + ); + + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; - $self->configure (0, 0, $::WIDTH, $::HEIGHT); + $self } -sub size_request { - ($::WIDTH, $::HEIGHT) +sub add { + my ($self, @widgets) = @_; + + $self->SUPER::add (@widgets); + + $self->{current} = $self->{children}[0] + if @{ $self->{children} }; } -sub configure { - my ($self, $x, $y, $w, $h) = @_; +sub get_current_page { + my ($self) = @_; - $self->SUPER::configure ($x, $y, $w, $h); + $self->{current} +} - for my $child (@{$self->{children}}) { - my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; +sub set_current_page { + my ($self, $page_or_widget) = @_; - $X = List::Util::max 0, List::Util::min $w - $W, $X; - $Y = List::Util::max 0, List::Util::min $h - $H, $Y; - $child->configure ($X, $Y, $W,$H); - } + 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 _topleft { - my ($self, $x, $y) = @_; +sub visible_children { + $_[0]{current} +} - ($x, $y) +sub size_request { + my ($self) = @_; + + $self->{current}->size_request } -sub update { +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + $self->{current}->configure (0, 0, $w, $h); + + 1 +} + +sub _draw { my ($self) = @_; - $self->check_size; - ::refresh (); + $self->{current}->draw; } -sub add { - my ($self, $child) = @_; +############################################################################# - # integerize window positions - $child->{x} = int $child->{x}; - $child->{y} = int $child->{y}; +package CFClient::UI::Notebook; - $self->SUPER::add ($child); +our @ISA = CFClient::UI::VBox::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + buttonbar => (new CFClient::UI::Buttonbar), + multiplexer => (new CFClient::UI::Multiplexer expand => 1), + # filter => # will be put between multiplexer and $self + @_, + ); + + $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; + $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); + + $self } -sub on_refresh { - my ($self, $id, $cb) = @_; +sub add { + my ($self, $title, $widget, $tooltip) = @_; - $self->{refresh_hook}{$id} = $cb; + Scalar::Util::weaken $self; + + $self->{buttonbar}->add (new CFClient::UI::Button + markup => $title, + tooltip => $tooltip, + on_activate => sub { $self->set_current_page ($widget) }, + ); + + $self->{multiplexer}->add ($widget); } -sub draw { +sub get_current_page { my ($self) = @_; - while (my $rcb = delete $self->{refresh_hook}) { - $_->() for values %$rcb; + $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}); +} + +############################################################################# + +package CFClient::UI::Combobox; + +use utf8; + +our @ISA = CFClient::UI::Button::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + options => [], # [value, title, longdesc], ... + value => undef, + @_, + ); + + $self->_set_value ($self->{value}); + + $self +} + +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) }]; } - glViewport 0, 0, $::WIDTH, $::HEIGHT; - glClearColor +($::CFG->{fow_intensity}) x 3, 1; - glClear GL_COLOR_BUFFER_BIT; + CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); +} - glMatrixMode GL_PROJECTION; - glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; - glMatrixMode GL_MODELVIEW; - glLoadIdentity; +sub _set_value { + my ($self, $value) = @_; - $self->_draw; + my ($item) = grep $_->[0] eq $value, @{ $self->{options} } + or return; + + $self->{value} = $item->[0]; + $self->set_markup ("$item->[1] ⇓"); + $self->set_tooltip ($item->[2]); +} + +sub set_value { + my ($self, $value) = @_; + + return unless $self->{value} ne $value; + + $self->_set_value ($value); + $self->emit (changed => $value); } ############################################################################# -package CFClient::UI::InventoryItem; +package CFClient::UI::Statusbox; -our @ISA = CFClient::UI::HBox::; +our @ISA = CFClient::UI::VBox::; sub new { my $class = shift; - my %args = @_; + my $self = $class->SUPER::new ( + fontsize => 0.8, + @_, + ); - my $item = $args{item}; + Scalar::Util::weaken (my $this = $self); - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; + $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); + $self +} - my $self = $class->SUPER::new ( - can_hover => 1, - can_events => 1, - tooltip => (CFClient::UI::Label->escape ($desc) - . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"), - connect_button_down => sub { - my ($self, $ev, $x, $y) = @_; - - # todo: maybe put examine on 1? but should just be a tooltip :( - if ($ev->{button} == 1) { - $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); - } elsif ($ev->{button} == 2) { - $::CONN->send ("apply $item->{tag}"); - } elsif ($ev->{button} == 3) { - CFClient::UI::Menu->new ( - items => [ - ["examine", sub { $::CONN->send ("examine $item->{tag}") }], - [ - $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", - sub { $::CONN->send ("lock $item->{tag}") }, - ], - ["mark", sub { $::CONN->send ("mark $item->{tag}") }], - ["apply", sub { $::CONN->send ("apply $item->{tag}") }], - ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], - ], - )->popup ($ev); +sub reorder { + my ($self) = @_; + my $NOW = Time::HiRes::time; + + # freeze display when hovering over any label + return if $CFClient::UI::TOOLTIP->{owner} + && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, + values %{ $self->{item} }; + + while (my ($k, $v) = each %{ $self->{item} }) { + delete $self->{item}{$k} if $v->{timeout} < $NOW; + } + + my @widgets; + + my @items = sort { + $a->{pri} <=> $b->{pri} + or $b->{id} <=> $a->{id} + } values %{ $self->{item} }; + + $self->{timer}->interval (1); + + my $count = 10 + 1; + for my $item (@items) { + last unless --$count; + + my $label = $item->{label} ||= do { + # TODO: doesn't handle markup well (read as: at all) + my $short = $item->{count} > 1 + ? "$item->{count} × $item->{text}" + : $item->{text}; + + for ($short) { + s/^\s+//; + s/\s+/ /g; } - 1 - }, - %args - ); - $self->add(new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}); - $self->add(new CFClient::UI::Label - can_events => 0, - text => $desc); + new CFClient::UI::Label + markup => $short, + tooltip => $item->{tooltip}, + tooltip_font => $::FONT_PROP, + tooltip_width => 0.67, + fontsize => $item->{fontsize} || $self->{fontsize}, + max_w => $::WIDTH * 0.44, + fg => [@{ $item->{fg} }], + can_events => 1, + can_hover => 1 + }; - $self + if ((my $diff = $item->{timeout} - $NOW) < 2) { + $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; + $label->update; + $label->set_max_size (undef, $label->{req_h} * $diff) + if $diff < 1; + $self->{timer}->interval (1/30); + } else { + $label->{fg}[3] = $item->{fg}[3] || 1; + } + + push @widgets, $label; + } + + $self->clear; + $self->SUPER::add (reverse @widgets); +} + +sub add { + my ($self, $text, %arg) = @_; + + $text =~ s/^\s+//; + $text =~ s/\s+$//; + + return unless $text; + + my $timeout = (int time) + ((delete $arg{timeout}) || 60); + + my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; + + if (my $item = $self->{item}{$group}) { + if ($item->{text} eq $text) { + $item->{count}++; + } else { + $item->{count} = 1; + $item->{text} = $item->{tooltip} = $text; + } + $item->{id} += 0.2;#d# + $item->{timeout} = $timeout; + delete $item->{label}; + } else { + $self->{item}{$group} = { + id => ++$self->{id}, + text => $text, + timeout => $timeout, + tooltip => $text, + fg => [0.8, 0.8, 0.8, 0.8], + pri => 0, + count => 1, + %arg, + }; + } + + $ROOT->on_refresh (reorder => sub { + $self->reorder; + }); +} + +sub reconfigure { + my ($self) = @_; + + delete $_->{label} + for values %{ $self->{item} || {} }; + + $self->reorder; + $self->SUPER::reconfigure; +} + +sub destroy { + my ($self) = @_; + + $self->{timer}->cancel; + + $self->SUPER::destroy; } ############################################################################# package CFClient::UI::Inventory; -our @ISA = CFClient::UI::ScrolledWindow::; +our @ISA = CFClient::UI::Table::; sub new { my $class = shift; my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::VBox), + col_expand => [0, 1, 0], @_, ); @@ -2735,27 +3478,383 @@ sub set_items { my ($self, $items) = @_; - $self->{scrolled}->clear; + $self->clear; return unless $items; - my @items = sort { $a->{type} <=> $b->{type} } @$items; + my @items = sort { + ($a->{type} <=> $b->{type}) + or ($a->{name} cmp $b->{name}) + } values %$items; $self->{real_items} = \@items; + my $row = 0; for my $item (@items) { - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; + CFClient::Item::update_widgets $item; - $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); + $self->add (0, $row, $item->{face_widget}); + $self->add (1, $row, $item->{desc_widget}); + $self->add (2, $row, $item->{weight_widget}); + + $row++; } +} + +############################################################################# + +package CFClient::UI::SpellList; + +our @ISA = CFClient::UI::Table::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + binding => [], + commands => [], + @_, + ) +} + +my $TOOLTIP_ALL = "\n\nLeft click - ready spell\nMiddle click - invoke spell\nRight click - further options"; + +my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip => + "Name. The name of the spell.$TOOLTIP_ALL"); +my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip => + "Skill. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL"); +my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Level. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL"); +my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Spell points / Grace points. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL"); +my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => + "Damage. The amount of damage the spell deals when it hits.$TOOLTIP_ALL"); + +sub rebuild_spell_list { + my ($self) = @_; + + $CFClient::UI::ROOT->on_refresh ($self => sub { + $self->clear; + + return unless $::CONN; + + $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); + $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); + $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); + $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); + $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); + + my $row = 0; + + for (sort { $a cmp $b } keys %{ $self->{spell} }) { + my $spell = $self->{spell}{$_}; + + $row++; + + my $spell_cb = sub { + my ($widget, $ev) = @_; + + if ($ev->{button} == 1) { + $::CONN->user_send ("cast $spell->{name}"); + } elsif ($ev->{button} == 2) { + $::CONN->user_send ("invoke $spell->{name}"); + } elsif ($ev->{button} == 3) { + (new CFClient::UI::Menu + items => [ + ["bind cast $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], + ["bind invoke $spell->{name} to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], + ], + )->popup ($ev); + } else { + return 0; + } + + 1 + }; + + my $tooltip = "$spell->{message}$TOOLTIP_ALL"; + + #TODO: add path info to tooltip + #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path}); + + $self->add (0, $row, new CFClient::UI::Face + face => $spell->{face}, + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + on_button_down => $spell_cb, + ); + + $self->add (1, $row, new CFClient::UI::Label + expand => 1, + text => $spell->{name}, + can_hover => 1, + can_events => 1, + tooltip => $tooltip, + on_button_down => $spell_cb, + ); + + $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL); + $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); + $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); + $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); + } + }); +} + +sub add_spell { + my ($self, $spell) = @_; + + $self->{spell}->{$spell->{name}} = $spell; + $self->rebuild_spell_list; +} + +sub remove_spell { + my ($self, $spell) = @_; + + delete $self->{spell}->{$spell->{name}}; + $self->rebuild_spell_list; +} + +sub clear_spells { + my ($self) = @_; -# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; + $self->{spell} = {}; + $self->rebuild_spell_list; +} + +############################################################################# + +package CFClient::UI::Root; + +our @ISA = CFClient::UI::Container::; + +use List::Util qw(min max); + +use CFClient::OpenGL; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + visible => 1, + @_, + ); + + Scalar::Util::weaken ($self->{root} = $self); + + $self } sub size_request { my ($self) = @_; - ($self->{req_w}, $self->{req_h}); + + ($self->{w}, $self->{h}) +} + +sub _to_pixel { + my ($coord, $size, $max) = @_; + + $coord = + $coord eq "center" ? ($max - $size) * 0.5 + : $coord eq "max" ? $max + : $coord; + + $coord = 0 if $coord < 0; + $coord = $max - $size if $coord > $max - $size; + + int $coord + 0.5 +} + +sub invoke_size_allocate { + my ($self, $w, $h) = @_; + + for my $child ($self->children) { + my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; + + $X = $child->{force_x} if exists $child->{force_x}; + $Y = $child->{force_y} if exists $child->{force_y}; + + $X = _to_pixel $X, $W, $self->{w}; + $Y = _to_pixel $Y, $H, $self->{h}; + + $child->configure ($X, $Y, $W, $H); + } + + 1 +} + +sub coord2local { + my ($self, $x, $y) = @_; + + ($x, $y) +} + +sub coord2global { + my ($self, $x, $y) = @_; + + ($x, $y) +} + +sub update { + my ($self) = @_; + + $::WANT_REFRESH++; +} + +sub add { + my ($self, @children) = @_; + + $_->{is_toplevel} = 1 + for @children; + + $self->SUPER::add (@children); +} + +sub remove { + my ($self, @children) = @_; + + $self->SUPER::remove (@children); + + delete $self->{is_toplevel} + for @children; + + while (@children) { + my $w = pop @children; + push @children, $w->children; + $w->set_invisible; + } +} + +sub on_refresh { + my ($self, $id, $cb) = @_; + + $self->{refresh_hook}{$id} = $cb; +} + +sub on_post_alloc { + my ($self, $id, $cb) = @_; + + $self->{post_alloc_hook}{$id} = $cb; +} + +sub draw { + my ($self) = @_; + + while ($self->{refresh_hook}) { + $_->() + for values %{delete $self->{refresh_hook}}; + } + + if ($self->{realloc}) { + my %queue; + my @queue; + my $widget; + + outer: + while () { + if (my $realloc = delete $self->{realloc}) { + for $widget (values %$realloc) { + $widget->{visible} or next; # do not resize invisible widgets + + $queue{$widget+0}++ and next; # duplicates are common + + push @{ $queue[$widget->{visible}] }, $widget; + } + } + + while () { + @queue or last outer; + + $widget = pop @{ $queue[-1] || [] } + and last; + + pop @queue; + } + + delete $queue{$widget+0}; + + my ($w, $h) = $widget->size_request; + + $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; + $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; + + $w = min $widget->{max_w}, $w if exists $widget->{max_w}; + $h = min $widget->{max_h}, $h if exists $widget->{max_h}; + + $w = $widget->{force_w} if exists $widget->{force_w}; + $h = $widget->{force_h} if exists $widget->{force_h}; + + if ($widget->{req_w} != $w || $widget->{req_h} != $h + || delete $widget->{force_realloc}) { + $widget->{req_w} = $w; + $widget->{req_h} = $h; + + $self->{size_alloc}{$widget+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->{visible} <=> $a->{visible} } + values %$size_alloc; + + while () { + my $widget = pop @queue || last; + + my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; + + $w = 0 if $w < 0; + $h = 0 if $h < 0; + + $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); + } + } + } + + while ($self->{post_alloc_hook}) { + $_->() + for values %{delete $self->{post_alloc_hook}}; + } + + + glViewport 0, 0, $::WIDTH, $::HEIGHT; + glClearColor +($::CFG->{fow_intensity}) x 3, 1; + glClear GL_COLOR_BUFFER_BIT; + + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + + { + package CFClient::UI::Base; + + ($draw_x, $draw_y, $draw_w, $draw_h) = + (0, 0, $self->{w}, $self->{h}); + } + + $self->_draw; } ############################################################################# @@ -2763,7 +3862,7 @@ package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1