--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 00:43:11 1.31 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/14 13:51:36 1.103 @@ -1,37 +1,102 @@ -package Crossfire::Client::Widget; +package CFClient::UI; use strict; -use Scalar::Util; +use Scalar::Util (); +use List::Util (); -use SDL::OpenGL; -use SDL::OpenGL::Constants; +use CFClient; + +our ($FOCUS, $HOVER, $GRAB); # various widgets -our $FOCUS; # the widget with current focus -our @ACTIVE_WIDGETS; +our $TOPLEVEL; +our $BUTTON_STATE; # class methods for events -sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } -sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } -sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } -sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } +sub feed_sdl_key_down_event { + $FOCUS->key_down ($_[0]) if $FOCUS; +} -sub new { - my $class = shift; +sub feed_sdl_key_up_event { + $FOCUS->key_up ($_[0]) if $FOCUS; +} + +sub feed_sdl_button_down_event { + my ($ev) = @_; + my ($x, $y) = ($ev->motion_x, $ev->motion_y); + + if (!$BUTTON_STATE) { + my $widget = $TOPLEVEL->find_widget ($x, $y); + + $GRAB = $widget; + $GRAB->update if $GRAB; + } + + $BUTTON_STATE |= 1 << ($ev->button - 1); - bless { @_ }, $class + $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; } -sub activate { - push @ACTIVE_WIDGETS, $_[0]; - Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; +sub feed_sdl_button_up_event { + my ($ev) = @_; + my ($x, $y) = ($ev->motion_x, $ev->motion_y); + + my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + + $BUTTON_STATE &= ~(1 << ($ev->button - 1)); + + $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; + + if (!$BUTTON_STATE) { + my $grab = $GRAB; undef $GRAB; + $grab->update if $grab; + $GRAB->update if $GRAB; + } } -sub deactivate { - @ACTIVE_WIDGETS = - sort { $a->{z} <=> $b->{z} } - grep { $_ && $_ != $_[0] } - @ACTIVE_WIDGETS; +sub feed_sdl_motion_event { + my ($ev) = @_; + my ($x, $y) = ($ev->motion_x, $ev->motion_y); + + my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + + if ($widget != $HOVER) { + my $hover = $HOVER; $HOVER = $widget; + + $hover->update if $hover; + $HOVER->update if $HOVER; + } + + $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; +} + +############################################################################# + +package CFClient::UI::Base; + +use strict; + +use SDL::OpenGL; + +sub new { + my $class = shift; + + my $self = bless { + x => 0, + y => 0, + z => 0, + w => -1, + h => -1, + @_ + }, $class; + + for (keys %$self) { + if (/^connect_(.*)$/) { + $self->connect ($1 => delete $self->{$_}); + } + } + + $self } sub move { @@ -46,142 +111,382 @@ } sub size_request { - die "size_request is abtract"; + require Carp; + Carp::confess "size_request is abtract"; } -sub focus_in { - my ($widget) = @_; - $FOCUS = $widget; +sub _size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->{x} = $x; + $self->{y} = $y; + + return unless $self->{w} != $w || $self->{h} != $h; + + $self->{w} = $w; + $self->{h} = $h; + + 1 } -sub focus_out { - my ($widget) = @_; +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); } -sub key_down { - my ($widget, $sdlev) = @_; +# translate global coordinates to local coordinate system +sub translate { + my ($self, $x, $y) = @_; + + $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); } -sub key_up { - my ($widget, $sdlev) = @_; +sub focus_in { + my ($self) = @_; + + return if $FOCUS == $self; + return unless $self->{can_focus}; + + my $focus = $FOCUS; $FOCUS = $self; + $focus->update if $focus; + $FOCUS->update; } -sub button_down { - my ($widget, $sdlev) = @_; +sub focus_out { + my ($self) = @_; + + return unless $FOCUS == $self; + + my $focus = $FOCUS; undef $FOCUS; + $focus->update if $focus; #? } -sub button_up { - my ($widget, $sdlev) = @_; +sub mouse_motion { } +sub button_up { } +sub key_down { } +sub key_up { } + +sub button_down { + my ($self, $ev, $x, $y) = @_; + + $self->focus_in; } -sub w { $_[0]->{w} } -sub h { $_[0]->{h} } -sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } -sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } -sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } +sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } +sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } +sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } +sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } +sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } sub draw { my ($self) = @_; + return unless $self->{h} && $self->{w}; + glPushMatrix; glTranslate $self->{x}, $self->{y}, 0; $self->_draw; glPopMatrix; + + if ($self == $HOVER && $self->{can_hover}) { + my ($x, $y) = @$self{qw(x y)}; + + glColor 0, 0, 1, 0.2; + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBegin GL_QUADS; + glVertex $x , $y; + glVertex $x + $self->{w}, $y; + glVertex $x + $self->{w}, $y + $self->{h}; + glVertex $x , $y + $self->{h}; + glEnd; + glDisable GL_BLEND; + } } sub _draw { - my ($widget) = @_; + my ($self) = @_; + + warn "no draw defined for $self\n"; +} + +sub find_widget { + my ($self, $x, $y) = @_; + + return $self + if $x >= $self->{x} && $x < $self->{x} + $self->{w} + && $y >= $self->{y} && $y < $self->{y} + $self->{h}; + + () +} + +sub set_parent { + my ($self, $par) = @_; + + $self->{parent} = $par; + Scalar::Util::weaken $self->{parent}; } -sub bbox { - my ($widget) = @_; +sub get_parent { + $_[0]->{parent} +} + +sub update { + my ($self) = @_; + + $self->{parent}->update + if $self->{parent}; +} + +sub connect { + my ($self, $signal, $cb) = @_; + + push @{ $self->{cb}{$signal} }, $cb; +} + +sub emit { + my ($self, $signal, @args) = @_; + + $_->($self, @args) + for @{$self->{cb}{$signal} || []}; } sub DESTROY { my ($self) = @_; - $self->deactivate; + #$self->deactivate; } -package Crossfire::Client::Widget::Container; +############################################################################# -our @ISA = Crossfire::Client::Widget::; +package CFClient::UI::DrawBG; +our @ISA = CFClient::UI::Base::; + +use strict; use SDL::OpenGL; -sub add { $_[0]->{child} = $_[1] } -sub get { $_[0]->{child} } +sub new { + my $class = shift; -sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } + # range [value, low, high, page] -sub _draw { die "Containers can't be drawn!" } + $class->SUPER::new ( + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + @_ + ) +} -package Crossfire::Client::Widget::Window; +sub _draw { + my ($self) = @_; -our @ISA = Crossfire::Client::Widget::Container::; + my ($w, $h) = @$self{qw(w h)}; -use SDL::OpenGL; + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; + + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; + + glDisable GL_BLEND; +} + +############################################################################# + +package CFClient::UI::Empty; + +our @ISA = CFClient::UI::Base::; + +sub size_request { + (0, 0) +} + +sub draw { } + +############################################################################# + +package CFClient::UI::Container; + +our @ISA = CFClient::UI::Base::; + +sub new { + my ($class, %arg) = @_; + + my $children = delete $arg{children} || []; + + my $self = $class->SUPER::new (children => [], %arg); + $self->add ($_) for @$children; + + $self +} sub add { my ($self, $chld) = @_; - $self->SUPER::add ($chld); - $self->render_chld; #TODO: Move this to the size_request event propably? + + $chld->set_parent ($self); + + $self->{children} = [ + sort { $a->{z} <=> $b->{z} } + @{$self->{children}}, $chld + ]; + + $self->{w} = $self->{h} = -1; + $self->update; +} + +sub remove { + my ($self, $widget) = @_; + + $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; + + $self->size_allocate (0, 0, $self->{w}, $self->{h}); +} + +sub find_widget { + my ($self, $x, $y) = @_; + + $x -= $self->{x}; + $y -= $self->{y}; + + my $res; + + for (reverse @{ $self->{children} }) { + $res = $_->find_widget ($x, $y) + and return $res; + } + + $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) +} + +sub _draw { + my ($self) = @_; + + $_->draw for @{$self->{children}}; +} + +############################################################################# + +package CFClient::UI::Bin; + +our @ISA = CFClient::UI::Container::; + +sub new { + my ($class, %arg) = @_; + + my $child = (delete $arg{child}) || new CFClient::UI::Empty::; + + $class->SUPER::new (children => [$child], %arg) +} + +sub add { + my ($self, $widget) = @_; + + $self->{children} = []; + + $self->SUPER::add ($widget); +} + +sub remove { + my ($self, $widget) = @_; + + $self->SUPER::remove ($widget); + + $self->{children} = [new CFClient::UI::Empty] + unless @{$self->{children}}; +} + +sub child { $_[0]->{children}[0] } + +sub size_request { + $_[0]{children}[0]->size_request +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + $self->{children}[0]->size_allocate (0, 0, $w, $h); +} + +############################################################################# + +package CFClient::UI::Window; + +our @ISA = CFClient::UI::Bin::; + +use SDL::OpenGL; + +sub new { + my ($class, %arg) = @_; + + my $self = $class->SUPER::new (%arg); +} + +sub update { + my ($self) = @_; + + # we want to do this delayed... + $self->render_chld; + $self->SUPER::update; } sub render_chld { my ($self) = @_; - my $chld = $self->get; - my ($w, $h) = $self->size_request; $self->{texture} = - Crossfire::Client::Texture->new_from_opengl ( - $w, $h, sub { $chld->draw } + CFClient::Texture->new_from_opengl ( + $self->{w}, $self->{h}, sub { $self->child->draw } ); - $self->{texture}->upload; } -sub size_request { - my ($self) = @_; - my $chld = $self->get - or return (0, 0); - $chld->size_request +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + $self->child->size_allocate (0, 0, $w, $h); + + $self->render_chld; } sub _draw { my ($self) = @_; - my ($w, $h) = $self->size_request;#TODO# use width/height of texture + my ($w, $h) = ($self->w, $self->h); my $tex = $self->{texture} or return; 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; - glBindTexture GL_TEXTURE_2D, $tex->{name}; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 1, 0, 1; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0, 0; - glTexCoord 0, 1; glVertex 0, $h; - glTexCoord 1, 1; glVertex $w, $h; - glTexCoord 1, 0; glVertex $w, 0; - glEnd; + $tex->draw_quad (0, 0, $w, $h); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } -package Crossfire::Client::Widget::Frame; +############################################################################# + +package CFClient::UI::Frame; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; sub size_request { my ($self) = @_; - my $chld = $self->get + my $chld = $self->child or return (0, 0); $chld->move (2, 2); @@ -189,171 +494,451 @@ map { $_ + 4 } $chld->size_request; } +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + $self->child->size_allocate (2, 2, $w - 4, $h - 4); +} + sub _draw { my ($self) = @_; - my $chld = $self->get; + my $chld = $self->child; my ($w, $h) = $chld->size_request; glBegin GL_QUADS; glColor 0, 0, 0; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $h + 4; - glTexCoord 1, 1; glVertex $w + 4 , $h + 4; - glTexCoord 1, 0; glVertex $w + 4 , 0; + glVertex 0 , 0; + glVertex 0 , $h + 4; + glVertex $w + 4 , $h + 4; + glVertex $w + 4 , 0; glEnd; $chld->draw; } -package Crossfire::Client::Widget::FancyFrame; +############################################################################# -our @ISA = Crossfire::Client::Widget::Frame::; +package CFClient::UI::FancyFrame; + +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; -#TODO: implement themed frame +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); + +sub new { + my $class = shift; + + # TODO: user_x, user_y, overwrite moveto? + + $class->SUPER::new ( + bg => [1, 1, 1, 1], + border_bg => [1, 1, 1, 1], + border => $::FONTSIZE * 0.8, + @_ + ) +} + +sub size_request { + my ($self) = @_; -package Crossfire::Client::Widget::Table; + return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; -our @ISA = Crossfire::Client::Widget::Container::; + my ($w, $h) = $self->SUPER::size_request; + + ( + $w + $self->{border} * 2, + $h + $self->{border} * 2, + ) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + $h -= List::Util::max 0, $self->{border} * 2; + $w -= List::Util::max 0, $self->{border} * 2; + + $self->child->size_allocate ($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 ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bw, $bh) = ($self->{w}, $self->{h}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $self->{user_w} = $bw + $x - $ox; + $self->{user_h} = $bh + $y - $oy; + $self->update; + }; + + } elsif ($x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{border}) { + + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bx, $by) = ($self->{x}, $self->{y}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $self->move ($bx + $x - $ox, $by + $y - $oy); + $self->update; + }; + } +} + +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 _draw { + my ($self) = @_; + + my ($w, $h ) = ($self->{w}, $self->{h}); + my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); + + 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; + + 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); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + $self->child->draw; +} + +############################################################################# + +package CFClient::UI::Table; + +our @ISA = CFClient::UI::Base::; + +use List::Util qw(max sum); use SDL::OpenGL; +sub new { + my $class = shift; + + $class->SUPER::new ( + col_expand => [], + @_ + ) +} + sub add { my ($self, $x, $y, $chld) = @_; - $self->{childs}[$y][$x] = $chld; -} -sub max_row_height { - my ($self, $row) = @_; + $self->{children}[$y][$x] = $chld; + $chld->set_parent ($self); - my $hs = 0; - for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { - my $c = $self->{childs}->[$row]->[$xi]; - if ($c) { - my ($w, $h) = $c->size_request; - if ($hs < $h) { $hs = $h } - } - } - return $hs; + $self->{w} = $self->{h} = -1; + $self->update; } -sub max_col_width { - my ($self, $col) = @_; +sub get_wh { + my ($self) = @_; + + my (@w, @h); + + for my $y (0 .. $#{$self->{children}}) { + my $row = $self->{children}[$y] + or next; + + for my $x (0 .. $#$row) { + my $widget = $row->[$x] + or next; + my ($w, $h) = $widget->size_request; - my $ws = 0; - for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { - my $c = ($self->{childs}->[$yi] || [])->[$col]; - if ($c) { - my ($w, $h) = $c->size_request; - if ($ws < $w) { $ws = $w } + $w[$x] = max $w[$x], $w; + $h[$y] = max $h[$y], $h; } } - return $ws; + + (\@w, \@h) } sub size_request { my ($self) = @_; - my ($hs, $ws) = (0, 0); + my ($ws, $hs) = $self->get_wh; - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { - $hs += $self->max_row_height ($yi); - } + ( + (sum @$ws), + (sum @$hs), + ) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + my ($ws, $hs) = $self->get_wh; + + my $req_w = sum @$ws; + my $req_h = sum @$hs; + + # TODO: nicer code && do row_expand + my @col_expand = @{$self->{col_expand}}; + @col_expand = (1) x @$ws unless @col_expand; + my $col_expand = (sum @col_expand) || 1; - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { - my $wm = 0; - for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { - $wm += $self->max_col_width ($xi) + # linearly scale sizes + $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; + $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; + + my $y; + + for my $r (0 .. $#{$self->{children}}) { + my $row = $self->{children}[$r] + or next; + + my $x = 0; + my $row_h = $hs->[$r]; + + for my $c (0 .. $#$row) { + my $col_w = $ws->[$c]; + + if (my $widget = $row->[$c]) { + $widget->size_allocate ($x, $y, $col_w, $row_h); + } + + $x += $col_w; } - if ($ws < $wm) { $ws = $wm } + + $y += $row_h; } - return ($ws, $hs); +} + +sub find_widget { + my ($self, $x, $y) = @_; + + $x -= $self->{x}; + $y -= $self->{y}; + + my $res; + + for (grep $_, map @$_, grep $_, @{ $self->{children} }) { + $res = $_->find_widget ($x, $y) + and return $res; + } + + $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) } sub _draw { my ($self) = @_; - my $y = 0; - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { - my $x = 0; + for (grep $_, @{$self->{children}}) { + $_->draw for grep $_, @$_; + } +} - for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { +############################################################################# - my $c = $self->{childs}->[$yi]->[$xi]; - if ($c) { - $c->move ($x, $y, 0); #TODO: Move to size_request - $c->draw if $c; - } +package CFClient::UI::HBox; + +# TODO: wrap into common Box base class - $x += $self->max_col_width ($xi); +our @ISA = CFClient::UI::Container::; + +sub size_request { + my ($self) = @_; + + my @alloc = map [$_->size_request], @{$self->{children}}; + + ( + (List::Util::sum map $_->[0], @alloc), + (List::Util::max map $_->[1], @alloc), + ) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); + + ($h, $w) = ($w, $h); + + my $children = $self->{children}; + + my @h = map +($_->size_request)[0], @$children; + + my $req_h = List::Util::sum @h; + + if ($req_h > $h) { + # ah well, not enough space + $_ *= $h / $req_h for @h; + } else { + my $exp = List::Util::sum map $_->{expand}, @$children; + $exp ||= 1; + + for (0 .. $#$children) { + my $child = $children->[$_]; + + my $alloc_h = $h[$_]; + $alloc_h += ($h - $req_h) * $child->{expand} / $exp; + $h[$_] = $alloc_h; } + } + + my $y = 0; + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->size_allocate ($y, 0, $h, $w); - $y += $self->max_row_height ($yi); + $y += $h; } } -package Crossfire::Client::Widget::VBox; +############################################################################# -our @ISA = Crossfire::Client::Widget::Container::; +package CFClient::UI::VBox; -use SDL::OpenGL; +# TODO: wrap into common Box base class -sub add { - my ($self, $chld) = @_; - push @{$self->{childs}}, $chld; -} +our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; - my ($hs, $ws) = (0, 0); - for (@{$self->{childs} || []}) { - my ($w, $h) = $_->size_request; - $hs += $h; - if ($ws < $w) { $ws = $w } - } + my @alloc = map [$_->size_request], @{$self->{children}}; - return ($ws, $hs); + ( + (List::Util::max map $_->[0], @alloc), + (List::Util::sum map $_->[1], @alloc), + ) } -sub _draw { - my ($self) = @_; +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); + + my $children = $self->{children}; + + my @h = map +($_->size_request)[1], @$children; + + my $req_h = List::Util::sum @h; + + if ($req_h > $h) { + # ah well, not enough space + $_ *= $h / $req_h for @h; + } else { + my $exp = List::Util::sum map $_->{expand}, @$children; + $exp ||= 1; + + for (0 .. $#$children) { + my $child = $children->[$_]; + + $h[$_] += ($h - $req_h) * $child->{expand} / $exp; + } + } + + my $y = 0; + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->size_allocate (0, $y, $w, $h); - my ($x, $y); - for (@{$self->{childs} || []}) { - $_->move (0, $y, 0); #TODO: move to size_request - $_->draw; - my ($w, $h) = $_->size_request; $y += $h; } } -package Crossfire::Client::Widget::Label; +############################################################################# -our @ISA = Crossfire::Client::Widget::; +package CFClient::UI::Label; + +our @ISA = CFClient::UI::Base::; use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $height, $text) = @_; + my ($class, %arg) = @_; - my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + height => $::FONTSIZE, + text => "", + align => -1, + padding => 2, + layout => new CFClient::Layout, + %arg + ); - $self->set_text ($text); + $self->set_text ($self->{text}); $self } +sub escape_text { + local $_ = $_[1]; + + s/&/&/g; + s/>/>/g; + s/{text} = $text; + $self->{layout}->set_markup ($text); - $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; + delete $self->{texture}; +# $self->{w} = $self->{h} = -1; + $self->update; } sub get_text { @@ -365,236 +950,690 @@ sub size_request { my ($self) = @_; + $self->{layout}->set_width; + $self->{layout}->set_height ($self->{height}); + my ($w, $h) = $self->{layout}->size; + ( - $self->{texture}{width}, - $self->{texture}{height}, + $w + $self->{padding} * 2, + $h + $self->{padding} * 2, ) } +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + delete $self->{texture}; +} + +sub update { + my ($self) = @_; + + delete $self->{texture}; + $self->SUPER::update; +} + sub _draw { my ($self) = @_; - my $tex = $self->{texture}; + my $tex = $self->{texture} ||= do { + $self->{layout}->set_width ($self->{w}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + new_from_layout CFClient::Texture $self->{layout} + }; glEnable GL_BLEND; - glEnable GL_TEXTURE_2D; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glBindTexture GL_TEXTURE_2D, $tex->{name}; - glColor 1, 1, 1, 0.8; + glColor @{$self->{fg}}; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , 0; - glTexCoord 0, 1; glVertex 0 , $tex->{height}; - glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; - glTexCoord 1, 0; glVertex $tex->{width}, 0; - glEnd; + my $x = + $self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5; + + glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; + $tex->draw_quad (0, 0); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } -package Crossfire::Client::Widget::TextEntry; +############################################################################# -our @ISA = Crossfire::Client::Widget::Label::; +package CFClient::UI::Entry; + +our @ISA = CFClient::UI::Label::; use SDL; use SDL::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, + @_ + ) +} + +sub _set_text { + my ($self, $text) = @_; + + my $old_text = $self->{text}; + + $self->{last_activity} = $::NOW; + + $self->{text} = $text; + $self->{layout}->set_width ($self->{w}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + + $text =~ s/./*/g if $self->{hidden}; + + $self->{layout}->set_markup ($self->escape_text ($text) . " "); + + $text = substr $text, 0, $self->{cursor}; + utf8::encode $text; + + @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); + + $self->emit (changed => $self->{text}) # XXX: is this the right place to do this? + if $old_text ne $self->{text}; +} + +sub size_request { + my ($self) = @_; + + my ($w, $h) = $self->SUPER::size_request; + + ($w + 1, $h) # add 1 for cursor +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->SUPER::size_allocate ($x, $y, $w, $h); + + $self->_set_text ($self->{text}); +} + +sub set_text { + my ($self, $text) = @_; + + $self->{cursor} = length $text; + $self->_set_text ($text); + $self->update; +} + sub key_down { my ($self, $ev) = @_; my $mod = $ev->key_mod; my $sym = $ev->key_sym; - $ev->set_unicode (1); my $uni = $ev->key_unicode; my $text = $self->get_text; if ($sym == SDLK_BACKSPACE) { - substr $text, -1, 1, ''; - + substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; + } elsif ($sym == SDLK_DELETE) { + substr $text, $self->{cursor}, 1, ""; + } elsif ($sym == SDLK_LEFT) { + --$self->{cursor} if $self->{cursor}; + } elsif ($sym == SDLK_RIGHT) { + ++$self->{cursor} if $self->{cursor} < length $self->{text}; + } elsif ($sym == SDLK_HOME) { + $self->{cursor} = 0; + } elsif ($sym == SDLK_END) { + $self->{cursor} = length $text; + } elsif ($sym == SDLK_ESCAPE) { + $self->emit ('escape'); } elsif ($uni) { - $text .= chr $uni; + substr $text, $self->{cursor}++, 0, chr $uni; } - $self->set_text ($text); + + $self->_set_text ($text); + $self->update; } +sub focus_in { + my ($self) = @_; -# XXX: TextView isn't neccessary with pango multiline text rendering -package Crossfire::Client::Widget::TextView; + $self->{last_activity} = $::NOW; -use strict; + $self->SUPER::focus_in; +} -our @ISA = qw/Crossfire::Client::Widget/; +sub button_down { + my ($self, $ev, $x, $y) = @_; -use SDL::OpenGL; -use SDL::OpenGL::Constants; + $self->SUPER::button_down ($ev, $x, $y); -sub new { - my ($class, $text, $h) = @_; - my $self = $class->SUPER::new (); + my $idx = $self->{layout}->xy_to_index ($x, $y); - $self->{txt_height} = $h; - @{$self->{lines}} = split /\r?\n/, $text; + # byte-index to char-index + my $text = $self->{text}; + utf8::encode $text; + $self->{cursor} = length substr $text, 0, $idx; - for (split /\r?\n/, $text) { - $self->add_line ($_); - } - $self + $self->_set_text ($self->{text}); + $self->update; +} + +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; +# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# } -#sub render_lines { -# my ($self) = @_; -# -# $self->{txt_lines} = []; -# -# for (@{$self->{lines}}) { -# push @{$self->{txt_lines}}, -# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_; -# } -#} +sub _draw { + my ($self) = @_; -sub add_line { - my ($self, $line) = @_; - push @{$self->{lines}}, $line; + local $self->{fg} = $self->{fg}; - push @{$self->{txt_lines}}, - new_from_text Crossfire::Client::Texture $line, $self->{txt_height}; + if ($FOCUS == $self) { + glColor @{$self->{active_bg}}; + $self->{fg} = $self->{active_fg}; + } else { + glColor @{$self->{bg}}; + } + + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $self->{h}; + glVertex $self->{w}, $self->{h}; + glVertex $self->{w}, 0; + glEnd; + glDisable GL_BLEND; + + $self->SUPER::_draw; + + #TODO: force update every cursor change :( + if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { + glColor @{$self->{fg}}; + glBegin GL_LINES; + glVertex $self->{cur_x}, $self->{cur_y}; + glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; + glEnd; + } } -sub size_request { - my ($self) = @_; +package CFClient::UI::LineEntry; + +our @ISA = CFClient::UI::Entry::; + +use SDL; +use SDL::OpenGL; + +sub key_down { + my ($self, $ev) = @_; + + my $sym = $ev->key_sym; - my $w = 0; - my $h = 0; + if ($sym == SDLK_RETURN) { + $self->emit (activate => $self->get_text); + $self->update; - for (@{$self->{txt_lines}}) { - if ($w < $_->{width}) { $w = $_->{width} } - $h += $_->{height}; + } else { + $self->SUPER::key_down ($ev); } - return ($w, $h); } -sub draw_line { - my ($self, $tex, $y) = @_; +############################################################################# - glBindTexture GL_TEXTURE_2D, $tex->{name}; +package CFClient::UI::Button; - glColor 1, 0, 1; +our @ISA = CFClient::UI::Label::; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex 0 , $y; - glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; - glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; - glTexCoord 1, 0; glVertex $tex->{width}, $y; - glEnd; +use SDL; +use SDL::OpenGL; + +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + 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 => [1, 1, 0], + can_hover => 1, + @_ + ) +} + +sub button_up { + my ($self, $ev, $x, $y) = @_; + + if ($x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $self->{h}) { + $self->emit ("activate"); + } } sub _draw { my ($self) = @_; + local $self->{fg} = $self->{fg}; + my $tex = $tex[0]; + glEnable GL_BLEND; glEnable GL_TEXTURE_2D; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - my $l = 0; - for (@{$self->{txt_lines}}) { - $self->draw_line ($_, $l); - $l += $_->{height}; + if ($GRAB == $self) { + $self->{fg} = $self->{active_fg}; } - glDisable GL_BLEND; + glBindTexture GL_TEXTURE_2D, $tex->{name}; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + $tex->draw_quad (0, 0, $self->{w}, $self->{h}); + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + $self->SUPER::_draw; } -package Crossfire::Client::Widget::MapWidget; +############################################################################# -use strict; +package CFClient::UI::CheckBox; -use List::Util qw(min max); +our @ISA = CFClient::UI::DrawBG::; + +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw(c1_checkbox_bg.png c1_checkbox_active.png); use SDL; use SDL::OpenGL; -use SDL::OpenGL::Constants; -our @ISA = Crossfire::Client::Widget::; +sub new { + my $class = shift; -sub key_down { - print "MAPKEYDOWN\n"; + $class->SUPER::new ( + padding => 2, + fg => [1, 1, 1], + active_fg => [1, 1, 0], + state => 0, + can_hover => 1, + @_ + ) } -sub key_up { +sub size_request { + my ($self) = @_; + + ($self->{padding} * 2 + 6) x 2 +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); +} + +sub button_down { + my ($self, $ev, $x, $y) = @_; + + 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}); + } } sub _draw { my ($self) = @_; - my $mx = $::CONN->{mapx}; - my $my = $::CONN->{mapy}; + $self->SUPER::_draw; - my $map = $::CONN->{map}; + glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; - my ($xofs, $yofs); + my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; - my $sw = 1 + int $::WIDTH / 32; - my $sh = 1 + int $::HEIGHT / 32; + glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; - if ($::CONN->{mapw} > $sw) { - $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; - } else { - $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + + my $tex = $self->{state} ? $tex[1] : $tex[0]; + + $tex->draw_quad (0, 0, $s, $s); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; +} + +############################################################################# + +package CFClient::UI::Slider; + +use strict; + +use SDL::OpenGL; + +our @ISA = CFClient::UI::DrawBG::; + +my @tex = + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw(s1_slider.png s1_slider_bg.png); + +sub new { + my $class = shift; + + # range [value, low, high, page] + + # TODO: 0-width page + # TODO: req_w/h are wrong with vertical + # TODO: calculations are off + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + active_fg => [0, 0, 0], + range => [0, 0, 100, 10], + req_w => 40, + req_h => 13, + vertical => 0, + can_hover => 1, + inner_pad => 5, + @_ + ); + + $self +} + +sub size_request { + my ($self) = @_; + + my $w = $self->{req_w}; + my $h = $self->{req_h}; + + $self->{vertical} ? ($h, $w) : ($w, $h) +} + +sub button_down { + my ($self, $ev, $x, $y) = @_; + + $self->SUPER::button_down ($ev, $x, $y); + $self->mouse_motion ($ev, $x, $y); +} + +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; + + if ($GRAB == $self) { + my ($value, $lo, $hi, $page) = @{$self->{range}}; + + my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); + + my $inner_pad_px = $self->_calc_inner_pad_px ($w); + my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + + $x -= $inner_pad_px; # substract the padding + $x = $x * ($hi - $lo) / $inner_w + $lo; + $x = $lo if $x < $lo; + $x = $hi - $page if $x > $hi - $page; + $self->{range}[0] = $x; + + $self->emit (changed => $x); + $self->update; } +} - if ($::CONN->{maph} > $sh) { - $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; - } else { - $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; +# the inner_* stuff is for generating a padding for the slider handle, +# so that the handle doesn't leave the texture. This calculation isn't 100% +# correct propably, but it does the job for now +sub _calc_inner_pad_px { + my ($self, $w) = @_; + ($w / 100) * $self->{inner_pad} # % to pixels +} + +sub _draw { + my ($self) = @_; + + $self->SUPER::_draw (); + + my ($w, $h) = @$self{qw(w h)}; + + if ($self->{vertical}) { + # draw a vertical slider like a rotated horizontal slider + + glRotate 90, 0, 0, 1; + glTranslate 0, -$self->{w}, 0; + + ($w, $h) = ($h, $w); } + my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; + my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; + + my ($value, $lo, $hi, $page) = @{$self->{range}}; + + my $inner_pad_px = $self->_calc_inner_pad_px ($w); + my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right + + $page = int $page * $inner_w / ($hi - $lo); + $value = int +($value - $lo) * $inner_w / ($hi - $lo); + + $w -= $page; + $page &= ~1; + glTranslate $page * 0.5, 0, 0; + $page ||= 2; + + my $knob_a = $inner_pad_px + ($value - $page * 0.5); + my $knob_b = $inner_pad_px + ($value + $page * 0.5); + + 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; + + # draw background + $tex[1]->draw_quad (0, 0, $w, $h); + + # draw handle + $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; +} + +############################################################################# + +package CFClient::UI::TextView; + +our @ISA = CFClient::UI::HBox::; + +use SDL::OpenGL; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + par => [], + @_, + children => [ + (new CFClient::UI::Empty expand => 1), + (new CFClient::UI::Slider vertical => 1), + ], + ); + + $self +} + +sub add_paragraph { + my ($self, $color, $text) = @_; + + push @{$self->{par}}, [$color, $text]; + my $count = scalar @{$self->{par}}; + $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; + $self->{children}[1]->update; +} + +sub _draw { + my ($self) = @_; + + my $par = $self->{par}; + + my $bottom = (scalar @$par) - 1; + + my $w = $self->{children}[0]{w}; + my $y = $self->{h}; + 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; - for my $x (0 .. $sw - 1) { - for my $y (0 .. $sh - 1) { + # TODO: everything! + while ($y > 0 && $bottom >= 0) { + my $par = $par->[$bottom--]; + + my $layout = new CFClient::Layout; + + $layout->set_height ($::FONTSIZE); + $layout->set_width ($w); + $layout->set_text ($par->[1]); + my $tex = new_from_layout CFClient::Texture $layout; + $y -= $tex->{h}; - my $cell = $map->[$x + $xofs][$y + $yofs] - or next; + glColor @{ $par->[0] }; + $tex->draw_quad (0, $y); + } - my $darkness = $cell->[0] * (1 / 255); - if ($darkness < 0) { - glColor 0.3, 0.3, 0.3; - } else { - glColor $darkness, $darkness, $darkness; - } + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; +} + +############################################################################# + +package CFClient::UI::MapWidget; - for my $num (grep $_, @$cell[1,2,3]) { - my $tex = $::CONN->{face}[$num]{texture} || next; +use strict; + +use List::Util qw(min max); + +use SDL; +use SDL::OpenGL; - glBindTexture GL_TEXTURE_2D, $tex->{name}; +our @ISA = CFClient::UI::Base::; - my $w = $tex->{width}; - my $h = $tex->{height}; +sub new { + my $class = shift; + + $class->SUPER::new ( + z => -1, + can_focus => 1, + list => (glGenLists 1), + @_ + ) +} - my $px = ($x + 1) * 32 - $w; - my $py = ($y + 1) * 32 - $h; - - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $px , $py; - glTexCoord 0, 1; glVertex $px , $py + $h; - glTexCoord 1, 1; glVertex $px + $w, $py + $h; - glTexCoord 1, 0; glVertex $px + $w, $py; - glEnd; +sub key_down { + print "MAPKEYDOWN\n"; +} + +sub key_up { +} + +sub size_request { + ( + 1 + 32 * int $::WIDTH / 32, + 1 + 32 * int $::HEIGHT / 32, + ) +} + +sub update { + my ($self) = @_; + + $self->{need_update} = 1; + $self->SUPER::update; +} + +sub draw { + my ($self) = @_; + + $self->{need_update}++;#d# + if (delete $self->{need_update}) { + glNewList $self->{list}, GL_COMPILE; + + my $sw = int $::WIDTH / 32; + my $sh = int $::HEIGHT / 32; + + if ($::MAP) { + my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); + + 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; + } + + my $tex = 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; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + + glColor +($::CFG->{fow_intensity}) x 3, 1; + $tex->draw_quad (0, 0, $w * 32, $h * 32); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } } + + glEndList; } - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glCallList $self->{list}; + + 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; + } } my %DIR = ( @@ -620,16 +1659,20 @@ my $sym = $ev->key_sym; if ($sym == SDLK_KP5) { - $::CONN->send ("command stay fire"); + $::CONN->user_send ("command stay fire"); + } elsif ($sym == SDLK_a) { + $::CONN->user_send ("command apply"); + } elsif ($sym == SDLK_QUOTE) { + $self->emit ('activate_console'); } elsif (exists $DIR{$sym}) { if ($mod & KMOD_SHIFT) { $self->{shft}++; - $::CONN->send ("command fire $DIR{$sym}[0]"); + $::CONN->user_send ("command fire $DIR{$sym}[0]"); } elsif ($mod & KMOD_CTRL) { $self->{ctrl}++; - $::CONN->send ("command run $DIR{$sym}[0]"); + $::CONN->user_send ("command run $DIR{$sym}[0]"); } else { - $::CONN->send ("command $DIR{$sym}[1]"); + $::CONN->user_send ("command $DIR{$sym}[1]"); } } } @@ -641,12 +1684,144 @@ my $sym = $ev->key_sym; if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { - $::CONN->send ("command fire_stop"); + $::CONN->user_send ("command fire_stop"); } if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { - $::CONN->send ("command run_stop"); + $::CONN->user_send ("command run_stop"); + } +} + +############################################################################# + +package CFClient::UI::Animator; + +use SDL::OpenGL; + +our @ISA = CFClient::UI::Bin::; + +sub moveto { + my ($self, $x, $y) = @_; + + $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; + $self->{speed} = 0.001; + $self->{time} = 1; + + ::animation_start $self; +} + +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 _draw { + my ($self) = @_; + + glPushMatrix; + glRotate $self->{time} * 1000, 0, 1, 0; + $self->{children}[0]->draw; + glPopMatrix; +} + +############################################################################# + +package CFClient::UI::Flopper; + +our @ISA = CFClient::UI::Button::; + +sub new { + my $class = shift; + + my $self = $class->SUPER::new ( + state => 0, + connect_activate => \&toggle_flopper, + @_ + ); + + if ($self->{state}) { + $self->{state} = 0; + $self->toggle_flopper; } + + $self +} + +sub toggle_flopper { + my ($self) = @_; + + # TODO: use animation + if ($self->{state} = !$self->{state}) { + $CFClient::UI::TOPLEVEL->add ($self->{other}); + $self->{other}->move ( + ($::WIDTH - $self->{other}{w}) * 0.5, + ($::HEIGHT - $self->{other}{h}) * 0.5, + ); + } else { + $CFClient::UI::TOPLEVEL->remove ($self->{other}); + } +} + +############################################################################# + +package CFClient::UI::Toplevel; + +our @ISA = CFClient::UI::Container::; + +sub size_request { + ($::WIDTH, $::HEIGHT) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); + + $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) + for @{$self->{children}}; +} + +sub translate { + my ($self, $x, $y) = @_; + + ($x, $y) } -1; +sub update { + my ($self) = @_; + + $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); + ::refresh (); +} + +sub add { + my ($self, $widget) = @_; + + $self->SUPER::add ($widget); + + $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); +} + +sub draw { + my ($self) = @_; + + $self->_draw; +} + +############################################################################# + +package CFClient::UI; + +$TOPLEVEL = new CFClient::UI::Toplevel; + +1