--- deliantra/Deliantra-Client/bin/pclient	2006/04/17 09:33:12	1.121
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/18 02:07:37	1.132
@@ -51,6 +51,8 @@
 our $CONSOLE;
 our $METASERVER;
 
+our $GAUGES;
+
 our $SDL_ACTIVE;
 our $SDL_EV;
 our %SDL_CB;
@@ -61,14 +63,12 @@
 
 sub status {
    $STATUS_LINE->set_text ($_[0]);
-   my ($w, $h) = $STATUS_LINE->size_request;
-   $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
+   $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
 }
 
 sub debug {
    $DEBUG_STATUS->set_text ($_[0]);
-   my ($w, $h) = $DEBUG_STATUS->size_request;
-   $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
+   $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
 }
 
 sub start_game {
@@ -148,6 +148,7 @@
    $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
       my ($self, $value) = @_;
       $CFG->{fow_smooth} = $value;
+      status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
    });
 
    $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
@@ -302,8 +303,8 @@
    my $window = new CFClient::UI::FancyFrame
       border_bg => [1, 1, 1, 0.5],
       bg        => [0.3, 0.3, 0.3, 0.8],
-      user_w    => $::WIDTH/4,
-      user_h    => $::HEIGHT,
+      user_w    => int $::WIDTH  / 3,
+      user_h    => int $::HEIGHT / 5,
       child     => (my $vbox = new CFClient::UI::VBox);
 
    $vbox->add ($LOGVIEW = new CFClient::UI::TextView
@@ -311,7 +312,7 @@
       fontsize => $::CFG->{log_fontsize},
    );
 
-   $vbox->add (my $input = new CFClient::UI::LineEntry
+   $vbox->add (my $input = new CFClient::UI::Entry
       connect_focus_in => sub {
          my ($input, $prev_focus) = @_;
 
@@ -327,10 +328,10 @@
          $input->set_text ('');
 
          if ($text =~ /^\/(.*)/) {
-            $::CONN->user_send ("command $1");
+            $::CONN->user_send ($1);
          } else {
             my $say_cmd = $::CFG->{say_command} || 'say';
-            $::CONN->user_send ("command $say_cmd $text");
+            $::CONN->user_send ("$say_cmd $text");
          }
          if ($input->{refocus_map}) {
             delete $input->{refocus_map};
@@ -351,8 +352,8 @@
 }
 
 sub sdl_init {
-   #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
-   SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
+   SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
+   #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
       and die "SDL::Init failed!\n";
 }
 
@@ -406,10 +407,10 @@
    $CFClient::UI::ROOT->add ($STATUS_LINE);
 
    $ALT_ENTER_MESSAGE = new CFClient::UI::Label
-                           padding => 0,
-                           y => $HEIGHT * 44 / 45,
-                           height => $HEIGHT / 45,
-                           text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
+                           padding  => 0,
+                           y        => $HEIGHT * 44 / 45,
+                           fontsize => $HEIGHT / 45,
+                           markup   => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
    $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
 
    $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
@@ -439,6 +440,17 @@
    });
 
    $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
+
+   my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
+   $tgw->add (my $hbox = new CFClient::UI::HBox ());
+
+   $hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
+   $hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
+   $hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
+   $hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
+
+   $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
+   $CFClient::UI::ROOT->add ($tgw);
 }
 
 sub destroy_screen {
@@ -504,10 +516,31 @@
 
 @conn::ISA = Crossfire::Protocol::;
 
+sub conn::stats_update {
+   my ($self, $stats) = @_;
+
+   # i love text protocols!!!
+   # FIXME: the stats are somehow weird
+   my $hp   = $stats->{1};
+   my $hp_m = $stats->{2};
+   my $sp   = $stats->{3};
+   my $sp_m = $stats->{4};
+   my $fo   = $stats->{18};
+   my $fo_m = 1000;
+   my $gr   = $stats->{23};
+   my $gr_m = $stats->{24};
+
+   #d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
+   $GAUGES->{hp}->set_value ($hp, $hp_m);
+   $GAUGES->{mana}->set_value ($sp, $sp_m);
+   $GAUGES->{food}->set_value ($fo, $fo_m);
+   $GAUGES->{grace}->set_value ($gr, $gr_m);
+}
+
 sub conn::user_send {
    my ($self, $command) = @_;
 
-   $self->send ($command);
+   $self->send_command ($command);
    status $command;
 }
 
@@ -581,13 +614,14 @@
       $self->send_mapinfo ("spatial $path$tile", sub {
          my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
 
-         warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
+         #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
          return if $mode ne "spatial";
 
          $x += $MAP->ox;
          $y += $MAP->oy;
          
-         $self->load_map ($hash, $x, $y);
+         $self->load_map ($hash, $x, $y)
+            unless $self->{neigh}{$hash}[5]++;#d#
 
          $neigh->[$tile] = [$x, $y, $w, $h];
 
@@ -604,8 +638,6 @@
 
    my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
 
-   warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
-
    my $mapmapw = 250;
    my $mapmaph = 250;
    
@@ -745,6 +777,8 @@
 
 #############################################################################
 
+$SIG{INT} = $SIG{TERM} = sub { exit };
+
 $TILECACHE = CFClient::db_table "tilecache";
 $FACEMAP   = CFClient::db_table "facemap";
 
@@ -780,8 +814,6 @@
 
 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
 
-init_screen;
-
 {
    my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
 
@@ -789,6 +821,10 @@
    CFClient::set_font $fonts[0];
 }
 
+init_screen;
+
 Event::loop;
 
+END { SDL::Quit }
+