--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/22 23:11:32 1.149 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/03 19:56:05 1.184 @@ -10,15 +10,52 @@ our ($FOCUS, $HOVER, $GRAB); # various widgets our $ROOT; +our $TOOLTIP; our $BUTTON_STATE; +sub check_tooltip { + if (!$GRAB) { + for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { + if (length $widget->{tooltip}) { + + if ($TOOLTIP->{owner} != $widget) { + $TOOLTIP->{owner} = $widget; + + my $tip = $widget->{tooltip}; + + $tip = $tip->($widget) if CODE:: eq ref $tip; + + $TOOLTIP->set_markup ($widget->{tooltip}); + + $TOOLTIP->show; + + my ($x, $y) = $widget->coord2global ($widget->{w}, 0); + + if ($x + $TOOLTIP->{w} > $::WIDTH) { + ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); + } + + $TOOLTIP->move ($x, $y); + } + + return; + } + } + } + + $TOOLTIP->hide; + delete $TOOLTIP->{owner}; +} + # class methods for events sub feed_sdl_key_down_event { - $FOCUS->key_down ($_[0]) if $FOCUS; + $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) + if $FOCUS; } sub feed_sdl_key_up_event { - $FOCUS->key_up ($_[0]) if $FOCUS; + $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) + if $FOCUS; } sub feed_sdl_button_down_event { @@ -30,11 +67,16 @@ $GRAB = $widget; $GRAB->update if $GRAB; + + check_tooltip; } $BUTTON_STATE |= 1 << ($ev->{button} - 1); - $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; + if ($GRAB) { + ($x, $y) = $GRAB->coord2local ($x, $y); + $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); + } } sub feed_sdl_button_up_event { @@ -45,12 +87,17 @@ $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); - $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; + if ($GRAB) { + ($x, $y) = $GRAB->coord2local ($x, $y); + $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); + } if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; $GRAB->update if $GRAB; + + check_tooltip; } } @@ -65,9 +112,14 @@ $hover->update if $hover && $hover->{can_hover}; $HOVER->update if $HOVER && $HOVER->{can_hover}; + + check_tooltip; } - $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; + if ($HOVER) { + ($x, $y) = $HOVER->coord2local ($x, $y); + $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); + } } # convert position array to integers @@ -95,9 +147,10 @@ my $class = shift; my $self = bless { - x => 0, - y => 0, - z => 0, + x => 0, + y => 0, + z => 0, + can_events => 1, @_ }, $class; @@ -110,6 +163,13 @@ $self } +sub destroy { + my ($self) = @_; + + $self->hide; + %$self = (); +} + sub show { my ($self) = @_; @@ -121,9 +181,11 @@ sub hide { my ($self) = @_; - return unless $self->{parent}; + undef $GRAB if $GRAB == $self; + undef $HOVER if $HOVER == $self; - $self->{parent}->remove ($self); + $self->{parent}->remove ($self) + if $self->{parent}; } sub move { @@ -136,8 +198,13 @@ $self->update; } -sub needs_redraw { - 0 +sub set_size { + my ($self, $w, $h) = @_; + + $self->{user_w} = $w; + $self->{user_h} = $h; + + $self->check_size; } sub size_request { @@ -172,6 +239,7 @@ $self->size_allocate ($w, $h); $self->update; + $self->emit (size_allocate => $w, $h); } } @@ -179,10 +247,33 @@ # nothing to be done } +sub children { +} + +# call when resolution changes etc. +sub reconfigure { + my ($self) = @_; + + $_->reconfigure + for $self->children; + + $_->check_size; +} + +sub set_max_size { + my ($self, $w, $h) = @_; + + delete $self->{max_w}; $self->{max_w} = $w if $w; + delete $self->{max_h}; $self->{max_h} = $h if $h; +} + # return top left coordinates sub _topleft { my ($self, $x, $y) = @_; + $self->{parent} + or Carp::confess "no parent widget in _topleft\n";#d# + $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); } @@ -269,6 +360,20 @@ glEnd; glDisable GL_BLEND; } + + if ($ENV{PCLIENT_DEBUG}) { + glPushMatrix; + glColor 1, 1, 0, 1; + glTranslate $self->{x} + 0.375, $self->{y} + 0.375; + glBegin GL_LINE_LOOP; + glVertex 0 , 0; + glVertex $self->{w}, 0; + glVertex $self->{w}, $self->{h}; + glVertex 0 , $self->{h}; + glEnd; + glPopMatrix; + CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; + } } sub _draw { @@ -280,6 +385,8 @@ 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}; @@ -296,15 +403,26 @@ sub check_size { my ($self) = @_; - return unless $self->{parent}; + $self->{parent} + or return 1; - my ($w, $h) = $self->size_request; + my ($w, $h) = $self->{user_w} && $self->{user_h} + ? @$self{qw(user_w user_h)} + : $self->size_request; - if ($w != $self->{req_w} || $h != $self->{req_h}) { + if ($w != $self->{req_w} || $h != $self->{req_h}) { $self->{req_w} = $w; $self->{req_h} = $h; - $self->{parent}->check_size; + $self->{parent}->check_size + or $self->size_allocate ( + (List::Util::max $self->{w}, $w), + (List::Util::max $self->{h}, $h), + ); + + 1 + } else { + 0 } } @@ -324,9 +442,7 @@ sub emit { my ($self, $signal, @args) = @_; - for my $cb (@{$self->{signal_cb}{$signal} || []}) { - $cb->($self, @args); - } + List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} } sub DESTROY { @@ -381,6 +497,11 @@ our @ISA = CFClient::UI::Base::; +sub new { + my ($class, %arg) = @_; + $class->SUPER::new (can_events => 0, %arg); +} + sub size_request { (0, 0) } @@ -398,7 +519,11 @@ my $children = delete $arg{children} || []; - my $self = $class->SUPER::new (children => [], %arg); + my $self = $class->SUPER::new ( + children => [], + can_events => 0, + %arg, + ); $self->add ($_) for @$children; $self @@ -417,16 +542,38 @@ ]; $child->check_size; + $self->update; +} + +sub children { + @{ $_[0]{children} } } sub remove { my ($self, $child) = @_; delete $child->{parent}; + $child->hide; $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; $self->check_size; + $self->update; +} + +sub clear { + my ($self) = @_; + + my $children = delete $self->{children}; + $self->{children} = []; + + for (@$children) { + delete $_->{parent}; + $_->hide; + } + + $self->check_size; + $self->update; } sub find_widget { @@ -511,27 +658,37 @@ sub update { my ($self) = @_; - # we want to do this delayed... - $self->render_chld; + $ROOT->on_refresh ($self => sub { $self->render_child }); $self->SUPER::update; } -sub render_chld { - my ($self) = @_; +sub size_allocate { + my ($self, $w, $h) = @_; - $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { - glClearColor 0, 0, 0, 1; - glClear GL_COLOR_BUFFER_BIT; - $self->child->draw; - }; + $self->SUPER::size_allocate ($w, $h); + $self->update; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub _render { + $_[0]{children}[0]->draw; +} - $self->child->configure (0, 0, $w, $h); +sub render_child { + my ($self) = @_; - $self->render_chld; + $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 0; + 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; + }; } sub _draw { @@ -543,9 +700,10 @@ or return; glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glColor 0, 0, 0, 1; $tex->draw_quad (0, 0, $w, $h); @@ -559,23 +717,91 @@ our @ISA = CFClient::UI::Window::; -sub new { die } - sub size_request { my ($self) = @_; @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; - $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); + $self->child->configure (0, 0, @$self{qw(child_w child_h)}); @$self{qw(child_w child_h)} } -sub _draw { +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->update; +} + +sub set_offset { + my ($self, $x, $y) = @_; + + $self->{view_x} = int $x; + $self->{view_y} = int $y; + + $self->update; +} + +# hmm, this does not work for topleft of $self... but we should not aks for that +sub _topleft { + my ($self, $x, $y) = @_; + + $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) +} + +sub find_widget { + my ($self, $x, $y) = @_; + + 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}) + } else { + $self->CFClient::UI::Base::find_widget ($x, $y) + } +} + +sub _render { my ($self) = @_; - $self->{children}[1]->draw; + CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; + + $self->SUPER::_render; +} + +############################################################################# + +package CFClient::UI::ScrolledWindow; + +our @ISA = CFClient::UI::HBox::; + +sub new { + my $class = shift; + + my $self; + + my $slider = new CFClient::UI::Slider + vertical => 1, + range => [0, 0, 1, 0.01], # HACK fix + connect_changed => sub { + $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); + }, + ; + + $self = $class->SUPER::new ( + vp => (new CFClient::UI::ViewPort), + slider => $slider, + @_, + ); + + $self->{vp}->add ($self->{scrolled}); + $self->add ($self->{vp}); + $self->add ($self->{slider}); + + $self } +#TODO# update range on size_allocate depeneing on child +# update viewport offset on scroll ############################################################################# @@ -598,25 +824,6 @@ $self } -sub set_size { - my ($self, $w, $h) = @_; - $self->{req_w} = $w; - $self->{req_h} = $h; - $self->check_size; -} - -sub size_request { - my ($self) = @_; - ($self->{req_w}, $self->{req_h}) -} - -sub size_allocate { - my ($self, $w, $h) = @_; - $self->{w} = $w; - $self->{h} = $h; - $self->child->configure (0, 0, $w, $h); -} - sub _draw { my ($self) = @_; @@ -659,9 +866,10 @@ # 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.8, + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + can_events => 1, @_ ); @@ -669,7 +877,7 @@ align => 0, valign => 1, text => $self->{title}, - fontsize => 1; + fontsize => $self->{border}; $self } @@ -681,8 +889,6 @@ sub size_request { my ($self) = @_; - return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; - my ($w, $h) = $self->SUPER::size_request; ( @@ -706,27 +912,33 @@ sub button_down { my ($self, $ev, $x, $y) = @_; + my ($w, $h) = @$self{qw(w h)}; my $border = $self->border; - if ($x < $self->{w} && $x >= $self->{w} - $border - && $y < $self->{h} && $y >= $self->{h} - $border) { + my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); + my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); + if ($lr & $td) { + my ($wx, $wy) = ($self->{x}, $self->{y}); my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($self->{w}, $self->{h}); + my $mx = $x < $border; + my $my = $y < $border; + $self->{motion} = sub { my ($ev, $x, $y) = @_; - ($x, $y) = ($ev->{x}, $ev->{y}); + my $dx = $ev->{x} - $ox; + my $dy = $ev->{y} - $oy; - $self->{user_w} = $bw + $x - $ox; - $self->{user_h} = $bh + $y - $oy; + $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); + $self->{user_h} = $bh + $dy * ($my ? -1 : 1); + $self->move ($wx + $dx * $mx, $wy + $dy * $my); $self->check_size; }; - } elsif ($x >= 0 && $x < $self->{w} - && $y >= 0 && $y < $border) { - + } elsif ($lr ^ $td) { my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bx, $by) = ($self->{x}, $self->{y}); @@ -772,23 +984,26 @@ $tex[2]->draw_quad ($w - $border, $border, $border, $ch); $tex[4]->draw_quad (0, $h - $border, $w, $border); - my $bg = $tex[0]; + if (@{$self->{bg}} < 4 || $self->{bg}[3]) { + my $bg = $tex[0]; - # TODO: repeat texture not scale - my $rep_x = $cw / $bg->{w}; - my $rep_y = $ch / $bg->{h}; - - glColor @{ $self->{bg} }; - - $bg->{s} = $rep_x; - $bg->{t} = $rep_y; - $bg->{wrap_mode} = 1; - $bg->draw_quad ($border, $border, $cw, $ch); + # TODO: repeat texture not scale + my $rep_x = $cw / $bg->{w}; + my $rep_y = $ch / $bg->{h}; + + glColor @{ $self->{bg} }; + + $bg->{s} = $rep_x; + $bg->{t} = $rep_y; + $bg->{wrap_mode} = 1; + $bg->draw_quad ($border, $border, $cw, $ch); - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } $self->{title}->draw if $self->{title}; + $self->child->draw; } @@ -820,11 +1035,22 @@ $child->check_size; } +sub children { + grep $_, map @$_, grep $_, @{ $_[0]{children} } +} + # TODO: move to container class maybe? send childs a signal on removal? sub clear { my ($self) = @_; + my @children = $self->children; delete $self->{children}; + + for (@children) { + delete $_->{parent}; + $_->hide; + } + $self->update; } @@ -1057,13 +1283,15 @@ my ($class, %arg) = @_; my $self = $class->SUPER::new ( - fg => [1, 1, 1], - fontsize => 1, - text => "", - align => -1, - valign => -1, - padding => 2, - layout => new CFClient::Layout, + fg => [1, 1, 1], + #font => default_font + fontsize => 1, + text => "", + align => -1, + valign => -1, + padding => 2, + layout => new CFClient::Layout, + can_events => 0, %arg ); @@ -1079,7 +1307,7 @@ $self } -sub escape_text { +sub escape { local $_ = $_[1]; s/&/&/g; @@ -1089,35 +1317,56 @@ $_[1] } +sub update { + my ($self) = @_; + + delete $self->{texture}; + $self->SUPER::update; +} + +sub reconfigure { + my ($self) = @_; + + delete $self->{texture}; +} + sub set_text { my ($self, $text) = @_; + return if $self->{text} eq "T$text"; + $self->{text} = "T$text"; + $self->{layout}->set_text ($text); delete $self->{texture}; - $self->check_size; $self->update; + $self->check_size; } sub set_markup { my ($self, $markup) = @_; + return if $self->{text} eq "M$markup"; + $self->{text} = "M$markup"; + $self->{layout}->set_markup ($markup); delete $self->{texture}; - $self->check_size; $self->update; + $self->check_size; } sub size_request { my ($self) = @_; - $self->{layout}->set_width; + $self->{layout}->set_font ($self->{font}) if $self->{font}; + $self->{layout}->set_width ($self->{max_w} || -1); $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w, $h) = $self->{layout}->size; if (exists $self->{template}) { + $self->{template}->set_font ($self->{font}) if $self->{font}; $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); my ($w2, $h2) = $self->{template}->size; @@ -1142,13 +1391,16 @@ my ($self, $fontsize) = @_; $self->{fontsize} = $fontsize; + delete $self->{texture}; $self->check_size; + $self->update; } sub _draw { my ($self) = @_; my $tex = $self->{texture} ||= do { + $self->{layout}->set_font ($self->{font}) if $self->{font}; $self->{layout}->set_width ($self->{w}); $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); new_from_layout CFClient::Texture $self->{layout} @@ -1191,13 +1443,14 @@ my $class = shift; $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], - can_hover => 1, - can_focus => 1, - valign => 0, + fg => [1, 1, 1], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + active_fg => [0, 0, 0], + can_hover => 1, + can_focus => 1, + valign => 0, + can_events => 1, @_ ) } @@ -1360,9 +1613,35 @@ my $sym = $ev->{sym}; if ($sym == 13) { - $self->emit (activate => $self->get_text); + unshift @{$self->{history}}, + my $txt = $self->get_text; + $self->{history_pointer} = -1; + $self->{history_saveback} = ''; + $self->emit (activate => $txt); $self->update; + } elsif ($sym == CFClient::SDLK_UP) { + if ($self->{history_pointer} < 0) { + $self->{history_saveback} = $self->get_text; + } + if (@{$self->{history} || []} > 0) { + $self->{history_pointer}++; + if ($self->{history_pointer} >= @{$self->{history} || []}) { + $self->{history_pointer} = @{$self->{history} || []} - 1; + } + $self->set_text ($self->{history}->[$self->{history_pointer}]); + } + + } elsif ($sym == CFClient::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}); + } + } else { $self->SUPER::key_down ($ev); } @@ -1385,13 +1664,14 @@ my $class = shift; $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, - valign => 0, + padding => 4, + fg => [1, 1, 1], + bg => [1, 1, 1, 0.2], + active_fg => [0, 0, 1], + can_hover => 1, + align => 0, + valign => 0, + can_events => 1, @_ ) } @@ -1506,7 +1786,7 @@ sub new { my $class = shift; - my $self = $class->SUPER::new (@_); + my $self = $class->SUPER::new (can_events => 0, @_); $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; @@ -1559,6 +1839,8 @@ our @ISA = CFClient::UI::Base::; +use List::Util qw(min max); + use CFClient::OpenGL; my %tex = ( @@ -1568,7 +1850,7 @@ ], grace => [ map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ + qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ ], hp => [ map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } @@ -1576,7 +1858,7 @@ ], mana => [ map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } - qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ + qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ ], ); @@ -1605,7 +1887,10 @@ sub set_max { my ($self, $max) = @_; + return if $self->{max_val} == $max; + $self->{max_val} = $max; + $self->update; } sub set_value { @@ -1614,9 +1899,9 @@ $self->set_max ($max) if defined $max; - $max = $self->{max_val}; - $self->{val} = $val; + return if $self->{val} == $val; + $self->{val} = $val; $self->update; } @@ -1624,6 +1909,7 @@ my ($self) = @_; my $tex = $tex{$self->{type}}; + my ($t1, $t2, $t3) = @$tex; my ($w, $h) = ($self->{w}, $self->{h}); @@ -1635,35 +1921,45 @@ } my $ycut = $self->{val} / ($self->{max_val} || 1); - $ycut = 1 if $self->{val} > $self->{max_val}; - my $t1 = $tex->[0]; - my $t2 = $tex->[1]; + my $ycut1 = max 0, min 1, $ycut; + my $ycut2 = max 0, min 1, $ycut - 1; + + my $h1 = $self->{h} * (1 - $ycut1); + my $h2 = $self->{h} * (1 - $ycut2); glEnable GL_BLEND; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - my $h1 = $self->{h} - $ycut * $self->{h}; - my $h2 = $ycut * $self->{h}; - glBindTexture GL_TEXTURE_2D, $t1->{name}; glBegin GL_QUADS; - glTexCoord 0 , 0; glVertex 0 , 0; - glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; - glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; - glTexCoord $t1->{s}, 0; glVertex $w, 0; + glTexCoord 0 , 0; glVertex 0 , 0; + glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1; + glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1; + glTexCoord $t1->{s}, 0; glVertex $w, 0; glEnd; + my $ycut1 = List::Util::min 1, $ycut; glBindTexture GL_TEXTURE_2D, $t2->{name}; glBegin GL_QUADS; - glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; - glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; - glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; - glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; + glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1; + glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2; + glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2; + glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1; glEnd; + if ($t3) { + glBindTexture GL_TEXTURE_2D, $t3->{name}; + glBegin GL_QUADS; + glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; + glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; + glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; + glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; + glEnd; + } + glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } @@ -1675,15 +1971,18 @@ our @ISA = CFClient::UI::VBox::; sub new { - my ($class, %arg) = shift; + my ($class, %arg) = @_; my $self = $class->SUPER::new ( - @_, + tooltip => $arg{type}, + can_hover => 1, + can_events => 1, + %arg, ); - $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); - $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); - $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); + $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); + $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); + $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); $self } @@ -1695,6 +1994,13 @@ $self->{max} ->set_fontsize ($fsize); } +sub set_max { + my ($self, $max) = @_; + + $self->{gauge}->set_max ($max); + $self->{max}->set_text ($max); +} + sub set_value { my ($self, $val, $max) = @_; @@ -1705,13 +2011,6 @@ $self->{value}->set_text ($val); } -sub set_max { - my ($self, $max) = @_; - - $self->{gauge}->set_max ($max); - $self->{max}->set_text ($max); -} - ############################################################################# package CFClient::UI::Slider; @@ -1738,8 +2037,8 @@ fg => [1, 1, 1], active_fg => [0, 0, 0], range => [0, 0, 100, 10], - req_w => 20, - req_h => 20, + req_w => $::WIDTH / 80, + req_h => $::WIDTH / 80, vertical => 0, can_hover => 1, inner_pad => 5, @@ -1859,21 +2158,21 @@ my $class = shift; my $self = $class->SUPER::new ( - fontsize => 1, + fontsize => 1, + can_events => 0, + #font => default_font @_, - - layout => (new CFClient::Layout), - par => [], - height => 0, - children => [ + + layout => (new CFClient::Layout), + par => [], + height => 0, + children => [ (new CFClient::UI::Empty expand => 1), (new CFClient::UI::Slider vertical => 1), ], ); - $self->{children}[1]->connect (changed => sub { - $self->update; - }); + $self->{children}[1]->connect (changed => sub { $self->update }); $self } @@ -1891,7 +2190,7 @@ my $layout = $self->{layout}; $layout->set_height ($self->{fontsize} * $::FONTSIZE); - $layout->set_width ($self->{w}); + $layout->set_width ($self->{children}[0]{w}); $layout->set_text ($text); ($layout->size)[1] @@ -1909,6 +2208,7 @@ $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}); @@ -1953,8 +2253,8 @@ delete $self->{texture}; } - $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { - glClearColor 0, 0, 0, 1; + $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { + glClearColor 0, 0, 0, 0; glClear GL_COLOR_BUFFER_BIT; glEnable GL_BLEND; @@ -1971,6 +2271,8 @@ my $layout = $self->{layout}; + $layout->set_font ($self->{font}) if $self->{font}; + for my $par (@{$self->{par}}) { my $h = $par->[0]; @@ -1994,12 +2296,14 @@ sub _draw { my ($self) = @_; - if ($self->{texture}) { - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); - glDisable GL_TEXTURE_2D; - } + glEnable GL_BLEND; + glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glColor 1, 1, 1, 1; + $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; $self->{children}[1]->draw; @@ -2057,7 +2361,7 @@ my $class = shift; my $self = $class->SUPER::new ( - state => 0, + state => 0, connect_activate => \&toggle_flopper, @_ ); @@ -2088,6 +2392,188 @@ ############################################################################# +package CFClient::UI::Tooltip; + +our @ISA = CFClient::UI::Bin::; + +use CFClient::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + @_, + can_events => 0, + ) +} + +sub set_markup { + my ($self, $text) = @_; + + $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; + $self->{label}->set_markup ($text); + $self->add ($self->{label}); +} + +sub size_request { + my ($self) = @_; + + $self->child->set_max_size ($::WIDTH * 0.3); + + my ($w, $h) = @{$self->child}{qw(req_w req_h)}; + + ($w + 4, $h + 4) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w - 4, $h - 4); +} + +sub _draw { + my ($self) = @_; + + glPushMatrix; + 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; + + glPopMatrix; + + glTranslate 2, 2; + $self->SUPER::_draw; +} + +############################################################################# + +package CFClient::UI::Face; + +our @ISA = CFClient::UI::Base::; + +use CFClient::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + aspect => 1, + @_, + ) +} + +sub size_request { + (32, 8) +} + +sub _draw { + my ($self) = @_; + + my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; + + # TODO animation + if ($tex) { + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glColor 1, 1, 1, 1; + $tex->draw_quad (0, 0, $self->{w}, $self->{h}); + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } +} + +############################################################################# + +package CFClient::UI::Menu; + +our @ISA = CFClient::UI::FancyFrame::; + +use CFClient::OpenGL; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + items => [], + z => 100, + @_, + ); + + $self->add ($self->{vbox} = new CFClient::UI::VBox); + + for my $item (@{ $self->{items} }) { + my ($widget, $cb) = @$item; + + # handle various types of items, only text for now + if (!ref $widget) { + $widget = new CFClient::UI::Label + can_hover => 1, + can_events => 1, + text => $widget; + } + + $self->{item}{$widget} = $item; + + $self->{vbox}->add ($widget); + } + + $self +} + +# popup given the event (must be a mouse button down event currently) +sub popup { + my ($self, $ev) = @_; + + $self->emit ("popdown"); + + # maybe save $GRAB? must be careful about events... + $GRAB = $self; + $self->{button} = $ev->{button}; + + $self->show; + $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); +} + +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; + + # TODO: should use vbox->find_widget or so + $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); + $self->{hover} = $self->{item}{$HOVER}; +} + +sub button_up { + my ($self, $ev, $x, $y) = @_; + + if ($ev->{button} == $self->{button}) { + undef $GRAB; + $self->hide; + + $self->emit ("popdown"); + $self->{hover}[1]->() if $self->{hover}; + } +} + +############################################################################# + package CFClient::UI::Root; our @ISA = CFClient::UI::Container::; @@ -2169,9 +2655,115 @@ ############################################################################# +package CFClient::UI::InventoryItem; + +our @ISA = CFClient::UI::HBox::; + +sub new { + my $class = shift; + + my %args = @_; + + my $item = $args{item}; + + my $desc = $item->{nrof} < 2 + ? $item->{name} + : "$item->{nrof} $item->{name_pl}"; + + + my $self = $class->SUPER::new ( + can_hover => 1, + can_events => 1, + tooltip => (CFClient::UI::Label->escape ($desc) + . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"), + connect_button_down => sub { + my ($self, $ev, $x, $y) = @_; + + # todo: maybe put examine on 1? but should just be a tooltip :( + if ($ev->{button} == 1) { + $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); + } elsif ($ev->{button} == 2) { + $::CONN->send ("apply $item->{tag}"); + } elsif ($ev->{button} == 3) { + CFClient::UI::Menu->new ( + items => [ + ["examine", sub { $::CONN->send ("examine $item->{tag}") }], + [ + $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", + sub { $::CONN->send ("lock $item->{tag}") }, + ], + ["mark", sub { $::CONN->send ("mark $item->{tag}") }], + ["apply", sub { $::CONN->send ("apply $item->{tag}") }], + ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], + ], + )->popup ($ev); + } + + 1 + }, + %args + ); + $self->add(new CFClient::UI::Face + can_events => 0, + face => $item->{face}, + anim => $item->{anim}, + animspeed => $item->{animspeed}); + $self->add(new CFClient::UI::Label + can_events => 0, + text => $desc); + + $self +} + +############################################################################# + +package CFClient::UI::Inventory; + +our @ISA = CFClient::UI::ScrolledWindow::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + scrolled => (new CFClient::UI::VBox), + @_, + ); + + $self +} + +sub set_items { + my ($self, $items) = @_; + + $self->{scrolled}->clear; + return unless $items; + + my @items = sort { $a->{type} <=> $b->{type} } @$items; + + $self->{real_items} = \@items; + + for my $item (@items) { + my $desc = $item->{nrof} < 2 + ? $item->{name} + : "$item->{nrof} $item->{name_pl}"; + + $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); + } + +# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; +} + +sub size_request { + my ($self) = @_; + ($self->{req_w}, $self->{req_h}); +} + +############################################################################# + package CFClient::UI; $ROOT = new CFClient::UI::Root; +$TOOLTIP = new CFClient::UI::Tooltip; 1