[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

    my $slider = new CFClient::UI::Slider
       vertical        => 1,
       range           => [0, 0, 1, 0.01], # HACK fix
       connect_changed => sub {
-         $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
+         $self->{vp}->set_offset (0, $_[1]);
       },
    ;
    $self = $class->SUPER::new (
       vp     => (new CFClient::UI::ViewPort expand => 1),
    $self->{vp}->add ($self->{scrolled});
    $self->add ($self->{vp});
    $self->add ($self->{slider});
    $self
+}
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->SUPER::size_allocate ($w, $h);
+   my $child = $self->{vp}->child;
+   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
 }
 #TODO# update range on size_allocate depending on child
 # update viewport offset on scroll
    my $self = $class->SUPER::new (
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
       bg        => [0, 0, 0, 0.2],
       active_bg => [1, 1, 1, 0.5],
-      range     => [0, 0, 100, 10],
+      range     => [0, 0, 100, 10, 0],
       req_w     => $::WIDTH / 80,
       req_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
       inner_pad => 0.02,
    my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
    $hi = $lo + 1 if $hi <= $lo;
+   $page = $hi - $lo if $page > $hi - $lo;
-   $value = $lo if $value < $lo;
+   $value = $lo         if $value < $lo;
-   $value = $hi if $value > $hi;
+   $value = $hi - $page if $value > $hi - $page;
    $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
       if $unit;
-   $page = $hi - $lo if $page > $hi - $lo;
    @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
    if ($value != $old_value) {
       $self->emit (changed => $value);
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
    $self->SUPER::button_down ($ev, $x, $y);
+   $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
    $self->mouse_motion ($ev, $x, $y);
 }
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
    if ($GRAB == $self) {
       my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
       my (undef, $lo, $hi, $page) = @{$self->{range}};
-      $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
+      $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
-      $self->set_value ($x * ($hi - $lo) + $lo);
+      $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
    }
 }
 sub update {
    my ($self) = @_;
    $CFClient::UI::ROOT->on_post_alloc ($self => sub {
       $self->set_value ($self->{range}[0]);
       my ($value, $lo, $hi, $page) = @{$self->{range}};
+      my $range = ($hi - $page - $lo) || 1e-100;
-      my $inner_w = 1 - 2 * $self->{inner_pad};
+      my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
-      $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
+      $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
+      $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
-      $page  = $self->{scale} * $page || 10 / ($self->{w} || 1);
+      $value = ($value - $lo) / $range;
-      $value = $self->{scale} * ($value - $lo);
+      $value = $value * $self->{scale} + $self->{offset};
-      $value = $self->{inner_pad} + ($value - $page * 0.5);
-      $value = 0 if $value < 0;
-      $page  = 1 - $value if $value + $page > 1;
-      $self->{knob_x} = $value;
+      $self->{knob_x} = $value - $knob_w * 0.5;
-      $self->{knob_w} = $page;
+      $self->{knob_w} = $knob_w;
    });
    $self->SUPER::update;
 }
    $self->{layout}->set_width ($self->{children}[0]{w});
    $self->reflow;
 }
-sub text_height {
+sub text_size {
    my ($self, $text, $indent) = @_;
    my $layout = $self->{layout};
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
    $layout->set_width ($self->{children}[0]{w} - $indent);
    $layout->set_markup ($text);
-   ($layout->size)[1]
+   $layout->size
 }
 sub reflow {
    my ($self) = @_;
    $self->{need_reflow}++;
    $self->update;
 }
+sub set_offset {
+   my ($self, $offset) = @_;
+   # todo: base offset on lines or so, not on pixels
+   $self->{children}[1]->set_value ($offset);
+}
+sub clear {
+   my ($self) = @_;
+   $self->{par} = [];
+   $self->{height} = 0;
+   $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
+}
 sub add_paragraph {
    my ($self, $color, $text, $indent) = @_;
-   #TODO: intelligently "reformat" paragraph
    for my $line (split /\n/, $text) {
-      my $height = $self->text_height ($line);
+      my ($w, $h) = $self->text_size ($line);
-      $self->{height} += $height;
+      $self->{height} += $h;
-      push @{$self->{par}}, [$height, $color, $indent, $line];
+      push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
    }
-   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
+   $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
-   $self->{children}[1]->update;
 }
 sub update {
    my ($self) = @_;
    return unless $self->{h} > 0;
    delete $self->{texture};
    $ROOT->on_post_alloc ($self, sub {
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
       if (delete $self->{need_reflow}) {
          my $height = 0;
-         $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
+         my $layout = $self->{layout};
+         $layout->set_height ($self->{fontsize} * $::FONTSIZE);
-            for @{$self->{par}};
+         for (@{$self->{par}}) {
+            if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
+               $layout->set_width ($W - $_->[3]);
+               $layout->set_markup ($_->[4]);
+               my ($w, $h) = $layout->size;
+               $_->[0] = $w + $_->[3];
+               $_->[1] = $h;
+            }
+            $height += $_->[1];
+         }
          $self->{height} = $height;
-         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
-         $self->{children}[1]->update;
          delete $self->{texture};
       }
-      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
+      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
          glClearColor 0.5, 0.5, 0.5, 0;
          glClear GL_COLOR_BUFFER_BIT;
          my $top = int $self->{children}[1]{range}[0];
          my $y0 = $top;
-         my $y1 = $top + $self->{h};
+         my $y1 = $top + $H;
          my $y = 0;
          my $layout = $self->{layout};
          $layout->set_font ($self->{font}) if $self->{font};
          glEnable GL_BLEND;
+         #TODO# not correct in windows where rgba is forced off
          glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
          for my $par (@{$self->{par}}) {
-            my $h = $par->[0];
+            my $h = $par->[1];
             if ($y0 < $y + $h && $y < $y1) {
-               $layout->set_foreground (@{ $par->[1] });
+               $layout->set_foreground (@{ $par->[2] });
-               $layout->set_width ($self->{w} - $par->[2]);
+               $layout->set_width ($W - $par->[3]);
-               $layout->set_markup ($par->[3]);
+               $layout->set_markup ($par->[4]);
                my ($w, $h, $data, $format, $internalformat) = $layout->render;
-               glRasterPos $par->[2], $y - $y0;
+               glRasterPos $par->[3], $y - $y0;
                glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
             }
             $y += $h;
          }
 }
 sub _draw {
    my ($self) = @_;
-   return unless $::CONN;#d# manage and cache textures differently
+   return unless $::CONN;
    my $face;
    if ($self->{frame}) {
       my $anim = $::CONN->{anim}[$self->{anim}];
 }
 sub add {
    my ($self, @children) = @_;
+   for (my @widgets = @children; my $w = pop @widgets; ) {
+      push @widgets, $w->children;
+      $w->{root} = $self;
+      $w->{visible} = 1;
+   }
    for my $child (@children) {
       $child->{toplevel} = 1;
       # integerise window positions
       $child->{x} = int $child->{x};
       $child->{y} = int $child->{y};
    }
    $self->SUPER::add (@children);
-   while (@children) {
-      my $w = pop @children;
-      push @children, $w->children;
-      $w->{visible} = 1;
-   }
 }
 sub remove {
    my ($self, @children) = @_;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC vs. Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC