--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 00:09:50 1.29 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 21:50:21 1.41 @@ -7,14 +7,15 @@ use SDL::OpenGL; use SDL::OpenGL::Constants; +use Crossfire::Client; + our $FOCUS; # the widget with current focus -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,18 +23,6 @@ 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 move { my ($self, $x, $y, $z) = @_; $self->{x} = $x; @@ -46,7 +35,15 @@ } sub size_request { - die "size_request is abtract"; + require Carp; + Carp::confess "size_request is abtract"; +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->{w} = $w; + $self->{h} = $h; } sub focus_in { @@ -74,8 +71,8 @@ my ($widget, $sdlev) = @_; } -sub w { $_[0]->{w} } -sub h { $_[0]->{h} } +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} } @@ -90,42 +87,181 @@ } 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; + #$self->deactivate; } +############################################################################# + package Crossfire::Client::Widget::Container; our @ISA = Crossfire::Client::Widget::; -use SDL::OpenGL; +sub new { + my ($class, @widgets) = @_; -sub add { $_[0]->{child} = $_[1] } -sub get { $_[0]->{child} } + my $self = $class->SUPER::new (children => []); + $self->add ($_) for @widgets; -sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } + $self +} -sub _draw { die "Containers can't be drawn!" } +sub add { + my ($self, $chld, $expand) = @_; -package Crossfire::Client::Widget::Window; + $chld->{expand} = $expand; + $chld->set_parent ($self); + + @{$self->{children}} = + sort { $a->{z} <=> $b->{z} } + @{$self->{children}}, $chld; + + $self->size_allocate ($self->{w}, $self->{h}); +} + +sub remove { + my ($self, $widget) = @_; + + $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; + + $self->size_allocate ($self->{w}, $self->{h}); +} + +sub find_widget { + my ($self, $x, $y) = @_; + + my $res; + + for (@{ $self->{children} }) { + $res = $_->find_widget ($x, $y) + and return $res; + } + + () +} + +sub size_request { + my ($self) = @_; + + my ($hs, $ws) = (0, 0); + for (@{$self->{children} || []}) { + my ($w, $h) = $_->size_request; + $hs += $h; + if ($ws < $w) { $ws = $w } + } + + return ($ws, $hs); +} + +sub _draw { + my ($self) = @_; + + $_->draw for @{$self->{children}}; +} + +############################################################################# + +package Crossfire::Client::Widget::Bin; + +our @ISA = Crossfire::Client::Widget::Container::; + +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 Crossfire::Client::Widget::Toplevel; our @ISA = Crossfire::Client::Widget::Container::; +sub update { + my ($self) = @_; + + ::refresh (); +} + +############################################################################# + +package Crossfire::Client::Widget::Window; + +our @ISA = Crossfire::Client::Widget::Bin::; + use SDL::OpenGL; sub add { my ($self, $chld) = @_; + warn "ADD $chld\n"; $self->SUPER::add ($chld); - $self->render_chld; #TODO: Move this to the size_request event propably? + $chld->set_parent ($self); +} + +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; } sub render_chld { @@ -133,6 +269,9 @@ my $chld = $self->get; my ($w, $h) = $self->size_request; + require Carp; + Carp::cluck "RENDERCHI $w $h"; + warn "RENDERCHI $w $h\n"; $self->{texture} = Crossfire::Client::Texture->new_from_opengl ( $w, $h, sub { $chld->draw } @@ -142,26 +281,32 @@ sub size_request { my ($self) = @_; - my $chld = $self->get - or return (0, 0); - $chld->size_request + ($self->w, $self->h) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->w ($w); + $self->h ($h); + $self->get->size_allocate ($w, $h); + + $self->update; #TODO: Move this to the size_request event propably? } 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; 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; @@ -173,30 +318,42 @@ glDisable GL_TEXTURE_2D; } +############################################################################# + package Crossfire::Client::Widget::Frame; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = Crossfire::Client::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->SUPER::size_allocate ($w, $h); + + $self->child->size_allocate ($w - 4, $h - 4); + $self->child->move (2, 2); +} + sub _draw { my ($self) = @_; - my $chld = $self->get; - - $chld->move (2, 2, 0); #TODO:move to size_request + my $chld = $self->child; 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; @@ -206,23 +363,145 @@ $chld->draw; } +############################################################################# + +package Crossfire::Client::Widget::FancyFrame; + +our @ISA = Crossfire::Client::Widget::Bin::; + +use SDL::OpenGL; + +my @tex = + 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); + +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; + warn "CHILD:$w $h\n"; + $self->child->size_allocate ($w, $h); + $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[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]; + glBindTexture GL_TEXTURE_2D, $top->{name}; + + 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 = $tex[3]; + glBindTexture GL_TEXTURE_2D, $left->{name}; + + 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 = $tex[2]; + glBindTexture GL_TEXTURE_2D, $right->{name}; + + 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 = $tex[4]; + glBindTexture GL_TEXTURE_2D, $bottom->{name}; + + 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 = $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}; + + 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; + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; + + $self->child->draw; + +} + +############################################################################# + 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) = @_; - $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 } @@ -235,8 +514,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 } @@ -250,13 +529,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 } @@ -269,12 +548,12 @@ 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++) { - my $c = $self->{childs}->[$yi]->[$xi]; + my $c = $self->{children}->[$yi]->[$xi]; if ($c) { $c->move ($x, $y, 0); #TODO: Move to size_request $c->draw if $c; @@ -287,42 +566,67 @@ } } +############################################################################# + package Crossfire::Client::Widget::VBox; our @ISA = Crossfire::Client::Widget::Container::; use SDL::OpenGL; -sub add { - my ($self, $chld) = @_; - push @{$self->{childs}}, $chld; -} +sub size_allocate { + my ($self, $w, $h) = @_; -sub size_request { - my ($self) = @_; + $self->w ($w); + $self->h ($h); - my ($hs, $ws) = (0, 0); - for (@{$self->{childs} || []}) { + my $exp; + my @oth; + # find expand widget + for (@{$self->{children}}) { + if ($_->{expand}) { + $exp = $_; + last; + } + push @oth, $_; + } + + my ($ow, $oh); + + # get sizes of other widgets + for (@oth) { my ($w, $h) = $_->size_request; - $hs += $h; - if ($ws < $w) { $ws = $w } + $oh += $h; + if ($ow < $w) { $ow = $w } } - return ($ws, $hs); + 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; + } + } } sub _draw { my ($self) = @_; my ($x, $y); - for (@{$self->{childs} || []}) { - $_->move (0, $y, 0); #TODO: move to size_request + for (@{$self->{children} || []}) { $_->draw; - my ($w, $h) = $_->size_request; - $y += $h; + $y += $_->h; } } +############################################################################# + package Crossfire::Client::Widget::Label; our @ISA = Crossfire::Client::Widget::; @@ -332,6 +636,7 @@ sub new { my ($class, $x, $y, $z, $height, $text) = @_; + # 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,8 +648,9 @@ my ($self, $text) = @_; $self->{text} = $text; - $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; + + $self->update; } sub get_text { @@ -369,10 +675,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, 0.8; + glColor 1, 0, 0, 1; # TODO color glBegin GL_QUADS; glTexCoord 0, 0; glVertex 0 , 0; @@ -385,25 +692,37 @@ glDisable GL_TEXTURE_2D; } -package Crossfire::Client::Widget::TextView; +############################################################################# -use strict; +package Crossfire::Client::Widget::TextEntry; -our @ISA = qw/Crossfire::Client::Widget/; +our @ISA = Crossfire::Client::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) = @_; -sub _draw { - my ($self) = @_; + 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); } +############################################################################# + package Crossfire::Client::Widget::MapWidget; use strict; @@ -423,6 +742,13 @@ sub key_up { } +sub size_request { + +} + +sub size_allocate { +} + sub _draw { my ($self) = @_; @@ -450,7 +776,10 @@ 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 $sw4 = ($sw + 3) & ~3; + my $lighting = "\x00" x ($sw4 * $sh); for my $x (0 .. $sw - 1) { for my $y (0 .. $sh - 1) { @@ -460,10 +789,9 @@ my $darkness = $cell->[0] * (1 / 255); if ($darkness < 0) { - glColor 0.3, 0.3, 0.3; - } else { - glColor $darkness, $darkness, $darkness; + $darkness = 0.15; } + 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; @@ -486,6 +814,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; } @@ -541,5 +898,47 @@ } } +############################################################################# + +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.2; + $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->{children}[0]->draw; + glPopMatrix; +} + 1;