--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/14 15:14:25 1.106 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/15 01:16:17 1.110 @@ -1429,6 +1429,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 @@ -1484,9 +1486,20 @@ ], ); + $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) = @_; @@ -1502,15 +1515,8 @@ sub reflow { my ($self) = @_; - my $height = 0; - - for (@{$self->{par}}) { - $height += $_->[0] = $self->text_height ($_->[2]); - } - - $self->{height} = $height; - - $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + $self->{need_reflow}++; + $self->update; } sub size_request { @@ -1528,7 +1534,6 @@ $self->{layout}->set_width ($self->{w}); $self->reflow; - $self->update; } sub add_paragraph { @@ -1553,39 +1558,58 @@ return unless $self->{h} > 0; - $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { - glClearColor 0, 0, 0, 1; - glClear GL_COLOR_BUFFER_BIT; + delete $self->{texture}; - my $y0 = $self->{height} - $self->{h}; - my $y1 = $self->{height}; + $TOPLEVEL->on_refresh ($self, sub { + if (delete $self->{need_reflow}) { + my $height = 0; - 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; + $height += $_->[0] = $self->text_height ($_->[2]) + for @{$self->{par}}; - my $y = 0; + $self->{height} = $height; - my $layout = $self->{layout}; + $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; + + delete $self->{texture}; + } - for my $par (@{$self->{par}}) { - my $h = $par->[0]; + $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { + glClearColor 0, 0, 0, 1; + glClear GL_COLOR_BUFFER_BIT; - if ($y0 < $y + $h && $y < $y1) { - $layout->set_text ($par->[2]); + 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 @{ $par->[1] }; - my ($W, $H) = $layout->size; - CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); - } + my $top = int $self->{children}[1]{range}[0]; - $y += $h; - } + my $y0 = $top; + my $y1 = $top + $self->{h}; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; - }; + 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 { @@ -1633,6 +1657,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, @@ -1650,15 +1708,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 $sy = $::CFG->{map_shift_y}; + + glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0; + + my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1); if ($::CFG->{fow_enable}) { if ($::CFG->{fow_smooth}) { # smooth fog of war @@ -1686,6 +1748,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; @@ -1695,12 +1758,36 @@ glDisable GL_TEXTURE_2D; glDisable GL_BLEND; } + + # HACK BEGIN + { + glTranslate -(($sx & 31) - 32), -(($sy & 31) - 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; @@ -1859,6 +1946,8 @@ our @ISA = CFClient::UI::Container::; +use SDL::OpenGL; + sub size_request { ($::WIDTH, $::HEIGHT) } @@ -1893,9 +1982,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; }