--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/10 11:56:28 1.53 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/19 06:06:45 1.134 @@ -1,17 +1,15 @@ -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 Crossfire::Client; +use CFClient; our ($FOCUS, $HOVER, $GRAB); # various widgets -our $TOPLEVEL; +our $ROOT; our $BUTTON_STATE; # class methods for events @@ -28,7 +26,7 @@ my ($x, $y) = ($ev->motion_x, $ev->motion_y); if (!$BUTTON_STATE) { - my $widget = $TOPLEVEL->find_widget ($x, $y); + my $widget = $ROOT->find_widget ($x, $y); $GRAB = $widget; $GRAB->update if $GRAB; @@ -36,17 +34,19 @@ $BUTTON_STATE |= 1 << ($ev->button - 1); - $GRAB->button_down ($ev) if $GRAB; + $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; } 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); + my $widget = $GRAB || $ROOT->find_widget ($x, $y); $BUTTON_STATE &= ~(1 << ($ev->button - 1)); + $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; + if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; $grab->update if $grab; @@ -58,29 +58,82 @@ my ($ev) = @_; my ($x, $y) = ($ev->motion_x, $ev->motion_y); - my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + my $widget = $GRAB || $ROOT->find_widget ($x, $y); if ($widget != $HOVER) { my $hover = $HOVER; $HOVER = $widget; - $hover->update if $hover; - $HOVER->update if $HOVER; + $hover->update if $hover && $hover->{can_hover}; + $HOVER->update if $HOVER && $HOVER->{can_hover}; } - $HOVER->mouse_motion ($ev) if $HOVER; + $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; } +# convert position array to integers +sub harmonize { + my ($vals) = @_; + + my $rem = 0; + + for (@$vals) { + my $i = int $_ + $rem; + $rem += $_ - $i; + $_ = $i; + } +} + +############################################################################# + +package CFClient::UI::Base; + +use strict; + +use SDL::OpenGL; + sub new { my $class = shift; - bless { @_ }, $class + my $self = bless { + x => 0, + y => 0, + z => 0, + @_ + }, $class; + + for (keys %$self) { + if (/^connect_(.*)$/) { + $self->connect ($1 => delete $self->{$_}); + } + } + + $self +} + +sub show { + my ($self) = @_; + + return if $self->{parent}; + + $CFClient::UI::ROOT->add ($self); +} + +sub hide { + my ($self) = @_; + + return unless $self->{parent}; + + $self->{parent}->remove ($self); } sub move { my ($self, $x, $y, $z) = @_; - $self->{x} = $x; - $self->{y} = $y; + + $self->{x} = int $x; + $self->{y} = int $y; $self->{z} = $z if defined $z; + + $self->update; } sub needs_redraw { @@ -92,17 +145,58 @@ Carp::confess "size_request is abtract"; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub configure { + 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; + + $self->size_allocate ($w, $h); + $self->update; +} + +sub size_allocate { + # nothing to be done +} + +# return top left coordinates +sub _topleft { + my ($self, $x, $y) = @_; + + $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); +} + +# translate global coordinates to local coordinate system +sub coord2local { + my ($self, $x, $y) = @_; + + my ($X, $Y) = $self->_topleft; + ($x - $X, $y - $Y) +} + +# translate local coordinates to global coordinate system +sub coord2global { + my ($self, $x, $y) = @_; + + my ($X, $Y) = $self->_topleft; + ($x + $X, $y + $Y) } sub focus_in { my ($self) = @_; + return if $FOCUS == $self; + return unless $self->{can_focus}; + my $focus = $FOCUS; $FOCUS = $self; + + $self->emit (focus_in => $focus); + $focus->update if $focus; $FOCUS->update; } @@ -113,15 +207,23 @@ return unless $FOCUS == $self; my $focus = $FOCUS; undef $FOCUS; + + $self->emit (focus_out => $focus); + $focus->update if $focus; #? } sub mouse_motion { } sub button_up { } -sub button_down { } sub key_down { } sub key_up { } +sub button_down { + my ($self, $ev, $x, $y) = @_; + + $self->focus_in; +} + 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} } @@ -131,21 +233,27 @@ sub draw { my ($self) = @_; + return unless $self->{h} && $self->{w}; + glPushMatrix; glTranslate $self->{x}, $self->{y}, 0; $self->_draw; - if ($self == $HOVER) { - glColor 1, 1, 1, 0.4; + glPopMatrix; + + if ($self == $HOVER && $self->{can_hover}) { + my ($x, $y) = @$self{qw(x y)}; + + glColor 1, 0.8, 0.5, 0.2; glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glBegin GL_QUADS; - glVertex 0 , 0; - glVertex $self->{w}, 0; - glVertex $self->{w}, $self->{h}; - glVertex 0 , $self->{h}; + glVertex $x , $y; + glVertex $x + $self->{w}, $y; + glVertex $x + $self->{w}, $y + $self->{h}; + glVertex $x , $y + $self->{h}; glEnd; glDisable GL_BLEND; } - glPopMatrix; } sub _draw { @@ -154,17 +262,6 @@ warn "no draw defined for $self\n"; } -sub bbox { - 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) = @_; @@ -175,17 +272,24 @@ () } -sub del_parent { $_[0]->{parent} = undef } - sub set_parent { - my ($self, $par) = @_; + my ($self, $parent) = @_; - $self->{parent} = $par; - Scalar::Util::weaken $self->{parent}; + Scalar::Util::weaken ($self->{parent} = $parent); } -sub get_parent { - $_[0]->{parent} +sub check_size { + my ($self) = @_; + + my ($w, $h) = $self->size_request; + + if ($w != $self->{req_w} || $h != $self->{req_h}) { + $self->{req_w} = $w; + $self->{req_h} = $h; + + $self->{parent}->check_size + if $self->{parent}; + } } sub update { @@ -195,6 +299,20 @@ if $self->{parent}; } +sub connect { + my ($self, $signal, $cb) = @_; + + push @{ $self->{signal_cb}{$signal} }, $cb; +} + +sub emit { + my ($self, $signal, @args) = @_; + + for my $cb (@{$self->{signal_cb}{$signal} || []}) { + $cb->($self, @args); + } +} + sub DESTROY { my ($self) = @_; @@ -203,39 +321,96 @@ ############################################################################# -package Crossfire::Client::Widget::Container; +package CFClient::UI::DrawBG; + +our @ISA = CFClient::UI::Base::; -our @ISA = Crossfire::Client::Widget::; +use strict; +use SDL::OpenGL; sub new { - my ($class, @widgets) = @_; + my $class = shift; + + # range [value, low, high, page] - my $self = $class->SUPER::new (children => []); - $self->add ($_) for @widgets; + $class->SUPER::new ( + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], + @_ + ) +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = @$self{qw(w h)}; + + 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, $expand) = @_; + my ($self, $child) = @_; + + $child->set_parent ($self); - $chld->{expand} = $expand; - $chld->set_parent ($self); + use sort 'stable'; - @{$self->{children}} = + $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $chld; + @{$self->{children}}, $child + ]; - $self->size_allocate ($self->{w}, $self->{h}) - if $self->{w}; #TODO: check for "realised state" + $child->check_size; } sub remove { - my ($self, $widget) = @_; + my ($self, $child) = @_; + + delete $child->{parent}; - $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; + $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; - $self->size_allocate ($self->{w}, $self->{h}); + $self->check_size; } sub find_widget { @@ -262,43 +437,65 @@ ############################################################################# -package Crossfire::Client::Widget::Bin; +package CFClient::UI::Bin; + +our @ISA = CFClient::UI::Container::; -our @ISA = Crossfire::Client::Widget::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, $child) = @_; + + $self->{children} = []; + + $self->SUPER::add ($child); +} + +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 if $_[0]{children}[0]; + $_[0]{children}[0]->size_request } sub size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); - $self->{children}[0]->size_allocate ($w, $h) - if $self->{children}[0] + $self->{children}[0]->configure (0, 0, $w, $h); } ############################################################################# -package Crossfire::Client::Widget::Window; +package CFClient::UI::Window; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $w, $h) = @_; - - my $self = $class->SUPER::new; + my ($class, %arg) = @_; - @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h); + my $self = $class->SUPER::new (%arg); } sub update { my ($self) = @_; + # we want to do this delayed... $self->render_chld; $self->SUPER::update; } @@ -306,19 +503,17 @@ sub render_chld { my ($self) = @_; - $self->{texture} = - Crossfire::Client::Texture->new_from_opengl ( - $self->{w}, $self->{h}, sub { $self->child->draw } - ); + $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + glClear GL_COLOR_BUFFER_BIT; + $self->child->draw; + }; } sub size_allocate { my ($self, $w, $h) = @_; - $self->{w} = $w; - $self->{h} = $h; - - $self->child->size_allocate ($w, $h); + $self->child->configure (0, 0, $w, $h); $self->render_chld; } @@ -332,16 +527,11 @@ 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_REPLACE; - glBindTexture GL_TEXTURE_2D, $tex->{name}; - 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; @@ -349,9 +539,33 @@ ############################################################################# -package Crossfire::Client::Widget::Frame; +package CFClient::UI::ViewPort; + +our @ISA = CFClient::UI::Window::; -our @ISA = Crossfire::Client::Widget::Bin::; +sub new { die } + +sub size_request { + my ($self) = @_; + + @$self{qw(child_w child_h)} = $self->child->size_request; + $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); + + @$self{qw(child_w child_h)} +} + +sub _draw { + my ($self) = @_; + + $self->{children}[1]->draw; +} + + +############################################################################# + +package CFClient::UI::Frame; + +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; @@ -366,13 +580,9 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - $self->{w} = $w; - $self->{h} = $h; - - $self->child->size_allocate ($w - 4, $h - 4); - $self->child->move (2, 2); + $self->child->configure (2, 2, $w - 4, $h - 4); } sub _draw { @@ -384,10 +594,10 @@ 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; @@ -395,214 +605,347 @@ ############################################################################# -package Crossfire::Client::Widget::FancyFrame; +package CFClient::UI::FancyFrame; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; my @tex = - map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } + 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 => 0.8, + @_ + ) +} + +sub border { + int $_[0]{border} * $::FONTSIZE +} + sub size_request { my ($self) = @_; - my ($w, $h) = $self->SUPER::size_request; + return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; - $h += $tex[1]->{height}; - $h += $tex[4]->{height}; - $w += $tex[2]->{width}; - $w += $tex[3]->{width}; + my ($w, $h) = $self->SUPER::size_request; - ($w, $h) + ( + $w + $self->border * 2, + $h + $self->border * 2, + ) } sub size_allocate { my ($self, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); + $h -= List::Util::max 0, $self->border * 2; + $w -= List::Util::max 0, $self->border * 2; - $h -= $tex[1]->{height}; - $h -= $tex[4]->{height}; - $w -= $tex[2]->{width}; - $w -= $tex[3]->{width}; + $self->child->configure ($self->border, $self->border, $w, $h); +} - $h = $h < 0 ? 0 : $h; - $w = $w < 0 ? 0 : $w; +sub button_down { + my ($self, $ev, $x, $y) = @_; - $self->child->size_allocate ($w, $h); - $self->child->move ($tex[3]->{width}, $tex[1]->{height}); -} + my $border = $self->border; -sub _draw { - my ($self) = @_; + if ($x < $self->{w} && $x >= $self->{w} - $border + && $y < $self->{h} && $y >= $self->{h} - $border) { - my ($w, $h) = ($self->{w}, $self->{h}); - my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bw, $bh) = ($self->{w}, $self->{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; + $self->{motion} = sub { + my ($ev, $x, $y) = @_; - my $top = $tex[1]; - glBindTexture GL_TEXTURE_2D, $top->{name}; + ($x, $y) = ($ev->motion_x, $ev->motion_y); - 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; + $self->{user_w} = $bw + $x - $ox; + $self->{user_h} = $bh + $y - $oy; + $self->check_size; + }; - my $left = $tex[3]; - glBindTexture GL_TEXTURE_2D, $left->{name}; + } elsif ($x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $border) { - 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 ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bx, $by) = ($self->{x}, $self->{y}); - my $right = $tex[2]; - glBindTexture GL_TEXTURE_2D, $right->{name}; + $self->{motion} = sub { + my ($ev, $x, $y) = @_; - 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; + ($x, $y) = ($ev->motion_x, $ev->motion_y); - my $bottom = $tex[4]; - glBindTexture GL_TEXTURE_2D, $bottom->{name}; + $self->move ($bx + $x - $ox, $by + $y - $oy); + $self->update; + }; + } +} - 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; +sub button_up { + my ($self, $ev, $x, $y) = @_; - 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; + delete $self->{motion}; +} - my $rep_x = $cw / $bg->{width}; - my $rep_y = $ch / $bg->{height}; +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; - 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->{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; + + my $border = $self->border; + + glColor @{ $self->{border_bg} }; + $tex[1]->draw_quad (0, 0, $w, $border); + $tex[3]->draw_quad (0, $border, $border, $ch); + $tex[2]->draw_quad ($w - $border, $border, $border, $ch); + $tex[4]->draw_quad (0, $h - $border, $w, $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 ($border, $border, $cw, $ch); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; $self->child->draw; - } ############################################################################# -package Crossfire::Client::Widget::Table; +package CFClient::UI::Table; + +our @ISA = CFClient::UI::Base::; -our @ISA = Crossfire::Client::Widget::Bin::; +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) = @_; - my $old_chld = $self->{children}[$y][$x]; + my ($self, $x, $y, $child) = @_; - $self->{children}[$y][$x] = $chld; - $chld->set_parent ($self); - $self->update; + $child->set_parent ($self); + $self->{children}[$y][$x] = $child; + + $child->check_size; } -sub max_row_height { - my ($self, $row) = @_; +# TODO: move to container class maybe? send childs a signal on removal? +sub clear { + my ($self) = @_; - my $hs = 0; - 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 } - } - } - return $hs; + delete $self->{children}; + $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->{children} || []}; $yi++) { - my $c = ($self->{children}->[$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->{children}}; $yi++) { - $hs += $self->max_row_height ($yi); - } + ( + (sum @$ws), + (sum @$hs), + ) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + my ($ws, $hs) = $self->get_wh; - for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { - my $wm = 0; - for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { - $wm += $self->max_col_width ($xi) + 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; + + # linearly scale sizes + $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; + $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; + + CFClient::UI::harmonize $ws; + CFClient::UI::harmonize $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->configure ($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->{children}}; $yi++) { - my $x = 0; + for (grep $_, @{$self->{children}}) { + $_->draw for grep $_, @$_; + } +} - for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { +############################################################################# - my $c = $self->{children}->[$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, $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; } + } + + CFClient::UI::harmonize \@h; - $y += $self->max_row_height ($yi); + my $y = 0; + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->configure ($y, 0, $h, $w); + + $y += $h; } + + 1 } ############################################################################# -package Crossfire::Client::Widget::VBox; +package CFClient::UI::VBox; -our @ISA = Crossfire::Client::Widget::Container::; +# TODO: wrap into common Box base class -use SDL::OpenGL; +our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; @@ -618,129 +961,220 @@ sub size_allocate { my ($self, $w, $h) = @_; - $self->w ($w); - $self->h ($h); + my $children = $self->{children}; - my $exp; - my @oth; - # find expand widget - for (@{$self->{children}}) { - if ($_->{expand}) { - $exp = $_; - last; - } - push @oth, $_; - } + my @h = map +($_->size_request)[1], @$children; - my ($ow, $oh); + my $req_h = List::Util::sum @h; - # get sizes of other widgets - for (@oth) { - my ($w, $h) = $_->size_request; - $oh += $h; - if ($ow < $w) { $ow = $w } + 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; + } } + CFClient::UI::harmonize \@h; + my $y = 0; - for (@{$self->{children}}) { - $_->move (0, $y); + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->configure (0, $y, $w, $h); - if ($_ == $exp) { - $_->size_allocate ($w, $h - $oh); - $y += $h - $oh; - } else { - my ($cw, $h) = $_->size_request; - $_->size_allocate ($w, $h); - $y += $h; - } + $y += $h; } + + 1 } ############################################################################# -package Crossfire::Client::Widget::Label; +package CFClient::UI::Label; -our @ISA = Crossfire::Client::Widget::; +our @ISA = CFClient::UI::Base::; use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $height, $text) = @_; + my ($class, %arg) = @_; - $height ||= $::FONTSIZE; + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + fontsize => 1, + text => "", + align => -1, + valign => -1, + padding => 2, + layout => new CFClient::Layout, + %arg + ); - # TODO: color, and make height, xyz etc. optional - my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); + $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# - $self->set_text ($text); + $self->set_text (delete $self->{text}) if exists $self->{text}; + $self->set_markup (delete $self->{markup}) if exists $self->{markup}; $self } +sub escape_text { + local $_ = $_[1]; + + s/&/&/g; + s/>/>/g; + s/{text} = $text; - $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; + $self->{layout}->set_text ($text); + delete $self->{texture}; $self->update; } -sub get_text { - my ($self, $text) = @_; +sub set_markup { + my ($self, $markup) = @_; + + $self->{layout}->set_markup ($markup); - $self->{text} + delete $self->{texture}; + $self->update; } sub size_request { my ($self) = @_; - if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack - ( - $self->{texture}{width}, - $self->{texture}{height}, - ) - } else { - my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; + $self->{layout}->set_width; + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); - ($w, $h) - } + my ($w, $h) = $self->{layout}->size; + ( + $w + $self->{padding} * 2, + $h + $self->{padding} * 2, + ) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + delete $self->{texture}; } 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->{fontsize} * $::FONTSIZE); + 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}; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - glColor 1, 0, 0, 1; # TODO color + 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; + $self->{ox} = int ( + $self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5 + ); + + $self->{oy} = int ( + $self->{valign} < 0 ? $self->{padding} + : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} + : ($self->{h} - $tex->{h}) * 0.5 + ); + + $tex->draw_quad ($self->{ox}, $self->{oy}); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } ############################################################################# -package Crossfire::Client::Widget::Entry; +package CFClient::UI::EntryBase; -our @ISA = Crossfire::Client::Widget::Label::; +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, + valign => 0, + @_ + ) +} + +sub _set_text { + my ($self, $text) = @_; + + delete $self->{cur_h}; + + return if $self->{text} eq $text; + + delete $self->{texture}; + + $self->{last_activity} = $::NOW; + $self->{text} = $text; + + $text =~ s/./*/g if $self->{hidden}; + $self->{layout}->set_text ("$text "); + + $self->emit (changed => $self->{text}); +} + +sub get_text { + $_[0]{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, $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) = @_; @@ -752,164 +1186,822 @@ 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; - print "$uni <$text>\n";#d# + substr $text, $self->{cursor}++, 0, chr $uni; } - $self->set_text ($text); + $self->_set_text ($text); + $self->update; +} + +sub focus_in { + my ($self) = @_; + + $self->{last_activity} = $::NOW; + + $self->SUPER::focus_in; } sub button_down { - my ($self, $ev) = @_; + my ($self, $ev, $x, $y) = @_; - $self->focus_in; + $self->SUPER::button_down ($ev, $x, $y); + + my $idx = $self->{layout}->xy_to_index ($x, $y); + + # byte-index to char-index + my $text = $self->{text}; + utf8::encode $text; + $self->{cursor} = length substr $text, 0, $idx; + + $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 _draw { my ($self) = @_; + local $self->{fg} = $self->{fg}; + if ($FOCUS == $self) { - glColor 1, 1, 1; + glColor @{$self->{active_bg}}; + $self->{fg} = $self->{active_fg}; } else { - glColor 0.7, 0.7, 0.7; + 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} - 1; - glVertex $self->{w} - 1, $self->{h} - 1; - glVertex $self->{w} - 1, 0; + 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) { + + unless (exists $self->{cur_h}) { + my $text = substr $self->{text}, 0, $self->{cursor}; + utf8::encode $text; + + @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) + } + + glColor @{$self->{fg}}; + glBegin GL_LINES; + glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; + glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; + glEnd; + } +} + +package CFClient::UI::Entry; + +our @ISA = CFClient::UI::EntryBase::; + +use SDL; +use SDL::OpenGL; + +sub key_down { + my ($self, $ev) = @_; + + my $sym = $ev->key_sym; + + if ($sym == SDLK_RETURN) { + $self->emit (activate => $self->get_text); + $self->update; + + } else { + $self->SUPER::key_down ($ev); + } + } ############################################################################# -package Crossfire::Client::Widget::MapWidget; +package CFClient::UI::Button; -use strict; +our @ISA = CFClient::UI::Label::; -use List::Util qw(min max); +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 => [0, 0, 1], + can_hover => 1, + align => 0, + valign => 0, + @_ + ) +} + +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}; + + if ($GRAB == $self) { + $self->{fg} = $self->{active_fg}; + } + + 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; + glColor 0, 0, 0, 1; + + $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + $self->SUPER::_draw; +} + +############################################################################# + +package CFClient::UI::CheckBox; + +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 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) = @_; + + $self->SUPER::_draw; + + glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; + + my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; + + glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; + + 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::VGauge; + +our @ISA = CFClient::UI::Base::; + +use SDL::OpenGL; + +my %tex = ( + food => [ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ + ], + grace => [ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ + ], + hp => [ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ + ], + mana => [ + map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } + qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ + ], +); + +# eg. VGauge->new (gauge => 'food'), default gauge: food +sub new { + my $class = shift; + + my $self = $class->SUPER::new (gauge => 'food', @_); + + $self } sub size_request { - ( - 1 + int $::WIDTH / 32, - 1 + int $::HEIGHT / 32, - ) + my ($self) = @_; + + my $tex = $tex{$self->{gauge}}[0]; + + @$tex{qw(w h)} +} + +sub set_max { + my ($self, $max) = @_; + + $self->{max_val} = $max; +} + +sub set_value { + my ($self, $val, $max) = @_; + + $self->set_max ($max) + if defined $max; + + $max = $self->{max_val}; + $self->{val} = $val; + + $self->update; } sub _draw { my ($self) = @_; - my $mx = $::CONN->{mapx}; - my $my = $::CONN->{mapy}; + my $tex = $tex{$self->{gauge}}; - my $map = $::CONN->{map}; + my ($w, $h) = ($self->{w}, $self->{h}); - my ($xofs, $yofs); + my $ycut = $self->{val} / ($self->{max_val} || 1); + $ycut = 1 if $self->{val} > $self->{max_val}; - my $sw = 1 + int $::WIDTH / 32; - my $sh = 1 + int $::HEIGHT / 32; + my $t1 = $tex->[0]; + my $t2 = $tex->[1]; - 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; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + my $h1 = $self->{h} - $ycut * $self->{h}; + my $h2 = $ycut * $self->{h}; + + my $yp = 0; + + glBindTexture GL_TEXTURE_2D, $t1->{name}; + glBegin GL_QUADS; + glTexCoord 0 , 0; glVertex 0 , $yp; + glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; + glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; + glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; + glEnd; + + $yp += $h1; + + glBindTexture GL_TEXTURE_2D, $t2->{name}; + glBegin GL_QUADS; + glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; + glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; + glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2; + glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; + glEnd; + + glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; +} + +############################################################################# + +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 => 20, + req_h => 20, + 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); } - glEnable GL_TEXTURE_2D; + 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}}; + + $hi = $value + 1 if $lo == $hi; + + 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; - my $sw4 = ($sw + 3) & ~3; - my $lighting = "\x00" x ($sw4 * $sh); + # draw background + $tex[1]->draw_quad (0, 0, $w, $h); - for my $x (0 .. $sw - 1) { - for my $y (0 .. $sh - 1) { + # draw handle + $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); - my $cell = $map->[$x + $xofs][$y + $yofs] - or next; + 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 $darkness = $cell->[0] * (1 / 255); - if ($darkness < 0) { - $darkness = $cell->[1] ? 0.2 : 0; + my $self = $class->SUPER::new ( + fontsize => 1, + @_, + + layout => (new CFClient::Layout), + par => [], + height => 0, + children => [ + (new CFClient::UI::Empty expand => 1), + (new CFClient::UI::Slider vertical => 1), + ], + ); + + $self->{children}[1]->connect (changed => sub { + $self->update; + }); + + $self +} + +sub set_fontsize { + my ($self, $fontsize) = @_; + + $self->{fontsize} = $fontsize; + $self->reflow; +} + +sub text_height { + my ($self, $text) = @_; + + my $layout = $self->{layout}; + + $layout->set_height ($self->{fontsize} * $::FONTSIZE); + $layout->set_width ($self->{w}); + $layout->set_text ($text); + + ($layout->size)[1] +} + +sub reflow { + my ($self) = @_; + + $self->{need_reflow}++; + $self->update; +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); + $self->{layout}->set_width ($self->{children}[0]{w}); + + $self->reflow; +} + +sub add_paragraph { + my ($self, $color, $text) = @_; + + #TODO: intelligently "reformat" paragraph + + my $height = $self->text_height ($text); + + $self->{height} += $height; + + push @{$self->{par}}, [$height, $color, $text]; + + $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; + $self->{children}[1]->update; +} + +sub update { + my ($self) = @_; + + $self->SUPER::update; + + return unless $self->{h} > 0; + + delete $self->{texture}; + + $ROOT->on_refresh ($self, sub { + if (delete $self->{need_reflow}) { + my $height = 0; + + $height += $_->[0] = $self->text_height ($_->[2]) + for @{$self->{par}}; + + $self->{height} = $height; + + $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + + delete $self->{texture}; + } + + $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + glClear GL_COLOR_BUFFER_BIT; + + 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; + + my $top = int $self->{children}[1]{range}[0]; + + my $y0 = $top; + my $y1 = $top + $self->{h}; + + my $y = 0; + + my $layout = $self->{layout}; + + for my $par (@{$self->{par}}) { + my $h = $par->[0]; + + if ($y0 < $y + $h && $y < $y1) { + $layout->set_text ($par->[2]); + + glColor @{ $par->[1] }; + my ($W, $H) = $layout->size; + CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); + } + + $y += $h; } - 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; + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + }; + }); +} + +sub _draw { + my ($self) = @_; + + if ($self->{texture}) { + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); + glDisable GL_TEXTURE_2D; + } + + $self->{children}[1]->draw; + +} + +############################################################################# + +package CFClient::UI::MapWidget; + +use strict; + +use List::Util qw(min max); + +use SDL; +use SDL::OpenGL; + +our @ISA = CFClient::UI::Base::; - glBindTexture GL_TEXTURE_2D, $tex->{name}; +sub new { + my $class = shift; + + $class->SUPER::new ( + z => -1, + can_focus => 1, + list => (glGenLists 1), + @_ + ) +} + +sub key_down { + print "MAPKEYDOWN\n"; +} + +sub key_up { +} + +sub button_down { + my ($self, $ev, $x, $y) = @_; + + $self->focus_in; + + if ($ev->button == 2) { + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $::CFG->{map_shift_x} = $bw + $x - $ox; + $::CFG->{map_shift_y} = $bh + $y - $oy; + + $self->update; + }; + } +} + +sub button_up { + my ($self, $ev, $x, $y) = @_; + + delete $self->{motion}; +} + +sub mouse_motion { + my ($self, $ev, $x, $y) = @_; - my $w = $tex->{width}; - my $h = $tex->{height}; + $self->{motion}->($ev, $x, $y) if $self->{motion}; +} - my $px = ($x + 1) * 32 - $w; - my $py = ($y + 1) * 32 - $h; +sub size_request { + ( + 1 + 32 * int $::WIDTH / 32, + 1 + 32 * int $::HEIGHT / 32, + ) +} + +sub update { + my ($self) = @_; + + $self->{need_update} = 1; + $self->SUPER::update; +} - 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 draw { + my ($self) = @_; + + if (delete $self->{need_update}) { + glNewList $self->{list}, GL_COMPILE; + + if ($::MAP) { + my $sw = int $::WIDTH / 32; + my $sh = int $::HEIGHT / 32; + + my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; + my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; + + glTranslate $sx0 - 32, $sy0 - 32, 0; + + my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); + + if ($::CFG->{fow_enable}) { + if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # 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; + } + + $self->{fow_texture} = 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; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + + glColor +($::CFG->{fow_intensity}) x 3, 1; + $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } + + # HACK BEGIN + { + glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove + my ($w, $h) = (250, 250); + + 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; + + $self->{mapmap_texture} = + new CFClient::Texture + w => $w, + h => $h, + data => $::MAP->mapmap ($w, $h), + type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; + + $self->{mapmap_texture}->draw_quad (100, 100); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } + # HACK END } - } -# 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_ALPHA, - format => GL_ALPHA; + glEndList; + } - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor 0.5, 0.5, 0.5, 1; - 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; + glPushMatrix; + glCallList $self->{list}; + glPopMatrix; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + 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 = ( @@ -935,16 +2027,22 @@ my $sym = $ev->key_sym; if ($sym == SDLK_KP5) { - $::CONN->send ("command stay fire"); + $::CONN->user_send ("stay fire"); + } elsif ($sym == SDLK_a) { + $::CONN->user_send ("apply"); + } elsif ($sym == SDLK_QUOTE) { + $self->emit ('activate_console'); + } elsif ($sym == SDLK_SLASH) { + $self->emit ('activate_console' => '/'); } elsif (exists $DIR{$sym}) { if ($mod & KMOD_SHIFT) { $self->{shft}++; - $::CONN->send ("command fire $DIR{$sym}[0]"); + $::CONN->user_send ("fire $DIR{$sym}[0]"); } elsif ($mod & KMOD_CTRL) { $self->{ctrl}++; - $::CONN->send ("command run $DIR{$sym}[0]"); + $::CONN->user_send ("run $DIR{$sym}[0]"); } else { - $::CONN->send ("command $DIR{$sym}[1]"); + $::CONN->user_send ("$DIR{$sym}[1]"); } } } @@ -956,26 +2054,26 @@ my $sym = $ev->key_sym; if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { - $::CONN->send ("command fire_stop"); + $::CONN->user_send ("fire_stop"); } if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { - $::CONN->send ("command run_stop"); + $::CONN->user_send ("run_stop"); } } ############################################################################# -package Crossfire::Client::Widget::Animator; +package CFClient::UI::Animator; use SDL::OpenGL; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; sub moveto { my ($self, $x, $y) = @_; $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; - $self->{speed} = 2; + $self->{speed} = 0.001; $self->{time} = 1; ::animation_start $self; @@ -1007,49 +2105,120 @@ ############################################################################# -package Crossfire::Client::Widget::Toplevel; +package CFClient::UI::Flopper; -our @ISA = Crossfire::Client::Widget::Container::; +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::ROOT->add ($self->{other}); + $self->{other}->move ($self->coord2global (0, $self->{h})); + $self->emit ("open"); + } else { + $CFClient::UI::ROOT->remove ($self->{other}); + $self->emit ("close"); + } + + $self->emit (changed => $self->{state}); +} + +############################################################################# + +package CFClient::UI::Root; + +our @ISA = CFClient::UI::Container::; + +use SDL::OpenGL; + +sub check_size { + my ($self) = @_; + + $self->configure (0, 0, $::WITH, $::HEIGHT); +} sub size_request { ($::WIDTH, $::HEIGHT) } -sub size_allocate { - my ($self, $w, $h) = @_; +sub configure { + my ($self, $x, $y, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); + $self->SUPER::configure ($x, $y, $w, $h); - $_->size_allocate ($_->size_request) + $_->configure ($_->{x}, $_->{y}, $_->size_request) for @{$self->{children}}; } +sub _topleft { + my ($self, $x, $y) = @_; + + ($x, $y) +} + sub update { my ($self) = @_; - $self->size_allocate ($self->size_request); + $self->check_size; ::refresh (); } sub add { - my ($self, $widget) = @_; + my ($self, $child) = @_; + + $self->SUPER::add ($child); +} - $self->SUPER::add ($widget); +sub on_refresh { + my ($self, $id, $cb) = @_; - $widget->size_allocate ($widget->size_request); + $self->{refresh_hook}{$id} = $cb; } sub draw { my ($self) = @_; + while (my $rcb = delete $self->{refresh_hook}) { + $_->() for values %$rcb; + } + + glViewport 0, 0, $::WIDTH, $::HEIGHT; + glClearColor +($::CFG->{fow_intensity}) x 3, 1; + glClear GL_COLOR_BUFFER_BIT; + + glMatrixMode GL_PROJECTION; + glLoadIdentity; + glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; + glMatrixMode GL_MODELVIEW; + glLoadIdentity; + $self->_draw; } ############################################################################# -package Crossfire::Client::Widget; +package CFClient::UI; -$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; +$ROOT = new CFClient::UI::Root; 1