--- deliantra/Deliantra-Client/DC/UI.pm	2007/12/28 15:05:20	1.457
+++ deliantra/Deliantra-Client/DC/UI.pm	2008/09/19 02:24:32	1.470
@@ -295,7 +295,7 @@
 
    $self->realloc if !exists $self->{req_w};
 
-   $_->set_visible for $self->children;
+   $_->set_visible for $self->visible_children;
 }
 
 sub set_invisible {
@@ -370,10 +370,18 @@
 sub get_max_wh {
    my ($self) = @_;
 
-   return $self->{parent}->get_max_wh
-      if $self->{parent};
+   my ($w, $h) = @$self{qw(max_w max_h)};
+
+   if ($w <= 0 || $h <= 0) {
+      my ($mw, $mh) = $self->{parent}
+         ? $self->{parent}->get_max_wh
+         : ($::WIDTH, $::HEIGHT);
 
-   ($::WIDTH, $::HEIGHT)
+      $w = $mw if $w <= 0;
+      $h = $mh if $h <= 0;
+   }
+
+   ($w, $h)
 }
 
 sub size_request {
@@ -1243,14 +1251,14 @@
    if ((exists $arg{label}) && !ref $arg{label}) {
       $arg{label} = new DC::UI::Label
          align    => 1,
-         valign   => 0,
+         valign   => 0.5,
          text     => $arg{label},
          fontsize => ($arg{border} || 0.8) * 0.75;
    }
 
    my $self = $class->SUPER::new (
       # label     => "",
-      fg          => [0.6, 0.3, 0.1],
+      fg          => undef,
       border      => 0.8,
       style       => 'single',
       %arg,
@@ -1313,7 +1321,7 @@
 
    $child->draw;
 
-   glColor @{$self->{fg}};
+   glColor @{$self->{fg} || $DC::THEME{fancyframe}};
    glBegin GL_LINE_STRIP;
    glVertex $border * 1.5      , $border * 0.5 + 0.5;
    glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
@@ -1338,15 +1346,15 @@
 use DC::OpenGL;
 
 my $bg = 
-      new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
+      new_from_resource DC::Texture "d1_bg.png",
          mipmap => 1, wrap => 1;
 
 my @border = 
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 my @icon =
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw(x1_move.png x1_resize.png);
 
 sub new {
@@ -1355,7 +1363,7 @@
    my $self = $class->SUPER::new (
       bg          => [1, 1, 1, 1],
       border_bg   => [1, 1, 1, 1],
-      border      => 0.6,
+      border      => 0.8,
       can_events  => 1,
       min_w       => 64,
       min_h       => 32,
@@ -1363,7 +1371,7 @@
    );
 
    $self->{title_widget} = new DC::UI::Label
-      align    => 0,
+      align    => 0.5,
       valign   => 1,
       text     => $self->{title},
       fontsize => $self->{border},
@@ -1891,9 +1899,9 @@
       ellipsise  => 3, # end
       layout     => (new DC::Layout),
       fontsize   => 1,
-      align      => -1,
-      valign     => -1,
-      padding_x  => 2,
+      align      => 0.5,
+      valign     => 0.5,
+      padding_x  => 4,
       padding_y  => 2,
       can_events => 0,
       %arg
@@ -1969,7 +1977,7 @@
       my ($max_w, $max_h) = $self->get_max_wh;
 
       $self->{layout}->set_font ($self->{font}) if $self->{font};
-      $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
+      $self->{layout}->set_width ($max_w);
       $self->{layout}->set_ellipsise ($self->{ellipsise});
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
@@ -1978,7 +1986,7 @@
 
       if (exists $self->{template}) {
          $self->{template}->set_font ($self->{font}) if $self->{font};
-         $self->{template}->set_width ($self->{max_w} || -1);
+         $self->{template}->set_width ($max_w);
          $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
 
          my ($w2, $h2) = $self->{template}->size;
@@ -2044,13 +2052,8 @@
    };
 
    unless (exists $self->{ox}) {
-      $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
-                       : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
-                       :                      ($self->{w} - $size->[0]) * 0.5);
-
-      $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
-                       : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
-                       :                       ($self->{h} - $size->[1]) * 0.5);
+      $self->{ox} = $self->{padding_x} + int $self->{align}  * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
+      $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
 
       $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
    };
@@ -2089,13 +2092,14 @@
    $class->SUPER::new (
       fg         => [1, 1, 1],
       bg         => [0, 0, 0, 0.2],
-      outline    => [0.6, 0.3, 0.1],
+      outline    => undef,
       active_bg  => [0, 0,  1, .2],
       active_fg  => [1, 1,  1],
       active_outline => [1, 1, 0],
       can_hover  => 1,
       can_focus  => 1,
-      valign     => 0,
+      align      => 0,
+      valign     => 0.5,
       can_events => 1,
       ellipsise  => 0,
       padding_x  => 4,
@@ -2156,9 +2160,9 @@
 
    $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
 
-   if ($uni == 8) {
+   if ($sym == DC::SDLK_BACKSPACE) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
-   } elsif ($uni == 127) {
+   } elsif ($sym == DC::SDLK_DELETE) {
       substr $text, $self->{cursor}, 1, "";
    } elsif ($sym == DC::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
@@ -2271,7 +2275,7 @@
       glLineWidth 1;
 
    } else {
-      glColor @{$self->{outline}};
+      glColor @{$self->{outline} || $DC::THEME{entry_outline}};
       glBegin GL_LINE_STRIP;
       glVertex              .5, $self->{h} *  .5;
       glVertex              .5, $self->{h} - 2.5;
@@ -2289,6 +2293,16 @@
 
 use DC::OpenGL;
 
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      history_pointer => -1,
+      @_
+   )
+}
+
+
 sub invoke_key_down {
    my ($self, $ev) = @_;
 
@@ -2322,7 +2336,10 @@
       if ($self->{history_pointer} >= 0) {
          $self->set_text ($self->{history}->[$self->{history_pointer}]);
       } else {
-         $self->set_text ($self->{history_saveback});
+         if (defined $self->{history_saveback}) {
+            $self->set_text ($self->{history_saveback});
+            $self->{history_saveback} = undef;
+         }
       }
 
    } else {
@@ -2354,12 +2371,10 @@
    my ($self, $dy) = @_;
 
    my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
-   warn "cursor $self->{cursor} => $x $line\n";#d#
 
    $line += $dy;
 
    if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
-      warn "index $x $line => $index\n";#d#
       $self->{cursor} = $index;
       delete $self->{cur_h};
       $self->update;
@@ -2392,7 +2407,7 @@
 use DC::OpenGL;
 
 my @tex =
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
@@ -2400,8 +2415,8 @@
 
    $class->SUPER::new (
       can_hover  => 1,
-      align      => 0,
-      valign     => 0,
+      align      => 0.5,
+      valign     => 0.5,
       can_events => 1,
       @_
    )
@@ -2441,7 +2456,7 @@
 use DC::OpenGL;
 
 my @tex =
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
@@ -2453,8 +2468,8 @@
       fg         => [1.0, 1.0, 1.0],
       active_fg  => [0.8, 0.8, 0.8],
       can_hover  => 1,
-      align      => 0,
-      valign     => 0,
+      align      => 0.5,
+      valign     => 0.5,
       can_events => 1,
       @_
    )
@@ -2494,7 +2509,7 @@
 our @ISA = DC::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
 use DC::OpenGL;
@@ -2585,7 +2600,7 @@
       or Carp::croak "'path' or 'tex' attributes required";
 
    $self->{tex} ||= $texture_cache{$self->{path}} ||=
-      new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
+      new_from_resource DC::Texture $self->{path}, mipmap => 1;
 
    DC::weaken $texture_cache{$self->{path}};
 
@@ -2656,8 +2671,8 @@
       fg         => [1, 1, 1],
       active_fg  => [0, 0, 1],
       can_hover  => 1,
-      align      => 0,
-      valign     => 0,
+      align      => 0.5,
+      valign     => 0.5,
       can_events => 1,
       @_
    );
@@ -2691,19 +2706,19 @@
 
 my %tex = (
    food => [
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
    ],
    grace => [
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
    ],
    hp => [
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
    ],
    mana => [
-      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
+      map { new_from_resource DC::Texture $_, mipmap => 1 }
          qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
@@ -2831,8 +2846,8 @@
       bar        => [0.7, 0.5, 0.1, 0.8],
       outline    => [0.4, 0.3, 0],
       fontsize   => 0.9,
-      valign     => 0,
-      align      => 0,
+      valign     => 0.5,
+      align      => 0.5,
       can_events => 1,
       ellipsise  => 1,
       label      => "%d%%",
@@ -2968,9 +2983,9 @@
       %arg,
    );
 
-   $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
    $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
-   $self->add ($self->{max}   = new DC::UI::Label valign => -1, align => 0, template => "999");
+   $self->add ($self->{max}   = new DC::UI::Label valign => 0, align => 0.5, template => "999");
 
    $self
 }
@@ -3010,7 +3025,7 @@
 our @ISA = DC::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file DC::Texture DC::find_rcfile $_ }
+      map { new_from_resource DC::Texture $_ }
          qw(s1_slider.png s1_slider_bg.png);
 
 sub new {
@@ -3057,12 +3072,10 @@
 
    my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
 
-   $hi = $lo + 1 if $hi <= $lo;
-
-   $page = $hi - $lo if $page > $hi - $lo;
+   $hi = $lo if $hi < $lo;
 
-   $value = $lo         if $value < $lo;
    $value = $hi - $page if $value > $hi - $page;
+   $value = $lo         if $value < $lo;
 
    $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
       if $unit;
@@ -3136,10 +3149,10 @@
    unless ($self->{knob_w}) {
       $self->set_value ($self->{range}[0]);
 
-      my ($value, $lo, $hi, $page) = @{$self->{range}};
-      my $range = ($hi - $page - $lo) || 1e-100;
+      my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
+      my $range = ($hi - $page - $lo) || 1e-10;
 
-      my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
+      my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
 
       $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
       $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
@@ -3308,7 +3321,7 @@
 
    $layout->set_shapes (
       map
-         +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
+         +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
          @{$para->{widget}}
    );
 
@@ -3609,10 +3622,12 @@
    $tip =~ s/\n+$//;
 
    $self->add (new DC::UI::Label
+      fg        => $DC::THEME{tooltip_fg},
       markup    => $tip,
       max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+      align     => 0,
       fontsize  => 0.8,
-      style     => 1, # FLAG_INVERSE
+      style     => $DC::THEME{tooltip_style}, # FLAG_INVERSE
       ellipsise => 0,
       font      => ($widget->{tooltip_font} || $::FONT_PROP),
    );
@@ -3659,10 +3674,10 @@
 
    my ($w, $h) = @$self{qw(w h)};
 
-   glColor 1, 0.8, 0.4;
+   glColor @{ $DC::THEME{tooltip_bg} };
    glRect 0, 0, $w, $h;
    
-   glColor 0, 0, 0;
+   glColor @{ $DC::THEME{tooltip_border} };
    glRect_lineloop .5, .5, $w + .5, $h + .5;
    
    glTranslate 2, 2;
@@ -3844,8 +3859,8 @@
                can_events => 1,
                tooltip    => $tooltip,
                children   => [
-                  (new DC::UI::Label markup => $left, expand => 1),
-                  (new DC::UI::Label markup => $right, align => +1),
+                  (new DC::UI::Label markup => $left , align => 0, expand => 1),
+                  (new DC::UI::Label markup => $right, align => 1),
                ],
             ;
 
@@ -3853,6 +3868,7 @@
             $widget = new DC::UI::Label
                can_hover  => 1,
                can_events => 1,
+               align      => 0,
                markup     => $widget,
                tooltip    => $tooltip;
          }
@@ -3919,8 +3935,7 @@
       @_,
    );
 
-   $self->{current} = $self->{children}[0]
-      if @{ $self->{children} };
+   $self->set_current_page (0);
 
    $self
 }
@@ -3930,8 +3945,8 @@
 
    $self->SUPER::add (@widgets);
 
-   $self->{current} = $self->{children}[0]
-      if @{ $self->{children} };
+   $self->set_current_page (0)
+      unless @widgets == @{ $self->{children} };
 }
 
 sub get_current_page {
@@ -3947,28 +3962,35 @@
                    ? $page_or_widget
                    : $self->{children}[$page_or_widget];
 
-   $self->{current} = $widget;
-   $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+   $self->{current}->set_invisible if $self->{current} && $self->{visible};
 
-   $self->emit (page_changed => $self->{current});
+   if (($self->{current} = $widget)) {
+      $self->{current}->set_visible if $self->{current} && $self->{visible};
+      $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+
+      $self->emit (page_changed => $self->{current});
+   }
 
    $self->realloc;
 }
 
 sub visible_children {
-   $_[0]{current}
+   $_[0]{current} || ()
 }
 
 sub size_request {
    my ($self) = @_;
 
-   $self->{current}->size_request
+   $self->{current}
+      ? $self->{current}->size_request
+      : (0, 0)
 }
 
 sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->{current}->configure (0, 0, $w, $h);
+   $self->{current}->configure (0, 0, $w, $h)
+     if $self->{current};
 
    1
 }
@@ -3976,7 +3998,8 @@
 sub _draw {
    my ($self) = @_;
 
-   $self->{current}->draw;
+   $self->{current}->draw
+      if $self->{current};
 }
 
 #############################################################################
@@ -4055,6 +4078,18 @@
    $self->{multiplexer}->children
 }
 
+sub page_index {
+   my ($self, $widget) = @_;
+
+   my $i = 0;
+   for ($self->pages) {
+      if ($_ eq $widget) { return $i };
+      $i++;
+   }
+
+   undef
+}
+
 sub add_tab {
    my ($self, $title, $widget, $tooltip) = @_;
 
@@ -4184,7 +4219,7 @@
 
 sub reorder {
    my ($self) = @_;
-   my $NOW = Time::HiRes::time;
+   my $NOW = EV::time;
 
    # freeze display when hovering over any label
    return if $DC::UI::TOOLTIP->{owner}
@@ -4226,6 +4261,7 @@
             tooltip_width => 0.67,
             fontsize      => $item->{fontsize} || $self->{fontsize},
             max_w         => $::WIDTH * 0.44,
+            align         => 0,
             fg            => [@{ $item->{fg} }],
             can_events    => 1,
             can_hover     => 1
@@ -4244,6 +4280,10 @@
       push @widgets, $label;
    }
 
+   my $hash = join ",", @widgets;
+   return if $hash eq $self->{last_widget_hash};
+   $self->{last_widget_hash} = $hash;
+
    $self->clear;
    $self->SUPER::add (reverse @widgets);
 }
@@ -4459,8 +4499,11 @@
 
          my ($w, $h) = $widget->size_request;
 
-         $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
-         $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+         $w += $widget->{padding_x} * 2;
+         $h += $widget->{padding_y} * 2;
+
+         $w = max $widget->{min_w}, $w;
+         $h = max $widget->{min_h}, $h;
 
          $w = min $widget->{max_w}, $w if exists $widget->{max_w};
          $h = min $widget->{max_h}, $h if exists $widget->{max_h};
@@ -4550,7 +4593,7 @@
 
 package DC::UI;
 
-$ROOT = new DC::UI::Root;
+$ROOT    = new DC::UI::Root;
 $TOOLTIP = new DC::UI::Tooltip z => 900;
 
 1