--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/08 13:34:19 1.17 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 14:36:59 1.67 @@ -1,69 +1,146 @@ -package Crossfire::Client::Widget; +package CFClient::Widget; use strict; + +use Scalar::Util; + use SDL::OpenGL; use SDL::OpenGL::Constants; -our $FOCUS; # the widget with current focus -our @ACTIVE_WIDGETS; +use CFClient; + +our ($FOCUS, $HOVER, $GRAB); # various 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; + } - bless { @_ }, $class + $BUTTON_STATE |= 1 << ($ev->button - 1); + + $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; } -sub activate { - push @ACTIVE_WIDGETS, $_[0]; +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_down ($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; } -sub size_request { - die "size_request is abtract"; +sub new { + my $class = shift; + + bless { + x => 0, + y => 0, + z => 0, + @_ + }, $class +} + +sub move { + my ($self, $x, $y, $z) = @_; + $self->{x} = $x; + $self->{y} = $y; + $self->{z} = $z if defined $z; } -sub focus_in { - my ($widget) = @_; - $FOCUS = $widget; +sub needs_redraw { + 0 } -sub focus_out { - my ($widget) = @_; +sub size_request { + require Carp; + Carp::confess "size_request is abtract"; } -sub key_down { - my ($widget, $sdlev) = @_; +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->{w} = $w; + $self->{h} = $h; } -sub key_up { - my ($widget, $sdlev) = @_; +# translate global koordinates to local coordinate system +sub translate { + my ($self, $x, $y) = @_; + + $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); } -sub button_down { - my ($widget, $sdlev) = @_; +sub focus_in { + my ($self) = @_; + + my $focus = $FOCUS; $FOCUS = $self; + $focus->update if $focus; + $FOCUS->update; } -sub button_up { - my ($widget, $sdlev) = @_; +sub focus_out { + my ($self) = @_; + + return unless $FOCUS == $self; + + my $focus = $FOCUS; undef $FOCUS; + $focus->update if $focus; #? } -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 mouse_motion { } +sub button_up { } +sub button_down { } +sub key_down { } +sub key_up { } + +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) = @_; @@ -71,81 +148,406 @@ glPushMatrix; glTranslate $self->{x}, $self->{y}, 0; $self->_draw; + if ($self == $HOVER) { + glColor 1, 1, 1, 0.4; + glEnable GL_BLEND; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex $self->{w}, 0; + glVertex $self->{w}, $self->{h}; + glVertex 0 , $self->{h}; + glEnd; + glDisable GL_BLEND; + } glPopMatrix; } sub _draw { - my ($widget) = @_; + my ($self) = @_; + + warn "no draw defined for $self\n"; } sub bbox { - my ($widget) = @_; + my ($self) = @_; + my ($w, $h) = $self->size_request; + ( + $self->{x}, + $self->{y}, + $self->{x} = $w, + $self->{y} = $h + ) +} + +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 del_parent { $_[0]->{parent} = undef } + +sub set_parent { + my ($self, $par) = @_; + + $self->{parent} = $par; + Scalar::Util::weaken $self->{parent}; +} + +sub get_parent { + $_[0]->{parent} +} + +sub update { + my ($self) = @_; + + $self->{parent}->update + if $self->{parent}; +} + +sub DESTROY { + my ($self) = @_; + + #$self->deactivate; +} + +############################################################################# + +package CFClient::Widget::Empty; + +our @ISA = CFClient::Widget::; + +sub size_request { + (0, 0) +} + +sub draw { } + +############################################################################# + +package CFClient::Widget::Container; + +our @ISA = CFClient::Widget::; + +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, $expand) = @_; + + $chld->{expand} = $expand; + $chld->set_parent ($self); + + $self->{children} = [ + sort { $a->{z} <=> $b->{z} } + @{$self->{children}}, $chld + ]; + + $self->size_allocate ($self->{w}, $self->{h}) + if $self->{w}; #TODO: check for "realised state" +} + +sub remove { + my ($self, $widget) = @_; + + $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; + + $self->size_allocate ($self->{w}, $self->{h}); } -package Crossfire::Client::Widget::Container; +sub find_widget { + my ($self, $x, $y) = @_; + + $x -= $self->{x}; + $y -= $self->{y}; -our @ISA = Crossfire::Client::Widget::; + 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::Widget::Bin; + +our @ISA = CFClient::Widget::Container::; + +sub new { + my ($class, %arg) = @_; + + my $child = (delete $arg{child}) || new CFClient::Widget::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::Widget::Empty] + unless @{$self->{children}}; +} + +sub child { $_[0]->{children}[0] } + +sub size_request { + $_[0]{children}[0]->size_request if $_[0]{children}[0]; +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + $self->{children}[0]->size_allocate ($w, $h) + if $self->{children}[0] +} + +############################################################################# + +package CFClient::Widget::Window; + +our @ISA = CFClient::Widget::Bin::; use SDL::OpenGL; -sub add { $_[0]->{child} = $_[1] } -sub get { $_[0]->{child} } +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) = @_; + + $self->{texture} = + CFClient::Texture->new_from_opengl ( + $self->{w}, $self->{h}, sub { $self->child->draw } + ); +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->{w} = $w; + $self->{h} = $h; -sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } + $self->child->size_allocate ($w, $h); -sub _draw { die "Containers can't be drawn!" } + $self->render_chld; +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = ($self->w, $self->h); + + my $tex = $self->{texture} + or return; + + glEnable GL_BLEND; + 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 Crossfire::Client::Widget::Frame; +############################################################################# -our @ISA = Crossfire::Client::Widget::Container::; +package CFClient::Widget::Frame; + +our @ISA = CFClient::Widget::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); + map { $_ + 4 } $chld->size_request; } +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->{w} = $w; + $self->{h} = $h; + + $self->child->size_allocate ($w - 4, $h - 4); + $self->child->move (2, 2); +} + sub _draw { my ($self) = @_; - my $chld = $self->get; + my $chld = $self->child; my ($w, $h) = $chld->size_request; - glColor 1, 0, 0; glBegin GL_QUADS; - 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; + glColor 0, 0, 0; + glVertex 0 , 0; + glVertex 0 , $h + 4; + glVertex $w + 4 , $h + 4; + glVertex $w + 4 , 0; glEnd; - glPushMatrix; - glTranslate (2, 2, 0); - $chld->_draw; - glPopMatrix; + $chld->draw; } -package Crossfire::Client::Widget::Table; +############################################################################# + +package CFClient::Widget::FancyFrame; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = CFClient::Widget::Bin::; + +use SDL::OpenGL; + +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 size_request { + my ($self) = @_; + + my ($w, $h) = $self->SUPER::size_request; + + $h += $tex[1]->{height}; + $h += $tex[4]->{height}; + $w += $tex[2]->{width}; + $w += $tex[3]->{width}; + + ($w, $h) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + $h -= $tex[1]->{height}; + $h -= $tex[4]->{height}; + $w -= $tex[2]->{width}; + $w -= $tex[3]->{width}; + + $h = $h < 0 ? 0 : $h; + $w = $w < 0 ? 0 : $w; + + my $child = $self->child; + + $child->size_allocate ($w, $h); + $child->move ($tex[3]->{width}, $tex[1]->{height}); +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = ($self->{w}, $self->{h}); + my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); + + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + my $top = $tex[1]; + $top->draw_quad (0, 0, $w, $top->{height}); + + my $left = $tex[3]; + $left->draw_quad (0, $top->{height}, $left->{width}, $ch); + + my $right = $tex[2]; + $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); + + my $bottom = $tex[4]; + $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); + + my $bg = $tex[0]; + glBindTexture GL_TEXTURE_2D, $bg->{name}; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; + glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; + + my $rep_x = $cw / $bg->{width}; + my $rep_y = $ch / $bg->{height}; + + $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; + + $self->child->draw; + +} + +############################################################################# + +package CFClient::Widget::Table; + +our @ISA = CFClient::Widget::Bin::; use SDL::OpenGL; sub add { my ($self, $x, $y, $chld) = @_; - $self->{childs}[$y][$x] = $chld; + my $old_chld = $self->{children}[$y][$x]; + + $self->{children}[$y][$x] = $chld; + $chld->set_parent ($self); + $self->update; } sub max_row_height { my ($self, $row) = @_; my $hs = 0; - for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { - my $c = $self->{childs}->[$row]->[$xi]; + for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { + my $c = $self->{children}->[$row]->[$xi]; if ($c) { my ($w, $h) = $c->size_request; if ($hs < $h) { $hs = $h } @@ -158,8 +560,8 @@ my ($self, $col) = @_; my $ws = 0; - for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { - my $c = ($self->{childs}->[$yi] || [])->[$col]; + for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { + my $c = ($self->{children}->[$yi] || [])->[$col]; if ($c) { my ($w, $h) = $c->size_request; if ($ws < $w) { $ws = $w } @@ -173,13 +575,13 @@ my ($hs, $ws) = (0, 0); - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { + for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { $hs += $self->max_row_height ($yi); } - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { + for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { my $wm = 0; - for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { + for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { $wm += $self->max_col_width ($xi) } if ($ws < $wm) { $ws = $wm } @@ -192,16 +594,16 @@ my ($self) = @_; my $y = 0; - for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { + for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { my $x = 0; - for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { + for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { - glPushMatrix; - glTranslate ($x, $y, 0); - my $c = $self->{childs}->[$yi]->[$xi]; - $c->_draw if $c; - glPopMatrix; + my $c = $self->{children}->[$yi]->[$xi]; + if ($c) { + $c->move ($x, $y, 0); #TODO: Move to size_request + $c->draw if $c; + } $x += $self->max_col_width ($xi); } @@ -210,133 +612,234 @@ } } -package Crossfire::Client::Widget::VBox; +############################################################################# -our @ISA = Crossfire::Client::Widget::Container::; +package CFClient::Widget::VBox; -use SDL::OpenGL; +our @ISA = CFClient::Widget::Container::; -sub add { - my ($self, $chld) = @_; - push @{$self->{childs}}, $chld; -} +use SDL::OpenGL; 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, $w, $h) = @_; + + $self->w ($w); + $self->h ($h); + + my $exp; + my @oth; + # find expand widget + for (@{$self->{children}}) { + if ($_->{expand}) { + $exp = $_; + last; + } + push @oth, $_; + } - my ($x, $y); - for (@{$self->{childs} || []}) { - glPushMatrix; - glTranslate (0, $y, 0); - $_->_draw; - glPopMatrix; + my ($ow, $oh); + + # get sizes of other widgets + for (@oth) { my ($w, $h) = $_->size_request; - $y += $h; + $oh += $h; + if ($ow < $w) { $ow = $w } + } + + my $y = 0; + for (@{$self->{children}}) { + $_->move (0, $y); + + if ($_ == $exp) { + $_->size_allocate ($w, $h - $oh); + $y += $h - $oh; + } else { + my ($cw, $h) = $_->size_request; + $_->size_allocate ($w, $h); + $y += $h; + } } } -package Crossfire::Client::Widget::Label; +############################################################################# + +package CFClient::Widget::Label; -our @ISA = Crossfire::Client::Widget::; +our @ISA = CFClient::Widget::; use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $ttf, $text) = @_; + my ($class, %arg) = @_; - my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); + # TODO: color, and make height, xyz etc. optional + my $self = $class->SUPER::new ( + color => [1, 1, 1], + height => $::FONTSIZE, + text => "", + layout => new CFClient::Layout, + %arg + ); - $self->set_text ($text); + $self->set_text ($self->{text}); $self } sub set_text { my ($self, $text) = @_; - $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; + + $self->{text} = $text; + $self->{layout}->set_markup ($text); + + delete $self->{texture}; } sub get_text { my ($self, $text) = @_; + $self->{text} } sub size_request { my ($self) = @_; - ( - $self->{texture}{width}, - $self->{texture}{height}, - ) + $self->{layout}->set_width; + $self->{layout}->set_height ($self->{height}); + $self->{layout}->size +# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack +# ( +# $self->{texture}{width}, +# $self->{texture}{height}, +# ) +# } else { +# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height}; +# +# ($w, $h) +# } +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + delete $self->{texture}; } sub _draw { my ($self) = @_; - my $tex = $self->{texture}; - - $self->{x}--; + my $tex = $self->{texture} ||= do { + $self->{layout}->set_width ($self->{w}); + new_from_layout CFClient::Texture $self->{layout}; + }; glEnable GL_BLEND; glEnable GL_TEXTURE_2D; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glBindTexture GL_TEXTURE_2D, $tex->{name}; - glColor 1, 1, 1; + glColor @{$self->{color}}; - 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; + $tex->draw_quad (0, 0); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; } -package Crossfire::Client::Widget::TextView; +############################################################################# -use strict; +package CFClient::Widget::Entry; -our @ISA = qw/Crossfire::Client::Widget/; +our @ISA = CFClient::Widget::Label::; +use SDL; use SDL::OpenGL; -use SDL::OpenGL::Constants; -sub add_line { - my ($self, $line) = @_; - push @{$self->{lines}}, $line; +sub key_down { + my ($self, $ev) = @_; + + my $mod = $ev->key_mod; + my $sym = $ev->key_sym; + + my $uni = $ev->key_unicode; + + my $text = $self->get_text; + + if ($sym == SDLK_BACKSPACE) { + substr $text, -1, 1, ''; + } elsif ($uni) { + $text .= chr $uni; + } + + $self->set_text ($text); +} + +sub button_down { + my ($self, $ev) = @_; + + $self->focus_in; +} + +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 _draw { my ($self) = @_; + if ($FOCUS == $self) { + glColor 1, 1, 1; + } else { + glColor 0.7, 0.7, 0.7; + } + + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $self->{h} - 1; + glVertex $self->{w} - 1, $self->{h} - 1; + glVertex $self->{w} - 1, 0; + glEnd; + + $self->SUPER::_draw; } -package Crossfire::Client::Widget::MapWidget; +############################################################################# + +package CFClient::Widget::MapWidget; use strict; -our @ISA = qw/Crossfire::Client::Widget/; +use List::Util qw(min max); use SDL; use SDL::OpenGL; use SDL::OpenGL::Constants; +our @ISA = CFClient::Widget::; + +sub new { + my $class = shift; + + $class->SUPER::new ( + z => -1, + list => (glGenLists 1), + @_ + ) +} + sub key_down { print "MAPKEYDOWN\n"; } @@ -344,50 +847,125 @@ sub key_up { } +sub size_request { + ( + 1 + int $::WIDTH / 32, + 1 + int $::HEIGHT / 32, + ) +} + +sub update { + my ($self) = @_; + + $self->{need_update} = 1; +} + sub _draw { - glEnable GL_TEXTURE_2D; - glEnable GL_BLEND; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + my ($self) = @_; - my $map = $::CONN->{map}; + if (delete $self->{need_update}) { + glNewList $self->{list}, GL_COMPILE; - for my $x (0 .. $::CONN->{mapw} - 1) { - for my $y (0 .. $::CONN->{maph} - 1) { + my $mx = $::CONN->{mapx}; + my $my = $::CONN->{mapy}; - my $cell = $map->[$x][$y] - or next; + my $map = $::CONN->{map}; - my $darkness = $cell->[3] * (1 / 255); - glColor $darkness, $darkness, $darkness; + my ($xofs, $yofs); - for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { - my $tex = $::CONN->{face}[$num]{texture} || next; + my $sw = 1 + int $::WIDTH / 32; + my $sh = 1 + int $::HEIGHT / 32; - glBindTexture GL_TEXTURE_2D, $tex->{name}; + 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}; + } + + 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}; + } + + glEnable GL_TEXTURE_2D; + glEnable GL_BLEND; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + my $sw4 = ($sw + 3) & ~3; + my $darkness = "\x00" x ($sw4 * $sh); + + for my $x (0 .. $sw - 1) { + my $row = $map->[$x + $xofs]; + for my $y (0 .. $sh - 1) { + + my $cell = $row->[$y + $yofs] + or next; + + my $dark = $cell->[0]; + if ($dark < 0) { + substr $darkness, $y * $sw4 + $x, 1, chr 224; + } else { + substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; + } + + for my $num (grep $_, @$cell[1,2,3]) { + my $tex = $::CONN->{face}[$num]{texture} || next; + + my $w = $tex->{width}; + my $h = $tex->{height}; - glBegin GL_QUADS; - glTexCoord 0, 0; glVertex $x * 32 , $y * 32; - glTexCoord 0, 1; glVertex $x * 32 , $y * 32 + 32; - glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32; - glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32; - glEnd; + $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); + } } } + +# if (1) { # higher quality darkness +# $lighting =~ s/(.)/$1$1$1/gs; +# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; +# +# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear"); +# +# $lighting = $pb->get_pixels; +# $lighting =~ s/(.)../$1/gs; +# } + + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + + $darkness = new CFClient::Texture + width => $sw4, + height => $sh, + data => $darkness, + internalformat => GL_ALPHA, + format => GL_ALPHA; + + glColor 0.45, 0.45, 0.45, 1; + $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + glEndList; } - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glCallList $self->{list}; } my %DIR = ( SDLK_KP8, [1, "north"], - SDLK_KP9, [2, "northest"], + 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 key_down { @@ -400,10 +978,13 @@ $::CONN->send ("command stay fire"); } elsif (exists $DIR{$sym}) { if ($mod & KMOD_SHIFT) { + $self->{shft}++; $::CONN->send ("command fire $DIR{$sym}[0]"); } elsif ($mod & KMOD_CTRL) { + $self->{ctrl}++; $::CONN->send ("command run $DIR{$sym}[0]"); } else { + $::CONN->send ("command $DIR{$sym}[1]"); } } } @@ -414,14 +995,107 @@ my $mod = $ev->key_mod; my $sym = $ev->key_sym; - if (exists $DIR{$sym}) { - if ($mod & KMOD_SHIFT) { - $::CONN->send ("command fire_stop"); - } else { - $::CONN->send ("command run_stop"); - } + if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { + $::CONN->send ("command fire_stop"); + } + if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { + $::CONN->send ("command run_stop"); } } -1; +############################################################################# + +package CFClient::Widget::Animator; + +use SDL::OpenGL; + +our @ISA = CFClient::Widget::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::Widget::Toplevel; + +our @ISA = CFClient::Widget::Container::; + +sub size_request { + ($::WIDTH, $::HEIGHT) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + $_->size_allocate ($_->size_request) + for @{$self->{children}}; +} + +sub translate { + my ($self, $x, $y) = @_; + + ($x, $y) +} + +sub update { + my ($self) = @_; + + $self->size_allocate ($self->size_request); + ::refresh (); +} + +sub add { + my ($self, $widget) = @_; + + $self->SUPER::add ($widget); + + $widget->size_allocate ($widget->size_request); +} + +sub draw { + my ($self) = @_; + + $self->_draw; +} + +############################################################################# + +package CFClient::Widget; + +$TOPLEVEL = new CFClient::Widget::Toplevel; + +1