--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/09 22:21:02 1.46 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 17:02:36 1.68 @@ -1,4 +1,4 @@ -package Crossfire::Client::Widget; +package CFClient::Widget; use strict; @@ -7,20 +7,80 @@ use SDL::OpenGL; use SDL::OpenGL::Constants; -use Crossfire::Client; +use CFClient; -our $FOCUS; # the widget with current focus +our ($FOCUS, $HOVER, $GRAB); # various widgets + +our $TOPLEVEL; +our $BUTTON_STATE; # class methods for events -sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } -sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } -sub feed_sdl_button_down_event { } -sub feed_sdl_button_up_event { } +sub feed_sdl_key_down_event { + $FOCUS->key_down ($_[0]) if $FOCUS; +} + +sub feed_sdl_key_up_event { + $FOCUS->key_up ($_[0]) if $FOCUS; +} + +sub feed_sdl_button_down_event { + my ($ev) = @_; + my ($x, $y) = ($ev->motion_x, $ev->motion_y); + + if (!$BUTTON_STATE) { + my $widget = $TOPLEVEL->find_widget ($x, $y); + + $GRAB = $widget; + $GRAB->update if $GRAB; + } + + $BUTTON_STATE |= 1 << ($ev->button - 1); + + $GRAB->button_down ($ev, $GRAB->translate ($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); + + $BUTTON_STATE &= ~(1 << ($ev->button - 1)); + + $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; + + if (!$BUTTON_STATE) { + my $grab = $GRAB; undef $GRAB; + $grab->update if $grab; + $GRAB->update if $GRAB; + } +} + +sub feed_sdl_motion_event { + my ($ev) = @_; + my ($x, $y) = ($ev->motion_x, $ev->motion_y); + + my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); + + if ($widget != $HOVER) { + my $hover = $HOVER; $HOVER = $widget; + + $hover->update if $hover; + $HOVER->update if $HOVER; + } + + $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; +} sub new { my $class = shift; - bless { @_ }, $class + bless { + x => 0, + y => 0, + z => 0, + @_ + }, $class } sub move { @@ -46,43 +106,68 @@ $self->{h} = $h; } +# translate global koordinates to local coordinate system +sub translate { + my ($self, $x, $y) = @_; + + $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); +} + sub focus_in { - my ($widget) = @_; - $FOCUS = $widget; + my ($self) = @_; + + return if $FOCUS == $self; + + my $focus = $FOCUS; $FOCUS = $self; + $focus->update if $focus; + $FOCUS->update; } sub focus_out { - my ($widget) = @_; -} + my ($self) = @_; -sub key_down { - my ($widget, $sdlev) = @_; -} + return unless $FOCUS == $self; -sub key_up { - my ($widget, $sdlev) = @_; + my $focus = $FOCUS; undef $FOCUS; + $focus->update if $focus; #? } +sub mouse_motion { } +sub button_up { } +sub key_down { } +sub key_up { } + sub button_down { - my ($widget, $sdlev) = @_; -} + my ($self, $ev, $x, $y) = @_; -sub button_up { - my ($widget, $sdlev) = @_; + $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} } -sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } -sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } +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} } +sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } +sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 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; + glEnable GL_BLEND; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex $self->{w}, 0; + glVertex $self->{w}, $self->{h}; + glVertex 0 , $self->{h}; + glEnd; + glDisable GL_BLEND; + } glPopMatrix; } @@ -141,15 +226,64 @@ ############################################################################# -package Crossfire::Client::Widget::Container; +package CFClient::Widget::DrawBG; + +our @ISA = CFClient::Widget::; + +use strict; +use SDL::OpenGL; + +sub new { + my $class = shift; + + # range [value, low, high, page] + + $class->SUPER::new ( + bg => [0, 0, 0, 0.4], + active_bg => [1, 1, 1], + @_ + ) +} + +sub _draw { + my ($self) = @_; + + my ($w, $h) = @$self{qw(w h)}; + + glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $h; + glVertex $w, $h; + glVertex $w, 0; + glEnd; +} + +############################################################################# + +package CFClient::Widget::Empty; -our @ISA = Crossfire::Client::Widget::; +our @ISA = CFClient::Widget::; + +sub size_request { + (0, 0) +} + +sub draw { } + +############################################################################# + +package CFClient::Widget::Container; + +our @ISA = CFClient::Widget::; sub new { - my ($class, @widgets) = @_; + my ($class, %arg) = @_; - my $self = $class->SUPER::new (children => []); - $self->add ($_) for @widgets; + my $children = delete $arg{children} || []; + + my $self = $class->SUPER::new (children => [], %arg); + $self->add ($_) for @$children; $self } @@ -160,9 +294,10 @@ $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" @@ -200,63 +335,68 @@ ############################################################################# -package Crossfire::Client::Widget::Bin; +package CFClient::Widget::Bin; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = CFClient::Widget::Container::; -sub child { $_[0]->{children}[0] } +sub new { + my ($class, %arg) = @_; -sub size_request { - $_[0]{children}[0]->size_request if $_[0]{children}[0]; + my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; + + $class->SUPER::new (children => [$child], %arg) } -sub size_allocate { - my ($self, $w, $h) = @_; +sub add { + my ($self, $widget) = @_; - $self->SUPER::size_allocate ($w, $h); - $self->{children}[0]->size_allocate ($w, $h) - if $self->{children}[0] + $self->{children} = []; + + $self->SUPER::add ($widget); } -############################################################################# +sub remove { + my ($self, $widget) = @_; -package Crossfire::Client::Widget::Toplevel; + $self->SUPER::remove ($widget); -our @ISA = Crossfire::Client::Widget::Container::; + $self->{children} = [new CFClient::Widget::Empty] + unless @{$self->{children}}; +} -sub update { - my ($self) = @_; +sub child { $_[0]->{children}[0] } - ::refresh (); +sub size_request { + $_[0]{children}[0]->size_request } -sub add { - my ($self, $widget) = @_; +sub size_allocate { + my ($self, $w, $h) = @_; - $self->SUPER::add ($widget); + return unless $self->{w} != $w || $self->{h} != $h; - $widget->size_allocate ($widget->size_request); + $self->SUPER::size_allocate ($w, $h); + $self->{children}[0]->size_allocate ($w, $h); } ############################################################################# -package Crossfire::Client::Widget::Window; +package CFClient::Widget::Window; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::Widget::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; } @@ -265,7 +405,7 @@ my ($self) = @_; $self->{texture} = - Crossfire::Client::Texture->new_from_opengl ( + CFClient::Texture->new_from_opengl ( $self->{w}, $self->{h}, sub { $self->child->draw } ); } @@ -273,6 +413,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->{w} = $w; $self->{h} = $h; @@ -292,14 +434,8 @@ glEnable GL_BLEND; 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; @@ -307,9 +443,9 @@ ############################################################################# -package Crossfire::Client::Widget::Frame; +package CFClient::Widget::Frame; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::Widget::Bin::; use SDL::OpenGL; @@ -326,6 +462,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->{w} = $w; $self->{h} = $h; @@ -342,10 +480,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; @@ -353,14 +491,14 @@ ############################################################################# -package Crossfire::Client::Widget::FancyFrame; +package CFClient::Widget::FancyFrame; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::Widget::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 size_request { @@ -379,6 +517,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->SUPER::size_allocate ($w, $h); $h -= $tex[1]->{height}; @@ -389,8 +529,10 @@ $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 ($w, $h); + $child->move ($tex[3]->{width}, $tex[1]->{height}); } sub _draw { @@ -405,44 +547,16 @@ glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; my $top = $tex[1]; - glBindTexture GL_TEXTURE_2D, $top->{name}; - - 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; + $top->draw_quad (0, 0, $w, $top->{height}); my $left = $tex[3]; - glBindTexture GL_TEXTURE_2D, $left->{name}; - - 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; + $left->draw_quad (0, $top->{height}, $left->{width}, $ch); my $right = $tex[2]; - glBindTexture GL_TEXTURE_2D, $right->{name}; - - 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; + $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); my $bottom = $tex[4]; - glBindTexture GL_TEXTURE_2D, $bottom->{name}; - - 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; + $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); my $bg = $tex[0]; glBindTexture GL_TEXTURE_2D, $bg->{name}; @@ -453,12 +567,7 @@ my $rep_x = $cw / $bg->{width}; my $rep_y = $ch / $bg->{height}; - 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; + $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; @@ -469,9 +578,9 @@ ############################################################################# -package Crossfire::Client::Widget::Table; +package CFClient::Widget::Table; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::Widget::Bin::; use SDL::OpenGL; @@ -556,9 +665,9 @@ ############################################################################# -package Crossfire::Client::Widget::VBox; +package CFClient::Widget::VBox; -our @ISA = Crossfire::Client::Widget::Container::; +our @ISA = CFClient::Widget::Container::; use SDL::OpenGL; @@ -576,69 +685,89 @@ sub size_allocate { my ($self, $w, $h) = @_; - $self->w ($w); - $self->h ($h); + return unless $self->{w} != $w || $self->{h} != $h; - my $exp; - my @oth; - # find expand widget - for (@{$self->{children}}) { - if ($_->{expand}) { - $exp = $_; - last; - } - push @oth, $_; - } + $self->{w} = $w; + $self->{h} = $h; + + return unless $self->{h}; + + my $children = $self->{children}; + + my @h = map +($_->size_request)[1], @$children; + + my $req_h = List::Util::sum @h; - my ($ow, $oh); + if ($req_h > $h) { + # ah well, not enough space + $_ = $h[$_] * $h / $req_h for @h; + } else { + my @exp = grep $_->{expand}, @$children; + @exp = @$children unless @exp; + + my %exp = map +($_ => 1), @exp; + + for (0 .. $#$children) { + my $child = $children->[$_]; - # get sizes of other widgets - for (@oth) { - my ($w, $h) = $_->size_request; - $oh += $h; - if ($ow < $w) { $ow = $w } + my $alloc_h = $h[$_]; + $alloc_h += ($h - $req_h) / @exp if $exp{$child}; + $h[$_] = $alloc_h; + } } my $y = 0; - for (@{$self->{children}}) { - $_->move (0, $y); + for (0 .. $#$children) { + my $child = $children->[$_]; + my $h = $h[$_]; + $child->move (0, $y); + $child->size_allocate ($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 Crossfire::Client::Widget::Label; +package CFClient::Widget::Label; -our @ISA = Crossfire::Client::Widget::; +our @ISA = CFClient::Widget::; use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $height, $text) = @_; + my ($class, %arg) = @_; - # TODO: color, and make height, xyz etc. optional - my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); + my $self = $class->SUPER::new ( + fg => [1, 1, 1], + height => $::FONTSIZE, + text => "", + layout => new CFClient::Layout, + %arg + ); - $self->set_text ($text); + $self->set_text ($self->{text}); $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_markup ($text); + delete $self->{texture}; $self->update; } @@ -651,31 +780,53 @@ sub size_request { my ($self) = @_; - ( - $self->{texture}{width}, - $self->{texture}{height}, - ) + $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) +# } +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + return unless $self->{w} != $w || $self->{h} != $h; + + $self->SUPER::size_allocate ($w, $h); + delete $self->{texture}; +} + +sub update { + my ($self) = @_; + + delete $self->{texture}; + $self->SUPER::update; } sub _draw { my ($self) = @_; - my $tex = $self->{texture}; + my $tex = $self->{texture} ||= do { + $self->{layout}->set_width ($self->{w}); + 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}; - 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; + $tex->draw_quad (0, 0); glDisable GL_BLEND; glDisable GL_TEXTURE_2D; @@ -683,36 +834,216 @@ ############################################################################# -package Crossfire::Client::Widget::TextEntry; +package CFClient::Widget::Entry; -our @ISA = Crossfire::Client::Widget::Label::; +our @ISA = CFClient::Widget::Label::; use SDL; use SDL::OpenGL; +sub new { + my $class = shift; + + $class->SUPER::new ( + fg => [1, 1, 1], + bg => [0, 0, 0, 0.4], + active_bg => [1, 1, 1], + active_fg => [0, 0, 0], + @_ + ) +} + +sub _set_text { + my ($self, $text) = @_; + + $self->{last_activity} = $::NOW; + + $self->{text} = $text; + $self->{layout}->set_width ($self->{w}); + $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, $w, $h) = @_; + + return unless $self->{w} != $w || $self->{h} != $h; + + $self->SUPER::size_allocate ($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) = @_; my $mod = $ev->key_mod; my $sym = $ev->key_sym; - $ev->set_unicode (1); my $uni = $ev->key_unicode; 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 ($uni) { - $text .= chr $uni; + substr $text, $self->{cursor}++, 0, chr $uni; + } + + $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, $x, $y) = @_; + + $self->SUPER::button_down ($ev, $x, $y); + + my $idx = $self->{layout}->xy_to_index ($x, $y); + + # byte-index to char-index + my $text = $self->{layout}; + 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 @{$self->{active_bg}}; + $self->{fg} = $self->{active_fg}; + } else { + glColor @{$self->{bg}}; + } + + glBegin GL_QUADS; + glVertex 0 , 0; + glVertex 0 , $self->{h}; + glVertex $self->{w}, $self->{h}; + glVertex $self->{w}, 0; + glEnd; + + $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; } - $self->set_text ($text); } ############################################################################# -package Crossfire::Client::Widget::MapWidget; +package CFClient::Widget::Slider; + +use strict; + +use SDL::OpenGL; +use SDL::OpenGL::Constants; + +our @ISA = CFClient::Widget::DrawBG::; + +sub size_request { + my ($self) = @_; + + my $w = + my $h = 10; + + $self->{vertical} ? ($h, $w) : ($w, $h) +} + +sub new { + my $class = shift; + + # range [value, low, high, page] + + $class->SUPER::new ( + fg => [1, 1, 1], + active_fg => [0, 0, 0], + range => [0, 0, 100, 10], + vertical => 0, + @_ + ) +} + +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 + + glTranslate 0, $self->{w}; + glRotate 90, 0, 0, 1; + + ($w, $h) = ($h, $w); + } + + my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; + my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; + + 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; +} + +############################################################################# + +package CFClient::Widget::MapWidget; use strict; @@ -722,7 +1053,17 @@ use SDL::OpenGL; use SDL::OpenGL::Constants; -our @ISA = Crossfire::Client::Widget::; +our @ISA = CFClient::Widget::; + +sub new { + my $class = shift; + + $class->SUPER::new ( + z => -1, + list => (glGenLists 1), + @_ + ) +} sub key_down { print "MAPKEYDOWN\n"; @@ -732,76 +1073,77 @@ } sub size_request { - + ( + 1 + int $::WIDTH / 32, + 1 + int $::HEIGHT / 32, + ) } -sub size_allocate { +sub update { + my ($self) = @_; + + $self->{need_update} = 1; } sub _draw { my ($self) = @_; - my $mx = $::CONN->{mapx}; - my $my = $::CONN->{mapy}; + if (delete $self->{need_update}) { + glNewList $self->{list}, GL_COMPILE; - my $map = $::CONN->{map}; + my $mx = $::CONN->{mapx}; + my $my = $::CONN->{mapy}; - my ($xofs, $yofs); + my $map = $::CONN->{map}; - my $sw = 1 + int $::WIDTH / 32; - my $sh = 1 + int $::HEIGHT / 32; + my ($xofs, $yofs); - 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}; - } + my $sw = 1 + int $::WIDTH / 32; + my $sh = 1 + int $::HEIGHT / 32; - 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}; - } - - glEnable GL_TEXTURE_2D; - glEnable GL_BLEND; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - - my $sw4 = ($sw + 3) & ~3; - my $lighting = "\x00" x ($sw4 * $sh); - - for my $x (0 .. $sw - 1) { - for my $y (0 .. $sh - 1) { - - my $cell = $map->[$x + $xofs][$y + $yofs] - or next; - - my $darkness = $cell->[0] * (1 / 255); - if ($darkness < 0) { - $darkness = 0.15; - } - 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; - - glBindTexture GL_TEXTURE_2D, $tex->{name}; + 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}; + } - my $w = $tex->{width}; - my $h = $tex->{height}; + 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}; + } - my $px = ($x + 1) * 32 - $w; - my $py = ($y + 1) * 32 - $h; + glEnable GL_TEXTURE_2D; + glEnable GL_BLEND; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + + my $sw4 = ($sw + 3) & ~3; + my $darkness = "\x00" x ($sw4 * $sh); + + for my $x (0 .. $sw - 1) { + my $row = $map->[$x + $xofs]; + for my $y (0 .. $sh - 1) { + + my $cell = $row->[$y + $yofs] + or next; + + my $dark = $cell->[0]; + if ($dark < 0) { + substr $darkness, $y * $sw4 + $x, 1, chr 224; + } else { + substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark; + } + + for my $num (grep $_, @$cell[1,2,3]) { + my $tex = $::CONN->{face}[$num]{texture} || next; + + my $w = $tex->{width}; + my $h = $tex->{height}; - 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; + $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); + } } } - } # if (1) { # higher quality darkness # $lighting =~ s/(.)/$1$1$1/gs; @@ -813,27 +1155,26 @@ # $lighting =~ s/(.)../$1/gs; # } - $lighting = new Crossfire::Client::Texture - width => $sw4, - height => $sh, - data => $lighting, - internalformat => GL_ALPHA4, - format => GL_ALPHA; + glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; - glColor 0, 0, 0, 0.75; - 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; + $darkness = new CFClient::Texture + width => $sw4, + height => $sh, + data => $darkness, + internalformat => GL_ALPHA, + format => GL_ALPHA; - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glColor 0.45, 0.45, 0.45, 1; + $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); + + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + glEndList; + } + + glCallList $self->{list}; } my %DIR = ( @@ -889,17 +1230,17 @@ ############################################################################# -package Crossfire::Client::Widget::Animator; +package CFClient::Widget::Animator; use SDL::OpenGL; -our @ISA = Crossfire::Client::Widget::Bin::; +our @ISA = CFClient::Widget::Bin::; sub moveto { my ($self, $x, $y) = @_; $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; - $self->{speed} = 0.2; + $self->{speed} = 0.001; $self->{time} = 1; ::animation_start $self; @@ -924,10 +1265,62 @@ my ($self) = @_; glPushMatrix; - glRotate $self->{time} * 10000, 0, 1, 0; + glRotate $self->{time} * 1000, 0, 1, 0; $self->{children}[0]->draw; glPopMatrix; } -1; +############################################################################# + +package CFClient::Widget::Toplevel; + +our @ISA = CFClient::Widget::Container::; + +sub size_request { + ($::WIDTH, $::HEIGHT) +} + +sub size_allocate { + my ($self, $w, $h) = @_; + + $self->SUPER::size_allocate ($w, $h); + + $_->size_allocate ($_->size_request) + for @{$self->{children}}; +} + +sub translate { + my ($self, $x, $y) = @_; + + ($x, $y) +} + +sub update { + my ($self) = @_; + + $self->size_allocate ($self->size_request); + ::refresh (); +} + +sub add { + my ($self, $widget) = @_; + + $self->SUPER::add ($widget); + + $widget->size_allocate ($widget->size_request); +} + +sub draw { + my ($self) = @_; + + $self->_draw; +} + +############################################################################# + +package CFClient::Widget; + +$TOPLEVEL = new CFClient::Widget::Toplevel; + +1