--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 14:04:27 1.65 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/12 00:36:13 1.80 @@ -1,11 +1,9 @@ -package CFClient::Widget; +package CFClient::UI; use strict; -use Scalar::Util; - -use SDL::OpenGL; -use SDL::OpenGL::Constants; +use Scalar::Util (); +use List::Util (); use CFClient; @@ -47,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; @@ -72,15 +70,33 @@ $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; } +############################################################################# + +package CFClient::UI::Base; + +use strict; + +use SDL::OpenGL; + 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 { @@ -99,11 +115,24 @@ 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 @@ -116,6 +145,8 @@ sub focus_in { my ($self) = @_; + return if $FOCUS == $self; + my $focus = $FOCUS; $FOCUS = $self; $focus->update if $focus; $FOCUS->update; @@ -132,10 +163,15 @@ 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} } @@ -145,21 +181,27 @@ sub draw { my ($self) = @_; + return unless $self->{h} && $self->{w}; + glPushMatrix; glTranslate $self->{x}, $self->{y}, 0; $self->_draw; + glPopMatrix; + if ($self == $HOVER) { - glColor 1, 1, 1, 0.4; + my ($x, $y) = @$self{qw(x y)}; + + glColor 0, 0, 1, 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 { @@ -168,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) = @_; @@ -189,8 +220,6 @@ () } -sub del_parent { $_[0]->{parent} = undef } - sub set_parent { my ($self, $par) = @_; @@ -209,6 +238,19 @@ if $self->{parent}; } +sub connect { + my ($self, $signal, $cb) = @_; + + push @{ $self->{cb}{$signal} }, $cb; +} + +sub emit { + my ($self, $signal, @args) = @_; + + $_->($self, @args) + for @{$self->{cb}{$signal} || []}; +} + sub DESTROY { my ($self) = @_; @@ -217,9 +259,61 @@ ############################################################################# -package CFClient::Widget::Container; +package CFClient::UI::DrawBG; -our @ISA = CFClient::Widget::; +our @ISA = CFClient::UI::Base::; + +use strict; +use SDL::OpenGL; + +sub new { + my $class = shift; + + # range [value, low, high, page] + + $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) = @_; @@ -233,17 +327,17 @@ } sub add { - my ($self, $chld, $expand) = @_; + my ($self, $chld) = @_; - $chld->{expand} = $expand; $chld->set_parent ($self); - @{$self->{children}} = + $self->{children} = [ sort { $a->{z} <=> $b->{z} } - @{$self->{children}}, $chld; + @{$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 { @@ -251,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 { @@ -278,29 +372,54 @@ ############################################################################# -package CFClient::Widget::Bin; +package CFClient::UI::Bin; + +our @ISA = CFClient::UI::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, $widget) = @_; + + $self->{children} = []; + + $self->SUPER::add ($widget); +} + +sub remove { + my ($self, $widget) = @_; -our @ISA = CFClient::Widget::Container::; + $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) = @_; + my ($self, $x, $y, $w, $h) = @_; - $self->SUPER::size_allocate ($w, $h); - $self->{children}[0]->size_allocate ($w, $h) - if $self->{children}[0] + $self->_size_allocate ($x, $y, $w, $h) or return; + + $self->{children}[0]->size_allocate (0, 0, $w, $h); } ############################################################################# -package CFClient::Widget::Window; +package CFClient::UI::Window; -our @ISA = CFClient::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; @@ -328,12 +447,11 @@ } sub size_allocate { - my ($self, $w, $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; } @@ -347,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; @@ -358,9 +477,9 @@ ############################################################################# -package CFClient::Widget::Frame; +package CFClient::UI::Frame; -our @ISA = CFClient::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; @@ -375,13 +494,11 @@ } sub size_allocate { - my ($self, $w, $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 - 4, $h - 4); - $self->child->move (2, 2); + $self->child->size_allocate (2, 2, $w - 4, $h - 4); } sub _draw { @@ -404,9 +521,9 @@ ############################################################################# -package CFClient::Widget::FancyFrame; +package CFClient::UI::FancyFrame; -our @ISA = CFClient::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; use SDL::OpenGL; @@ -417,31 +534,82 @@ 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]->{height}; - $h += $tex[4]->{height}; - $w += $tex[2]->{width}; - $w += $tex[3]->{width}; + $h += $tex[1]->{h}; + $h += $tex[4]->{h}; + $w += $tex[2]->{w}; + $w += $tex[3]->{w}; ($w, $h) } 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) or return; - $h -= $tex[1]->{height}; - $h -= $tex[4]->{height}; - $w -= $tex[2]->{width}; - $w -= $tex[3]->{width}; + $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; - $self->child->size_allocate ($w, $h); - $self->child->move ($tex[3]->{width}, $tex[1]->{height}); + my $child = $self->child; + + $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 { @@ -451,35 +619,36 @@ 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]; - $top->draw_quad (0, 0, $w, $top->{height}); + $top->draw_quad (0, 0, $w, $top->{h}); my $left = $tex[3]; - $left->draw_quad (0, $top->{height}, $left->{width}, $ch); + $left->draw_quad (0, $top->{h}, $left->{w}, $ch); my $right = $tex[2]; - $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); + $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch); my $bottom = $tex[4]; - $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); + $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->{width}; - my $rep_y = $ch / $bg->{height}; + my $rep_x = $cw / $bg->{w}; + my $rep_y = $ch / $bg->{h}; - $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); + $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; $self->child->draw; @@ -487,98 +656,201 @@ ############################################################################# -package CFClient::Widget::Table; +package CFClient::UI::Table; -our @ISA = CFClient::Widget::Bin::; +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 $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; -} + my (@w, @h); + + 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 $widget = $row->[$c] + or next; + + my $col_w = $ws->[$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++) { +############################################################################# - 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 + +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) or return; + + return unless $self->{w}; + + ($h, $w) = ($w, $h); - $x += $self->max_col_width ($xi); + 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; } + } - $y += $self->max_row_height ($yi); + my $y = 0; + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->size_allocate ($y, 0, $h, $w); + + $y += $h; } } ############################################################################# -package CFClient::Widget::VBox; +package CFClient::UI::VBox; -our @ISA = CFClient::Widget::Container::; +# TODO: wrap into common Box base class -use SDL::OpenGL; +our @ISA = CFClient::UI::Container::; sub size_request { my ($self) = @_; @@ -592,63 +864,60 @@ } sub size_allocate { - my ($self, $w, $h) = @_; + my ($self, $x, $y, $w, $h) = @_; - $self->w ($w); - $self->h ($h); + $self->_size_allocate ($x, $y, $w, $h) or return; - my $exp; - my @oth; - # find expand widget - for (@{$self->{children}}) { - if ($_->{expand}) { - $exp = $_; - last; - } - push @oth, $_; - } + return unless $self->{h}; + + my $children = $self->{children}; + + 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; + } } my $y = 0; - for (@{$self->{children}}) { - $_->move (0, $y); + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->size_allocate (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; } } ############################################################################# -package CFClient::Widget::Label; +package CFClient::UI::Label; -our @ISA = CFClient::Widget::; +our @ISA = CFClient::UI::Base::; use SDL::OpenGL; sub new { my ($class, %arg) = @_; - # TODO: color, and make height, xyz etc. optional my $self = $class->SUPER::new ( - color => [1, 1, 1], - height => $::FONTSIZE, - text => "", - layout => new CFClient::Layout, + fg => [1, 1, 1], + height => $::FONTSIZE, + text => "", + align => -1, + padding => 2, + layout => new CFClient::Layout, %arg ); @@ -657,6 +926,16 @@ $self } +sub escape_text { + local $_ = $_[1]; + + s/&/&/g; + s/>/>/g; + s/{layout}->set_markup ($text); delete $self->{texture}; + $self->update; } sub get_text { @@ -677,24 +957,27 @@ $self->{layout}->set_width; $self->{layout}->set_height ($self->{height}); - $self->{layout}->size -# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack -# ( -# $self->{texture}{width}, -# $self->{texture}{height}, -# ) -# } else { -# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height}; -# -# ($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) = @_; + + $self->_size_allocate ($x, $y, $w, $h) or return; + + delete $self->{texture}; +} + +sub update { + my ($self) = @_; - $self->SUPER::size_allocate ($w, $h); delete $self->{texture}; + $self->SUPER::update; } sub _draw { @@ -702,31 +985,91 @@ 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->{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->{color}}; + glColor @{$self->{fg}}; - $tex->draw_quad (0, 0); + my $x = + $self->{align} < 0 ? $self->{padding} + : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} + : ($self->{w} - $tex->{w}) * 0.5; + + $tex->draw_quad ($x, $self->{padding}); - glDisable GL_BLEND; glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; } ############################################################################# -package CFClient::Widget::Entry; +package CFClient::UI::Entry; -our @ISA = CFClient::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], + @_ + ) +} + +sub _set_text { + my ($self, $text) = @_; + + $self->{last_activity} = $::NOW; + + $self->{text} = $text; + $self->{layout}->set_width ($self->{w}); + + $text =~ s/./*/g if $self->{hidden}; + + $self->{layout}->set_markup ($self->escape_text ($text) . " "); + + $text = substr $text, 0, $self->{cursor}; + utf8::encode $text; + + @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $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, $x, $y, $w, $h) = @_; + + $self->SUPER::size_allocate ($x, $y, $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) = @_; @@ -738,47 +1081,277 @@ 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 ($uni) { - $text .= chr $uni; + 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# +# 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) { + glColor @{$self->{fg}}; + glBegin GL_LINES; + glVertex $self->{cur_x}, $self->{cur_y}; + glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; + glEnd; + } +} + +############################################################################# + +package CFClient::UI::Button; + +our @ISA = CFClient::UI::Label::; + +use SDL; +use SDL::OpenGL; + +sub new { + my $class = shift; + + $class->SUPER::new ( + padding => 4, + fg => [1, 1, 1], + bg => [1, 1, 1, 0.2], + active_bg => [0, 0, 0, 0.5], + active_fg => [1, 1, 0], + 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}; + + glEnable GL_BLEND; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + + glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly + + glBegin GL_LINE_LOOP; + glColor @{$self->{border_fg}}; + glVertex 1 , 1; + glVertex 1 , $self->{h} - 2; + glVertex $self->{w} - 2, $self->{h} - 2; + glVertex $self->{w} - 2, 1; + glEnd; + + if ($GRAB == $self) { + glColor @{$self->{active_bg}}; + $self->{fg} = $self->{active_fg}; + } else { + glColor @{$self->{bg}}; + } + + glBegin GL_QUADS; + glVertex 2 , 2; + glVertex 2 , $self->{h} - 2; + glVertex $self->{w} - 2, $self->{h} - 2; + glVertex $self->{w} - 2, 2; + glEnd; + glDisable GL_BLEND; + + $self->SUPER::_draw; +} + +############################################################################# + +package CFClient::UI::Slider; + +use strict; + +use SDL::OpenGL; + +our @ISA = CFClient::UI::DrawBG::; + +sub new { + my $class = shift; + + # range [value, low, high, page] + + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + active_fg => [0, 0, 0], + range => [0, 0, 100, 10], + 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 { + 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}); + + $x = $x * ($hi - $lo) / $w + $lo; + $x = $lo if $x < $lo; + $x = $hi - $page if $x > $hi - $page; + $self->{range}[0] = $x; + + $self->emit (changed => $x); + $self->update; + } +} + +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); + } + + 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}}; + + $page = int $page * $w / ($hi - $lo); + $value = int +($value - $lo) * $w / ($hi - $lo); + + $w -= $page; + $page &= ~1; + glTranslate $page * 0.5, 0, 0; + $page ||= 2; + + glColor @$fg; + glBegin GL_LINES; + glVertex 0, 0; glVertex 0, $h; + glVertex $w - 1, 0; glVertex $w - 1, $h; + glVertex 0, $h * 0.5; glVertex $w, $h * 0.5; + glEnd; + + my $knob_a = $value - $page * 0.5; + my $knob_b = $value + $page * 0.5; + + glBegin GL_QUADS; + glColor @$fg; + glVertex $knob_a, 0; + glVertex $knob_a, $h; + glVertex $knob_b, $h; + glVertex $knob_b, 0; + + if ($knob_a < $knob_b - 2) { + glColor @$bg; + glVertex $knob_a + 1, 1; + glVertex $knob_a + 1, $h - 1; + glVertex $knob_b - 1, $h - 1; + glVertex $knob_b - 1, 1; + } + glEnd; } ############################################################################# -package CFClient::Widget::MapWidget; +package CFClient::UI::MapWidget; use strict; @@ -786,9 +1359,8 @@ use SDL; use SDL::OpenGL; -use SDL::OpenGL::Constants; -our @ISA = CFClient::Widget::; +our @ISA = CFClient::UI::Base::; sub new { my $class = shift; @@ -809,8 +1381,8 @@ sub size_request { ( - 1 + int $::WIDTH / 32, - 1 + int $::HEIGHT / 32, + 1 + 32 * int $::WIDTH / 32, + 1 + 32 * int $::HEIGHT / 32, ) } @@ -818,9 +1390,10 @@ my ($self) = @_; $self->{need_update} = 1; + $self->SUPER::update; } -sub _draw { +sub draw { my ($self) = @_; if (delete $self->{need_update}) { @@ -850,6 +1423,7 @@ 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; my $sw4 = ($sw + 3) & ~3; @@ -872,8 +1446,7 @@ for my $num (grep $_, @$cell[1,2,3]) { my $tex = $::CONN->{face}[$num]{texture} || next; - my $w = $tex->{width}; - my $h = $tex->{height}; + my ($w, $h) = @$tex{qw(w h)}; $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); } @@ -890,12 +1463,11 @@ # $lighting =~ s/(.)../$1/gs; # } - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; $darkness = new CFClient::Texture - width => $sw4, - height => $sh, + w => $sw4, + h => $sh, data => $darkness, internalformat => GL_ALPHA, format => GL_ALPHA; @@ -965,11 +1537,11 @@ ############################################################################# -package CFClient::Widget::Animator; +package CFClient::UI::Animator; use SDL::OpenGL; -our @ISA = CFClient::Widget::Bin::; +our @ISA = CFClient::UI::Bin::; sub moveto { my ($self, $x, $y) = @_; @@ -1007,20 +1579,20 @@ ############################################################################# -package CFClient::Widget::Toplevel; +package CFClient::UI::Toplevel; -our @ISA = CFClient::Widget::Container::; +our @ISA = CFClient::UI::Container::; sub size_request { ($::WIDTH, $::HEIGHT) } 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}}; } @@ -1033,7 +1605,7 @@ sub update { my ($self) = @_; - $self->size_allocate ($self->size_request); + $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); ::refresh (); } @@ -1042,7 +1614,7 @@ $self->SUPER::add ($widget); - $widget->size_allocate ($widget->size_request); + $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); } sub draw { @@ -1053,9 +1625,9 @@ ############################################################################# -package CFClient::Widget; +package CFClient::UI; -$TOPLEVEL = new CFClient::Widget::Toplevel; +$TOPLEVEL = new CFClient::UI::Toplevel; 1