--- deliantra/Deliantra-Client/DC/UI.pm 2007/07/19 13:45:18 1.381 +++ deliantra/Deliantra-Client/DC/UI.pm 2012/11/23 12:39:05 1.488 @@ -1,14 +1,15 @@ -package CFPlus::UI; +package DC::UI; -use utf8; -use strict; +use common::sense; use List::Util (); -use Event; -use CFPlus; -use CFPlus::Pod; -use CFPlus::Texture; +use AnyEvent (); +use Guard (); + +use DC; +use DC::Pod; +use DC::Texture; our ($FOCUS, $HOVER, $GRAB); # various widgets @@ -19,7 +20,9 @@ our %WIDGET; # all widgets, weak-referenced -our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { +our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub { + $_[0]->stop; + if (!$GRAB) { for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { if (length $widget->{tooltip}) { @@ -32,10 +35,6 @@ 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; } @@ -48,14 +47,14 @@ $TOOLTIP->hide; $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; delete $TOOLTIP->{owner}; -}); +}; sub get_layout { my $layout; for (grep { $_->{name} } values %WIDGET) { my $win = $layout->{$_->{name}} = { }; - + $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; @@ -74,7 +73,7 @@ } # class methods for events -sub feed_sdl_key_down_event { +sub feed_sdl_key_down_event { $FOCUS->emit (key_down => $_[0]) if $FOCUS; } @@ -93,7 +92,7 @@ $hover->update if $hover && $hover->{can_hover}; $HOVER->update if $HOVER && $HOVER->{can_hover}; - $TOOLTIP_WATCHER->start; + $TOOLTIP_WATCHER->again; } } @@ -109,14 +108,18 @@ $GRAB = $widget; $GRAB->update if $GRAB; - $TOOLTIP_WATCHER->cb->(); + $TOOLTIP_WATCHER->invoke; } if ($GRAB) { if ($ev->{button} == 4 || $ev->{button} == 5) { # mousewheel - $ev->{dx} = 0; - $ev->{dy} = $ev->{button} * 2 - 9; + my $delta = $ev->{button} * 2 - 9; + my $shift = $ev->{mod} & DC::KMOD_SHIFT; + + $ev->{dx} = $shift ? $delta : 0; + $ev->{dy} = $shift ? 0 : $delta; + $GRAB->emit (mouse_wheel => $ev); } else { $GRAB->emit (button_down => $ev) @@ -140,7 +143,7 @@ $GRAB->update if $GRAB; check_hover $widget; - $TOOLTIP_WATCHER->cb->(); + $TOOLTIP_WATCHER->invoke; } } @@ -190,7 +193,7 @@ my ($sx, $sy) = @_; for my $widget (values %WIDGET) { - if ($widget->{is_toplevel}) { + if ($widget->{is_toplevel} || $widget->{c_rescale}) { $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; @@ -212,7 +215,7 @@ ############################################################################# -package CFPlus::UI::Event; +package DC::UI::Event; sub xy { $_[1]->coord2local ($_[0]{x}, $_[0]{y}) @@ -220,11 +223,11 @@ ############################################################################# -package CFPlus::UI::Base; +package DC::UI::Base; -use strict; +use common::sense; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -239,7 +242,7 @@ @_ }, $class; - CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); + DC::weaken ($DC::UI::WIDGET{$self+0} = $self); for (keys %$self) { if (/^on_(.*)$/) { @@ -247,11 +250,11 @@ } } - 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}; + if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) { + $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x}; + $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y}; + $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w}; + $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h}; $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; @@ -271,7 +274,7 @@ } sub TO_JSON { - { __widget_ref__ => $_[0]{s_id} } + { "\fw" => $_[0]{s_id} } } sub show { @@ -279,7 +282,7 @@ return if $self->{parent}; - $CFPlus::UI::ROOT->add ($self); + $DC::UI::ROOT->add ($self); } sub set_visible { @@ -287,6 +290,9 @@ return if $self->{visible}; + $self->{parent} && $self->{parent}{root}#d# + or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1); + $self->{root} = $self->{parent}{root}; $self->{visible} = $self->{parent}{visible} + 1; @@ -294,7 +300,7 @@ $self->realloc if !exists $self->{req_w}; - $_->set_visible for $self->children; + $_->set_visible for $self->visible_children; } sub set_invisible { @@ -310,7 +316,7 @@ undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; - $CFPlus::UI::TOOLTIP_WATCHER->cb->() + $DC::UI::TOOLTIP_WATCHER->invoke if $TOOLTIP->{owner} == $self; $self->emit ("focus_out"); @@ -339,8 +345,11 @@ $self->set_invisible; - $self->{parent}->remove ($self) - if $self->{parent}; + # extra $parent copy for 5.8.8+ bug workaround + # (otherwise $_[0] in remove gets freed + if (my $parent = $self->{parent}) { + $parent->remove ($self); + } } sub move_abs { @@ -356,12 +365,30 @@ sub set_size { my ($self, $w, $h) = @_; - $self->{force_w} = $w; - $self->{force_h} = $h; + $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH ); + $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT); $self->realloc; } +## traverse the widget chain up to find the maximum "physical" size constraints +#sub get_max_wh { +# my ($self) = @_; +# +# my ($w, $h) = @$self{qw(max_w max_h)}; +# +# if ($w <= 0 || $h <= 0) { +# my ($mw, $mh) = $self->{parent} +# ? $self->{parent}->get_max_wh +# : ($::WIDTH, $::HEIGHT); +# +# $w = $mw if $w <= 0; +# $h = $mh if $h <= 0; +# } +# +# ($w, $h) +#} + sub size_request { require Carp; Carp::confess "size_request is abstract"; @@ -377,8 +404,8 @@ if ($self->{aspect}) { my ($ow, $oh) = ($w, $h); - $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; - $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; + $w = List::Util::min $w, DC::ceil $h * $self->{aspect}; + $h = List::Util::min $h, DC::ceil $w / $self->{aspect}; # use alignment to adjust x, y @@ -429,9 +456,9 @@ $self->{tooltip} = $tooltip; - if ($CFPlus::UI::TOOLTIP->{owner} == $self) { - delete $CFPlus::UI::TOOLTIP->{owner}; - $CFPlus::UI::TOOLTIP_WATCHER->cb->(); + if ($DC::UI::TOOLTIP->{owner} == $self) { + delete $DC::UI::TOOLTIP->{owner}; + $DC::UI::TOOLTIP_WATCHER->invoke; } } @@ -439,7 +466,7 @@ sub coord2local { my ($self, $x, $y) = @_; - Carp::confess unless $self->{parent};#d# + return (undef, undef) unless $self->{parent}; $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) } @@ -448,7 +475,7 @@ sub coord2global { my ($self, $x, $y) = @_; - Carp::confess unless $self->{parent};#d# + return (undef, undef) unless $self->{parent}; $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) } @@ -507,7 +534,7 @@ push @{ $self->{signal_cb}{$signal} }, $cb; - defined wantarray and CFPlus::guard { + defined wantarray and Guard::guard { @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, @{ $self->{signal_cb}{$signal} }; } @@ -549,22 +576,13 @@ $self->{parent} && $self->{parent}->emit ($signal, @args) } -sub find_widget { - my ($self, $x, $y) = @_; - - return () unless $self->{can_events}; - - return $self - if $x >= $self->{x} && $x < $self->{x} + $self->{w} - && $y >= $self->{y} && $y < $self->{y} + $self->{h}; - - () -} +#sub find_widget { +# in .xs sub set_parent { my ($self, $parent) = @_; - CFPlus::weaken ($self->{parent} = $parent); + DC::weaken ($self->{parent} = $parent); $self->set_visible if $parent->{visible}; } @@ -600,52 +618,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; - #CFPlus::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) = @_; @@ -653,12 +627,12 @@ warn "no draw defined for $self\n"; } -my $cntx;#d# sub DESTROY { my ($self) = @_; - return if CFPlus::in_destruct; + return if DC::in_destruct; + local $@; eval { $self->destroy }; warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; @@ -667,18 +641,17 @@ ############################################################################# -package CFPlus::UI::DrawBG; +package DC::UI::DrawBG; + +our @ISA = DC::UI::Base::; -our @ISA = CFPlus::UI::Base::; +use common::sense; -use strict; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; - # range [value, low, high, page] - $class->SUPER::new ( #bg => [0, 0, 0, 0.2], #active_bg => [1, 1, 1, 0.5], @@ -686,11 +659,18 @@ ) } +sub set_bg { + my ($self, $bg) = @_; + + $self->{bg} = $bg; + $self->update; +} + sub _draw { my ($self) = @_; - my $color = $FOCUS == $self && $self->{active_bg} - ? $self->{active_bg} + my $color = $FOCUS == $self + ? $self->{active_bg} || $self->{bg} : $self->{bg}; if ($color && (@$color < 4 || $color->[3])) { @@ -699,23 +679,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 CFPlus::UI::Empty; +package DC::UI::Empty; -our @ISA = CFPlus::UI::Base::; +our @ISA = DC::UI::Base::; sub new { my ($class, %arg) = @_; @@ -732,9 +705,9 @@ ############################################################################# -package CFPlus::UI::Container; +package DC::UI::Container; -our @ISA = CFPlus::UI::Base::; +our @ISA = DC::UI::Base::; sub new { my ($class, %arg) = @_; @@ -748,7 +721,7 @@ ); $self->add (@$children) - if $children; + if $children && @$children; $self } @@ -767,6 +740,7 @@ $_->set_parent ($self) for @widgets; + # TODO: only do this in widgets that need it, e.g. root, fixed use sort 'stable'; $self->{children} = [ @@ -775,6 +749,10 @@ ]; $self->realloc; + + $self->emit (c_add => \@widgets); + + map $_+0, @widgets } sub children { @@ -782,12 +760,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; } @@ -795,7 +776,7 @@ sub clear { my ($self) = @_; - my $children = delete $self->{children}; + my $children = $self->{children}; $self->{children} = []; for (@$children) { @@ -825,19 +806,19 @@ sub _draw { my ($self) = @_; - $_->draw for @{$self->{children}}; + $_->draw for $self->visible_children; } ############################################################################# -package CFPlus::UI::Bin; +package DC::UI::Bin; -our @ISA = CFPlus::UI::Container::; +our @ISA = DC::UI::Container::; sub new { my ($class, %arg) = @_; - my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; + my $child = (delete $arg{child}) || new DC::UI::Empty::; $class->SUPER::new (children => [$child], %arg) } @@ -845,7 +826,7 @@ sub add { my ($self, $child) = @_; - $self->SUPER::remove ($_) for @{ $self->{children} }; + $self->clear; $self->SUPER::add ($child); } @@ -854,7 +835,7 @@ $self->SUPER::remove ($widget); - $self->{children} = [new CFPlus::UI::Empty] + $self->{children} = [new DC::UI::Empty] unless @{$self->{children}}; } @@ -873,14 +854,13 @@ } ############################################################################# - # back-buffered drawing area -package CFPlus::UI::Window; +package DC::UI::Window; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my ($class, %arg) = @_; @@ -912,12 +892,12 @@ sub render_child { my ($self) = @_; - $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { + $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; { - package CFPlus::UI::Base; + package DC::UI::Base; local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); @@ -944,11 +924,11 @@ ############################################################################# -package CFPlus::UI::ViewPort; +package DC::UI::ViewPort; use List::Util qw(min max); -our @ISA = CFPlus::UI::Window::; +our @ISA = DC::UI::Window::; sub new { my $class = shift; @@ -965,8 +945,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) } @@ -1000,6 +980,24 @@ } } +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 sub coord2local { my ($self, $x, $y) = @_; @@ -1022,28 +1020,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->CFPlus::UI::Base::find_widget ($x, $y) + $self->DC::UI::Base::find_widget ($x, $y) } } sub _render { my ($self) = @_; - 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}; + local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x}; + local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y}; - CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; + DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; $self->SUPER::_render; } ############################################################################# -package CFPlus::UI::ScrolledWindow; +package DC::UI::ScrolledWindow; -our @ISA = CFPlus::UI::Table::; +our @ISA = DC::UI::Table::; sub new { my ($class, %arg) = @_; @@ -1052,7 +1050,9 @@ my $self; - my $hslider = new CFPlus::UI::Slider + my $hslider = new DC::UI::Slider + c_col => 0, + c_row => 1, vertical => 0, range => [0, 0, 1, 0.01], # HACK fix on_changed => sub { @@ -1061,7 +1061,9 @@ }, ; - my $vslider = new CFPlus::UI::Slider + my $vslider = new DC::UI::Slider + c_col => 1, + c_row => 0, vertical => 1, range => [0, 0, 1, 0.01], # HACK fix on_changed => sub { @@ -1081,7 +1083,9 @@ %arg, ); - $self->{vp} = new CFPlus::UI::ViewPort + $self->{vp} = new DC::UI::ViewPort + c_col => 0, + c_row => 0, expand => 1, scroll_x => $self->{scroll_x}, scroll_y => $self->{scroll_y}, @@ -1093,60 +1097,83 @@ 0 }, + on_size_allocate => sub { + my ($vp, $w, $h) = @_; + $vp->{parent}->update_slider; + 0 + }, ; - $self->SUPER::add (0, 0, $self->{vp}); + $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 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; - my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); - $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); + 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}); + } + } - my $visible = $w1 > $w2; - if ($visible != $self->{hslider}{visible}) { - $visible ? $self->SUPER::add (0, 1, $self->{hslider}) - : $self->{hslider}->hide; - } - - my ($h1, $h2) = ($child->{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}) { - $visible ? $self->SUPER::add (1, 0, $self->{vslider}) - : $self->{vslider}->hide; + 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 update { - my ($self) = @_; +sub start_dragging { + my ($self, $ev) = @_; - $self->SUPER::update; - $self->update_slider; + $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) = @_; - return 0 unless $ev->{dy}; # only vertical movements for now - - $self->{vslider}->emit (mouse_wheel => $ev); + $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; + $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; 1 } @@ -1155,18 +1182,7 @@ my ($self, $ev, $x, $y) = @_; if ($ev->{button} == 2) { - $self->grab_focus; - - my $ox = $self->{vp}{view_x} + $ev->{x}; - my $oy = $self->{vp}{view_y} + $ev->{y}; - - $self->{motion} = sub { - my ($ev, $x, $y) = @_; - - $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); - $self->update; - }; - + $self->start_dragging ($ev); return 1; } @@ -1203,11 +1219,11 @@ ############################################################################# -package CFPlus::UI::Frame; +package DC::UI::Frame; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -1227,14 +1243,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; } @@ -1243,26 +1252,26 @@ ############################################################################# -package CFPlus::UI::FancyFrame; +package DC::UI::FancyFrame; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my ($class, %arg) = @_; if ((exists $arg{label}) && !ref $arg{label}) { - $arg{label} = new CFPlus::UI::Label + $arg{label} = new DC::UI::Label align => 1, - valign => 0, + valign => 0.5, text => $arg{label}, fontsize => ($arg{border} || 0.8) * 0.75; } my $self = $class->SUPER::new ( # label => "", - fg => [0.6, 0.3, 0.1], + fg => undef, border => 0.8, style => 'single', %arg, @@ -1275,7 +1284,7 @@ my ($self, @widgets) = @_; $self->SUPER::add (@widgets); - $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; + $self->DC::UI::Container::add ($self->{label}) if $self->{label}; } sub border { @@ -1325,7 +1334,7 @@ $child->draw; - glColor @{$self->{fg}}; + glColor @{$self->{fg} || $DC::THEME{fancyframe}}; glBegin GL_LINE_STRIP; glVertex $border * 1.5 , $border * 0.5 + 0.5; glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; @@ -1343,35 +1352,39 @@ ############################################################################# -package CFPlus::UI::Toplevel; +package DC::UI::Toplevel; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; -my $bg = - new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", +my $bg = + new_from_resource DC::Texture "d1_bg.png", mipmap => 1, wrap => 1; -my @border = - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } +my @border = + map { new_from_resource DC::Texture $_, mipmap => 1 } qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); +my @icon = + map { new_from_resource DC::Texture $_, mipmap => 1 } + qw(x1_move.png x1_resize.png); + sub new { my ($class, %arg) = @_; my $self = $class->SUPER::new ( bg => [1, 1, 1, 1], border_bg => [1, 1, 1, 1], - border => 0.6, + border => 0.8, can_events => 1, min_w => 64, min_h => 32, %arg, ); - $self->{title_widget} = new CFPlus::UI::Label - align => 0, + $self->{title_widget} = new DC::UI::Label + align => 0.5, valign => 1, text => $self->{title}, fontsize => $self->{border}, @@ -1379,11 +1392,11 @@ if ($self->{has_close_button}) { $self->{close_button} = - new CFPlus::UI::ImageButton + new DC::UI::ImageButton path => 'x1_close.png', on_activate => sub { $self->emit ("delete") }; - $self->CFPlus::UI::Container::add ($self->{close_button}); + $self->DC::UI::Container::add ($self->{close_button}); } $self @@ -1393,14 +1406,23 @@ my ($self, @widgets) = @_; $self->SUPER::add (@widgets); - $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; - $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; + $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button}; + $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; } sub border { int $_[0]{border} * $::FONTSIZE } +#sub get_max_wh { +# my ($self) = @_; +# +# return ($self->{w}, $self->{h}) +# if $self->{visible} && $self->{w}; +# +# $self->SUPER::get_max_wh +#} + sub size_request { my ($self) = @_; @@ -1444,7 +1466,7 @@ my ($self) = @_; $self->hide; - + 1 } @@ -1454,10 +1476,10 @@ my ($w, $h) = @$self{qw(w h)}; my $border = $self->border; - my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); - my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); + my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right + my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down - if ($lr & $td) { + if ($lr & $td) { # corners my ($wx, $wy) = ($self->{x}, $self->{y}); my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($self->{w}, $self->{h}); @@ -1471,14 +1493,16 @@ my $dx = $ev->{x} - $ox; my $dy = $ev->{y} - $oy; - $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); - $self->{force_h} = $bh + $dy * ($my ? -1 : 1); + $self->set_size ( + $bw + $dx * ($mx ? -1 : 1), + $bh + $dy * ($my ? -1 : 1), + ); $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); $self->realloc; }; - } elsif ($lr ^ $td) { + } elsif ($lr ^ $td) { # edges my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bx, $by) = ($self->{x}, $self->{y}); @@ -1533,11 +1557,27 @@ 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); + if ($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); + + # 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} }; @@ -1566,67 +1606,50 @@ ############################################################################# -package CFPlus::UI::Table; +package DC::UI::Table; -our @ISA = CFPlus::UI::Base::; +our @ISA = DC::UI::Container::; use List::Util qw(max sum); -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; $class->SUPER::new ( - children => [], col_expand => [], row_expand => [], @_, ) } -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } -} - -# TODO: store row/col info in child widget and use standard add/del sub add { - my ($self) = shift; + my ($self, @widgets) = @_; - while (@_) { - my ($x, $y, $child) = splice @_, 0, 3, (); - $child->set_parent ($self); - $self->{children}[$y][$x] = $child; + for my $child (@widgets) { + $child->{c_rowspan} ||= 1; + $child->{c_colspan} ||= 1; } - $self->{force_realloc} = 1; - $self->{force_size_alloc} = 1; - $self->realloc; + $self->SUPER::add (@widgets); } -sub remove { - my ($self, $child) = @_; +sub add_at { + my $self = shift; - for (@{ $self->{children} }) { - for (@{ $_ || [] }) { - $_ = undef if $_ == $child; - } - } -} + 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 { @@ -1634,17 +1657,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 / $_ : $cs) for @w[$c .. $c + $cs - 1]; + } + } + + # second pass, rows + for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { + my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; - $w[$x] = max $w[$x], $w; - $h[$y] = max $h[$y], $h; + my $sh = sum @h[$r .. $r + $rs - 1]; + + if ($h > $sh) { + $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; } } @@ -1670,14 +1703,14 @@ my $req_w = (sum @$ws) || 1; my $req_h = (sum @$hs) || 1; - # TODO: nicer code + # 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; $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; - CFPlus::UI::harmonize $ws; + DC::UI::harmonize $ws; my @row_expand = @{$self->{row_expand}}; @row_expand = (1) x @$ws unless @row_expand; @@ -1685,78 +1718,35 @@ $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; - CFPlus::UI::harmonize $hs; + DC::UI::harmonize $hs; - my $y; + my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } + my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } - for my $r (0 .. $#{$self->{children}}) { - my $row = $self->{children}[$r] - or next; - - my $x = 0; - my $row_h = $hs->[$r]; - - for my $c (0 .. $#$row) { - my $col_w = $ws->[$c]; + 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)}; - if (my $widget = $row->[$c]) { - $widget->configure ($x, $y, $col_w, $row_h); - } - - $x += $col_w; - } - - $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}; - - my $res; - - for (grep $_, map @$_, grep $_, @{ $self->{children} }) { - $res = $_->find_widget ($x, $y) - and return $res; - } - - $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) -} - -sub _draw { - my ($self) = @_; - - for (grep $_, @{$self->{children}}) { - $_->draw for grep $_, @$_; - } -} - ############################################################################# -package CFPlus::UI::Fixed; +package DC::UI::Fixed; use List::Util qw(min max); -our @ISA = CFPlus::UI::Container::; - -sub add { - my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; - - $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; - $self->SUPER::add ($child); -} +our @ISA = DC::UI::Container::; sub _scale($$$) { - my ($mode, $val, $max) = @_; + my ($rel, $val, $max) = @_; - $mode eq "abs" ? $val - : $mode eq "rel" ? $val * $max - : 0 + $rel ? $val * $max : $val } sub size_request { @@ -1766,14 +1756,12 @@ # determine overall size by querying abs widgets for my $child ($self->visible_children) { - my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; + unless ($child->{c_rel}) { + my $x = $child->{c_x}; + my $y = $child->{c_y}; - if ($pos eq "abs") { - $w = _scale $size, $w, $child->{req_w}; - $h = _scale $size, $h, $child->{req_h}; - - $x1 = min $x1, $x; $x2 = max $x2, $x + $w; - $y1 = min $y1, $y; $y2 = max $y2, $y + $h; + $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; + $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; } } @@ -1782,16 +1770,12 @@ # now layout remaining widgets for my $child ($self->visible_children) { - my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; - - if ($pos ne "abs") { - $x = _scale $pos, $x, $W; - $y = _scale $pos, $x, $H; - $w = _scale $size, $w, $child->{req_w}; - $h = _scale $size, $h, $child->{req_h}; + 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 + $w; - $y1 = min $y1, $y; $y2 = max $y2, $y + $h; + $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w}; + $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h}; } } @@ -1805,14 +1789,13 @@ my ($self, $W, $H) = @_; for my $child ($self->visible_children) { - my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; + my $x = _scale $child->{c_rel}, $child->{c_x}, $W; + my $y = _scale $child->{c_rel}, $child->{c_y}, $H; - $x = _scale $pos, $x, $W; - $y = _scale $pos, $x, $H; - $w = _scale $size, $w, $child->{req_w}; - $h = _scale $size, $h, $child->{req_h}; + $x += $child->{c_halign} * $child->{req_w}; + $y += $child->{c_valign} * $child->{req_h}; - $child->configure ($x, $y, $w, $h); + $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h}); } 1 @@ -1820,21 +1803,23 @@ ############################################################################# -package CFPlus::UI::Box; +package DC::UI::Box; -our @ISA = CFPlus::UI::Container::; +our @ISA = DC::UI::Container::; sub size_request { my ($self) = @_; + my @children = $self->visible_children; + $self->{vertical} ? ( - (List::Util::max map $_->{req_w}, @{$self->{children}}), - (List::Util::sum map $_->{req_h}, @{$self->{children}}), + (List::Util::max map $_->{req_w}, @children), + (List::Util::sum map $_->{req_h}, @children), ) : ( - (List::Util::sum map $_->{req_w}, @{$self->{children}}), - (List::Util::max map $_->{req_h}, @{$self->{children}}), + (List::Util::sum map $_->{req_w}, @children), + (List::Util::max map $_->{req_h}, @children), ) } @@ -1857,7 +1842,7 @@ $_ *= $space / $req for @req; } else { my $expand = (List::Util::sum map $_->{expand}, @children) || 1; - + $space = ($space - $req) / $expand; # remaining space to give away $req[$_] += $space * $children[$_]{expand} @@ -1865,7 +1850,7 @@ } } - CFPlus::UI::harmonize \@req; + DC::UI::harmonize \@req; my $pos = 0; for (0 .. $#children) { @@ -1880,9 +1865,9 @@ ############################################################################# -package CFPlus::UI::HBox; +package DC::UI::HBox; -our @ISA = CFPlus::UI::Box::; +our @ISA = DC::UI::Box::; sub new { my $class = shift; @@ -1895,9 +1880,9 @@ ############################################################################# -package CFPlus::UI::VBox; +package DC::UI::VBox; -our @ISA = CFPlus::UI::Box::; +our @ISA = DC::UI::Box::; sub new { my $class = shift; @@ -1910,11 +1895,11 @@ ############################################################################# -package CFPlus::UI::Label; +package DC::UI::Label; -our @ISA = CFPlus::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my ($class, %arg) = @_; @@ -1929,18 +1914,18 @@ #max_w => maximum pixel width #style => 0, # render flags ellipsise => 3, # end - layout => (new CFPlus::Layout), + layout => (new DC::Layout), fontsize => 1, - align => -1, - valign => -1, - padding_x => 2, + align => 0.5, + valign => 0.5, + padding_x => 4, padding_y => 2, can_events => 0, %arg ); if (exists $self->{template}) { - my $layout = new CFPlus::Layout; + my $layout = new DC::Layout; $layout->set_text (delete $self->{template}); $self->{template} = $layout; } @@ -1968,6 +1953,12 @@ $self->SUPER::realloc; } +sub clear { + my ($self) = @_; + + $self->set_text (""); +} + sub set_text { my ($self, $text) = @_; @@ -2000,8 +1991,10 @@ my ($self) = @_; $self->{size_req} ||= do { + my $max_w = $self->{w} || $self->{max_w} || 0x0fffffff; # actually 2**31-1 but allow for overflow inside pango + $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_width ($self->{max_w} || -1); + $self->{layout}->set_width ($max_w); $self->{layout}->set_ellipsise ($self->{ellipsise}); $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); @@ -2010,7 +2003,7 @@ if (exists $self->{template}) { $self->{template}->set_font ($self->{font}) if $self->{font}; - $self->{template}->set_width ($self->{max_w} || -1); + $self->{template}->set_width ($max_w); $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w2, $h2) = $self->{template}->size; @@ -2076,28 +2069,39 @@ }; 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); + $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2); + $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2); + + $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); }; - my $w = List::Util::min $self->{w} + 4, $size->[0]; - my $h = List::Util::min $self->{h} + 2, $size->[1]; +# unless ($self->{list}) { +# $self->{list} = DC::OpenGL::glGenList; +# DC::OpenGL::glNewList $self->{list}; +# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); +# DC::OpenGL::glEndList; +# } +# +# DC::OpenGL::glCallList $self->{list}; - $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); + $self->{layout}->draw; } +#sub destroy { +# my ($self) = @_; +# +# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list}; +# +# $self->SUPER::destroy; +#} + ############################################################################# -package CFPlus::UI::EntryBase; +package DC::UI::EntryBase; -our @ISA = CFPlus::UI::Label::; +our @ISA = DC::UI::Label::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -2105,13 +2109,18 @@ $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 => undef, + active_bg => [0, 0, 1, .2], + active_fg => [1, 1, 1], + active_outline => [1, 1, 0], can_hover => 1, can_focus => 1, - valign => 0, + align => 0, + valign => 0.5, can_events => 1, ellipsise => 0, + padding_x => 4, + padding_y => 2, #text => ... #hidden => "*", @_ @@ -2168,21 +2177,21 @@ $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; - if ($uni == 8) { + if ($sym == DC::SDLK_BACKSPACE) { substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; - } elsif ($uni == 127) { + } elsif ($sym == DC::SDLK_DELETE) { substr $text, $self->{cursor}, 1, ""; - } elsif ($sym == CFPlus::SDLK_LEFT) { + } elsif ($sym == DC::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; - } elsif ($sym == CFPlus::SDLK_RIGHT) { + } elsif ($sym == DC::SDLK_RIGHT) { ++$self->{cursor} if $self->{cursor} < length $self->{text}; - } elsif ($sym == CFPlus::SDLK_HOME) { + } elsif ($sym == DC::SDLK_HOME) { # what a hack $self->{cursor} = (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ ? length $1 : 0; - } elsif ($sym == CFPlus::SDLK_END) { + } elsif ($sym == DC::SDLK_END) { # uh, again $self->{cursor} = (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ @@ -2231,7 +2240,7 @@ $self->_set_text ($self->{text}); $self->update; - + 1 } @@ -2256,12 +2265,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; @@ -2273,23 +2277,48 @@ 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_premultiply @{$self->{active_fg}}; glBegin GL_LINES; - glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; - glVertex 0.5 + $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} || $DC::THEME{entry_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 CFPlus::UI::Entry; +package DC::UI::Entry; + +our @ISA = DC::UI::EntryBase::; -our @ISA = CFPlus::UI::EntryBase::; +use DC::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + history_pointer => -1, + @_ + ) +} -use CFPlus::OpenGL; sub invoke_key_down { my ($self, $ev) = @_; @@ -2305,7 +2334,7 @@ $self->emit (activate => $txt); $self->update; - } elsif ($sym == CFPlus::SDLK_UP) { + } elsif ($sym == DC::SDLK_UP) { if ($self->{history_pointer} < 0) { $self->{history_saveback} = $self->get_text; } @@ -2317,14 +2346,17 @@ $self->set_text ($self->{history}->[$self->{history_pointer}]); } - } elsif ($sym == CFPlus::SDLK_DOWN) { + } elsif ($sym == DC::SDLK_DOWN) { $self->{history_pointer}--; $self->{history_pointer} = -1 if $self->{history_pointer} < 0; if ($self->{history_pointer} >= 0) { $self->set_text ($self->{history}->[$self->{history_pointer}]); } else { - $self->set_text ($self->{history_saveback}); + if (defined $self->{history_saveback}) { + $self->set_text ($self->{history_saveback}); + $self->{history_saveback} = undef; + } } } else { @@ -2336,20 +2368,30 @@ ############################################################################# -package CFPlus::UI::TextEdit; +package DC::UI::TextEdit; + +our @ISA = DC::UI::EntryBase::; + +use DC::OpenGL; + +sub new { + my $class = shift; -our @ISA = CFPlus::UI::EntryBase::; + $class->SUPER::new ( + padding_y => 4, -use CFPlus::OpenGL; + @_ + ) +} sub move_cursor_ver { my ($self, $dy) = @_; - my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); + my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); - $y += $dy; + $line += $dy; - if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { + if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) { $self->{cursor} = $index; delete $self->{cur_h}; $self->update; @@ -2362,9 +2404,9 @@ my $sym = $ev->{sym}; - if ($sym == CFPlus::SDLK_UP) { + if ($sym == DC::SDLK_UP) { $self->move_cursor_ver (-1); - } elsif ($sym == CFPlus::SDLK_DOWN) { + } elsif ($sym == DC::SDLK_DOWN) { $self->move_cursor_ver (+1); } else { return $self->SUPER::invoke_key_down ($ev) @@ -2375,27 +2417,76 @@ ############################################################################# -package CFPlus::UI::Button; +package DC::UI::ButtonBin; -our @ISA = CFPlus::UI::Label::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; my @tex = - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw(b1_button_inactive.png b1_button_active.png); sub new { my $class = shift; $class->SUPER::new ( - padding_x => 4, + can_hover => 1, + align => 0.5, + valign => 0.5, + can_events => 1, + @_ + ) +} + +sub invoke_button_up { + my ($self, $ev, $x, $y) = @_; + + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; + + 1 +} + +sub _draw { + my ($self) = @_; + + 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 DC::UI::Button; + +our @ISA = DC::UI::Label::; + +use DC::OpenGL; + +my @tex = + map { new_from_resource DC::Texture $_, mipmap => 1 } + qw(b1_button_inactive.png b1_button_active.png); + +sub new { + my $class = shift; + + $class->SUPER::new ( + padding_x => 8, padding_y => 4, fg => [1.0, 1.0, 1.0], active_fg => [0.8, 0.8, 0.8], can_hover => 1, - align => 0, - valign => 0, + align => 0.5, + valign => 0.5, can_events => 1, @_ ) @@ -2430,20 +2521,21 @@ ############################################################################# -package CFPlus::UI::CheckBox; +package DC::UI::CheckBox; -our @ISA = CFPlus::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; my @tex = - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw(c1_checkbox_bg.png c1_checkbox_active.png); -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; $class->SUPER::new ( + fontsize => 1, padding_x => 2, padding_y => 2, fg => [1, 1, 1], @@ -2459,7 +2551,7 @@ sub size_request { my ($self) = @_; - (6) x 2 + ($self->{fontsize} * $::FONTSIZE) x 2 } sub toggle { @@ -2488,7 +2580,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)}; @@ -2505,11 +2597,11 @@ ############################################################################# -package CFPlus::UI::Image; +package DC::UI::Image; -our @ISA = CFPlus::UI::Base::; +our @ISA = DC::UI::DrawBG::; -use CFPlus::OpenGL; +use DC::OpenGL; our %texture_cache; @@ -2518,6 +2610,7 @@ my $self = $class->SUPER::new ( can_events => 0, + scale => 1, @_, ); @@ -2525,9 +2618,9 @@ or Carp::croak "'path' or 'tex' attributes required"; $self->{tex} ||= $texture_cache{$self->{path}} ||= - new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; + new_from_resource DC::Texture $self->{path}, mipmap => 1; - CFPlus::weaken $texture_cache{$self->{path}}; + DC::weaken $texture_cache{$self->{path}}; $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; @@ -2538,7 +2631,7 @@ my ($self, $cloning) = @_; $self->{path} - or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; + or die "cannot serialise DC::UI::Image on non-loadable images\n"; $self->{path} } @@ -2549,15 +2642,24 @@ $self->new (path => $path) } +sub set_texture { + my ($self, $tex) = @_; + + $self->{tex} = $tex; + $self->update; +} + 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 { my ($self) = @_; + $self->SUPER::_draw; + my $tex = $self->{tex}; my ($w, $h) = ($self->{w}, $self->{h}); @@ -2572,20 +2674,18 @@ 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_TEXTURE_2D; } ############################################################################# -package CFPlus::UI::ImageButton; +package DC::UI::ImageButton; -our @ISA = CFPlus::UI::Image::; +our @ISA = DC::UI::Image::; -use CFPlus::OpenGL; - -my %textures; +use DC::OpenGL; sub new { my $class = shift; @@ -2596,13 +2696,19 @@ fg => [1, 1, 1], active_fg => [0, 0, 1], can_hover => 1, - align => 0, - valign => 0, + align => 0.5, + valign => 0.5, can_events => 1, @_ ); } +sub invoke_button_down { + my ($self, $ev, $x, $y) = @_; + + 1 +} + sub invoke_button_up { my ($self, $ev, $x, $y) = @_; @@ -2615,29 +2721,29 @@ ############################################################################# -package CFPlus::UI::VGauge; +package DC::UI::VGauge; -our @ISA = CFPlus::UI::Base::; +our @ISA = DC::UI::Base::; use List::Util qw(min max); -use CFPlus::OpenGL; +use DC::OpenGL; my %tex = ( food => [ - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ ], grace => [ - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ ], hp => [ - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ ], mana => [ - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } + map { new_from_resource DC::Texture $_, mipmap => 1 } qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ ], ); @@ -2750,9 +2856,163 @@ ############################################################################# -package CFPlus::UI::Gauge; +package DC::UI::Progress; + +our @ISA = DC::UI::Label::; -our @ISA = CFPlus::UI::VBox::; +use DC::OpenGL; + +sub new { + my ($class, %arg) = @_; + + my $self = $class->SUPER::new ( + padding_x => 2, + padding_y => 2, + 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.5, + align => 0.5, + can_events => 1, + ellipsise => 1, + label => "%d%%", + %arg, + ); + + $self->set_value ($arg{value} || -1); + + $self +} + +sub set_label { + my ($self, $label) = @_; + + return if $self->{label} eq $label; + $self->{label} = $label; + + $self->DC::UI::Progress::set_value (0 + delete $self->{value}); +} + +sub set_value { + my ($self, $value) = @_; + + if ($self->{value} ne $value) { + $self->{value} = $value; + + if ($value < 0) { + $self->set_text ("-"); + } else { + $self->set_text (sprintf $self->{label}, $value * 100); + } + + $self->update; + } +} + +sub _draw { + my ($self) = @_; + + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + + my $px = $self->{padding_x}; + my $py = $self->{padding_y}; + + if ($self->{value} >= 0) { + my $s = int $px + ($self->{w} - $px * 2) * $self->{value}; + + glColor_premultiply @{$self->{bar}}; + glRect $px, $py, $s, $self->{h} - $py; + glColor_premultiply @{$self->{bg}}; + glRect $s , $py, $self->{w} - $px, $self->{h} - $py; + } + + glColor_premultiply @{$self->{outline}}; + + $px -= .5; + $py -= .5; + + glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py; + + glDisable GL_BLEND; + + { + local $self->{bg}; # do not draw background + $self->SUPER::_draw; + } +} + +############################################################################# + +package DC::UI::ExperienceProgress; + +our @ISA = DC::UI::Progress::; + +sub new { + my ($class, %arg) = @_; + + my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : ""; + + my $self = $class->SUPER::new ( + %arg, + tooltip => sub { + my ($self) = @_; + + sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done", + $tt, + $self->{lvl}, + ::formsep ($self->{exp}), + ::formsep ($self->{nxt}), + ::formsep ($self->{nxt} - $self->{exp}), + $self->_percent * 100, + }, + ); + + $::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 _percent { + my ($self) = @_; + + my $table = $::CONN && $::CONN->{exp_table} + or return -1; + + my $l0 = $table->[$self->{lvl} - 1]; + my $l1 = $table->[$self->{lvl}]; + + $self->{nxt} = $l1; + + ($self->{exp} - $l0) / ($l1 - $l0) +} + +sub set_value { + my ($self, $lvl, $exp) = @_; + + $self->{lvl} = $lvl; + $self->{exp} = $exp; + + $self->SUPER::set_value ($self->_percent); +} + +############################################################################# + +package DC::UI::Gauge; + +our @ISA = DC::UI::VBox::; sub new { my ($class, %arg) = @_; @@ -2764,9 +3024,9 @@ %arg, ); - $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->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999"); + $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); + $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999"); $self } @@ -2797,16 +3057,16 @@ ############################################################################# -package CFPlus::UI::Slider; +package DC::UI::Slider; -use strict; +use common::sense; -use CFPlus::OpenGL; +use DC::OpenGL; -our @ISA = CFPlus::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; my @tex = - map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } + map { new_from_resource DC::Texture $_ } qw(s1_slider.png s1_slider_bg.png); sub new { @@ -2853,12 +3113,10 @@ my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; - $hi = $lo + 1 if $hi <= $lo; + $hi = $lo if $hi < $lo; - $page = $hi - $lo if $page > $hi - $lo; - - $value = $lo if $value < $lo; $value = $hi - $page if $value > $hi - $page; + $value = $lo if $value < $lo; $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit if $unit; @@ -2883,8 +3141,10 @@ $self->SUPER::invoke_button_down ($ev, $x, $y); $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 { @@ -2895,7 +3155,7 @@ my (undef, $lo, $hi, $page) = @{$self->{range}}; - $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); + $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999); $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); } else { @@ -2910,11 +3170,11 @@ my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; - my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; + my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2; $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); - ! ! $delta + 1 } sub update { @@ -2930,10 +3190,10 @@ 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 ($value, $lo, $hi, $page, $unit) = @{$self->{range}}; + my $range = ($hi - $page - $lo) || 1e-10; - my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; + my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w}; $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; @@ -2951,7 +3211,7 @@ if ($self->{vertical}) { # draw a vertical slider like a rotated horizontal slider - + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; } @@ -2973,9 +3233,9 @@ ############################################################################# -package CFPlus::UI::ValSlider; +package DC::UI::ValSlider; -our @ISA = CFPlus::UI::HBox::; +our @ISA = DC::UI::HBox::; sub new { my ($class, %arg) = @_; @@ -2983,8 +3243,8 @@ my $range = delete $arg{range}; my $self = $class->SUPER::new ( - slider => (new CFPlus::UI::Slider expand => 1, range => $range), - entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), + slider => (new DC::UI::Slider expand => 1, range => $range), + entry => (new DC::UI::Label text => "", template => delete $arg{template}), to_value => sub { shift }, from_value => sub { shift }, %arg, @@ -3014,11 +3274,11 @@ ############################################################################# -package CFPlus::UI::TextScroller; +package DC::UI::TextScroller; -our @ISA = CFPlus::UI::HBox::; +our @ISA = DC::UI::HBox::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -3029,19 +3289,20 @@ indent => 0, #font => default_font @_, - - layout => (new CFPlus::Layout), - par => [], + + layout => (new DC::Layout), max_par => 0, height => 0, children => [ - (new CFPlus::UI::Empty expand => 1), - (new CFPlus::UI::Slider vertical => 1), + (new DC::UI::Empty expand => 1), + (new DC::UI::Slider vertical => 1), ], ); $self->{children}[1]->connect (changed => sub { $self->update }); + $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} }; + $self } @@ -3055,7 +3316,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 @@ -3102,7 +3363,7 @@ $layout->set_shapes ( map - +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), + +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), @{$para->{widget}} ); @@ -3229,11 +3490,11 @@ my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; - $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { + $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub { glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; - package CFPlus::UI::Base; + package DC::UI::Base; local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); @@ -3254,6 +3515,7 @@ my $layout = $self->get_layout ($para); $layout->render ($para->{indent}, $y - $y0); + $layout->draw; if (my @w = @{ $para->{widget} }) { my @s = $layout->get_shapes; @@ -3301,11 +3563,11 @@ ############################################################################# -package CFPlus::UI::Animator; +package DC::UI::Animator; -use CFPlus::OpenGL; +use DC::OpenGL; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; sub moveto { my ($self, $x, $y) = @_; @@ -3313,7 +3575,7 @@ $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; $self->{speed} = 0.001; $self->{time} = 1; - + ::animation_start $self; } @@ -3327,7 +3589,7 @@ } my ($x0, $y0, $x1, $y1) = @{$self->{moveto}}; - + $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time}); $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time}); } @@ -3343,9 +3605,9 @@ ############################################################################# -package CFPlus::UI::Flopper; +package DC::UI::Flopper; -our @ISA = CFPlus::UI::Button::; +our @ISA = DC::UI::Button::; sub new { my $class = shift; @@ -3367,11 +3629,11 @@ ############################################################################# -package CFPlus::UI::Tooltip; +package DC::UI::Tooltip; -our @ISA = CFPlus::UI::Bin::; +our @ISA = DC::UI::Bin::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -3382,32 +3644,86 @@ ) } -sub set_tooltip_from { - my ($self, $widget) = @_; +# expand, as good as possible +sub _expand_doclets { + my ($tip) = @_; + + $tip =~ s{#\(([^)]+)\)}{ + if ($::CONN) { + exists $::CONN->{doclet}{$1} + ? $::CONN->{doclet}{$1} + : "(waiting for server to show full text)" + } else { + "(unable to show full text without server connection)" + } + }ge; - $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1 - if $widget->{tooltip} =~ /^#(.*)$/; + $tip =~ s/^\n+//; + $tip =~ s/\n+$//; - my $tooltip = $widget->{tooltip}; + $tip +} + +# expands a tooltip, potentially multiple times remotely +# and returns a guard. clals the clalback each time the text changes. +sub expand_tooltip { + my ($tip, $cb) = @_; + + # first expand #name tooltips from local pod + $tip = DC::Pod::section_label tooltip => $1 + if $tip =~ /^#([^(].*)$/; + + my $active; # true if any remote requests outstanding - 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}"; + if ($::CONN && $::CONN->{addme_success}) { + # now find all doclet references + for my $doclet ($tip =~ /#\(([^)]+)\)/g) { + unless (exists $::CONN->{doclet}{$doclet}) { + # need to ask the server + # we don't try to avoid duplicate requests + + $active = 1; + $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub { + $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0]; + $cb->(_expand_doclets $tip) if $active; + }); + } + } } - $tooltip =~ s/^\n+//; - $tooltip =~ s/\n+$//; + $cb->(_expand_doclets $tip); - $self->add (new CFPlus::UI::Label - markup => $tooltip, + $active and Guard::guard { undef $active } +} + +sub set_tooltip_from { + my ($self, $widget) = @_; + + my $tip = $widget->{tooltip}; + $tip = $tip->($widget) if "CODE" eq ref $tip; + + $self->add (new DC::UI::Label + fg => $DC::THEME{tooltip_fg}, max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, + align => 0, fontsize => 0.8, - style => 1, # FLAG_INVERSE + style => $DC::THEME{tooltip_style}, # FLAG_INVERSE ellipsise => 0, font => ($widget->{tooltip_font} || $::FONT_PROP), ); + + $self->{tooltip_expand} = expand_tooltip $tip, sub { + my ($tip) = @_; + + if ($ENV{CFPLUS_DEBUG} & 2) { + $tip .= "\n\n" . (ref $widget) . "\n" + . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" + . "req $widget->{req_w} $widget->{req_h}\n" + . "visible $widget->{visible}"; + } + + $self->{children}[0]->set_markup ($tip); + }; } sub size_request { @@ -3449,38 +3765,26 @@ 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; - - glColor 0, 0, 0; - glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; - - glTranslate 2 - 0.375, 2 - 0.375; + glColor @{ $DC::THEME{tooltip_bg} }; + glRect 0, 0, $w, $h; + + glColor @{ $DC::THEME{tooltip_border} }; + glRect_lineloop .5, .5, $w + .5, $h + .5; + + glTranslate 2, 2; $self->SUPER::_draw; } ############################################################################# -package CFPlus::UI::Face; +package DC::UI::Face; -our @ISA = CFPlus::UI::DrawBG::; +our @ISA = DC::UI::DrawBG::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -3493,28 +3797,8 @@ @_, ); - if ($self->{anim} && $self->{animspeed}) { - CFPlus::weaken (my $widget = $self); - - $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; - $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; - $self->{timer} = Event->timer ( - parked => 1, - cb => sub { - return unless $::CONN && $widget; - - ++$widget->{frame}; - $widget->update_face; - $widget->update; - - $widget->update_timer; - }, - ); + $self->update_anim; - $self->update_face; - $self->update_timer; - } - $self } @@ -3524,11 +3808,6 @@ return unless $self->{timer}; if ($self->{visible}) { - $self->{timer}->at ( - $self->{anim_start} - + $self->{animspeed} - * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} - ); $self->{timer}->start; } else { $self->{timer}->stop; @@ -3538,28 +3817,64 @@ sub update_face { my ($self) = @_; - return unless $::CONN; - - if (my $anim = $::CONN->{anim}[$self->{anim}]) { - if ($anim && @$anim) { - delete $self->{wait_face}; - $self->{face} = $anim->[ $self->{frame} % @$anim ]; + 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 update_anim { + my ($self) = @_; + + if ($self->{anim} && $self->{animspeed}) { + DC::weaken (my $widget = $self); + + $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; + } else { + delete $self->{timer}; + } +} + sub size_request { my ($self) = @_; if ($::CONN) { - if (my $faceid = $::CONN->{faceid}[$self->{face}]) { - if (my $tex = $::CONN->{texture}[$faceid]) { - return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); - } else { - $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { - $self->realloc; - }); + 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 }); } } @@ -3574,6 +3889,27 @@ $self->SUPER::update; } +sub set_face { + my ($self, $face) = @_; + + $self->{face} = $face; + $self->reconfigure; +} + +sub set_anim { + my ($self, $anim) = @_; + + $self->{anim} = $anim; + $self->update_anim; +} + +sub set_animspeed { + my ($self, $animspeed) = @_; + + $self->{animspeed} = $animspeed; + $self->update_anim; +} + sub invoke_visibility_change { my ($self) = @_; @@ -3585,16 +3921,9 @@ sub _draw { my ($self) = @_; - return unless $::CONN; - $self->SUPER::_draw; - my $faceid = $::CONN->{faceid}[$self->{face}] - or return; - - my $tex = $::CONN->{texture}[$faceid]; - - 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; @@ -3614,19 +3943,19 @@ ############################################################################# -package CFPlus::UI::Buttonbar; +package DC::UI::Buttonbar; -our @ISA = CFPlus::UI::HBox::; +our @ISA = DC::UI::HBox::; # TODO: should actually wrap buttons and other goodies. ############################################################################# -package CFPlus::UI::Menu; +package DC::UI::Menu; -our @ISA = CFPlus::UI::Toplevel::; +our @ISA = DC::UI::Toplevel::; -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -3637,7 +3966,7 @@ @_, ); - $self->add ($self->{vbox} = new CFPlus::UI::VBox); + $self->add ($self->{vbox} = new DC::UI::VBox); for my $item (@{ $self->{items} }) { my ($widget, $cb, $tooltip) = @$item; @@ -3647,20 +3976,21 @@ if ($widget =~ /\t/) { my ($left, $right) = split /\t/, $widget, 2; - $widget = new CFPlus::UI::HBox + $widget = new DC::UI::HBox can_hover => 1, can_events => 1, tooltip => $tooltip, children => [ - (new CFPlus::UI::Label markup => $left, expand => 1), - (new CFPlus::UI::Label markup => $right, align => +1), + (new DC::UI::Label markup => $left , align => 0, expand => 1), + (new DC::UI::Label markup => $right, align => 1), ], ; - + } else { - $widget = new CFPlus::UI::Label + $widget = new DC::UI::Label can_hover => 1, can_events => 1, + align => 0, markup => $widget, tooltip => $tooltip; } @@ -3685,7 +4015,15 @@ $self->{button} = $ev->{button}; $self->show; - $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); + + my $x = $ev->{x}; + my $y = $ev->{y}; + + $self->{root}->on_post_alloc ($self => sub { + $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5); + }); + + 1 # so it can be used inside event handlers } sub invoke_mouse_motion { @@ -3716,9 +4054,9 @@ ############################################################################# -package CFPlus::UI::Multiplexer; +package DC::UI::Multiplexer; -our @ISA = CFPlus::UI::Container::; +our @ISA = DC::UI::Container::; sub new { my $class = shift; @@ -3727,8 +4065,7 @@ @_, ); - $self->{current} = $self->{children}[0] - if @{ $self->{children} }; + $self->set_current_page (0); $self } @@ -3738,8 +4075,8 @@ $self->SUPER::add (@widgets); - $self->{current} = $self->{children}[0] - if @{ $self->{children} }; + $self->set_current_page (0) + if @widgets == @{ $self->{children} }; } sub get_current_page { @@ -3755,28 +4092,35 @@ ? $page_or_widget : $self->{children}[$page_or_widget]; - $self->{current} = $widget; - $self->{current}->configure (0, 0, $self->{w}, $self->{h}); + $self->{current}->set_invisible if $self->{current} && $self->{visible}; - $self->emit (page_changed => $self->{current}); + if (($self->{current} = $widget)) { + $self->{current}->set_visible if $self->{current} && $self->{visible}; + $self->{current}->configure (0, 0, $self->{w}, $self->{h}); + + $self->emit (page_changed => $self->{current}); + } $self->realloc; } sub visible_children { - $_[0]{current} + $_[0]{current} || () } sub size_request { my ($self) = @_; - $self->{current}->size_request + $self->{current} + ? $self->{current}->size_request + : (0, 0) } sub invoke_size_allocate { my ($self, $w, $h) = @_; - $self->{current}->configure (0, 0, $w, $h); + $self->{current}->configure (0, 0, $w, $h) + if $self->{current}; 1 } @@ -3784,43 +4128,105 @@ sub _draw { my ($self) = @_; - $self->{current}->draw; + $self->{current}->draw + if $self->{current}; } ############################################################################# -package CFPlus::UI::Notebook; +package DC::UI::Notebook; + +use DC::OpenGL; -our @ISA = CFPlus::UI::VBox::; +our @ISA = DC::UI::VBox::; sub new { my $class = shift; my $self = $class->SUPER::new ( - buttonbar => (new CFPlus::UI::Buttonbar), - multiplexer => (new CFPlus::UI::Multiplexer expand => 1), + buttonbar => (new DC::UI::Buttonbar), + multiplexer => (new DC::UI::Multiplexer expand => 1), + active_outline => [.7, .7, 0.2], # filter => # will be put between multiplexer and $self @_, ); - + $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); + { + Scalar::Util::weaken (my $wself = $self); + + $self->{multiplexer}->connect (c_add => sub { + my ($mplex, $widgets) = @_; + + for my $child (@$widgets) { + Scalar::Util::weaken $child; + $child->{c_tab_} ||= do { + my $tab = + (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base") + ? $child->{c_tab} + : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1]; + + $tab->connect (activate => sub { + $wself->set_current_page ($child); + }); + + $tab + }; + + $self->{buttonbar}->add ($child->{c_tab_}); + } + }); + + $self->{multiplexer}->connect (c_remove => sub { + my ($mplex, $widgets) = @_; + + for my $child (@$widgets) { + $wself->{buttonbar}->remove ($child->{c_tab_}); + } + }); + } + $self } sub add { - my ($self, $title, $widget, $tooltip) = @_; + my ($self, @widgets) = @_; - CFPlus::weaken $self; + $self->{multiplexer}->add (@widgets) +} - $self->{buttonbar}->add (new CFPlus::UI::Button - markup => $title, - tooltip => $tooltip, - on_activate => sub { $self->set_current_page ($widget) }, - ); +sub remove { + my ($self, @widgets) = @_; - $self->{multiplexer}->add ($widget); + $self->{multiplexer}->remove (@widgets) +} + +sub pages { + my ($self) = @_; + $self->{multiplexer}->children +} + +sub page_index { + my ($self, $widget) = @_; + + my $i = 0; + for ($self->pages) { + if ($_ eq $widget) { return $i }; + $i++; + } + + undef +} + +sub add_tab { + my ($self, $title, $widget, $tooltip) = @_; + + $title = [$title, $tooltip] unless ref $title; + $widget->{c_tab} = $title; + + $self->add ($widget); } sub get_current_page { @@ -3836,13 +4242,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 CFPlus::UI::Selector; +package DC::UI::Selector; use utf8; -our @ISA = CFPlus::UI::Button::; +our @ISA = DC::UI::Button::; sub new { my $class = shift; @@ -3869,18 +4295,19 @@ push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; } - CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); + DC::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 { @@ -3892,11 +4319,18 @@ $self->emit (changed => $value); } +sub set_options { + my ($self, $options) = @_; + + $self->{options} = $options; + $self->_set_value ($self->{value}); +} + ############################################################################# -package CFPlus::UI::Statusbox; +package DC::UI::Statusbox; -our @ISA = CFPlus::UI::VBox::; +our @ISA = DC::UI::VBox::; sub new { my $class = shift; @@ -3906,26 +4340,28 @@ @_, ); - CFPlus::weaken (my $this = $self); + DC::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 } sub reorder { my ($self) = @_; - my $NOW = Time::HiRes::time; + my $NOW = AE::time; # freeze display when hovering over any label - return if $CFPlus::UI::TOOLTIP->{owner} - && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, + return if $DC::UI::TOOLTIP->{owner} + && grep $DC::UI::TOOLTIP->{owner} == $_->{label}, values %{ $self->{item} }; while (my ($k, $v) = each %{ $self->{item} }) { delete $self->{item}{$k} if $v->{timeout} < $NOW; } + $self->{timer}->set (1, 1); + my @widgets; my @items = sort { @@ -3933,8 +4369,6 @@ or $b->{id} <=> $a->{id} } values %{ $self->{item} }; - $self->{timer}->interval (1); - my $count = 10 + 1; for my $item (@items) { last unless --$count; @@ -3950,13 +4384,14 @@ s/\s+/ /g; } - new CFPlus::UI::Label + new DC::UI::Label markup => $short, tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, tooltip_width => 0.67, fontsize => $item->{fontsize} || $self->{fontsize}, max_w => $::WIDTH * 0.44, + align => 0, fg => [@{ $item->{fg} }], can_events => 1, can_hover => 1 @@ -3967,7 +4402,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; } @@ -3975,6 +4410,10 @@ push @widgets, $label; } + my $hash = join ",", @widgets; + return if $hash eq $self->{last_widget_hash}; + $self->{last_widget_hash} = $hash; + $self->clear; $self->SUPER::add (reverse @widgets); } @@ -4019,6 +4458,16 @@ }); } +sub clr_group { + my ($self, $group) = @_; + + if (delete $self->{item}{$group}) { + $ROOT->on_refresh (reorder => sub { + $self->reorder; + }); + } +} + sub reconfigure { my ($self) = @_; @@ -4039,13 +4488,13 @@ ############################################################################# -package CFPlus::UI::Root; +package DC::UI::Root; -our @ISA = CFPlus::UI::Container::; +our @ISA = DC::UI::Container::; use List::Util qw(min max); -use CFPlus::OpenGL; +use DC::OpenGL; sub new { my $class = shift; @@ -4055,7 +4504,7 @@ @_, ); - CFPlus::weaken ($self->{root} = $self); + DC::weaken ($self->{root} = $self); $self } @@ -4113,7 +4562,7 @@ sub update { my ($self) = @_; - $::WANT_REFRESH++; + $::WANT_REFRESH = 1; } sub add { @@ -4160,7 +4609,7 @@ for values %{delete $self->{refresh_hook}}; } - if ($self->{realloc}) { + while ($self->{realloc}) { my %queue; my @queue; my $widget; @@ -4182,7 +4631,7 @@ $widget = pop @{ $queue[-1] || [] } and last; - + pop @queue; } @@ -4190,8 +4639,11 @@ 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 += $widget->{padding_x} * 2; + $h += $widget->{padding_y} * 2; + + $w = max $widget->{min_w}, $w; + $h = max $widget->{min_h}, $h; $w = min $widget->{max_w}, $w if exists $widget->{max_w}; $h = min $widget->{max_h}, $h if exists $widget->{max_h}; @@ -4217,40 +4669,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 $widget = pop @queue || last; + while (my $size_alloc = delete $self->{size_alloc}) { + my @queue = sort { $a->{visible} <=> $b->{visible} } + values %$size_alloc; - my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; + while () { + my $widget = pop @queue || last; - $w = 0 if $w < 0; - $h = 0 if $h < 0; + my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; - $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); + } } } } @@ -4271,7 +4720,7 @@ glLoadIdentity; { - package CFPlus::UI::Base; + package DC::UI::Base; local ($draw_x, $draw_y, $draw_w, $draw_h) = (0, 0, $self->{w}, $self->{h}); @@ -4282,10 +4731,9 @@ ############################################################################# -package CFPlus::UI; +package DC::UI; -$ROOT = new CFPlus::UI::Root; -$TOOLTIP = new CFPlus::UI::Tooltip z => 900; +$ROOT = new DC::UI::Root; +$TOOLTIP = new DC::UI::Tooltip z => 900; 1 -