--- deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 13:29:24 1.63 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/04/11 17:33:43 1.70 @@ -75,7 +75,12 @@ sub new { my $class = shift; - bless { @_ }, $class + bless { + x => 0, + y => 0, + z => 0, + @_ + }, $class } sub move { @@ -111,6 +116,8 @@ sub focus_in { my ($self) = @_; + return if $FOCUS == $self; + my $focus = $FOCUS; $FOCUS = $self; $focus->update if $focus; $FOCUS->update; @@ -127,10 +134,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} } @@ -140,6 +152,8 @@ sub draw { my ($self) = @_; + return unless $self->{h} && $self->{w}; + glPushMatrix; glTranslate $self->{x}, $self->{y}, 0; $self->_draw; @@ -212,15 +226,64 @@ ############################################################################# +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 = 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 } @@ -231,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" @@ -275,18 +339,44 @@ our @ISA = CFClient::Widget::Container::; +sub new { + my ($class, %arg) = @_; + + my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; + + $class->SUPER::new (children => [$child], %arg) +} + +sub add { + my ($self, $widget) = @_; + + $self->{children} = []; + + $self->SUPER::add ($widget); +} + +sub remove { + my ($self, $widget) = @_; + + $self->SUPER::remove ($widget); + + $self->{children} = [new CFClient::Widget::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) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->SUPER::size_allocate ($w, $h); - $self->{children}[0]->size_allocate ($w, $h) - if $self->{children}[0] + $self->{children}[0]->size_allocate ($w, $h); } ############################################################################# @@ -298,11 +388,9 @@ use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $w, $h) = @_; + my ($class, %arg) = @_; - my $self = $class->SUPER::new; - - @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h); + my $self = $class->SUPER::new (%arg); } sub update { @@ -325,6 +413,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->{w} = $w; $self->{h} = $h; @@ -372,6 +462,8 @@ sub size_allocate { my ($self, $w, $h) = @_; + return unless $self->{w} != $w || $self->{h} != $h; + $self->{w} = $w; $self->{h} = $h; @@ -425,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}; @@ -435,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 { @@ -589,41 +685,45 @@ 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 ($ow, $oh); + my @h = map +($_->size_request)[1], @$children; - # get sizes of other widgets - for (@oth) { - my ($w, $h) = $_->size_request; - $oh += $h; - if ($ow < $w) { $ow = $w } + my $req_h = List::Util::sum @h; + + 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->[$_]; + + 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; } } @@ -636,25 +736,31 @@ use SDL::OpenGL; sub new { - my ($class, $x, $y, $z, $height, $text) = @_; + my ($class, %arg) = @_; - $height ||= $::FONTSIZE; - - # TODO: color, and make height, xyz etc. optional my $self = $class->SUPER::new ( - color => [1, 1, 1], - x => $x, - y => $y, - z => $z, - height => $height, - layout => new CFClient::Layout $height, + 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/{layout}->set_markup ($text); delete $self->{texture}; + $self->update; } sub get_text { @@ -674,6 +781,7 @@ my ($self) = @_; $self->{layout}->set_width; + $self->{layout}->set_height ($self->{height}); $self->{layout}->size # if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack # ( @@ -690,10 +798,19 @@ 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) = @_; @@ -707,7 +824,7 @@ glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - glColor @{$self->{color}}; + glColor @{$self->{fg}}; $tex->draw_quad (0, 0); @@ -724,6 +841,59 @@ 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) = @_; @@ -735,42 +905,195 @@ 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->_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->{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# +# 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}}; } 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; $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::Widget::Slider; + +use strict; + +use SDL::OpenGL; +use SDL::OpenGL::Constants; + +our @ISA = CFClient::Widget::DrawBG::; + +sub size_request { + my ($self) = @_; + + my $w = 20; + 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 => 1, + @_ + ) +} + +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}}; + + $x = $x * ($hi - $lo) / $self->{w} + $lo; + $x = $lo if $x < $lo; + $x = $hi - $page if $x > $hi - $page; + $self->{range}[0] = $x; + + $self->{changed}($x) if $self->{changed}; + $self->update; + } +} + +sub _draw { + my ($self) = @_; + + $self->SUPER::_draw (); + + glPushMatrix; + + 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}; + + 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; + + 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; + + glPopMatrix; } ############################################################################# @@ -787,6 +1110,16 @@ our @ISA = CFClient::Widget::; +sub new { + my $class = shift; + + $class->SUPER::new ( + z => -1, + list => (glGenLists 1), + @_ + ) +} + sub key_down { print "MAPKEYDOWN\n"; } @@ -801,62 +1134,71 @@ ) } +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}; - } + 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}; + } - glEnable GL_TEXTURE_2D; - glEnable GL_BLEND; - glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; + 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 $sw4 = ($sw + 3) & ~3; - my $darkness = "\x00" x ($sw4 * $sh); + glEnable GL_TEXTURE_2D; + glEnable GL_BLEND; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; - 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; - } + my $sw4 = ($sw + 3) & ~3; + my $darkness = "\x00" x ($sw4 * $sh); - for my $num (grep $_, @$cell[1,2,3]) { - my $tex = $::CONN->{face}[$num]{texture} || next; - - my $w = $tex->{width}; - my $h = $tex->{height}; + 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}; - $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); + $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); + } } } - } # if (1) { # higher quality darkness # $lighting =~ s/(.)/$1$1$1/gs; @@ -868,21 +1210,26 @@ # $lighting =~ s/(.)../$1/gs; # } - 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; + glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; - $darkness = new CFClient::Texture - width => $sw4, - height => $sh, - data => $darkness, - internalformat => GL_ALPHA, - format => GL_ALPHA; + $darkness = new CFClient::Texture + width => $sw4, + height => $sh, + data => $darkness, + internalformat => GL_ALPHA, + format => GL_ALPHA; - glColor 0.45, 0.45, 0.45, 1; - $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); + glColor 0.45, 0.45, 0.45, 1; + $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); - glDisable GL_TEXTURE_2D; - glDisable GL_BLEND; + glDisable GL_TEXTURE_2D; + glDisable GL_BLEND; + + glEndList; + } + + glCallList $self->{list}; } my %DIR = (