--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/18 01:51:06 1.130 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/05/03 19:56:05 1.184 @@ -10,53 +10,100 @@ 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 { my ($ev) = @_; - my ($x, $y) = ($ev->motion_x, $ev->motion_y); + my ($x, $y) = ($ev->{x}, $ev->{y}); if (!$BUTTON_STATE) { my $widget = $ROOT->find_widget ($x, $y); $GRAB = $widget; $GRAB->update if $GRAB; + + check_tooltip; } - $BUTTON_STATE |= 1 << ($ev->button - 1); + $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 { my ($ev) = @_; - my ($x, $y) = ($ev->motion_x, $ev->motion_y); + my ($x, $y) = ($ev->{x}, $ev->{y}); my $widget = $GRAB || $ROOT->find_widget ($x, $y); - $BUTTON_STATE &= ~(1 << ($ev->button - 1)); + $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; } } sub feed_sdl_motion_event { my ($ev) = @_; - my ($x, $y) = ($ev->motion_x, $ev->motion_y); + my ($x, $y) = ($ev->{x}, $ev->{y}); my $widget = $GRAB || $ROOT->find_widget ($x, $y); @@ -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 @@ -89,17 +141,16 @@ use strict; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my $class = shift; my $self = bless { - x => 0, - y => 0, - z => 0, - w => -1, - h => -1, + x => 0, + y => 0, + z => 0, + can_events => 1, @_ }, $class; @@ -112,6 +163,31 @@ $self } +sub destroy { + my ($self) = @_; + + $self->hide; + %$self = (); +} + +sub show { + my ($self) = @_; + + return if $self->{parent}; + + $CFClient::UI::ROOT->add ($self); +} + +sub hide { + my ($self) = @_; + + undef $GRAB if $GRAB == $self; + undef $HOVER if $HOVER == $self; + + $self->{parent}->remove ($self) + if $self->{parent}; +} + sub move { my ($self, $x, $y, $z) = @_; @@ -122,37 +198,82 @@ $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 { require Carp; - Carp::confess "size_request is abtract"; + Carp::confess "size_request is abstract"; } sub configure { my ($self, $x, $y, $w, $h) = @_; - $self->{x} = $x; - $self->{y} = $y; + if ($self->{aspect}) { + my $w2 = List::Util::min $w, int $h * $self->{aspect}; + my $h2 = List::Util::min $h, int $w / $self->{aspect}; - return unless $self->{w} != $w || $self->{h} != $h; + # use alignment to adjust x, y - $self->{w} = $w; - $self->{h} = $h; + $x += int +($w - $w2) * 0.5; + $y += int +($h - $h2) * 0.5; - $self->size_allocate ($w, $h); + ($w, $h) = ($w2, $h2); + } + + if ($self->{x} != $x || $self->{y} != $y) { + $self->{x} = $x; + $self->{y} = $y; + $self->update; + } + + if ($self->{w} != $w || $self->{h} != $h) { + $self->{w} = $w; + $self->{h} = $h; + + $self->size_allocate ($w, $h); + $self->update; + $self->emit (size_allocate => $w, $h); + } } sub size_allocate { # 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}); } @@ -239,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 { @@ -250,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}; @@ -266,17 +403,26 @@ sub check_size { my ($self) = @_; - my ($w, $h) = $self->size_request; + $self->{parent} + or return 1; + + 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 - if $self->{parent}; + or $self->size_allocate ( + (List::Util::max $self->{w}, $w), + (List::Util::max $self->{h}, $h), + ); - $self->size_allocate ($w, $h); - $self->update; + 1 + } else { + 0 } } @@ -290,14 +436,13 @@ sub connect { my ($self, $signal, $cb) = @_; - push @{ $self->{cb}{$signal} }, $cb; + push @{ $self->{signal_cb}{$signal} }, $cb; } sub emit { my ($self, $signal, @args) = @_; - $_->($self, @args) - for @{$self->{cb}{$signal} || []}; + List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} } sub DESTROY { @@ -313,7 +458,7 @@ our @ISA = CFClient::UI::Base::; use strict; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my $class = shift; @@ -352,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) } @@ -369,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 @@ -387,17 +541,39 @@ @{$self->{children}}, $child ]; - $self->{w} = $self->{h} = -1; - $child->check_size; + $self->update; +} + +sub children { + @{ $_[0]{children} } } sub remove { - my ($self, $widget) = @_; + my ($self, $child) = @_; + + delete $child->{parent}; + $child->hide; - $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; + $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 { @@ -437,11 +613,11 @@ } sub add { - my ($self, $widget) = @_; + my ($self, $child) = @_; $self->{children} = []; - $self->SUPER::add ($widget); + $self->SUPER::add ($child); } sub remove { @@ -471,7 +647,7 @@ our @ISA = CFClient::UI::Bin::; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my ($class, %arg) = @_; @@ -482,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; +} + +sub render_child { + my ($self) = @_; - $self->child->configure (0, 0, $w, $h); + $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 0; + glClear GL_COLOR_BUFFER_BIT; - $self->render_chld; + $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 { @@ -514,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); @@ -530,23 +717,91 @@ our @ISA = CFClient::UI::Window::; -sub new { die } - sub size_request { my ($self) = @_; - @$self{qw(child_w child_h)} = $self->child->size_request; - $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); + @$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)} } -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 ############################################################################# @@ -554,40 +809,43 @@ our @ISA = CFClient::UI::Bin::; -use SDL::OpenGL; +use CFClient::OpenGL; -sub size_request { - my ($self) = @_; - my $chld = $self->child - or return (0, 0); - - $chld->move (2, 2); +sub new { + my $class = shift; - map { $_ + 4 } $chld->size_request; -} + my $self = $class->SUPER::new ( + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.8, + @_ + ); -sub size_allocate { - my ($self, $x, $y, $w, $h) = @_; - - $self->child->configure (2, 2, $w - 4, $h - 4); + $self } sub _draw { my ($self) = @_; - my $chld = $self->child; + my ($w, $h) = ($self->{w}, $self->{h}); - my ($w, $h) = $chld->size_request; + 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; + +# glBegin GL_QUADS; +# glColor 0, 0, 0, 0; +# glVertex 0 , 0; +# glVertex 0 , $h; +# glVertex $w, $h; +# glVertex $w, 0; +# glEnd; - glBegin GL_QUADS; - glColor 0, 0, 0; - glVertex 0 , 0; - glVertex 0 , $h + 4; - glVertex $w + 4 , $h + 4; - glVertex $w + 4 , 0; - glEnd; - $chld->draw; + $self->child->draw; + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; } ############################################################################# @@ -596,10 +854,10 @@ our @ISA = CFClient::UI::Bin::; -use SDL::OpenGL; +use CFClient::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); sub new { @@ -607,65 +865,87 @@ # TODO: user_x, user_y, overwrite moveto? - $class->SUPER::new ( - bg => [1, 1, 1, 1], - border_bg => [1, 1, 1, 1], - border => int $::FONTSIZE * 0.8, + my $self = $class->SUPER::new ( + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => 0.6, + can_events => 1, @_ - ) + ); + + $self->{title} &&= new CFClient::UI::Label + align => 0, + valign => 1, + text => $self->{title}, + fontsize => $self->{border}; + + $self +} + +sub border { + int $_[0]{border} * $::FONTSIZE } 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; ( - $w + $self->{border} * 2, - $h + $self->{border} * 2, + $w + $self->border * 2, + $h + $self->border * 2, ) } sub size_allocate { my ($self, $w, $h) = @_; - $h -= List::Util::max 0, $self->{border} * 2; - $w -= List::Util::max 0, $self->{border} * 2; + $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) + if $self->{title}; - $self->child->configure ($self->{border}, $self->{border}, $w, $h); + $self->child->configure ($self->border, $self->border, $w, $h); } sub button_down { my ($self, $ev, $x, $y) = @_; - if ($x < $self->{w} && $x >= $self->{w} - $self->{border} - && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { + 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 ($ox, $oy) = ($ev->button_x, $ev->button_y); + 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->motion_x, $ev->motion_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 < $self->{border}) { - - my ($ox, $oy) = ($ev->button_x, $ev->button_y); + } elsif ($lr ^ $td) { + my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bx, $by) = ($self->{x}, $self->{y}); $self->{motion} = sub { my ($ev, $x, $y) = @_; - ($x, $y) = ($ev->motion_x, $ev->motion_y); + ($x, $y) = ($ev->{x}, $ev->{y}); $self->move ($bx + $x - $ox, $by + $y - $oy); $self->update; @@ -696,27 +976,33 @@ glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + my $border = $self->border; + glColor @{ $self->{border_bg} }; - $tex[1]->draw_quad (0, 0, $w, $self->{border}); - $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); - $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); - $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); - - 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 ($self->{border}, $self->{border}, $cw, $ch); + $tex[1]->draw_quad (0, 0, $w, $border); + $tex[3]->draw_quad (0, $border, $border, $ch); + $tex[2]->draw_quad ($w - $border, $border, $border, $ch); + $tex[4]->draw_quad (0, $h - $border, $w, $border); + + 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); - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } + + $self->{title}->draw if $self->{title}; $self->child->draw; } @@ -729,7 +1015,7 @@ use List::Util qw(max sum); -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my $class = shift; @@ -746,16 +1032,25 @@ $child->set_parent ($self); $self->{children}[$y][$x] = $child; - $self->{w} = $self->{h} = -1; - $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; } @@ -771,7 +1066,7 @@ for my $x (0 .. $#$row) { my $widget = $row->[$x] or next; - my ($w, $h) = $widget->size_request; + my ($w, $h) = @$widget{qw(req_w req_h)}; $w[$x] = max $w[$x], $w; $h[$y] = max $h[$y], $h; @@ -886,7 +1181,7 @@ my $children = $self->{children}; - my @h = map +($_->size_request)[0], @$children; + my @h = map $_->{req_w}, @$children; my $req_h = List::Util::sum @h; @@ -944,7 +1239,7 @@ my $children = $self->{children}; - my @h = map +($_->size_request)[1], @$children; + my @h = map $_->{req_h}, @$children; my $req_h = List::Util::sum @h; @@ -982,23 +1277,29 @@ our @ISA = CFClient::UI::Base::; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my ($class, %arg) = @_; my $self = $class->SUPER::new ( - fg => [1, 1, 1], - fontsize => $::FONTSIZE, - 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 ); - $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# + if (exists $self->{template}) { + my $layout = new CFClient::Layout; + $layout->set_text (delete $self->{template}); + $self->{template} = $layout; + } $self->set_text (delete $self->{text}) if exists $self->{text}; $self->set_markup (delete $self->{markup}) if exists $self->{markup}; @@ -1006,7 +1307,7 @@ $self } -sub escape_text { +sub escape { local $_ = $_[1]; s/&/&/g; @@ -1016,32 +1317,64 @@ $_[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->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->update; + $self->check_size; } sub size_request { my ($self) = @_; - $self->{layout}->set_width; - $self->{layout}->set_height ($self->{fontsize}); + $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; + + $w = List::Util::max $w, $w2; + $h = List::Util::max $h, $h2; + } + ( $w + $self->{padding} * 2, $h + $self->{padding} * 2, @@ -1054,19 +1387,22 @@ delete $self->{texture}; } -sub update { - my ($self) = @_; +sub set_fontsize { + my ($self, $fontsize) = @_; + $self->{fontsize} = $fontsize; delete $self->{texture}; - $self->SUPER::update; + $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}); + $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); new_from_layout CFClient::Texture $self->{layout} }; @@ -1101,20 +1437,20 @@ our @ISA = CFClient::UI::Label::; -use SDL; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { 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, @_ ) } @@ -1126,6 +1462,8 @@ return if $self->{text} eq $text; + delete $self->{texture}; + $self->{last_activity} = $::NOW; $self->{text} = $text; @@ -1150,7 +1488,7 @@ sub size_allocate { my ($self, $w, $h) = @_; - $self->_set_text ($self->{text}); + $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text } sub set_text { @@ -1164,26 +1502,25 @@ sub key_down { my ($self, $ev) = @_; - my $mod = $ev->key_mod; - my $sym = $ev->key_sym; - - my $uni = $ev->key_unicode; + my $mod = $ev->{mod}; + my $sym = $ev->{sym}; + my $uni = $ev->{unicode}; my $text = $self->get_text; - if ($sym == SDLK_BACKSPACE) { + if ($sym == 8) { substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; - } elsif ($sym == SDLK_DELETE) { + } elsif ($sym == 127) { substr $text, $self->{cursor}, 1, ""; - } elsif ($sym == SDLK_LEFT) { + } elsif ($sym == CFClient::SDLK_LEFT) { --$self->{cursor} if $self->{cursor}; - } elsif ($sym == SDLK_RIGHT) { + } elsif ($sym == CFClient::SDLK_RIGHT) { ++$self->{cursor} if $self->{cursor} < length $self->{text}; - } elsif ($sym == SDLK_HOME) { + } elsif ($sym == CFClient::SDLK_HOME) { $self->{cursor} = 0; - } elsif ($sym == SDLK_END) { + } elsif ($sym == CFClient::SDLK_END) { $self->{cursor} = length $text; - } elsif ($sym == SDLK_ESCAPE) { + } elsif ($sym == 27) { $self->emit ('escape'); } elsif ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; @@ -1268,18 +1605,43 @@ our @ISA = CFClient::UI::EntryBase::; -use SDL; -use SDL::OpenGL; +use CFClient::OpenGL; sub key_down { my ($self, $ev) = @_; - my $sym = $ev->key_sym; + my $sym = $ev->{sym}; - if ($sym == SDLK_RETURN) { - $self->emit (activate => $self->get_text); + if ($sym == 13) { + 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); } @@ -1292,24 +1654,24 @@ our @ISA = CFClient::UI::Label::; -use SDL; -use SDL::OpenGL; +use CFClient::OpenGL; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(b1_button_active.png); sub new { 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, @_ ) } @@ -1353,11 +1715,10 @@ our @ISA = CFClient::UI::DrawBG::; my @tex = - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw(c1_checkbox_bg.png c1_checkbox_active.png); -use SDL; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my $class = shift; @@ -1413,28 +1774,91 @@ ############################################################################# +package CFClient::UI::Image; + +our @ISA = CFClient::UI::Base::; + +use CFClient::OpenGL; +use Carp qw/confess/; + +our %loaded_images; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new (can_events => 0, @_); + + $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; + + $loaded_images{$self->{image}} ||= + new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; + + my $tex = $self->{tex} = $loaded_images{$self->{image}}; + + Scalar::Util::weaken $loaded_images{$self->{image}}; + + $self->{aspect} = $tex->{w} / $tex->{h}; + + $self +} + +sub size_request { + my ($self) = @_; + + ($self->{tex}->{w}, $self->{tex}->{h}) +} + +sub _draw { + my ($self) = @_; + + my $tex = $self->{tex}; + + my ($w, $h) = ($self->{w}, $self->{h}); + + if ($self->{rot90}) { + glRotate 90, 0, 0, 1; + glTranslate 0, -$self->{w}, 0; + + ($w, $h) = ($h, $w); + } + + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + $tex->draw_quad (0, 0, $w, $h); + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; +} + +############################################################################# + package CFClient::UI::VGauge; our @ISA = CFClient::UI::Base::; -use SDL::OpenGL; +use List::Util qw(min max); + +use CFClient::OpenGL; my %tex = ( food => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ ], grace => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } - qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ ], hp => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ ], mana => [ - map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } - qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } + qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ ], ); @@ -1442,7 +1866,12 @@ sub new { my $class = shift; - my $self = $class->SUPER::new (gauge => 'food', @_); + my $self = $class->SUPER::new ( + type => 'food', + @_ + ); + + $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h}; $self } @@ -1450,15 +1879,18 @@ sub size_request { my ($self) = @_; - my $tex = $tex{$self->{gauge}}[0]; - - @$tex{qw(w h)} + #my $tex = $tex{$self->{type}}[0]; + #@$tex{qw(w h)} + (0, 0) } sub set_max { my ($self, $max) = @_; + return if $self->{max_val} == $max; + $self->{max_val} = $max; + $self->update; } sub set_value { @@ -1467,52 +1899,66 @@ $self->set_max ($max) if defined $max; - $max = $self->{max_val}; - $self->{val} = $val; + return if $self->{val} == $val; + $self->{val} = $val; $self->update; } sub _draw { my ($self) = @_; - my $tex = $tex{$self->{gauge}}; + my $tex = $tex{$self->{type}}; + my ($t1, $t2, $t3) = @$tex; my ($w, $h) = ($self->{w}, $self->{h}); + if ($self->{vertical}) { + glRotate 90, 0, 0, 1; + glTranslate 0, -$self->{w}, 0; + + ($w, $h) = ($h, $w); + } + 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 - $ycut1); glVertex 0 , $h1; + glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1; + glTexCoord $t1->{s}, 0; glVertex $w, 0; + glEnd; - my $yp = 0; + my $ycut1 = List::Util::min 1, $ycut; + glBindTexture GL_TEXTURE_2D, $t2->{name}; + glBegin GL_QUADS; + 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; - glBindTexture (GL_TEXTURE_2D, $t1->{name}); - glBegin (GL_QUADS); - glTexCoord (0, 0); glVertex (0 , $yp); - glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1); - glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1); - glTexCoord (1, 0); glVertex (0 + $w, $yp); - glEnd (); - - $yp += $h1; - - glBindTexture (GL_TEXTURE_2D, $t2->{name}); - glBegin (GL_QUADS); - glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp); - glTexCoord (0, 1); glVertex (0 , $yp + $h2); - glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2); - glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp); - 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; @@ -1520,11 +1966,58 @@ ############################################################################# +package CFClient::UI::Gauge; + +our @ISA = CFClient::UI::VBox::; + +sub new { + 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, can_hover => 1); + $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); + + $self +} + +sub set_fontsize { + my ($self, $fsize) = @_; + + $self->{value}->set_fontsize ($fsize); + $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) = @_; + + $self->set_max ($max) + if defined $max; + + $self->{gauge}->set_value ($val, $max); + $self->{value}->set_text ($val); +} + +############################################################################# + package CFClient::UI::Slider; use strict; -use SDL::OpenGL; +use CFClient::OpenGL; our @ISA = CFClient::UI::DrawBG::; @@ -1544,8 +2037,8 @@ fg => [1, 1, 1], active_fg => [0, 0, 0], range => [0, 0, 100, 10], - req_w => 40, - req_h => 13, + req_w => $::WIDTH / 80, + req_h => $::WIDTH / 80, vertical => 0, can_hover => 1, inner_pad => 5, @@ -1659,29 +2152,27 @@ our @ISA = CFClient::UI::HBox::; -use SDL::OpenGL; +use CFClient::OpenGL; sub new { my $class = shift; my $self = $class->SUPER::new ( - req_w => $::WIDTH / 6, - req_h => $::HEIGHT / 6, - fontsize => $::FONTSIZE, + 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 } @@ -1698,8 +2189,8 @@ my $layout = $self->{layout}; - $layout->set_height ($self->{fontsize}); - $layout->set_width ($self->{w}); + $layout->set_height ($self->{fontsize} * $::FONTSIZE); + $layout->set_width ($self->{children}[0]{w}); $layout->set_text ($text); ($layout->size)[1] @@ -1712,20 +2203,16 @@ $self->update; } -sub size_request { - my ($self) = @_; - - ($self->{req_w}, $self->{req_h}) -} - sub size_allocate { my ($self, $w, $h) = @_; - $self->{layout}->set_height ($self->{fontsize}); - $self->{layout}->set_width ($self->{w}); + $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; - $self->update; } sub add_paragraph { @@ -1766,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; @@ -1784,6 +2271,8 @@ my $layout = $self->{layout}; + $layout->set_font ($self->{font}) if $self->{font}; + for my $par (@{$self->{par}}) { my $h = $par->[0]; @@ -1807,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; @@ -1820,319 +2311,265 @@ ############################################################################# -package CFClient::UI::MapWidget; +package CFClient::UI::Animator; -use strict; +use CFClient::OpenGL; -use List::Util qw(min max); +our @ISA = CFClient::UI::Bin::; -use SDL; -use SDL::OpenGL; +sub moveto { + my ($self, $x, $y) = @_; -our @ISA = CFClient::UI::Base::; + $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; + $self->{speed} = 0.001; + $self->{time} = 1; + + ::animation_start $self; +} -sub new { - my $class = shift; +sub animate { + my ($self, $interval) = @_; - $class->SUPER::new ( - z => -1, - can_focus => 1, - list => (glGenLists 1), - @_ - ) -} + $self->{time} -= $interval * $self->{speed}; + if ($self->{time} <= 0) { + $self->{time} = 0; + ::animation_stop $self; + } -sub key_down { - print "MAPKEYDOWN\n"; + 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}); } -sub key_up { -} +sub _draw { + my ($self) = @_; -sub button_down { - my ($self, $ev, $x, $y) = @_; + glPushMatrix; + glRotate $self->{time} * 1000, 0, 1, 0; + $self->{children}[0]->draw; + glPopMatrix; +} - $self->focus_in; +############################################################################# - if ($ev->button == 2) { - my ($ox, $oy) = ($ev->button_x, $ev->button_y); - my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); +package CFClient::UI::Flopper; - $self->{motion} = sub { - my ($ev, $x, $y) = @_; +our @ISA = CFClient::UI::Button::; - ($x, $y) = ($ev->motion_x, $ev->motion_y); +sub new { + my $class = shift; - $::CFG->{map_shift_x} = $bw + $x - $ox; - $::CFG->{map_shift_y} = $bh + $y - $oy; + my $self = $class->SUPER::new ( + state => 0, + connect_activate => \&toggle_flopper, + @_ + ); - $self->update; - }; + if ($self->{state}) { + $self->{state} = 0; + $self->toggle_flopper; } -} - -sub button_up { - my ($self, $ev, $x, $y) = @_; - - delete $self->{motion}; -} - -sub mouse_motion { - my ($self, $ev, $x, $y) = @_; - - $self->{motion}->($ev, $x, $y) if $self->{motion}; -} -sub size_request { - ( - 1 + 32 * int $::WIDTH / 32, - 1 + 32 * int $::HEIGHT / 32, - ) + $self } -sub update { +sub toggle_flopper { my ($self) = @_; - $self->{need_update} = 1; - $self->SUPER::update; + # TODO: use animation + if ($self->{state} = !$self->{state}) { + $CFClient::UI::ROOT->add ($self->{other}); + $self->{other}->move ($self->coord2global (0, $self->{h})); + $self->emit ("open"); + } else { + $CFClient::UI::ROOT->remove ($self->{other}); + $self->emit ("close"); + } + + $self->emit (changed => $self->{state}); } -sub draw { - my ($self) = @_; +############################################################################# - if (delete $self->{need_update}) { - glNewList $self->{list}, GL_COMPILE; +package CFClient::UI::Tooltip; - if ($::MAP) { - my $sw = int $::WIDTH / 32; - my $sh = int $::HEIGHT / 32; - - my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; - my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; - - glTranslate $sx0 - 32, $sy0 - 32, 0; - - my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); - - if ($::CFG->{fow_enable}) { - if ($::CFG->{fow_smooth}) { # smooth fog of war - glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); - glConvolutionFilter2D ( - GL_CONVOLUTION_2D, - GL_ALPHA, - 3, 3, - GL_ALPHA, GL_FLOAT, - pack "f*", - 0.1, 0.1, 0.1, - 0.1, 0.2, 0.1, - 0.1, 0.1, 0.1, - ); - glEnable GL_CONVOLUTION_2D; - } +our @ISA = CFClient::UI::Bin::; - $self->{fow_texture} = new CFClient::Texture - w => $w, - h => $h, - data => $data, - internalformat => GL_ALPHA, - format => GL_ALPHA; - - glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; - - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; +use CFClient::OpenGL; - glColor +($::CFG->{fow_intensity}) x 3, 1; - $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); +sub new { + my $class = shift; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; - } + $class->SUPER::new ( + @_, + can_events => 0, + ) +} - # HACK BEGIN - { - glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove - my ($w, $h) = (250, 250); - - glEnable GL_BLEND; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - - $self->{mapmap_texture} = - new CFClient::Texture - w => $w, - h => $h, - data => $::MAP->mapmap ($w, $h), - type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; +sub set_markup { + my ($self, $text) = @_; - $self->{mapmap_texture}->draw_quad (100, 100); + $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; + $self->{label}->set_markup ($text); + $self->add ($self->{label}); +} - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; - } - # HACK END - } +sub size_request { + my ($self) = @_; - glEndList; - } + $self->child->set_max_size ($::WIDTH * 0.3); - glPushMatrix; - glCallList $self->{list}; - glPopMatrix; + my ($w, $h) = @{$self->child}{qw(req_w req_h)}; - if ($FOCUS != $self) { - glColor 64/255, 64/255, 64/255; - glLogicOp GL_AND; - glEnable GL_COLOR_LOGIC_OP; - glBegin GL_QUADS; - glVertex 0, 0; - glVertex 0, $::HEIGHT; - glVertex $::WIDTH, $::HEIGHT; - glVertex $::WIDTH, 0; - glEnd; - glDisable GL_COLOR_LOGIC_OP; - } + ($w + 4, $h + 4) } -my %DIR = ( - SDLK_KP8, [1, "north"], - SDLK_KP9, [2, "northeast"], - SDLK_KP6, [3, "east"], - SDLK_KP3, [4, "southeast"], - SDLK_KP2, [5, "south"], - SDLK_KP1, [6, "southwest"], - SDLK_KP4, [7, "west"], - SDLK_KP7, [8, "northwest"], - - SDLK_UP, [1, "north"], - SDLK_RIGHT, [3, "east"], - SDLK_DOWN, [5, "south"], - SDLK_LEFT, [7, "west"], -); +sub size_allocate { + my ($self, $w, $h) = @_; -sub key_down { - my ($self, $ev) = @_; + $self->SUPER::size_allocate ($w - 4, $h - 4); +} - my $mod = $ev->key_mod; - my $sym = $ev->key_sym; +sub _draw { + my ($self) = @_; - if ($sym == SDLK_KP5) { - $::CONN->user_send ("stay fire"); - } elsif ($sym == SDLK_a) { - $::CONN->user_send ("apply"); - } elsif ($sym == SDLK_QUOTE) { - $self->emit ('activate_console'); - } elsif ($sym == SDLK_SLASH) { - $self->emit ('activate_console' => '/'); - } elsif (exists $DIR{$sym}) { - if ($mod & KMOD_SHIFT) { - $self->{shft}++; - $::CONN->user_send ("fire $DIR{$sym}[0]"); - } elsif ($mod & KMOD_CTRL) { - $self->{ctrl}++; - $::CONN->user_send ("run $DIR{$sym}[0]"); - } else { - $::CONN->user_send ("$DIR{$sym}[1]"); - } - } -} + glPushMatrix; + glTranslate 0.375, 0.375; -sub key_up { - my ($self, $ev) = @_; + my ($w, $h) = @$self{qw(w h)}; - my $mod = $ev->key_mod; - my $sym = $ev->key_sym; + 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; - if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { - $::CONN->user_send ("fire_stop"); - } - if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { - $::CONN->user_send ("run_stop"); - } + glTranslate 2, 2; + $self->SUPER::_draw; } ############################################################################# -package CFClient::UI::Animator; +package CFClient::UI::Face; -use SDL::OpenGL; +our @ISA = CFClient::UI::Base::; -our @ISA = CFClient::UI::Bin::; +use CFClient::OpenGL; -sub moveto { - my ($self, $x, $y) = @_; +sub new { + my $class = shift; - $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; - $self->{speed} = 0.001; - $self->{time} = 1; - - ::animation_start $self; + $class->SUPER::new ( + aspect => 1, + @_, + ) } -sub animate { - my ($self, $interval) = @_; - - $self->{time} -= $interval * $self->{speed}; - if ($self->{time} <= 0) { - $self->{time} = 0; - ::animation_stop $self; - } - - 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}); +sub size_request { + (32, 8) } sub _draw { my ($self) = @_; - glPushMatrix; - glRotate $self->{time} * 1000, 0, 1, 0; - $self->{children}[0]->draw; - glPopMatrix; + 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::Flopper; +package CFClient::UI::Menu; -our @ISA = CFClient::UI::Button::; +our @ISA = CFClient::UI::FancyFrame::; + +use CFClient::OpenGL; sub new { my $class = shift; my $self = $class->SUPER::new ( - state => 0, - connect_activate => \&toggle_flopper, - @_ + items => [], + z => 100, + @_, ); - if ($self->{state}) { - $self->{state} = 0; - $self->toggle_flopper; + $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 } -sub toggle_flopper { - my ($self) = @_; +# popup given the event (must be a mouse button down event currently) +sub popup { + my ($self, $ev) = @_; - # TODO: use animation - if ($self->{state} = !$self->{state}) { - $CFClient::UI::ROOT->add ($self->{other}); - $self->{other}->move ($self->coord2global (0, $self->{h})); - $self->emit ("open"); - } else { - $CFClient::UI::ROOT->remove ($self->{other}); - $self->emit ("close"); - } + $self->emit ("popdown"); - $self->emit (changed => $self->{state}); + # 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}; + } } ############################################################################# @@ -2141,12 +2578,12 @@ our @ISA = CFClient::UI::Container::; -use SDL::OpenGL; +use CFClient::OpenGL; sub check_size { my ($self) = @_; - $self->configure (0, 0, $::WITH, $::HEIGHT); + $self->configure (0, 0, $::WIDTH, $::HEIGHT); } sub size_request { @@ -2158,8 +2595,13 @@ $self->SUPER::configure ($x, $y, $w, $h); - $_->configure ($_->{x}, $_->{y}, $_->size_request) - for @{$self->{children}}; + for my $child (@{$self->{children}}) { + my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; + + $X = List::Util::max 0, List::Util::min $w - $W, $X; + $Y = List::Util::max 0, List::Util::min $h - $H, $Y; + $child->configure ($X, $Y, $W,$H); + } } sub _topleft { @@ -2178,6 +2620,10 @@ sub add { my ($self, $child) = @_; + # integerize window positions + $child->{x} = int $child->{x}; + $child->{y} = int $child->{y}; + $self->SUPER::add ($child); } @@ -2209,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