--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/14 13:51:36 1.103 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/15 13:56:25 1.114 @@ -9,7 +9,7 @@ our ($FOCUS, $HOVER, $GRAB); # various widgets -our $TOPLEVEL; +our $ROOT; our $BUTTON_STATE; # class methods for events @@ -26,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; @@ -34,18 +34,18 @@ $BUTTON_STATE |= 1 << ($ev->button - 1); - $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) 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->translate ($x, $y)) if $GRAB; + $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; @@ -58,16 +58,29 @@ 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, $HOVER->translate ($x, $y)) 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; + } } ############################################################################# @@ -135,11 +148,27 @@ $self->_size_allocate ($x, $y, $w, $h); } +# 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 translate { +sub coord2local { my ($self, $x, $y) = @_; - $self->{parent}->translate ($x - $self->{x}, $y - $self->{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 { @@ -222,14 +251,9 @@ } sub set_parent { - my ($self, $par) = @_; + my ($self, $parent) = @_; - $self->{parent} = $par; - Scalar::Util::weaken $self->{parent}; -} - -sub get_parent { - $_[0]->{parent} + Scalar::Util::weaken ($self->{parent} = $parent); } sub update { @@ -328,13 +352,15 @@ } sub add { - my ($self, $chld) = @_; + my ($self, $child) = @_; + + $child->set_parent ($self); - $chld->set_parent ($self); + use sort 'stable'; $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $chld + @{$self->{children}}, $child ]; $self->{w} = $self->{h} = -1; @@ -441,10 +467,11 @@ sub render_chld { my ($self) = @_; - $self->{texture} = - CFClient::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 { @@ -673,10 +700,10 @@ } sub add { - my ($self, $x, $y, $chld) = @_; + my ($self, $x, $y, $child) = @_; - $self->{children}[$y][$x] = $chld; - $chld->set_parent ($self); + $child->set_parent ($self); + $self->{children}[$y][$x] = $child; $self->{w} = $self->{h} = -1; $self->update; @@ -734,6 +761,9 @@ $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}}) { @@ -830,6 +860,8 @@ } } + CFClient::UI::harmonize \@h; + my $y = 0; for (0 .. $#$children) { my $child = $children->[$_]; @@ -884,6 +916,8 @@ } } + CFClient::UI::harmonize \@h; + my $y = 0; for (0 .. $#$children) { my $child = $children->[$_]; @@ -906,12 +940,12 @@ my ($class, %arg) = @_; my $self = $class->SUPER::new ( - fg => [1, 1, 1], - height => $::FONTSIZE, - text => "", - align => -1, - padding => 2, - layout => new CFClient::Layout, + fg => [1, 1, 1], + fontsize => $::FONTSIZE, + text => "", + align => -1, + padding => 2, + layout => new CFClient::Layout, %arg ); @@ -951,7 +985,7 @@ my ($self) = @_; $self->{layout}->set_width; - $self->{layout}->set_height ($self->{height}); + $self->{layout}->set_height ($self->{fontsize}); my ($w, $h) = $self->{layout}->size; ( @@ -980,14 +1014,14 @@ my $tex = $self->{texture} ||= do { $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); new_from_layout CFClient::Texture $self->{layout} }; 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; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; glColor @{$self->{fg}}; @@ -996,8 +1030,7 @@ : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} : ($self->{w} - $tex->{w}) * 0.5; - glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0; - $tex->draw_quad (0, 0); + $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); glDisable GL_TEXTURE_2D; glDisable GL_BLEND; @@ -1035,7 +1068,7 @@ $self->{text} = $text; $self->{layout}->set_width ($self->{w}); - $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); $text =~ s/./*/g if $self->{hidden}; @@ -1426,6 +1459,8 @@ 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 @@ -1467,59 +1502,158 @@ my $class = shift; my $self = $class->SUPER::new ( - par => [], + req_w => $::WIDTH / 6, + req_h => $::HEIGHT / 6, + fontsize => $::FONTSIZE, @_, + + 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}); + $layout->set_width ($self->{w}); + $layout->set_text ($text); + + ($layout->size)[1] +} + +sub reflow { + my ($self) = @_; + + $self->{need_reflow}++; + $self->update; +} + +sub size_request { + my ($self) = @_; + + ($self->{req_w}, $self->{req_h}) +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->SUPER::size_allocate ($x, $y, $w, $h); + + $self->{layout}->set_height ($self->{fontsize}); + $self->{layout}->set_width ($self->{w}); + + $self->reflow; +} + sub add_paragraph { my ($self, $color, $text) = @_; - push @{$self->{par}}, [$color, $text]; - my $count = scalar @{$self->{par}}; - $self->{children}[1]{range} = [$count - 1, 0, $count, 1]; + #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 _draw { +sub update { my ($self) = @_; - my $par = $self->{par}; + $self->SUPER::update; - my $bottom = (scalar @$par) - 1; + return unless $self->{h} > 0; - my $w = $self->{children}[0]{w}; - my $y = $self->{h}; + delete $self->{texture}; - 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; + $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}; + } - # TODO: everything! - while ($y > 0 && $bottom >= 0) { - my $par = $par->[$bottom--]; - - my $layout = new CFClient::Layout; - - $layout->set_height ($::FONTSIZE); - $layout->set_width ($w); - $layout->set_text ($par->[1]); - my $tex = new_from_layout CFClient::Texture $layout; - $y -= $tex->{h}; + $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + glClear GL_COLOR_BUFFER_BIT; - glColor @{ $par->[0] }; - $tex->draw_quad (0, $y); + 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; + } + + 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; } - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + $self->{children}[1]->draw; + } ############################################################################# @@ -1553,6 +1687,40 @@ 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) = @_; + + $self->{motion}->($ev, $x, $y) if $self->{motion}; +} + sub size_request { ( 1 + 32 * int $::WIDTH / 32, @@ -1570,15 +1738,19 @@ sub draw { my ($self) = @_; - $self->{need_update}++;#d# if (delete $self->{need_update}) { glNewList $self->{list}, GL_COMPILE; - my $sw = int $::WIDTH / 32; - my $sh = int $::HEIGHT / 32; - if ($::MAP) { - my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh); + 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}) { # smooth fog of war @@ -1606,6 +1778,7 @@ 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; @@ -1615,12 +1788,36 @@ 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; + + CFClient::Texture->new ( + w => $w, + h => $h, + data => $::MAP->mapmap ($w, $h), + type => GL_UNSIGNED_INT_8_8_8_8_REV + )->draw_quad (100, 100); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + } + # HACK END } glEndList; } + glPushMatrix; glCallList $self->{list}; + glPopMatrix; if ($FOCUS != $self) { glColor 64/255, 64/255, 64/255; @@ -1664,6 +1861,8 @@ $::CONN->user_send ("command 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}++; @@ -1761,22 +1960,25 @@ # TODO: use animation if ($self->{state} = !$self->{state}) { - $CFClient::UI::TOPLEVEL->add ($self->{other}); - $self->{other}->move ( - ($::WIDTH - $self->{other}{w}) * 0.5, - ($::HEIGHT - $self->{other}{h}) * 0.5, - ); + $CFClient::UI::ROOT->add ($self->{other}); + $self->{other}->move ($self->coord2global (0, $self->{h})); + $self->emit ("open"); } else { - $CFClient::UI::TOPLEVEL->remove ($self->{other}); + $CFClient::UI::ROOT->remove ($self->{other}); + $self->emit ("close"); } + + $self->emit (changed => $self->{state}); } ############################################################################# -package CFClient::UI::Toplevel; +package CFClient::UI::Root; our @ISA = CFClient::UI::Container::; +use SDL::OpenGL; + sub size_request { ($::WIDTH, $::HEIGHT) } @@ -1790,7 +1992,7 @@ for @{$self->{children}}; } -sub translate { +sub _topleft { my ($self, $x, $y) = @_; ($x, $y) @@ -1811,9 +2013,29 @@ $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); } +sub on_refresh { + my ($self, $id, $cb) = @_; + + $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; } @@ -1821,7 +2043,7 @@ package CFClient::UI; -$TOPLEVEL = new CFClient::UI::Toplevel; +$ROOT = new CFClient::UI::Root; 1