--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/07 23:16:29 1.16 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 00:09:50 1.29 @@ -1,6 +1,9 @@ package Crossfire::Client::Widget; use strict; + +use Scalar::Util; + use SDL::OpenGL; use SDL::OpenGL::Constants; @@ -21,15 +24,27 @@ sub activate { push @ACTIVE_WIDGETS, $_[0]; + Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; } sub deactivate { @ACTIVE_WIDGETS = sort { $a->{z} <=> $b->{z} } - grep { $_ != $_[0] } + grep { $_ && $_ != $_[0] } @ACTIVE_WIDGETS; } +sub move { + my ($self, $x, $y, $z) = @_; + $self->{x} = $x; + $self->{y} = $y; + $self->{z} = $z if defined $z; +} + +sub needs_redraw { + 0 +} + sub size_request { die "size_request is abtract"; } @@ -82,6 +97,12 @@ my ($widget) = @_; } +sub DESTROY { + my ($self) = @_; + + $self->deactivate; +} + package Crossfire::Client::Widget::Container; our @ISA = Crossfire::Client::Widget::; @@ -95,6 +116,63 @@ sub _draw { die "Containers can't be drawn!" } +package Crossfire::Client::Widget::Window; + +our @ISA = Crossfire::Client::Widget::Container::; + +use SDL::OpenGL; + +sub add { + my ($self, $chld) = @_; + $self->SUPER::add ($chld); + $self->render_chld; #TODO: Move this to the size_request event propably? +} + +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 } + ); + $self->{texture}->upload; +} + +sub size_request { + my ($self) = @_; + my $chld = $self->get + or return (0, 0); + $chld->size_request +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = $self->size_request;#TODO# use width/height of texture + + my $tex = $self->{texture} + or return; + + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + glBindTexture GL_TEXTURE_2D, $tex->{name}; + + glColor 1, 1, 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; + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; +} + package Crossfire::Client::Widget::Frame; our @ISA = Crossfire::Client::Widget::Container::; @@ -113,6 +191,8 @@ my $chld = $self->get; + $chld->move (2, 2, 0); #TODO:move to size_request + my ($w, $h) = $chld->size_request; glColor 1, 0, 0; @@ -123,10 +203,7 @@ glTexCoord 1, 0; glVertex $w + 4 , 0; glEnd; - glPushMatrix; - glTranslate (2, 2, 0); - $chld->_draw; - glPopMatrix; + $chld->draw; } package Crossfire::Client::Widget::Table; @@ -146,8 +223,10 @@ my $hs = 0; for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { my $c = $self->{childs}->[$row]->[$xi]; - my ($w, $h) = $c->size_request if $c; - if ($hs < $h) { $hs = $h } + if ($c) { + my ($w, $h) = $c->size_request; + if ($hs < $h) { $hs = $h } + } } return $hs; } @@ -158,8 +237,10 @@ my $ws = 0; for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { my $c = ($self->{childs}->[$yi] || [])->[$col]; - my ($w, $h) = $c->size_request if $c; - if ($ws < $w) { $ws = $w } + if ($c) { + my ($w, $h) = $c->size_request; + if ($ws < $w) { $ws = $w } + } } return $ws; } @@ -193,11 +274,11 @@ for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { - glPushMatrix; - glTranslate ($x, $y, 0); my $c = $self->{childs}->[$yi]->[$xi]; - $c->_draw if $c; - glPopMatrix; + if ($c) { + $c->move ($x, $y, 0); #TODO: Move to size_request + $c->draw if $c; + } $x += $self->max_col_width ($xi); } @@ -235,10 +316,8 @@ my ($x, $y); for (@{$self->{childs} || []}) { - glPushMatrix; - glTranslate (0, $y, 0); - $_->_draw; - glPopMatrix; + $_->move (0, $y, 0); #TODO: move to size_request + $_->draw; my ($w, $h) = $_->size_request; $y += $h; } @@ -251,9 +330,9 @@ use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $ttf, $text) = @_; + my ($class, $x, $y, $z, $height, $text) = @_; - my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf); + my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); $self->set_text ($text); @@ -262,11 +341,15 @@ sub set_text { my ($self, $text) = @_; - $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text; + + $self->{text} = $text; + + $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; } sub get_text { my ($self, $text) = @_; + $self->{text} } @@ -284,14 +367,12 @@ my $tex = $self->{texture}; - $self->{x}--; - glEnable GL_BLEND; glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; glBindTexture GL_TEXTURE_2D, $tex->{name}; - glColor 1, 1, 1; + glColor 1, 1, 1, 0.8; glBegin GL_QUADS; glTexCoord 0, 0; glVertex 0 , 0; @@ -327,12 +408,14 @@ 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 = Crossfire::Client::Widget::; + sub key_down { print "MAPKEYDOWN\n"; } @@ -341,31 +424,63 @@ } sub _draw { + my ($self) = @_; + + my $mx = $::CONN->{mapx}; + my $my = $::CONN->{mapy}; + + my $map = $::CONN->{map}; + + my ($xofs, $yofs); + + my $sw = 1 + int $::WIDTH / 32; + my $sh = 1 + int $::HEIGHT / 32; + + 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_MODULATE; - my $map = $::CONN->{map}; - - for my $x (0 .. $::CONN->{mapw} - 1) { - for my $y (0 .. $::CONN->{maph} - 1) { + for my $x (0 .. $sw - 1) { + for my $y (0 .. $sh - 1) { - my $cell = $map->[$x][$y] + my $cell = $map->[$x + $xofs][$y + $yofs] or next; - my $darkness = $cell->[3] * (1 / 255); - glColor $darkness, $darkness, $darkness; + my $darkness = $cell->[0] * (1 / 255); + if ($darkness < 0) { + glColor 0.3, 0.3, 0.3; + } else { + glColor $darkness, $darkness, $darkness; + } - for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) { + for my $num (grep $_, @$cell[1,2,3]) { my $tex = $::CONN->{face}[$num]{texture} || next; glBindTexture GL_TEXTURE_2D, $tex->{name}; + my $w = $tex->{width}; + my $h = $tex->{height}; + + my $px = ($x + 1) * 32 - $w; + my $py = ($y + 1) * 32 - $h; + 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; + 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; } } @@ -377,13 +492,18 @@ 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 { @@ -396,10 +516,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]"); } } } @@ -410,12 +533,11 @@ 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"); } }