--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 18:06:53 1.73 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/12 23:15:39 1.91 @@ -2,7 +2,8 @@ use strict; -use Scalar::Util; +use Scalar::Util (); +use List::Util (); use CFClient; @@ -44,7 +45,7 @@ $BUTTON_STATE &= ~(1 << ($ev->button - 1)); - $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; + $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB; if (!$BUTTON_STATE) { my $grab = $GRAB; undef $GRAB; @@ -80,12 +81,22 @@ sub new { my $class = shift; - bless { + my $self = bless { x => 0, y => 0, z => 0, + w => -1, + h => -1, @_ - }, $class + }, $class; + + for (keys %$self) { + if (/^connect_(.*)$/) { + $self->connect ($1 => delete $self->{$_}); + } + } + + $self } sub move { @@ -104,14 +115,27 @@ Carp::confess "size_request is abtract"; } -sub size_allocate { - my ($self, $w, $h) = @_; +sub _size_allocate { + 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; + + 1 +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h); } -# translate global koordinates to local coordinate system +# translate global coordinates to local coordinate system sub translate { my ($self, $x, $y) = @_; @@ -167,8 +191,9 @@ if ($self == $HOVER) { my ($x, $y) = @$self{qw(x y)}; - glColor 1, 1, 1, 0.1; + glColor 0, 0, 1, 0.2; glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glBegin GL_QUADS; glVertex $x , $y; glVertex $x + $self->{w}, $y; @@ -185,17 +210,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) = @_; @@ -206,8 +220,6 @@ () } -sub del_parent { $_[0]->{parent} = undef } - sub set_parent { my ($self, $par) = @_; @@ -260,8 +272,8 @@ # range [value, low, high, page] $class->SUPER::new ( - bg => [0, 0, 0, 0.4], - active_bg => [1, 1, 1], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], @_ ) } @@ -271,13 +283,18 @@ 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; } ############################################################################# @@ -310,9 +327,8 @@ } sub add { - my ($self, $chld, $expand) = @_; + my ($self, $chld) = @_; - $chld->{expand} = $expand; $chld->set_parent ($self); $self->{children} = [ @@ -320,8 +336,8 @@ @{$self->{children}}, $chld ]; - $self->size_allocate ($self->{w}, $self->{h}) - if $self->{w}; #TODO: check for "realised state" + $self->{w} = $self->{h} = -1; + $self->update; } sub remove { @@ -329,7 +345,7 @@ $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; - $self->size_allocate ($self->{w}, $self->{h}); + $self->size_allocate (0, 0, $self->{w}, $self->{h}); } sub find_widget { @@ -392,12 +408,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{w} != $w || $self->{h} != $h; + $self->_size_allocate ($x, $y, $w, $h) or return; - $self->SUPER::size_allocate ($w, $h); - $self->{children}[0]->size_allocate ($w, $h); + $self->{children}[0]->size_allocate (0, 0, $w, $h); } ############################################################################# @@ -432,14 +447,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; - - return unless $self->{w} != $w || $self->{h} != $h; + my ($self, $x, $y, $w, $h) = @_; - $self->{w} = $w; - $self->{h} = $h; + $self->_size_allocate ($x, $y, $w, $h) or return; - $self->child->size_allocate ($w, $h); + $self->child->size_allocate (0, 0, $w, $h); $self->render_chld; } @@ -453,6 +465,7 @@ 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; @@ -481,15 +494,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{w} != $w || $self->{h} != $h; - - $self->{w} = $w; - $self->{h} = $h; + $self->_size_allocate ($x, $y, $w, $h) or return; - $self->child->size_allocate ($w - 4, $h - 4); - $self->child->move (2, 2); + $self->child->size_allocate (2, 2, $w - 4, $h - 4); } sub _draw { @@ -525,6 +534,8 @@ sub size_request { my ($self) = @_; + return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; + my ($w, $h) = $self->SUPER::size_request; $h += $tex[1]->{h}; @@ -536,24 +547,69 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{w} != $w || $self->{h} != $h; + $self->_size_allocate ($x, $y, $w, $h) or return; - $self->SUPER::size_allocate ($w, $h); - - $h -= $tex[1]->{h}; - $h -= $tex[4]->{h}; - $w -= $tex[2]->{w}; - $w -= $tex[3]->{w}; + $h -= $tex[1]{h}; + $h -= $tex[4]{h}; + $w -= $tex[2]{w}; + $w -= $tex[3]{w}; $h = $h < 0 ? 0 : $h; $w = $w < 0 ? 0 : $w; my $child = $self->child; - $child->size_allocate ($w, $h); - $child->move ($tex[3]->{w}, $tex[1]->{h}); + $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h); +} + +sub button_down { + my ($self, $ev, $x, $y) = @_; + + if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w} + && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) { + + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bw, $bh) = ($self->{w}, $self->{h}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $self->{user_w} = $bw + $x - $ox; + $self->{user_h} = $bh + $y - $oy; + $self->update; + }; + + } elsif ($x >= 0 && $x < $self->{w} + && $y >= 0 && $y < $tex[1]{h}) { + + my ($ox, $oy) = ($ev->button_x, $ev->button_y); + my ($bx, $by) = ($self->{x}, $self->{y}); + + $self->{motion} = sub { + my ($ev, $x, $y) = @_; + + ($x, $y) = ($ev->motion_x, $ev->motion_y); + + $self->move ($bx + $x - $ox, $by + $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 _draw { @@ -563,8 +619,8 @@ 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; + glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; my $top = $tex[1]; @@ -580,18 +636,17 @@ $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h}); 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->{w}; my $rep_y = $ch / $bg->{h}; $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; $self->child->draw; @@ -603,84 +658,184 @@ our @ISA = CFClient::UI::Base::; +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]; $self->{children}[$y][$x] = $chld; $chld->set_parent ($self); + + $self->{w} = $self->{h} = -1; $self->update; } -sub max_row_height { - my ($self, $row) = @_; +sub get_wh { + my ($self) = @_; + + my (@w, @h); - 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; -} + for my $y (0 .. $#{$self->{children}}) { + my $row = $self->{children}[$y] + or next; -sub max_col_width { - my ($self, $col) = @_; + 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, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + my ($ws, $hs) = $self->get_wh; + + 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; - 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) + # linearly scale sizes + $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; + $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$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->size_allocate ($x, $y, $col_w, $row_h); + } + + $x += $col_w; } - if ($ws < $wm) { $ws = $wm } + + $y += $row_h; + } + +} + +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; } - return ($ws, $hs); + $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++) { +package CFClient::UI::HBox; - my $c = $self->{children}->[$yi]->[$xi]; - if ($c) { - $c->move ($x, $y, 0); #TODO: Move to size_request - $c->draw if $c; - } +# TODO: wrap into common Box base class + +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, $x, $y, $w, $h) = @_; + + $self->_size_allocate ($x, $y, $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->[$_]; - $x += $self->max_col_width ($xi); + my $alloc_h = $h[$_]; + $alloc_h += ($h - $req_h) * $child->{expand} / $exp; + $h[$_] = $alloc_h; } + } + + my $y = 0; + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->size_allocate ($y, 0, $h, $w); - $y += $self->max_row_height ($yi); + $y += $h; } } @@ -688,9 +843,9 @@ package CFClient::UI::VBox; -our @ISA = CFClient::UI::Container::; +# TODO: wrap into common Box base class -use SDL::OpenGL; +our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; @@ -704,14 +859,9 @@ } sub size_allocate { - my ($self, $w, $h) = @_; - - return unless $self->{w} != $w || $self->{h} != $h; - - $self->{w} = $w; - $self->{h} = $h; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{h}; + $self->_size_allocate ($x, $y, $w, $h); my $children = $self->{children}; @@ -721,19 +871,15 @@ if ($req_h > $h) { # ah well, not enough space - $_ = $h[$_] * $h / $req_h for @h; + $_ *= $h / $req_h for @h; } else { - my @exp = grep $_->{expand}, @$children; - @exp = @$children unless @exp; + my $exp = List::Util::sum map $_->{expand}, @$children; + $exp ||= 1; - my %exp = map +($_ => 1), @exp; - for (0 .. $#$children) { my $child = $children->[$_]; - my $alloc_h = $h[$_]; - $alloc_h += ($h - $req_h) / @exp if $exp{$child}; - $h[$_] = $alloc_h; + $h[$_] += ($h - $req_h) * $child->{expand} / $exp; } } @@ -741,8 +887,7 @@ for (0 .. $#$children) { my $child = $children->[$_]; my $h = $h[$_]; - $child->move (0, $y); - $child->size_allocate ($w, $h); + $child->size_allocate (0, $y, $w, $h); $y += $h; } @@ -760,11 +905,12 @@ my ($class, %arg) = @_; my $self = $class->SUPER::new ( - fg => [1, 1, 1], - height => $::FONTSIZE, - text => "", - align => -1, - layout => new CFClient::Layout, + fg => [1, 1, 1], + height => $::FONTSIZE, + text => "", + align => -1, + padding => 2, + layout => new CFClient::Layout, %arg ); @@ -790,6 +936,7 @@ $self->{layout}->set_markup ($text); delete $self->{texture}; +# $self->{w} = $self->{h} = -1; $self->update; } @@ -804,25 +951,19 @@ $self->{layout}->set_width; $self->{layout}->set_height ($self->{height}); - $self->{layout}->size -# if ($self->{texture}{w} > 1 && $self->{texture}{height} > 1) { #TODO: hack -# ( -# $self->{texture}{w}, -# $self->{texture}{h}, -# ) -# } else { -# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{h}; -# -# ($w, $h) -# } + my ($w, $h) = $self->{layout}->size; + + ( + $w + $self->{padding} * 2, + $h + $self->{padding} * 2, + ) } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{w} != $w || $self->{h} != $h; + $self->_size_allocate ($x, $y, $w, $h) or return; - $self->SUPER::size_allocate ($w, $h); delete $self->{texture}; } @@ -838,25 +979,27 @@ my $tex = $self->{texture} ||= do { $self->{layout}->set_width ($self->{w}); - new_from_layout CFClient::Texture $self->{layout}; + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); + new_from_layout CFClient::Texture $self->{layout} }; glEnable GL_BLEND; - glEnable GL_TEXTURE_2D; glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glEnable GL_TEXTURE_2D; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; glColor @{$self->{fg}}; my $x = - $self->{align} < 0 ? 0 - : $self->{align} > 0 ? $self->{w} - $self->{texture}{w} - : ($self->{w} + $self->{texture}{w}) * 0.5; + $self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5; - $tex->draw_quad ($x, 0); + glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0; + $tex->draw_quad (0, 0); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } ############################################################################# @@ -873,8 +1016,8 @@ $class->SUPER::new ( fg => [1, 1, 1], - bg => [0, 0, 0, 0.4], - active_bg => [1, 1, 1], + bg => [0, 0, 0, 0.2], + active_bg => [1, 1, 1, 0.5], active_fg => [0, 0, 0], @_ ) @@ -887,11 +1030,11 @@ $self->{text} = $text; $self->{layout}->set_width ($self->{w}); + $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height}); $text =~ s/./*/g if $self->{hidden}; - - $self->{layout}->set_markup ($self->escape_text ($text)); + $self->{layout}->set_markup ($self->escape_text ($text) . " "); $text = substr $text, 0, $self->{cursor}; utf8::encode $text; @@ -908,11 +1051,9 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - return unless $self->{w} != $w || $self->{h} != $h; - - $self->SUPER::size_allocate ($w, $h); + $self->SUPER::size_allocate ($x, $y, $w, $h); $self->_set_text ($self->{text}); } @@ -943,6 +1084,10 @@ --$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 ($uni) { substr $text, $self->{cursor}++, 0, chr $uni; } @@ -967,7 +1112,7 @@ my $idx = $self->{layout}->xy_to_index ($x, $y); # byte-index to char-index - my $text = $self->{layout}; + my $text = $self->{text}; utf8::encode $text; $self->{cursor} = length substr $text, 0, $idx; @@ -992,12 +1137,15 @@ 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}; glVertex $self->{w}, $self->{h}; glVertex $self->{w}, 0; glEnd; + glDisable GL_BLEND; $self->SUPER::_draw; @@ -1013,36 +1161,171 @@ ############################################################################# -package CFClient::UI::Slider; +package CFClient::UI::Button; -use strict; +our @ISA = CFClient::UI::Label::; +use SDL; use SDL::OpenGL; -use SDL::OpenGL::Constants; + +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 => [1, 1, 0], +# active_bg => [0, 0, 0, 0.5], +# border_fg => [1, 1, 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}; + my $tex = $tex[0]; + + glEnable GL_BLEND; + glEnable GL_TEXTURE_2D; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + + if ($GRAB == $self) { + $self->{fg} = $self->{active_fg}; + } + + glBindTexture GL_TEXTURE_2D, $tex->{name}; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + $tex->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::; +use SDL; +use SDL::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + padding => 2, + fg => [1, 1, 1], + active_fg => [1, 1, 0], + state => 0, + @_ + ) +} + sub size_request { my ($self) = @_; - my $w = 50; - my $h = 10; + ($self->{padding} * 2 + 6) x 2 +} + +sub size_allocate { + my ($self, $x, $y, $w, $h) = @_; - $self->{vertical} ? ($h, $w) : ($w, $h) + $self->_size_allocate ($x, $y, $w, $h); } +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} }; + + glBegin GL_LINE_LOOP; + glVertex 0 , 0; + glVertex 0 , $s; + glVertex $s, $s; + glVertex $s, 0; + glEnd; + + if ($self->{state}) { + glBegin GL_LINES; + glVertex 0 , 0; + glVertex $s, $s; + glVertex $s, 0; + glVertex 0 , $s; + glEnd; + } +} + +############################################################################# + +package CFClient::UI::Slider; + +use strict; + +use SDL::OpenGL; + +our @ISA = CFClient::UI::DrawBG::; + sub new { my $class = shift; # range [value, low, high, page] - $class->SUPER::new ( + my $self = $class->SUPER::new ( fg => [1, 1, 1], active_fg => [0, 0, 0], range => [0, 0, 100, 10], - vertical => 1, + req_w => 40, + req_h => 10, + vertical => 0, @_ - ) + ); + + $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 { @@ -1097,6 +1380,7 @@ $w -= $page; $page &= ~1; glTranslate $page * 0.5, 0, 0; + $page ||= 2; glColor @$fg; glBegin GL_LINES; @@ -1135,7 +1419,6 @@ use SDL; use SDL::OpenGL; -use SDL::OpenGL::Constants; our @ISA = CFClient::UI::Base::; @@ -1158,8 +1441,8 @@ sub size_request { ( - 1 + int $::WIDTH / 32, - 1 + int $::HEIGHT / 32, + 1 + 32 * int $::WIDTH / 32, + 1 + 32 * int $::HEIGHT / 32, ) } @@ -1167,9 +1450,10 @@ my ($self) = @_; $self->{need_update} = 1; + $self->SUPER::update; } -sub _draw { +sub draw { my ($self) = @_; if (delete $self->{need_update}) { @@ -1199,7 +1483,9 @@ glEnable GL_TEXTURE_2D; glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + glColor 1, 1, 1, 1; my $sw4 = ($sw + 3) & ~3; my $darkness = "\x00" x ($sw4 * $sh); @@ -1238,19 +1524,33 @@ # $lighting =~ s/(.)../$1/gs; # } - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; + if ($::CFG->{fow_smooth}) { # smooth fog of war + my @conv = ( + 0.05, 0.05, 0.05, + 0.05, 0.60, 0.05, + 0.05, 0.05, 0.05, + ); + CFClient::glConvolutionParameteri GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_REPLICATE_BORDER; + CFClient::glConvolutionFilter2D GL_CONVOLUTION_2D, + GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT, + pack "f*", @conv; + glEnable GL_CONVOLUTION_2D; + } + $darkness = new CFClient::Texture - width => $sw4, - height => $sh, + w => $sw4, + h => $sh, data => $darkness, internalformat => GL_ALPHA, format => GL_ALPHA; - glColor 0.45, 0.45, 0.45, 1; + glColor +($::CFG->{fow_intensity}) x 3, 1; $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); + glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; + glDisable GL_TEXTURE_2D; glDisable GL_BLEND; @@ -1258,6 +1558,18 @@ } glCallList $self->{list}; + + if ($FOCUS != $self) { + glEnable GL_BLEND; + glColor 0, 0, 1, 0.4; + glBegin GL_QUADS; + glVertex 0, 0; + glVertex 0, $::HEIGHT; + glVertex $::WIDTH, $::HEIGHT; + glVertex $::WIDTH, 0; + glEnd; + glDisable GL_BLEND; + } } my %DIR = ( @@ -1283,16 +1595,18 @@ my $sym = $ev->key_sym; if ($sym == SDLK_KP5) { - $::CONN->send ("command stay fire"); + $::CONN->user_send ("command stay fire"); + } elsif ($sym == SDLK_a) { + $::CONN->user_send ("command apply"); } elsif (exists $DIR{$sym}) { if ($mod & KMOD_SHIFT) { $self->{shft}++; - $::CONN->send ("command fire $DIR{$sym}[0]"); + $::CONN->user_send ("command fire $DIR{$sym}[0]"); } elsif ($mod & KMOD_CTRL) { $self->{ctrl}++; - $::CONN->send ("command run $DIR{$sym}[0]"); + $::CONN->user_send ("command run $DIR{$sym}[0]"); } else { - $::CONN->send ("command $DIR{$sym}[1]"); + $::CONN->user_send ("command $DIR{$sym}[1]"); } } } @@ -1304,10 +1618,10 @@ my $sym = $ev->key_sym; if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { - $::CONN->send ("command fire_stop"); + $::CONN->user_send ("command fire_stop"); } if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { - $::CONN->send ("command run_stop"); + $::CONN->user_send ("command run_stop"); } } @@ -1364,11 +1678,11 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); + $self->_size_allocate ($x, $y, $w, $h); - $_->size_allocate ($_->size_request) + $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) for @{$self->{children}}; } @@ -1381,7 +1695,7 @@ sub update { my ($self) = @_; - $self->size_allocate ($self->size_request); + $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); ::refresh (); } @@ -1390,7 +1704,7 @@ $self->SUPER::add ($widget); - $widget->size_allocate ($widget->size_request); + $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); } sub draw {