--- deliantra/Deliantra-Client/bin/cfplus	2006/07/03 22:04:25	1.88
+++ deliantra/Deliantra-Client/bin/cfplus	2006/07/11 13:51:38	1.91
@@ -42,6 +42,7 @@
 use CFClient::MapWidget;
 
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
+$SIG{PIPE} = 'IGNORE';
 
 $Event::DIED = sub {
    # TODO: display dialog box or so
@@ -477,18 +478,6 @@
       on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
    );
 
-   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
-
-   $table->add (1, $row++, new CFClient::UI::Slider
-      range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
-      tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
-      on_changed => sub {
-         $CFG->{stat_fontsize} = $_[1];
-         &set_stats_window_fontsize;
-         0
-      }
-   );
-
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
    $table->add (1, $row++, new CFClient::UI::Slider
       range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
@@ -567,12 +556,6 @@
    $vbox
 }
 
-sub set_stats_window_fontsize {
-   for (values %{$STATWIDS}) {
-      $_->set_fontsize ($::CFG->{stat_fontsize});
-   }
-}
-
 sub set_gauge_window_fontsize {
    for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
       $_->set_fontsize ($::CFG->{gauge_fontsize});
@@ -661,9 +644,7 @@
 }
 
 sub stats_window {
-   my $tgw =
-      new CFClient::UI::Window
-         child => my $vb = new CFClient::UI::VBox;
+   my $vb = new CFClient::UI::VBox;
 
    $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
       can_hover => 1, can_events => 1,
@@ -765,10 +746,12 @@
       }
    }
 
-   &set_stats_window_fontsize;
+   $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
+   $STATWIDS->{"_skill_tbl"} = $tbl3;
+
    update_stats_window ({});
 
-   $tgw
+   $vb
 }
 
 sub formsep($) {
@@ -839,6 +822,43 @@
       blind => CS_STAT_RES_BLIND,
    );
 
+   if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
+      my $sktbl = $STATWIDS->{_skill_tbl};
+      $sktbl->clear;
+
+      $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
+      $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
+      $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
+
+      my @skills;
+
+      for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
+         push @skills, [$i, $::CONN->{skill_info}{$i}];
+      }
+
+      my $y = 1;
+      for (sort { $a->[1] cmp $b->[1] } @skills) {
+         my ($idx, $name) = @$_;
+
+         unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
+            $sktbl->add (0, $y,   $STATWIDS->{"sk_xp_$idx"}  = new CFClient::UI::Label text => "0", align => 1);
+            $sktbl->add (1, $y,   $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
+            $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
+         }
+      }
+
+      $STATWIDS->{_skill_tbl_init} = 1;
+   }
+
+   for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
+      if (exists $stats->{$i}) {
+         $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
+            if $STATWIDS->{"sk_xp_$i"};
+         $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
+            if $STATWIDS->{"sk_lvl_$i"};
+      }
+   }
+
    $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
       for keys %tbl;
 }
@@ -1321,6 +1341,7 @@
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Player",
+      name    => "playerbook",
       has_close_button => 1
    ;