--- deliantra/Deliantra-Client/DC/UI.pm 2006/05/15 18:23:33 1.207 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/25 21:36:45 1.237 @@ -52,12 +52,12 @@ # class methods for events sub feed_sdl_key_down_event { - $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) + $FOCUS->emit (key_down => $_[0]) if $FOCUS; } sub feed_sdl_key_up_event { - $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) + $FOCUS->emit (key_up => $_[0]) if $FOCUS; } @@ -76,10 +76,8 @@ $BUTTON_STATE |= 1 << ($ev->{button} - 1); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); - } + $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; } sub feed_sdl_button_up_event { @@ -90,10 +88,8 @@ $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - if ($GRAB) { - ($x, $y) = $GRAB->coord2local ($x, $y); - $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); - } + $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) + if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; @@ -119,10 +115,8 @@ check_tooltip; } - if ($HOVER) { - ($x, $y) = $HOVER->coord2local ($x, $y); - $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); - } + $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) + if $HOVER; } # convert position array to integers @@ -138,12 +132,28 @@ } } +sub full_refresh { + # make a copy, otherwise for complains about freed values. + my @widgets = values %WIDGET; + + $_->update + for @widgets; +} + +sub reconfigure_widgets { + # make a copy, otherwise C complains about freed values. + my @widgets = values %WIDGET; + + $_->reconfigure + for @widgets; +} + # call when resolution changes etc. sub rescale_widgets { my ($sx, $sy) = @_; for my $widget (values %WIDGET) { - if ($widget->{toplevel}) { + if ($widget->{is_toplevel}) { $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; @@ -153,9 +163,9 @@ $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; } - - $widget->reconfigure; } + + reconfigure_widgets; } ############################################################################# @@ -197,18 +207,45 @@ sub show { my ($self) = @_; - return if $self->{parent}; $CFClient::UI::ROOT->add ($self); } -sub hide { +sub show_centered { my ($self) = @_; + return if $self->{parent}; + + $self->show; + + $CFClient::UI::ROOT->on_post_alloc ( + "centered $self" => sub { + $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); + }, + ); +} + +sub set_invisible { + my ($self) = @_; + + # broken show/hide model + + delete $self->{visible}; undef $GRAB if $GRAB == $self; undef $HOVER if $HOVER == $self; + CFClient::UI::check_tooltip + if $CFClient::UI::TOOLTIP->{owner} == $self; + + $self->focus_out; +} + +sub hide { + my ($self) = @_; + + $self->set_invisible; + $self->{parent}->remove ($self) if $self->{parent}; } @@ -284,6 +321,22 @@ delete $self->{max_h}; $self->{max_h} = $h if $h; } +sub set_tooltip { + my ($self, $tooltip) = @_; + + $tooltip =~ s/^\s+//; + $tooltip =~ s/\s+$//; + + return if $self->{tooltip} eq $tooltip; + + $self->{tooltip} = $tooltip; + + if ($CFClient::UI::TOOLTIP->{owner} == $self) { + delete $CFClient::UI::TOOLTIP->{owner}; + CFClient::UI::check_tooltip; + } +} + # translate global coordinates to local coordinate system sub coord2local { my ($self, $x, $y) = @_; @@ -306,7 +359,7 @@ my $focus = $FOCUS; $FOCUS = $self; - $self->emit (focus_in => $focus); + $self->_emit (focus_in => $focus); $focus->update if $focus; $FOCUS->update; @@ -319,15 +372,18 @@ my $focus = $FOCUS; undef $FOCUS; - $self->emit (focus_out => $focus); + $self->_emit (focus_out => $focus); $focus->update if $focus; #? + + $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus + unless $FOCUS; } sub mouse_motion { } -sub button_up { } -sub key_down { } -sub key_up { } +sub button_up { } +sub key_down { } +sub key_up { } sub button_down { my ($self, $ev, $x, $y) = @_; @@ -371,10 +427,10 @@ glColor 1, 1, 0, 1; glTranslate $self->{x} + 0.375, $self->{y} + 0.375; glBegin GL_LINE_LOOP; - glVertex 0 , 0; - glVertex $self->{w}, 0; - glVertex $self->{w}, $self->{h}; - glVertex 0 , $self->{h}; + 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; @@ -404,9 +460,14 @@ Scalar::Util::weaken ($self->{parent} = $parent); + $self->{root} = $parent->{root}; + $self->{visible} = $parent->{visible}; + # TODO: req_w _does_change after ->reconfigure $self->check_size unless exists $self->{req_w}; + + $self->show; } sub check_size { @@ -429,12 +490,19 @@ push @{ $self->{signal_cb}{$signal} }, $cb; } -sub emit { +sub _emit { my ($self, $signal, @args) = @_; List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} } +sub emit { + my ($self, $signal, @args) = @_; + + $self->_emit ($signal, @args) + || $self->$signal (@args); +} + sub DESTROY { my ($self) = @_; @@ -457,8 +525,8 @@ # range [value, low, high, page] $class->SUPER::new ( - bg => [0, 0, 0, 0.2], - active_bg => [1, 1, 1, 0.5], + #bg => [0, 0, 0, 0.2], + #active_bg => [1, 1, 1, 0.5], @_ ) } @@ -466,20 +534,26 @@ sub _draw { my ($self) = @_; - my ($w, $h) = @$self{qw(w h)}; + my $color = $FOCUS == $self && $self->{active_bg} + ? $self->{active_bg} + : $self->{bg}; - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; + if ($color && (@$color < 4 || $color->[3])) { + my ($w, $h) = @$self{qw(w h)}; - glBegin GL_QUADS; - glVertex 0 , 0; - glVertex 0 , $h; - glVertex $w, $h; - glVertex $w, 0; - glEnd; + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glColor @$color; - glDisable GL_BLEND; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + + glDisable GL_BLEND; + } } ############################################################################# @@ -549,7 +623,7 @@ $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->check_size; + $self->check_size (1); $self->update; } @@ -673,13 +747,6 @@ glClear GL_COLOR_BUFFER_BIT; $self->_render; -# glColorMask 1, 1, 1, 0; -# glEnable GL_BLEND; -# glBlendFunc GL_SRC_ALPHA, GL_ZERO; -# glRasterPos 0, 0; -# glCopyPixels 0, 0, $self->{w}, $self->{h}; -# glDisable GL_BLEND; -# glColorMask 1, 1, 1, 1; }; } @@ -693,7 +760,7 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 0, 0, 0, 1; + glColor 1, 1, 1, 1; $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); @@ -706,11 +773,20 @@ our @ISA = CFClient::UI::Window::; +sub new { + my $class = shift; + + $class->SUPER::new ( + scroll_x => 0, + scroll_y => 1, + @_, + ) +} + sub size_request { my ($self) = @_; @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - $self->child->configure (0, 0, @$self{qw(child_w child_h)}); @$self{qw(child_w child_h)} } @@ -718,6 +794,10 @@ sub size_allocate { my ($self, $w, $h) = @_; + $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; + $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; + + $self->child->configure (0, 0, $w, $h); $self->update; } @@ -781,12 +861,12 @@ vertical => 1, range => [0, 0, 1, 0.01], # HACK fix connect_changed => sub { - $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); + $self->{vp}->set_offset (0, $_[1]); }, ; $self = $class->SUPER::new ( - vp => (new CFClient::UI::ViewPort), + vp => (new CFClient::UI::ViewPort expand => 1), slider => $slider, @_, ); @@ -798,6 +878,15 @@ $self } +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + my $child = $self->{vp}->child; + $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); +} + #TODO# update range on size_allocate depending on child # update viewport offset on scroll @@ -859,11 +948,11 @@ # TODO: user_x, user_y, overwrite moveto? my $self = $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => 0.6, - toplevel => 1, - can_events => 1, + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + is_toplevel => 1, + can_events => 1, @_ ); @@ -897,7 +986,7 @@ $h -= List::Util::max 0, $self->border * 2; $w -= List::Util::max 0, $self->border * 2; - $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) + $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) if $self->{title}; $self->child->configure ($self->border, $self->border, $w, $h); @@ -1013,24 +1102,24 @@ $class->SUPER::new ( col_expand => [], - @_ + @_, ) } +sub children { + grep $_, map @$_, grep $_, @{ $_[0]{children} } +} + sub add { my ($self, $x, $y, $child) = @_; $child->set_parent ($self); $self->{children}[$y][$x] = $child; - $child->check_size; -} - -sub children { - grep $_, map @$_, grep $_, @{ $_[0]{children} } + $self->check_size (1); } -# TODO: move to container class maybe? send childs a signal on removal? +# TODO: move to container class maybe? send children a signal on removal? sub clear { my ($self) = @_; @@ -1042,6 +1131,7 @@ $_->hide; } + $self->check_size (1); $self->update; } @@ -1268,7 +1358,7 @@ package CFClient::UI::Label; -our @ISA = CFClient::UI::Base::; +our @ISA = CFClient::UI::DrawBG::; use CFClient::OpenGL; @@ -1277,9 +1367,13 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], + #bg => none + #active_bg => none #font => default_font #text => initial text #markup => initial narkup + #max_w => maximum pixel width + ellipsise => 3, # end layout => (new CFClient::Layout), fontsize => 1, align => -1, @@ -1304,14 +1398,14 @@ $self } -sub escape { - local $_ = $_[1]; +sub escape($) { + local $_ = $_[0]; s/&/&/g; s/>/>/g; s/{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{max_w} || -1); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w, $h) = $self->{layout}->size; @@ -1393,21 +1489,25 @@ sub _draw { my ($self) = @_; + $self->SUPER::_draw; # draw background, if applicable + my $tex = $self->{texture} ||= do { $self->{layout}->set_foreground (@{$self->{fg}}); $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); + $self->{layout}->set_ellipsise ($self->{ellipsise}); + $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); my $tex = new_from_layout CFClient::Texture $self->{layout}; - $self->{ox} = int $self->{align} < 0 ? $self->{padding} - : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} - : ($self->{w} - $tex->{w}) * 0.5; - - $self->{oy} = int $self->{valign} < 0 ? $self->{padding} - : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} - : ($self->{h} - $tex->{h}) * 0.5; + $self->{ox} = int ($self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5); + + $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} + : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} + : ($self->{h} - $tex->{h}) * 0.5); $tex }; @@ -1445,6 +1545,7 @@ can_focus => 1, valign => 0, can_events => 1, + #text => ... @_ ) } @@ -1464,7 +1565,7 @@ $text =~ s/./*/g if $self->{hidden}; $self->{layout}->set_text ("$text "); - $self->emit (changed => $self->{text}); + $self->_emit (changed => $self->{text}); } sub set_text { @@ -1472,8 +1573,8 @@ $self->{cursor} = length $text; $self->_set_text ($text); - $self->check_size; $self->update; + $self->check_size; } sub get_text { @@ -1488,12 +1589,6 @@ ($w + 1, $h) # add 1 for cursor } -sub size_allocate { - my ($self, $w, $h) = @_; - - $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text -} - sub key_down { my ($self, $ev) = @_; @@ -1516,13 +1611,14 @@ } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; } elsif ($uni == 27) { - $self->emit ('escape'); + $self->_emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; } $self->_set_text ($text); $self->update; + $self->check_size; } sub focus_in { @@ -1612,7 +1708,7 @@ my $txt = $self->get_text; $self->{history_pointer} = -1; $self->{history_saveback} = ''; - $self->emit (activate => $txt); + $self->_emit (activate => $txt); $self->update; } elsif ($sym == CFClient::SDLK_UP) { @@ -1661,7 +1757,6 @@ $class->SUPER::new ( padding => 4, fg => [1, 1, 1], - bg => [1, 1, 1, 0.2], active_fg => [0, 0, 1], can_hover => 1, align => 0, @@ -1671,13 +1766,14 @@ ) } +sub activate { } + sub button_up { my ($self, $ev, $x, $y) = @_; - if ($x >= 0 && $x < $self->{w} - && $y >= 0 && $y < $self->{h}) { - $self->emit ("activate"); - } + $self->emit ("activate") + if $x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}; } sub _draw { @@ -1719,6 +1815,8 @@ padding => 2, fg => [1, 1, 1], active_fg => [1, 1, 0], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], state => 0, can_hover => 1, @_ @@ -1737,7 +1835,7 @@ if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { $self->{state} = !$self->{state}; - $self->emit (changed => $self->{state}); + $self->_emit (changed => $self->{state}); } } @@ -2020,12 +2118,14 @@ my $self = $class->SUPER::new ( fg => [1, 1, 1], active_fg => [0, 0, 0], - range => [0, 0, 100, 10], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + range => [0, 0, 100, 10, 0], req_w => $::WIDTH / 80, req_h => $::WIDTH / 80, vertical => 0, can_hover => 1, - inner_pad => .05, + inner_pad => 0.02, @_ ); @@ -2035,6 +2135,14 @@ $self } +sub set_range { + my ($self, $range) = @_; + + $self->{range} = $range; + + $self->update; +} + sub set_value { my ($self, $value) = @_; @@ -2042,18 +2150,18 @@ $hi = $lo + 1 if $hi <= $lo; - $value = $lo if $value < $lo; - $value = $hi if $value > $hi; + $page = $hi - $lo if $page > $hi - $lo; + + $value = $lo if $value < $lo; + $value = $hi - $page if $value > $hi - $page; $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit if $unit; - $page = $hi - $lo if $page > $hi - $lo; - @{$self->{range}} = ($value, $lo, $hi, $page, $unit); if ($value != $old_value) { - $self->emit (changed => $value); + $self->_emit (changed => $value); $self->update; } } @@ -2071,6 +2179,9 @@ my ($self, $ev, $x, $y) = @_; $self->SUPER::button_down ($ev, $x, $y); + + $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; + $self->mouse_motion ($ev, $x, $y); } @@ -2082,9 +2193,9 @@ my (undef, $lo, $hi, $page) = @{$self->{range}}; - $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; + $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); - $self->set_value ($x * ($hi - $lo) + $lo); + $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); } } @@ -2095,21 +2206,18 @@ $self->set_value ($self->{range}[0]); my ($value, $lo, $hi, $page) = @{$self->{range}}; + my $range = ($hi - $page - $lo) || 1e-100; - my $inner_w = 1 - 2 * $self->{inner_pad}; + my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; - $self->{scale} = ($inner_w / ($hi - $lo)) || 1; + $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; + $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; - $page = $self->{scale} * $page || 10 / ($self->{w} || 1); - $value = $self->{scale} * ($value - $lo); + $value = ($value - $lo) / $range; + $value = $value * $self->{scale} + $self->{offset}; - $value = $self->{inner_pad} + ($value - $page * 0.5); - - $value = 0 if $value < 0; - $page = 1 - $value if $value + $page > 1; - - $self->{knob_x} = $value; - $self->{knob_w} = $page; + $self->{knob_x} = $value - $knob_w * 0.5; + $self->{knob_w} = $knob_w; }); $self->SUPER::update; @@ -2125,8 +2233,8 @@ if ($self->{vertical}) { # draw a vertical slider like a rotated horizontal slider + glTranslate 1, 0, 0; glRotate 90, 0, 0, 1; - glTranslate 0, 1, 0; } my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; @@ -2146,6 +2254,47 @@ ############################################################################# +package CFClient::UI::ValSlider; + +our @ISA = CFClient::UI::HBox::; + +sub new { + my ($class, %arg) = @_; + + my $range = delete $arg{range}; + + my $self = $class->SUPER::new ( + slider => (new CFClient::UI::Slider expand => 1, range => $range), + entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), + to_value => sub { shift }, + from_value => sub { shift }, + %arg, + ); + + $self->{slider}->connect (changed => sub { + my ($self, $value) = @_; + $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value)); + $self->{parent}->emit (changed => $value); + }); + +# $self->{entry}->connect (changed => sub { +# my ($self, $value) = @_; +# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value)); +# $self->{parent}->emit (changed => $value); +# }); + + $self->add ($self->{slider}, $self->{entry}); + + $self->{slider}->emit (changed => $self->{slider}{range}[0]); + + $self +} + +sub set_range { shift->{slider}->set_range (@_) } +sub set_value { shift->{slider}->set_value (@_) } + +############################################################################# + package CFClient::UI::TextView; our @ISA = CFClient::UI::HBox::; @@ -2182,16 +2331,28 @@ $self->reflow; } -sub text_height { - my ($self, $text) = @_; +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{layout}->set_width ($self->{children}[0]{w}); + + $self->reflow; +} + +sub text_size { + my ($self, $text, $indent) = @_; my $layout = $self->{layout}; $layout->set_height ($self->{fontsize} * $::FONTSIZE); - $layout->set_width ($self->{children}[0]{w}); + $layout->set_width ($self->{children}[0]{w} - $indent); $layout->set_markup ($text); - ($layout->size)[1] + $layout->size } sub reflow { @@ -2201,31 +2362,31 @@ $self->update; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub set_offset { + my ($self, $offset) = @_; - $self->SUPER::size_allocate ($w, $h); + # todo: base offset on lines or so, not on pixels + $self->{children}[1]->set_value ($offset); +} - $self->{layout}->set_font ($self->{font}) if $self->{font}; - $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - $self->{layout}->set_width ($self->{children}[0]{w}); +sub clear { + my ($self) = @_; - $self->reflow; + $self->{par} = []; + $self->{height} = 0; + $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); } sub add_paragraph { - my ($self, $color, $text) = @_; + my ($self, $color, $text, $indent) = @_; - #TODO: intelligently "reformat" paragraph - - my $height = $self->text_height ($text); - - $self->{height} += $height; - - push @{$self->{par}}, [$height, $color, $text]; + for my $line (split /\n/, $text) { + my ($w, $h) = $self->text_size ($line); + $self->{height} += $h; + push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; + } - $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; - $self->{children}[1]->update; + $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); } sub update { @@ -2238,30 +2399,42 @@ delete $self->{texture}; $ROOT->on_post_alloc ($self, sub { + my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; + if (delete $self->{need_reflow}) { my $height = 0; - $height += $_->[0] = $self->text_height ($_->[2]) - for @{$self->{par}}; + my $layout = $self->{layout}; + + $layout->set_height ($self->{fontsize} * $::FONTSIZE); + + for (@{$self->{par}}) { + if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support + $layout->set_width ($W - $_->[3]); + $layout->set_markup ($_->[4]); + my ($w, $h) = $layout->size; + $_->[0] = $w + $_->[3]; + $_->[1] = $h; + } + + $height += $_->[1]; + } $self->{height} = $height; - $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); delete $self->{texture}; } - $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { - glClearColor 0, 0, 0, 0; + $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { + glClearColor 0.5, 0.5, 0.5, 0; glClear GL_COLOR_BUFFER_BIT; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - my $top = int $self->{children}[1]{range}[0]; my $y0 = $top; - my $y1 = $top + $self->{h}; + my $y1 = $top + $H; my $y = 0; @@ -2269,21 +2442,28 @@ $layout->set_font ($self->{font}) if $self->{font}; + glEnable GL_BLEND; + #TODO# not correct in windows where rgba is forced off + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + for my $par (@{$self->{par}}) { - my $h = $par->[0]; + my $h = $par->[1]; if ($y0 < $y + $h && $y < $y1) { - $layout->set_foreground (@{ $par->[1] }); - $layout->set_markup ($par->[2]); + $layout->set_foreground (@{ $par->[2] }); + $layout->set_width ($W - $par->[3]); + $layout->set_markup ($par->[4]); + + my ($w, $h, $data, $format, $internalformat) = $layout->render; - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); + glRasterPos $par->[3], $y - $y0; + glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; } $y += $h; } - glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; }; }); } @@ -2294,7 +2474,7 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor 1, 1, 1, 1; - $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); glDisable GL_TEXTURE_2D; $self->{children}[1]->draw; @@ -2373,13 +2553,13 @@ if ($self->{state} = !$self->{state}) { $CFClient::UI::ROOT->add ($self->{other}); $self->{other}->move ($self->coord2global (0, $self->{h})); - $self->emit ("open"); + $self->_emit ("open"); } else { $CFClient::UI::ROOT->remove ($self->{other}); - $self->emit ("close"); + $self->_emit ("close"); } - $self->emit (changed => $self->{state}); + $self->_emit (changed => $self->{state}); } ############################################################################# @@ -2403,11 +2583,12 @@ my ($self, $widget) = @_; $self->add (new CFClient::UI::Label - markup => $widget->{tooltip}, - max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, - fontsize => 0.8, - fg => [0, 0, 0, 1], - font => ($widget->{tooltip_font} || $::FONT_PROP), + markup => $widget->{tooltip}, + max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, + fontsize => 0.8, + fg => [0, 0, 0, 1], + ellipsise => 0, + font => ($widget->{tooltip_font} || $::FONT_PROP), ); } @@ -2463,23 +2644,57 @@ sub new { my $class = shift; - $class->SUPER::new ( - aspect => 1, + my $self = $class->SUPER::new ( + aspect => 1, + can_events => 0, @_, - ) + ); + + if ($self->{anim} && $self->{animspeed}) { + Scalar::Util::weaken (my $widget = $self); + + $self->{timer} = Event->timer ( + at => $self->{animspeed} * int $::NOW / $self->{animspeed}, + hard => 1, + interval => $self->{animspeed}, + cb => sub { + ++$widget->{frame}; + $widget->update; + }, + ); + } + + $self } sub size_request { (32, 8) } +sub update { + my ($self) = @_; + + return unless $self->{visible}; + + $self->SUPER::update; +} + sub _draw { my ($self) = @_; - return unless $::CONN;#d# manage and cache textures differently - my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; + return unless $::CONN; + + my $face; + + if ($self->{frame}) { + my $anim = $::CONN->{anim}[$self->{anim}]; + + $face = $anim->[ $self->{frame} % @$anim ] + if $anim && @$anim; + } + + my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; - # TODO animation if ($tex) { glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; @@ -2489,84 +2704,13 @@ } } -############################################################################# - -package CFClient::UI::InventoryItem; - -our @ISA = CFClient::UI::HBox::; - -sub new { - my $class = shift; - - my %args = @_; - - my $item = delete $args{item}; - - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; - - $item->{flags} & Crossfire::Protocol::F_OPEN - and $desc .= " (open)"; - $item->{flags} & Crossfire::Protocol::F_APPLIED - and $desc .= " (applied)"; - $item->{flags} & Crossfire::Protocol::F_UNPAID - and $desc .= " (unpaid)"; - $item->{flags} & Crossfire::Protocol::F_MAGIC - and $desc .= " (magic)"; - $item->{flags} & Crossfire::Protocol::F_CURSED - and $desc .= " (cursed)"; - $item->{flags} & Crossfire::Protocol::F_DAMNED - and $desc .= " (damned)"; - $item->{flags} & Crossfire::Protocol::F_LOCKED - and $desc .= " *"; - - my $self = $class->SUPER::new ( - can_hover => 1, - can_events => 1, - tooltip => (CFClient::UI::Label->escape ($desc) - . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"), - connect_button_down => sub { - my ($self, $ev, $x, $y) = @_; - - # todo: maybe put examine on 1? but should just be a tooltip :( - if ($ev->{button} == 1) { - $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); - } elsif ($ev->{button} == 2) { - $::CONN->send ("apply $item->{tag}"); - } elsif ($ev->{button} == 3) { - my @menu_items = ( - ["examine", sub { $::CONN->send ("examine $item->{tag}") }], - ["mark", sub { $::CONN->send ("mark $item->{tag}") }], - ["apply", sub { $::CONN->send ("apply $item->{tag}") }], - ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], - [ - $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", - sub { $::CONN->send ("lock ". () ."$item->{tag}") }, - ], - ); - - CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); - } - - 1 - }, - %args - ); +sub DESTROY { + my ($self) = @_; - $self->add (new CFClient::UI::Face - can_events => 0, - face => $item->{face}, - anim => $item->{anim}, - animspeed => $item->{animspeed}, - ); + $self->{timer}->cancel + if $self->{timer}; - $self->add (new CFClient::UI::Label - can_events => 0, - text => $desc, - ); - - $self + $self->SUPER::DESTROY; } ############################################################################# @@ -2579,7 +2723,7 @@ my $class = shift; my $self = $class->SUPER::new ( - scrolled => (new CFClient::UI::VBox), + scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), @_, ); @@ -2599,15 +2743,16 @@ $self->{real_items} = \@items; + my $row = 0; for my $item (@items) { - my $desc = $item->{nrof} < 2 - ? $item->{name} - : "$item->{nrof} $item->{name_pl}"; + CFClient::Item::update_widgets $item; - $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; - } + $self->{scrolled}->add (0, $row, $item->{face_widget}); + $self->{scrolled}->add (1, $row, $item->{desc_widget}); + $self->{scrolled}->add (2, $row, $item->{weight_widget}); - $self->{scrolled}->add (@items); + $row++; + } # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; } @@ -2659,7 +2804,7 @@ sub popup { my ($self, $ev) = @_; - $self->emit ("popdown"); + $self->_emit ("popdown"); # maybe save $GRAB? must be careful about events... $GRAB = $self; @@ -2684,7 +2829,7 @@ undef $GRAB; $self->hide; - $self->emit ("popdown"); + $self->_emit ("popdown"); $self->{hover}[1]->() if $self->{hover}; } } @@ -2695,6 +2840,15 @@ our @ISA = CFClient::UI::VBox::; +sub new { + my $class = shift; + + $class->SUPER::new ( + fontsize => 0.8, + @_, + ) +} + sub reorder { my ($self) = @_; my $NOW = time; @@ -2723,8 +2877,6 @@ for ($short) { s/^\s+//; s/\s+/ /g; - my $len = int 40 / $item->{fontsize}; - substr $_, $len, length, "…" if $len < length; } new CFClient::UI::Label @@ -2732,7 +2884,8 @@ tooltip => $item->{tooltip}, tooltip_font => $::FONT_PROP, tooltip_width => 0.67, - fontsize => $item->{fontsize}, + fontsize => $item->{fontsize} || $self->{fontsize}, + max_w => $::WIDTH * 0.44, fg => $item->{fg}, can_events => 1, can_hover => 1 @@ -2749,6 +2902,8 @@ $text =~ s/^\s+//; $text =~ s/\s+$//; + return unless $text; + my $timeout = time + ((delete $arg{timeout}) || 60); my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; @@ -2769,7 +2924,6 @@ text => $text, timeout => $timeout, tooltip => $text, - fontsize => 0.8, fg => [0.8, 0.8, 0.8, 0.8], pri => 0, count => 1, @@ -2780,6 +2934,16 @@ $self->reorder; } +sub reconfigure { + my ($self) = @_; + + delete $_->{label} + for values %{ $self->{item} || {} }; + + $self->reorder; + $self->SUPER::reconfigure; +} + ############################################################################# package CFClient::UI::Root; @@ -2819,12 +2983,6 @@ sub size_allocate { my ($self, $w, $h) = @_; - my $old_w = $self->{old_w}; $self->{old_w} = $w; - my $old_h = $self->{old_h}; $self->{old_h} = $h; - - CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h - if $old_w && $old_h && ($old_w != $w || $old_h != $h); - for my $child ($self->children) { my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; @@ -2863,8 +3021,14 @@ sub add { my ($self, @children) = @_; + for (my @widgets = @children; my $w = pop @widgets; ) { + push @widgets, $w->children; + $w->{root} = $self; + $w->{visible} = 1; + } + for my $child (@children) { - $child->{toplevel} = 1; + $child->{is_toplevel} = 1; # integerise window positions $child->{x} = int $child->{x}; @@ -2874,6 +3038,18 @@ $self->SUPER::add (@children); } +sub remove { + my ($self, @children) = @_; + + $self->SUPER::remove (@children); + + while (@children) { + my $w = pop @children; + push @children, $w->children; + $w->set_invisible; + } +} + sub on_refresh { my ($self, $id, $cb) = @_; @@ -2934,7 +3110,6 @@ $widget->{w} = $w; $widget->{h} = $h; - $widget->size_allocate ($w, $h); $widget->emit (size_allocate => $w, $h); } } @@ -2950,7 +3125,7 @@ glMatrixMode GL_PROJECTION; glLoadIdentity; - glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; glMatrixMode GL_MODELVIEW; glLoadIdentity; @@ -2962,7 +3137,7 @@ package CFClient::UI; $ROOT = new CFClient::UI::Root; -$TOOLTIP = new CFClient::UI::Tooltip; +$TOOLTIP = new CFClient::UI::Tooltip z => 900; 1