--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/08 18:48:34 1.23 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 17:34:15 1.35 @@ -8,13 +8,13 @@ use SDL::OpenGL::Constants; our $FOCUS; # the widget with current focus -our @ACTIVE_WIDGETS; +#our @ACTIVE_WIDGETS; # 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_button_down_event { } +sub feed_sdl_button_up_event { } sub new { my $class = shift; @@ -22,17 +22,17 @@ bless { @_ }, $class } -sub activate { - push @ACTIVE_WIDGETS, $_[0]; - Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; -} - -sub deactivate { - @ACTIVE_WIDGETS = - sort { $a->{z} <=> $b->{z} } - grep { $_ && $_ != $_[0] } - @ACTIVE_WIDGETS; -} +#sub activate { +# push @ACTIVE_WIDGETS, $_[0]; +# Scalar::Util::weaken $ACTIVE_WIDGETS[-1]; +#} + +#sub deactivate { +# @ACTIVE_WIDGETS = +# sort { $a->{z} <=> $b->{z} } +# grep { $_ && $_ != $_[0] } +# @ACTIVE_WIDGETS; +#} sub move { my ($self, $x, $y, $z) = @_; @@ -94,37 +94,123 @@ } sub bbox { - my ($widget) = @_; + my ($self) = @_; + my ($w, $h) = $self->size_request; + ( + $self->{x}, + $self->{y}, + $self->{x} = $w, + $self->{y} = $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; + #$self->deactivate; } -package Crossfire::Client::Widget::Container; +package Crossfire::Client::Widget::Bin; our @ISA = Crossfire::Client::Widget::; -use SDL::OpenGL; +sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } -sub add { $_[0]->{child} = $_[1] } sub get { $_[0]->{child} } -sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } +sub remove { + my ($self, $chld) = @_; + delete $self->{child} + if $self->{child} == $chld; +} + +sub size_request { + $_[0]->{child}->size_request if $_[0]->{child} +} + +sub _draw { + my ($self) = @_; + + $self->{child}->draw; +} + +package Crossfire::Client::Widget::Toplevel; -sub _draw { die "Containers can't be drawn!" } +our @ISA = Crossfire::Client::Widget::; + +use SDL::OpenGL; + +sub add { + my ($self, $chld) = @_; + + push @{$self->{childs}}, $chld; + @{$self->{childs}} = + sort { $a->{z} <=> $b->{z} } + @{$self->{childs}}; + + $chld->set_parent ($self); +} + +sub remove { + my ($self, $chld) = @_; + @{$self->{childs}} = + sort { $a->{z} <=> $b->{z} } + grep { $_ && $_ != $_[0] } + @{$self->{childs}} +} + +sub update { + my ($self) = @_; + ::refresh (); +} + +sub _draw { + my ($self) = @_; + + $_->draw for @{$self->{childs}}; +} package Crossfire::Client::Widget::Window; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = Crossfire::Client::Widget::Bin::; use SDL::OpenGL; sub add { my ($self, $chld) = @_; $self->SUPER::add ($chld); + $chld->set_parent ($self); + $self->update; #TODO: Move this to the size_request event propably? +} + +sub remove { + my ($self) = @_; + # TODO FIXME: removing a child from a window will crash, see render_chld + $self->update; +} + +sub update { + my ($self) = @_; $self->render_chld; } @@ -150,17 +236,16 @@ sub _draw { my ($self) = @_; - my ($w, $h) = $self->size_request;#TODO# use widht/height of texture + 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; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 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; @@ -174,7 +259,7 @@ package Crossfire::Client::Widget::Frame; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = Crossfire::Client::Widget::Bin::; use SDL::OpenGL; @@ -182,6 +267,9 @@ my ($self) = @_; my $chld = $self->get or return (0, 0); + + $chld->move (2, 2); + map { $_ + 4 } $chld->size_request; } @@ -192,29 +280,145 @@ my ($w, $h) = $chld->size_request; - glColor 1, 0, 0; 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; glEnd; - glPushMatrix; - glTranslate (2, 2, 0); $chld->draw; - glPopMatrix; +} + +package Crossfire::Client::Widget::FancyFrame; + +our @ISA = Crossfire::Client::Widget::Frame::; + +use SDL::OpenGL; + +sub new { + my ($self, $theme) = @_; + $self = $self->SUPER::new; + + $self->{txts} = [ + map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } + qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ + ]; + $self + +} + +sub size_request { + my ($self) = @_; + my ($w, $h) = $self->get->size_request; + + $h += $self->{txts}->[1]->{height}; + $h += $self->{txts}->[4]->{height}; + $w += $self->{txts}->[2]->{width}; + $w += $self->{txts}->[3]->{width}; + + $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); + + ($w, $h) +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = $self->size_request; + my ($cw, $ch) = $self->get->size_request; + + 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; + + + my $top = $self->{txts}->[1]; + glBindTexture GL_TEXTURE_2D, $top->{name}; + + glColor 1, 1, 1, 0.8; + + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex 0 , 0; + glTexCoord 0, 1; glVertex 0 , $top->{height}; + glTexCoord 1, 1; glVertex $w , $top->{height}; + glTexCoord 1, 0; glVertex $w , 0; + glEnd; + + my $left = $self->{txts}->[3]; + glBindTexture GL_TEXTURE_2D, $left->{name}; + + glColor 1, 1, 1, 0.8; + + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex 0 , $top->{height}; + glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; + glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; + glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; + glEnd; + + my $right = $self->{txts}->[2]; + glBindTexture GL_TEXTURE_2D, $right->{name}; + + glColor 1, 1, 1, 0.8; + + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; + glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; + glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; + glTexCoord 1, 0; glVertex $w , $top->{height}; + glEnd; + + my $bottom = $self->{txts}->[4]; + glBindTexture GL_TEXTURE_2D, $bottom->{name}; + + glColor 1, 1, 1, 0.8; + + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; + glTexCoord 0, 1; glVertex 0 , $h; + glTexCoord 1, 1; glVertex $w , $h; + glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; + glEnd; + + my $bg = $self->{txts}->[0]; + glBindTexture GL_TEXTURE_2D, $bg->{name}; + glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; + glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; + + glColor 1, 1, 1, 0.8; + + my $rep_x = $cw / $bg->{width}; + my $rep_y = $ch / $bg->{height}; + + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; + glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; + glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; + glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; + glEnd; + + $self->get->draw; + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; } package Crossfire::Client::Widget::Table; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = Crossfire::Client::Widget::Bin::; use SDL::OpenGL; sub add { my ($self, $x, $y, $chld) = @_; + my $old_chld = $self->{childs}[$y][$x]; + $self->{childs}[$y][$x] = $chld; + $chld->set_parent ($self); + $self->update; } sub max_row_height { @@ -274,11 +478,11 @@ for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { - glPushMatrix; - glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved 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); } @@ -289,13 +493,15 @@ package Crossfire::Client::Widget::VBox; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = Crossfire::Client::Widget::Bin::; use SDL::OpenGL; sub add { my ($self, $chld) = @_; push @{$self->{childs}}, $chld; + $chld->set_parent ($self); + $self->update; } sub size_request { @@ -316,10 +522,8 @@ my ($x, $y); for (@{$self->{childs} || []}) { - glPushMatrix; - glTranslate (0, $y, 0);# see above TODO + $_->move (0, $y, 0); #TODO: move to size_request $_->draw; - glPopMatrix; my ($w, $h) = $_->size_request; $y += $h; } @@ -332,9 +536,10 @@ 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); + # TODO: color, and make height, xyz etc. optional + my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); $self->set_text ($text); @@ -343,11 +548,16 @@ 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}; + + $self->update; } sub get_text { my ($self, $text) = @_; + $self->{text} } @@ -367,10 +577,11 @@ 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 1, 1, 1, 0.6; # TODO color glBegin GL_QUADS; glTexCoord 0, 0; glVertex 0 , 0; @@ -383,6 +594,35 @@ glDisable GL_TEXTURE_2D; } +package Crossfire::Client::Widget::TextEntry; + +our @ISA = Crossfire::Client::Widget::Label::; + +use SDL; +use SDL::OpenGL; + +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, ''; + + } elsif ($uni) { + $text .= chr $uni; + } + $self->set_text ($text); +} + + +# XXX: TextView isn't neccessary with pango multiline text rendering package Crossfire::Client::Widget::TextView; use strict; @@ -392,26 +632,96 @@ use SDL::OpenGL; use SDL::OpenGL::Constants; +sub new { + my ($class, $text, $h) = @_; + my $self = $class->SUPER::new (); + + $self->{txt_height} = $h; + @{$self->{lines}} = split /\r?\n/, $text; + + for (split /\r?\n/, $text) { + $self->add_line ($_); + } + $self +} + +#sub render_lines { +# my ($self) = @_; +# +# $self->{txt_lines} = []; +# +# for (@{$self->{lines}}) { +# push @{$self->{txt_lines}}, +# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_; +# } +#} + sub add_line { my ($self, $line) = @_; push @{$self->{lines}}, $line; + + push @{$self->{txt_lines}}, + new_from_text Crossfire::Client::Texture $line, $self->{txt_height}; +} + +sub size_request { + my ($self) = @_; + + my $w = 0; + my $h = 0; + + for (@{$self->{txt_lines}}) { + if ($w < $_->{width}) { $w = $_->{width} } + $h += $_->{height}; + } + + return ($w, $h); +} + +sub draw_line { + my ($self, $tex, $y) = @_; + + glBindTexture GL_TEXTURE_2D, $tex->{name}; + + glColor 1, 0, 1; + + 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; } sub _draw { my ($self) = @_; + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL; + + my $l = 0; + for (@{$self->{txt_lines}}) { + $self->draw_line ($_, $l); + $l += $_->{height}; + } + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; } package Crossfire::Client::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 = Crossfire::Client::Widget::; + sub key_down { print "MAPKEYDOWN\n"; } @@ -422,24 +732,46 @@ 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; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - my $map = $::CONN->{map}; + my $sw4 = ($sw + 3) & ~3; + my $lighting = "\x00" x ($sw4 * $sh); - for my $x (0 .. int $::WIDTH / 32) { - for my $y (0 .. int $::HEIGHT / 32) { + for my $x (0 .. $sw - 1) { + for my $y (0 .. $sh - 1) { - my $cell = $map->[$x + $::CONN->{mapx}] - [$y + $::CONN->{mapy}] + my $cell = $map->[$x + $xofs][$y + $yofs] or next; my $darkness = $cell->[0] * (1 / 255); if ($darkness < 0) { - $darkness = 0.5; + $darkness = 0.15; } - glColor $darkness, $darkness, $darkness; + substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255; for my $num (grep $_, @$cell[1,2,3]) { my $tex = $::CONN->{face}[$num]{texture} || next; @@ -462,6 +794,35 @@ } } +# 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; +# } + + $lighting = new Crossfire::Client::Texture + width => $sw4, + height => $sh, + data => $lighting, + internalformat => GL_ALPHA4, + format => GL_ALPHA; + + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glColor 0, 0, 0, 0.75; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + glBindTexture GL_TEXTURE_2D, $lighting->{name}; + glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR; + glBegin GL_QUADS; + glTexCoord 0, 0; glVertex 0 , 0; + glTexCoord 0, 1; glVertex 0 , $sh * 32; + glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; + glTexCoord 1, 0; glVertex $sw4 * 32, 0; + glEnd; + glDisable GL_TEXTURE_2D; glDisable GL_BLEND; } @@ -517,5 +878,45 @@ } } +package Crossfire::Client::Widget::Animator; + +use SDL::OpenGL; + +our @ISA = Crossfire::Client::Widget::Bin::; + +sub moveto { + my ($self, $x, $y) = @_; + + $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; + $self->{speed} = 0.01; + $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} * 10000, 0, 1, 0; + $self->{child}->draw; + glPopMatrix; +} + 1;