--- deliantra/Deliantra-Client/DC/UI.pm 2006/07/23 02:44:06 1.329 +++ deliantra/Deliantra-Client/DC/UI.pm 2007/12/25 07:39:18 1.448 @@ -1,14 +1,13 @@ -package CFClient::UI; +package CFPlus::UI; use utf8; use strict; -use Scalar::Util (); use List::Util (); -use Event; -use CFClient; -use CFClient::Texture; +use CFPlus; +use CFPlus::Pod; +use CFPlus::Texture; our ($FOCUS, $HOVER, $GRAB); # various widgets @@ -19,21 +18,21 @@ our %WIDGET; # all widgets, weak-referenced -our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { +our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub { + $_[0]->stop; + 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}; return if $ENV{CFPLUS_DEBUG} & 8; - my $tip = $widget->{tooltip}; - - $tip = $tip->($widget) if CODE:: eq ref $tip; - $TOOLTIP->set_tooltip_from ($widget); $TOOLTIP->show; } @@ -44,8 +43,9 @@ } $TOOLTIP->hide; + $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; delete $TOOLTIP->{owner}; -}); +}; sub get_layout { my $layout; @@ -81,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; - $TOOLTIP_WATCHER->cb->(); + $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} & CFPlus::KMOD_SHIFT; + + $ev->{dx} = $shift ? $delta : 0; + $ev->{dy} = $shift ? 0 : $delta; - $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) - if $GRAB; + $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; - $TOOLTIP_WATCHER->cb->(); + check_hover $widget; + $TOOLTIP_WATCHER->invoke; } } @@ -126,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}; - - $TOOLTIP_WATCHER->start; - } + check_hover $widget; - $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + $HOVER->emit (mouse_motion => $ev) if $HOVER; } @@ -195,11 +213,19 @@ ############################################################################# -package CFClient::UI::Base; +package CFPlus::UI::Event; + +sub xy { + $_[1]->coord2local ($_[0]{x}, $_[0]{y}) +} + +############################################################################# + +package CFPlus::UI::Base; use strict; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -214,7 +240,7 @@ @_ }, $class; - Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); + CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); for (keys %$self) { if (/^on_(.*)$/) { @@ -222,11 +248,11 @@ } } - 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}; + if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { + $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; + $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; + $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; + $self->{force_h} = $layout->{h} * $CFPlus::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}; @@ -241,15 +267,20 @@ my ($self) = @_; $self->hide; + $self->emit ("destroy"); %$self = (); } +sub TO_JSON { + { "\fw" => $_[0]{s_id} } +} + sub show { my ($self) = @_; return if $self->{parent}; - $CFClient::UI::ROOT->add ($self); + $CFPlus::UI::ROOT->add ($self); } sub set_visible { @@ -280,7 +311,7 @@ undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; - $CFClient::UI::TOOLTIP_WATCHER->cb->() + $CFPlus::UI::TOOLTIP_WATCHER->invoke if $TOOLTIP->{owner} == $self; $self->emit ("focus_out"); @@ -292,8 +323,8 @@ return if $self->{visible} == $visible; - $visible ? $self->hide - : $self->show; + $visible ? $self->show + : $self->hide; } sub toggle_visibility { @@ -332,6 +363,16 @@ $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"; @@ -347,8 +388,8 @@ if ($self->{aspect}) { my ($ow, $oh) = ($w, $h); - $w = List::Util::min $w, int $h * $self->{aspect}; - $h = List::Util::min $h, int $w / $self->{aspect}; + $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; + $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; # use alignment to adjust x, y @@ -399,9 +440,9 @@ $self->{tooltip} = $tooltip; - if ($CFClient::UI::TOOLTIP->{owner} == $self) { - delete $CFClient::UI::TOOLTIP->{owner}; - $CFClient::UI::TOOLTIP_WATCHER->cb->(); + if ($CFPlus::UI::TOOLTIP->{owner} == $self) { + delete $CFPlus::UI::TOOLTIP->{owner}; + $CFPlus::UI::TOOLTIP_WATCHER->invoke; } } @@ -409,6 +450,8 @@ sub coord2local { my ($self, $x, $y) = @_; + return (undef, undef) unless $self->{parent}; + $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } @@ -416,6 +459,8 @@ sub coord2global { my ($self, $x, $y) = @_; + return (undef, undef) unless $self->{parent}; + $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } @@ -458,6 +503,7 @@ sub invoke_button_up { 0 } sub invoke_key_down { 0 } sub invoke_key_up { 0 } +sub invoke_mouse_wheel { 0 } sub invoke_button_down { my ($self, $ev, $x, $y) = @_; @@ -471,35 +517,56 @@ my ($self, $signal, $cb) = @_; push @{ $self->{signal_cb}{$signal} }, $cb; -} -sub emit { - my ($self, $signal, @args) = @_; + defined wantarray and CFPlus::guard { + @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, + @{ $self->{signal_cb}{$signal} }; + } +} - #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# +sub disconnect_all { + my ($self, $signal) = @_; - #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 + delete $self->{signal_cb}{$signal}; } -sub find_widget { - my ($self, $x, $y) = @_; +my %has_coords = ( + button_down => 1, + button_up => 1, + mouse_motion => 1, + mouse_wheel => 1, +); + +sub emit { + my ($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) + : (); - return () unless $self->{can_events}; + #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# - return $self - if $x >= $self->{x} && $x < $self->{x} + $self->{w} - && $y >= $self->{y} && $y < $self->{y} + $self->{h}; + 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 find_widget { +# in .xs + sub set_parent { my ($self, $parent) = @_; - Scalar::Util::weaken ($self->{parent} = $parent); + CFPlus::weaken ($self->{parent} = $parent); $self->set_visible if $parent->{visible}; } @@ -535,52 +602,8 @@ # 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; - } - - 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 { +#CFPlus.xs sub _draw { my ($self) = @_; @@ -591,28 +614,27 @@ sub DESTROY { my ($self) = @_; - return if CFClient::in_destruct; - - delete $WIDGET{$self+0}; + return if CFPlus::in_destruct; + local $@; eval { $self->destroy }; warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; + + delete $WIDGET{$self+0}; } ############################################################################# -package CFClient::UI::DrawBG; +package CFPlus::UI::DrawBG; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; use strict; -use CFClient::OpenGL; +use CFPlus::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], @@ -633,23 +655,16 @@ glEnable GL_BLEND; glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glColor_premultiply @$color; - - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; - + glRect 0, 0, $w, $h; glDisable GL_BLEND; } } ############################################################################# -package CFClient::UI::Empty; +package CFPlus::UI::Empty; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; sub new { my ($class, %arg) = @_; @@ -666,9 +681,9 @@ ############################################################################# -package CFClient::UI::Container; +package CFPlus::UI::Container; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; sub new { my ($class, %arg) = @_; @@ -682,17 +697,26 @@ ); $self->add (@$children) - if $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} = [ @@ -701,6 +725,10 @@ ]; $self->realloc; + + $self->emit (c_add => \@widgets); + + map $_+0, @widgets } sub children { @@ -708,12 +736,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; } @@ -721,7 +752,7 @@ sub clear { my ($self) = @_; - my $children = delete $self->{children}; + my $children = $self->{children}; $self->{children} = []; for (@$children) { @@ -751,19 +782,19 @@ sub _draw { my ($self) = @_; - $_->draw for @{$self->{children}}; + $_->draw for $self->visible_children; } ############################################################################# -package CFClient::UI::Bin; +package CFPlus::UI::Bin; -our @ISA = CFClient::UI::Container::; +our @ISA = CFPlus::UI::Container::; sub new { my ($class, %arg) = @_; - my $child = (delete $arg{child}) || new CFClient::UI::Empty::; + my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; $class->SUPER::new (children => [$child], %arg) } @@ -771,7 +802,7 @@ sub add { my ($self, $child) = @_; - $self->SUPER::remove ($_) for @{ $self->{children} }; + $self->clear; $self->SUPER::add ($child); } @@ -780,7 +811,7 @@ $self->SUPER::remove ($widget); - $self->{children} = [new CFClient::UI::Empty] + $self->{children} = [new CFPlus::UI::Empty] unless @{$self->{children}}; } @@ -799,14 +830,13 @@ } ############################################################################# - # back-buffered drawing area -package CFClient::UI::Window; +package CFPlus::UI::Window; -our @ISA = CFClient::UI::Bin::; +our @ISA = CFPlus::UI::Bin::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my ($class, %arg) = @_; @@ -838,26 +868,24 @@ sub render_child { my ($self) = @_; - $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; { - package CFClient::UI::Base; + package CFPlus::UI::Base; - ($draw_x, $draw_y, $draw_w, $draw_h) = + local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); - } - $self->_render; + $self->_render; + } }; } sub _draw { my ($self) = @_; - my ($w, $h) = @$self{qw(w h)}; - my $tex = $self->{texture} or return; @@ -865,16 +893,18 @@ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 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 CFPlus::UI::ViewPort; + +use List::Util qw(min max); -our @ISA = CFClient::UI::Window::; +our @ISA = CFPlus::UI::Window::; sub new { my $class = shift; @@ -891,8 +921,8 @@ 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) } @@ -914,10 +944,34 @@ 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 @@ -942,28 +996,28 @@ 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->CFPlus::UI::Base::find_widget ($x, $y) } } 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}; + local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; + local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; - CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; + CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; $self->SUPER::_render; } ############################################################################# -package CFClient::UI::ScrolledWindow; +package CFPlus::UI::ScrolledWindow; -our @ISA = CFClient::UI::HBox::; +our @ISA = CFPlus::UI::Table::; sub new { my ($class, %arg) = @_; @@ -972,71 +1026,180 @@ my $self; - my $slider = new CFClient::UI::Slider + my $hslider = new CFPlus::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 CFPlus::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->SUPER::add ($self->{vp}, $self->{slider}); + $self->{vp} = new CFPlus::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 } -#TODO# update range on size_allocate depending on child - sub add { my ($self, $widget) = @_; $self->{vp}->add ($self->{child} = $widget); } -sub invoke_button_up { +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) = @_; + + 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) = @_; - warn "button up $ev->{button}\n";#d# + $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) = @_; + + if ($ev->{button} == 2) { + $self->start_dragging ($ev); + return 1; + } + 0 } -sub update_slider { - my ($self) = @_; +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; - $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); + if (delete $self->{motion}) { + return 1; + } + + 0 } -sub update { - my ($self) = @_; +sub invoke_mouse_motion { + my ($self, $ev, $x, $y) = @_; - $self->SUPER::update; + if ($self->{motion}) { + $self->{motion}->($ev, $x, $y); + return 1; + } - $self->update_slider; + 0 } sub invoke_size_allocate { my ($self, $w, $h) = @_; $self->update_slider; - $self->SUPER::invoke_size_allocate ($w, $h) } ############################################################################# -package CFClient::UI::Frame; +package CFPlus::UI::Frame; -our @ISA = CFClient::UI::Bin::; +our @ISA = CFPlus::UI::Bin::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -1056,14 +1219,7 @@ glEnable GL_BLEND; glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glColor_premultiply @{ $self->{bg} }; - - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; - + glRect 0, 0, $w, $h; glDisable GL_BLEND; } @@ -1072,20 +1228,124 @@ ############################################################################# -package CFClient::UI::FancyFrame; +package CFPlus::UI::FancyFrame; + +our @ISA = CFPlus::UI::Bin::; + +use CFPlus::OpenGL; + +sub new { + my ($class, %arg) = @_; + + if ((exists $arg{label}) && !ref $arg{label}) { + $arg{label} = new CFPlus::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->CFPlus::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 CFPlus::UI::Toplevel; -our @ISA = CFClient::UI::Bin::; +our @ISA = CFPlus::UI::Bin::; -use CFClient::OpenGL; +use CFPlus::OpenGL; my $bg = - new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", + new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", mipmap => 1, wrap => 1; my @border = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file CFPlus::Texture CFPlus::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 CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + qw(x1_move.png x1_resize.png); + sub new { my ($class, %arg) = @_; @@ -1099,7 +1359,7 @@ %arg, ); - $self->{title_widget} = new CFClient::UI::Label + $self->{title_widget} = new CFPlus::UI::Label align => 0, valign => 1, text => $self->{title}, @@ -1108,11 +1368,11 @@ if ($self->{has_close_button}) { $self->{close_button} = - new CFClient::UI::ImageButton + new CFPlus::UI::ImageButton path => 'x1_close.png', on_activate => sub { $self->emit ("delete") }; - $self->CFClient::UI::Container::add ($self->{close_button}); + $self->CFPlus::UI::Container::add ($self->{close_button}); } $self @@ -1122,14 +1382,23 @@ 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}; + $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; + $self->CFPlus::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) = @_; @@ -1241,6 +1510,14 @@ ! ! $self->{motion} } +sub invoke_visibility_change { + my ($self, $visible) = @_; + + delete $self->{motion} unless $visible; + + 0 +} + sub _draw { my ($self) = @_; @@ -1255,10 +1532,24 @@ my $border = $self->border; glColor @{ $self->{border_bg} }; - $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); + $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]) { glColor @{ $self->{bg} }; @@ -1287,55 +1578,50 @@ ############################################################################# -package CFClient::UI::Table; +package CFPlus::UI::Table; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Container::; use List::Util qw(max sum); -use CFClient::OpenGL; +use CFPlus::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); } -sub remove { - my ($self, $child) = @_; +sub add_at { + my $self = shift; - # TODO: not yet implemented -} + my @widgets; -# TODO: move to container class maybe? send children a signal on removal? -sub clear { - my ($self) = @_; + while (@_) { + my ($col, $row, $child) = splice @_, 0, 3, (); - my @children = $self->children; - delete $self->{children}; - - for (@children) { - delete $_->{parent}; - $_->hide; + $child->{c_row} = $row; + $child->{c_col} = $col; + + push @widgets, $child; } - $self->realloc; + $self->add (@widgets); } sub get_wh { @@ -1343,17 +1629,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]; + + if ($w > $sw) { + $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; + } + } - $w[$x] = max $w[$x], $w; - $h[$y] = max $h[$y], $h; + # 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 ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; } } @@ -1379,84 +1675,123 @@ 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; + CFPlus::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]; + CFPlus::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 CFPlus::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 = CFPlus::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 CFPlus::UI::Box; -our @ISA = CFClient::UI::Container::; +our @ISA = CFPlus::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), ) } @@ -1487,7 +1822,7 @@ } } - CFClient::UI::harmonize \@req; + CFPlus::UI::harmonize \@req; my $pos = 0; for (0 .. $#children) { @@ -1502,9 +1837,9 @@ ############################################################################# -package CFClient::UI::HBox; +package CFPlus::UI::HBox; -our @ISA = CFClient::UI::Box::; +our @ISA = CFPlus::UI::Box::; sub new { my $class = shift; @@ -1517,9 +1852,9 @@ ############################################################################# -package CFClient::UI::VBox; +package CFPlus::UI::VBox; -our @ISA = CFClient::UI::Box::; +our @ISA = CFPlus::UI::Box::; sub new { my $class = shift; @@ -1532,11 +1867,11 @@ ############################################################################# -package CFClient::UI::Label; +package CFPlus::UI::Label; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = CFPlus::UI::DrawBG::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my ($class, %arg) = @_; @@ -1549,8 +1884,9 @@ #text => initial text #markup => initial narkup #max_w => maximum pixel width + #style => 0, # render flags ellipsise => 3, # end - layout => (new CFClient::Layout), + layout => (new CFPlus::Layout), fontsize => 1, align => -1, valign => -1, @@ -1561,7 +1897,7 @@ ); if (exists $self->{template}) { - my $layout = new CFClient::Layout; + my $layout = new CFPlus::Layout; $layout->set_text (delete $self->{template}); $self->{template} = $layout; } @@ -1575,16 +1911,6 @@ $self } -sub escape($) { - local $_ = $_[0]; - - s/&/&/g; - s/>/>/g; - s/SUPER::realloc; } +sub clear { + my ($self) = @_; + + $self->set_text (""); +} + sub set_text { my ($self, $text) = @_; @@ -1631,8 +1963,10 @@ my ($self) = @_; $self->{size_req} ||= do { + my ($max_w, $max_h) = $self->get_max_wh; + $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_width ($self->{max_w} || -1); + $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); @@ -1714,21 +2048,37 @@ $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); - }; - my $w = List::Util::min $self->{w} + 4, $size->[0]; - my $h = List::Util::min $self->{h} + 2, $size->[1]; + $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); + }; - $self->{layout}->render ($self->{ox}, $self->{oy}); -} +# unless ($self->{list}) { +# $self->{list} = CFPlus::OpenGL::glGenList; +# CFPlus::OpenGL::glNewList $self->{list}; +# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); +# CFPlus::OpenGL::glEndList; +# } +# +# CFPlus::OpenGL::glCallList $self->{list}; + + $self->{layout}->draw; +} + +#sub destroy { +# my ($self) = @_; +# +# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; +# +# $self->SUPER::destroy; +#} ############################################################################# -package CFClient::UI::EntryBase; +package CFPlus::UI::EntryBase; -our @ISA = CFClient::UI::Label::; +our @ISA = CFPlus::UI::Label::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -1736,12 +2086,15 @@ $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, #text => ... #hidden => "*", @_ @@ -1796,21 +2149,36 @@ 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 == CFPlus::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; - } elsif ($sym == CFClient::SDLK_RIGHT) { + } elsif ($sym == CFPlus::SDLK_RIGHT) { ++$self->{cursor} if $self->{cursor} < length $self->{text}; - } elsif ($sym == CFClient::SDLK_HOME) { + } elsif ($sym == CFPlus::SDLK_HOME) { + # what a hack + $self->{cursor} = + (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ + ? length $1 + : 0; + } elsif ($sym == CFPlus::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) { + } elsif ($uni == 0x0d) { + substr $text, $self->{cursor}++, 0, "\012"; + } elsif ($uni >= 0x20) { substr $text, $self->{cursor}++, 0, chr $uni; } else { return 0; @@ -1819,6 +2187,7 @@ $self->_set_text ($text); $self->realloc; + $self->update; 1 } @@ -1870,12 +2239,7 @@ glEnable GL_BLEND; glBlendFunc GL_ONE, 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; + glRect 0, 0, $self->{w}, $self->{h}; glDisable GL_BLEND; $self->SUPER::_draw; @@ -1887,29 +2251,45 @@ 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 CFPlus::UI::Entry; -our @ISA = CFClient::UI::EntryBase::; +our @ISA = CFPlus::UI::EntryBase::; -use CFClient::OpenGL; +use CFPlus::OpenGL; 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; @@ -1918,7 +2298,7 @@ $self->emit (activate => $txt); $self->update; - } elsif ($sym == CFClient::SDLK_UP) { + } elsif ($sym == CFPlus::SDLK_UP) { if ($self->{history_pointer} < 0) { $self->{history_saveback} = $self->get_text; } @@ -1930,7 +2310,7 @@ $self->set_text ($self->{history}->[$self->{history_pointer}]); } - } elsif ($sym == CFClient::SDLK_DOWN) { + } elsif ($sym == CFPlus::SDLK_DOWN) { $self->{history_pointer}--; $self->{history_pointer} = -1 if $self->{history_pointer} < 0; @@ -1949,24 +2329,59 @@ ############################################################################# -package CFClient::UI::Button; +package CFPlus::UI::TextEdit; + +our @ISA = CFPlus::UI::EntryBase::; + +use CFPlus::OpenGL; + +sub move_cursor_ver { + my ($self, $dy) = @_; + + my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); + + $y += $dy; + + if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { + $self->{cursor} = $index; + delete $self->{cur_h}; + $self->update; + return; + } +} + +sub invoke_key_down { + my ($self, $ev) = @_; + + my $sym = $ev->{sym}; + + if ($sym == CFPlus::SDLK_UP) { + $self->move_cursor_ver (-1); + } elsif ($sym == CFPlus::SDLK_DOWN) { + $self->move_cursor_ver (+1); + } else { + return $self->SUPER::invoke_key_down ($ev) + } + + 1 +} + +############################################################################# + +package CFPlus::UI::ButtonBin; -our @ISA = CFClient::UI::Label::; +our @ISA = CFPlus::UI::Bin::; -use CFClient::OpenGL; +use CFPlus::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw(b1_button_active.png); + map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + qw(b1_button_inactive.png b1_button_active.png); sub new { my $class = shift; $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, @@ -1988,13 +2403,12 @@ 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; @@ -2003,28 +2417,30 @@ ############################################################################# -package CFClient::UI::ImageButton; +package CFPlus::UI::Button; -our @ISA = CFClient::UI::Image::; +our @ISA = CFPlus::UI::Label::; -use CFClient::OpenGL; +use CFPlus::OpenGL; -my %textures; +my @tex = + map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + qw(b1_button_inactive.png b1_button_active.png); sub new { my $class = shift; - my $self = $class->SUPER::new ( + $class->SUPER::new ( padding_x => 4, padding_y => 4, - fg => [1, 1, 1], - active_fg => [0, 0, 1], + 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 { @@ -2037,17 +2453,34 @@ 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; + + my $tex = $tex[$GRAB == $self]; + $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); + + glDisable GL_TEXTURE_2D; + + $self->SUPER::_draw; +} + ############################################################################# -package CFClient::UI::CheckBox; +package CFPlus::UI::CheckBox; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = CFPlus::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } qw(c1_checkbox_bg.png c1_checkbox_active.png); -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -2097,7 +2530,7 @@ $self->SUPER::_draw; - glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; + glTranslate $self->{padding_x}, $self->{padding_y}, 0; my ($w, $h) = @$self{qw(w h)}; @@ -2114,11 +2547,11 @@ ############################################################################# -package CFClient::UI::Image; +package CFPlus::UI::Image; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; -use CFClient::OpenGL; +use CFPlus::OpenGL; our %texture_cache; @@ -2127,6 +2560,7 @@ my $self = $class->SUPER::new ( can_events => 0, + scale => 1, @_, ); @@ -2134,19 +2568,34 @@ or Carp::croak "'path' or 'tex' attributes required"; $self->{tex} ||= $texture_cache{$self->{path}} ||= - new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; + new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; - Scalar::Util::weaken $texture_cache{$self->{path}}; + CFPlus::weaken $texture_cache{$self->{path}}; $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; $self } +sub STORABLE_freeze { + my ($self, $cloning) = @_; + + $self->{path} + or die "cannot serialise CFPlus::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 { @@ -2173,29 +2622,71 @@ ############################################################################# -package CFClient::UI::VGauge; +package CFPlus::UI::ImageButton; + +our @ISA = CFPlus::UI::Image::; + +use CFPlus::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 CFPlus::UI::VGauge; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::Base::; use List::Util qw(min max); -use CFClient::OpenGL; +use CFPlus::OpenGL; my %tex = ( food => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + map { new_from_file CFPlus::Texture CFPlus::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 CFPlus::Texture CFPlus::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 CFPlus::Texture CFPlus::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 CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ ], ); @@ -2308,9 +2799,147 @@ ############################################################################# -package CFClient::UI::Gauge; +package CFPlus::UI::Progress; + +our @ISA = CFPlus::UI::Label::; + +use CFPlus::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->CFPlus::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 CFPlus::UI::ExperienceProgress; + +our @ISA = CFPlus::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 CFPlus::UI::Gauge; -our @ISA = CFClient::UI::VBox::; +our @ISA = CFPlus::UI::VBox::; sub new { my ($class, %arg) = @_; @@ -2322,9 +2951,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 CFPlus::UI::Label valign => +1, align => 0, template => "999"); + $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); + $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); $self } @@ -2355,16 +2984,16 @@ ############################################################################# -package CFClient::UI::Slider; +package CFPlus::UI::Slider; use strict; -use CFClient::OpenGL; +use CFPlus::OpenGL; -our @ISA = CFClient::UI::DrawBG::; +our @ISA = CFPlus::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } qw(s1_slider.png s1_slider_bg.png); sub new { @@ -2442,7 +3071,9 @@ $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; - $self->invoke_mouse_motion ($ev, $x, $y) + $self->invoke_mouse_motion ($ev, $x, $y); + + 1 } sub invoke_mouse_motion { @@ -2463,6 +3094,18 @@ 1 } +sub invoke_mouse_wheel { + my ($self, $ev) = @_; + + my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; + + my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; + + $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); + + 1 +} + sub update { my ($self) = @_; @@ -2519,9 +3162,9 @@ ############################################################################# -package CFClient::UI::ValSlider; +package CFPlus::UI::ValSlider; -our @ISA = CFClient::UI::HBox::; +our @ISA = CFPlus::UI::HBox::; sub new { my ($class, %arg) = @_; @@ -2529,8 +3172,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 CFPlus::UI::Slider expand => 1, range => $range), + entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), to_value => sub { shift }, from_value => sub { shift }, %arg, @@ -2560,28 +3203,29 @@ ############################################################################# -package CFClient::UI::TextScroller; +package CFPlus::UI::TextScroller; -our @ISA = CFClient::UI::HBox::; +our @ISA = CFPlus::UI::HBox::; -use CFClient::OpenGL; +use CFPlus::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), + layout => (new CFPlus::Layout), par => [], + max_par => 0, height => 0, children => [ - (new CFClient::UI::Empty expand => 1), - (new CFClient::UI::Slider vertical => 1), + (new CFPlus::UI::Empty expand => 1), + (new CFPlus::UI::Slider vertical => 1), ], ); @@ -2600,7 +3244,7 @@ sub size_request { my ($self) = @_; - my ($empty, $slider) = @{ $self->{children} }; + my ($empty, $slider) = $self->visible_children; local $self->{children} = [$empty, $slider]; $self->SUPER::size_request @@ -2623,6 +3267,16 @@ $self->SUPER::invoke_size_allocate ($w, $h) } +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) = @_; @@ -2658,6 +3312,21 @@ $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) = @_; @@ -2670,21 +3339,26 @@ } sub add_paragraph { - my ($self, $color, $para, $indent) = @_; + my $self = shift; - my ($text, @w) = ref $para ? @$para : $para; + for my $para (@_) { + $para = { + fg => [1, 1, 1, 1], + indent => 0, + markup => "", + widget => [], + ref $para ? %$para : (markup => $para), + w => 1e10, + wrapped => 1, + }; - $para = { - w => 1e10, - wrapped => 1, - fg => $color, - indent => $indent, - markup => $text, - widget => \@w, - }; + $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; + push @{$self->{par}}, $para; + } - $self->add (@w) if @w; - push @{$self->{par}}, $para; + if (my $max = $self->{max_par}) { + shift @{$self->{par}} while @{$self->{par}} > $max; + } $self->{need_reflow}++; $self->update; @@ -2693,68 +3367,83 @@ sub scroll_to_bottom { my ($self) = @_; - $self->{scroll_to_bottom} = 1; + $self->{scroll_to} = $#{$self->{par}}; $self->update; } -sub update { +sub force_uptodate { my ($self) = @_; - $self->SUPER::update; + if (delete $self->{need_reflow}) { + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; - return unless $self->{h} > 0; + my $height = 0; - delete $self->{texture}; + 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; + } - $ROOT->on_post_alloc ($self => sub { - my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + $para->{y} = $height; + $height += $para->{h}; + } - if (delete $self->{need_reflow}) { - my $height = 0; + $self->{height} = $height; + $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); - 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; + delete $self->{texture}; + } - $para->{w} = $w + $para->{indent}; - $para->{h} = $h; - $para->{wrapped} = $layout->has_wrapped; - } + if (my $paridx = delete $self->{scroll_to}) { + $self->{children}[1]->set_value ($self->{par}[$paridx]{y}); + } +} - $height += $para->{h}; - } +sub update { + my ($self) = @_; + + $self->SUPER::update; - $self->{height} = $height; + return unless $self->{h} > 0; - $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); + delete $self->{texture}; - delete $self->{texture}; - } + $ROOT->on_post_alloc ($self => sub { + $self->force_uptodate; - if (delete $self->{scroll_to_bottom}) { - $self->{children}[1]->set_value (1e10); - } + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; - $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { + $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; + package CFPlus::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; - for my $para (@{$self->{par}}) { my $h = $para->{h}; + my $y = $para->{y}; if ($y0 < $y + $h && $y < $y1) { - my $layout = $self->get_layout ($para); $layout->render ($para->{indent}, $y - $y0); + $layout->draw; if (my @w = @{ $para->{widget} }) { my @s = $layout->get_shapes; @@ -2770,8 +3459,11 @@ } } - $y += $h; + $paridx++; + $top_paragraph ||= $paridx if $y >= $top; } + + $self->{top_paragraph} = $top_paragraph; }; }); } @@ -2799,11 +3491,11 @@ ############################################################################# -package CFClient::UI::Animator; +package CFPlus::UI::Animator; -use CFClient::OpenGL; +use CFPlus::OpenGL; -our @ISA = CFClient::UI::Bin::; +our @ISA = CFPlus::UI::Bin::; sub moveto { my ($self, $x, $y) = @_; @@ -2841,9 +3533,9 @@ ############################################################################# -package CFClient::UI::Flopper; +package CFPlus::UI::Flopper; -our @ISA = CFClient::UI::Button::; +our @ISA = CFPlus::UI::Button::; sub new { my $class = shift; @@ -2865,11 +3557,11 @@ ############################################################################# -package CFClient::UI::Tooltip; +package CFPlus::UI::Tooltip; -our @ISA = CFClient::UI::Bin::; +our @ISA = CFPlus::UI::Bin::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -2883,23 +3575,27 @@ sub set_tooltip_from { my ($self, $widget) = @_; - my $tooltip = $widget->{tooltip}; + my $tip = $widget->{tooltip}; + $tip = $tip->($widget) if "CODE" eq ref $tip; + + $tip = CFPlus::Pod::section_label tooltip => $1 + if $tip =~ /^#(.*)$/; 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}"; + $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}"; } - $tooltip =~ s/^\n+//; - $tooltip =~ s/\n+$//; + $tip =~ s/^\n+//; + $tip =~ s/\n+$//; - $self->add (new CFClient::UI::Label - markup => $tooltip, + $self->add (new CFPlus::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), ); @@ -2928,79 +3624,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} > $self->{root}{w}; + ($x, $y) = $widget->coord2global (-$self->{w}, 0) + if $x + $self->{w} > $self->{root}{w}; - $self->move_abs ($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 CFPlus::UI::Face; -our @ISA = CFClient::UI::Base::; +our @ISA = CFPlus::UI::DrawBG::; -use CFClient::OpenGL; +use CFPlus::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); + CFPlus::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 { @@ -3011,23 +3756,20 @@ $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 0, 0, 0, 1; @@ -3039,7 +3781,7 @@ sub destroy { my ($self) = @_; - $self->{timer}->cancel + (delete $self->{timer})->cancel if $self->{timer}; $self->SUPER::destroy; @@ -3047,19 +3789,19 @@ ############################################################################# -package CFClient::UI::Buttonbar; +package CFPlus::UI::Buttonbar; -our @ISA = CFClient::UI::HBox::; +our @ISA = CFPlus::UI::HBox::; -# TODO: should actualyl wrap buttons and other goodies. +# TODO: should actually wrap buttons and other goodies. ############################################################################# -package CFClient::UI::Menu; +package CFPlus::UI::Menu; -our @ISA = CFClient::UI::FancyFrame::; +our @ISA = CFPlus::UI::Toplevel::; -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -3070,7 +3812,7 @@ @_, ); - $self->add ($self->{vbox} = new CFClient::UI::VBox); + $self->add ($self->{vbox} = new CFPlus::UI::VBox); for my $item (@{ $self->{items} }) { my ($widget, $cb, $tooltip) = @$item; @@ -3080,18 +3822,18 @@ if ($widget =~ /\t/) { my ($left, $right) = split /\t/, $widget, 2; - $widget = new CFClient::UI::HBox + $widget = new CFPlus::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), + (new CFPlus::UI::Label markup => $left, expand => 1), + (new CFPlus::UI::Label markup => $right, align => +1), ], ; - + } else { - $widget = new CFClient::UI::Label + $widget = new CFPlus::UI::Label can_hover => 1, can_events => 1, markup => $widget, @@ -3149,9 +3891,9 @@ ############################################################################# -package CFClient::UI::Multiplexer; +package CFPlus::UI::Multiplexer; -our @ISA = CFClient::UI::Container::; +our @ISA = CFPlus::UI::Container::; sub new { my $class = shift; @@ -3222,38 +3964,87 @@ ############################################################################# -package CFClient::UI::Notebook; +package CFPlus::UI::Notebook; + +use CFPlus::OpenGL; -our @ISA = CFClient::UI::VBox::; +our @ISA = CFPlus::UI::VBox::; sub new { my $class = shift; my $self = $class->SUPER::new ( - buttonbar => (new CFClient::UI::Buttonbar), - multiplexer => (new CFClient::UI::Multiplexer expand => 1), + buttonbar => (new CFPlus::UI::Buttonbar), + multiplexer => (new CFPlus::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}, "CFPlus::UI::Base") + ? $child->{c_tab} + : new CFPlus::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, $title, $widget, $tooltip) = @_; + my ($self, @widgets) = @_; - Scalar::Util::weaken $self; + $self->{multiplexer}->add (@widgets) +} - $self->{buttonbar}->add (new CFClient::UI::Button - markup => $title, - tooltip => $tooltip, - on_activate => sub { $self->set_current_page ($widget) }, - ); +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->{multiplexer}->add ($widget); + $self->add ($widget); } sub get_current_page { @@ -3269,13 +4060,33 @@ $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 CFClient::UI::Combobox; +package CFPlus::UI::Selector; use utf8; -our @ISA = CFClient::UI::Button::; +our @ISA = CFPlus::UI::Button::; sub new { my $class = shift; @@ -3302,18 +4113,19 @@ push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; } - CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); + CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); } sub _set_value { my ($self, $value) = @_; - my ($item) = grep $_->[0] eq $value, @{ $self->{options} } + 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]); +# $self->set_tooltip ($item->[2]); } sub set_value { @@ -3325,11 +4137,18 @@ $self->emit (changed => $value); } +sub set_options { + my ($self, $options) = @_; + + $self->{options} = $options; + $self->_set_value ($self->{value}); +} + ############################################################################# -package CFClient::UI::Statusbox; +package CFPlus::UI::Statusbox; -our @ISA = CFClient::UI::VBox::; +our @ISA = CFPlus::UI::VBox::; sub new { my $class = shift; @@ -3339,9 +4158,9 @@ @_, ); - Scalar::Util::weaken (my $this = $self); + CFPlus::weaken (my $this = $self); - $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); + $self->{timer} = EV::timer 1, 1, sub { $this->reorder }; $self } @@ -3351,8 +4170,8 @@ my $NOW = Time::HiRes::time; # freeze display when hovering over any label - return if $CFClient::UI::TOOLTIP->{owner} - && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, + return if $CFPlus::UI::TOOLTIP->{owner} + && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, values %{ $self->{item} }; while (my ($k, $v) = each %{ $self->{item} }) { @@ -3366,8 +4185,6 @@ or $b->{id} <=> $a->{id} } values %{ $self->{item} }; - $self->{timer}->interval (1); - my $count = 10 + 1; for my $item (@items) { last unless --$count; @@ -3383,7 +4200,7 @@ s/\s+/ /g; } - new CFClient::UI::Label + new CFPlus::UI::Label markup => $short, tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, @@ -3400,7 +4217,7 @@ $label->update; $label->set_max_size (undef, $label->{req_h} * $diff) if $diff < 1; - $self->{timer}->interval (1/30); + $self->{timer}->set (1/30, 1/30); } else { $label->{fg}[3] = $item->{fg}[3] || 1; } @@ -3472,177 +4289,13 @@ ############################################################################# -package CFClient::UI::Inventory; - -our @ISA = CFClient::UI::Table::; - -sub new { - my $class = shift; - - my $self = $class->SUPER::new ( - col_expand => [0, 1, 0], - @_, - ); - - $self -} - -sub set_items { - my ($self, $items) = @_; - - $self->clear; - return unless $items; - - my @items = sort { - ($a->{type} <=> $b->{type}) - or ($a->{name} cmp $b->{name}) - } values %$items; - - $self->{real_items} = \@items; +package CFPlus::UI::Root; - my $row = 0; - for my $item (@items) { - CFClient::Item::update_widgets $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) = @_; - - $self->{spell} = {}; - $self->rebuild_spell_list; -} - -############################################################################# - -package CFClient::UI::Root; - -our @ISA = CFClient::UI::Container::; +our @ISA = CFPlus::UI::Container::; use List::Util qw(min max); -use CFClient::OpenGL; +use CFPlus::OpenGL; sub new { my $class = shift; @@ -3652,7 +4305,7 @@ @_, ); - Scalar::Util::weaken ($self->{root} = $self); + CFPlus::weaken ($self->{root} = $self); $self } @@ -3710,7 +4363,7 @@ sub update { my ($self) = @_; - $::WANT_REFRESH++; + $::WANT_REFRESH->start; } sub add { @@ -3757,7 +4410,7 @@ for values %{delete $self->{refresh_hook}}; } - if ($self->{realloc}) { + while ($self->{realloc}) { my %queue; my @queue; my $widget; @@ -3814,37 +4467,37 @@ 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 $size_alloc = delete $self->{size_alloc}) { + my @queue = sort { $a->{visible} <=> $b->{visible} } + values %$size_alloc; - while () { - my $widget = pop @queue || last; + while () { + my $widget = pop @queue || last; - my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; + my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; - $w = 0 if $w < 0; - $h = 0 if $h < 0; + $w = max $widget->{min_w}, $w; + $h = max $widget->{min_h}, $h; - $w = max $widget->{min_w}, $w; - $h = max $widget->{min_h}, $h; +# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; +# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; - $w = min $widget->{max_w}, $w if exists $widget->{max_w}; - $h = min $widget->{max_h}, $h if exists $widget->{max_h}; + $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; + $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}; + 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->{w} = $w; + $widget->{h} = $h; - $widget->emit (size_allocate => $w, $h); + $widget->emit (size_allocate => $w, $h); + } } } } @@ -3854,7 +4507,6 @@ for values %{delete $self->{post_alloc_hook}}; } - glViewport 0, 0, $::WIDTH, $::HEIGHT; glClearColor +($::CFG->{fow_intensity}) x 3, 1; glClear GL_COLOR_BUFFER_BIT; @@ -3866,21 +4518,21 @@ glLoadIdentity; { - package CFClient::UI::Base; + package CFPlus::UI::Base; - ($draw_x, $draw_y, $draw_w, $draw_h) = + local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); - } - $self->_draw; + $self->_draw; + } } ############################################################################# -package CFClient::UI; +package CFPlus::UI; -$ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip z => 900; +$ROOT = new CFPlus::UI::Root; +$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 1