--- deliantra/Deliantra-Client/bin/pclient	2006/04/15 13:56:26	1.112
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/18 21:31:48	1.137
@@ -10,11 +10,18 @@
 use SDL::App;
 use SDL::Event;
 use SDL::Surface;
+
+use SDL::Mixer;
+use SDL::Sound;
+use SDL::Music;
+
 use SDL::OpenGL;
 
 use Crossfire;
 use Crossfire::Protocol;
 
+use Compress::LZF;
+
 use CFClient;
 use CFClient::UI;
 
@@ -25,7 +32,9 @@
 
 our $META_SERVER = "crossfire.real-time.com:13326";
 
-our $FACECACHE;
+our $FACEMAP;
+our $TILECACHE;
+our $MAPCACHE;
 
 our $LAST_REFRESH;
 our $NOW;
@@ -47,24 +56,28 @@
 our $CONSOLE;
 our $METASERVER;
 
+our $GAUGES;
+
 our $SDL_ACTIVE;
 our $SDL_EV;
 our %SDL_CB;
 
+our $SDL_MIXER;
+our @SOUNDS;       # event => file mapping
+our %AUDIO_CHUNKS; # audio files
+
 our $ALT_ENTER_MESSAGE;
 our $STATUS_LINE;
 our $DEBUG_STATUS;
 
 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 {
@@ -72,6 +85,8 @@
 
    my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
 
+   $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
+
    $MAP = new CFClient::Map $mapsize, $mapsize;
 
    my ($host, $port) = split /:/, $CFG->{host};
@@ -142,6 +157,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");
@@ -151,8 +167,23 @@
    });
 
    $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
-      destroy_screen ();
-      init_screen ();
+      video_shutdown ();
+      video_init ();
+   });
+
+   $table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound");
+   $table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{sound}, connect_changed => sub {
+      my ($self, $value) = @_;
+      $CFG->{sound} = $value;
+   });
+   $table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music");
+   $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bg_music_enable}, connect_changed => sub {
+      my ($self, $value) = @_;
+      $CFG->{bg_music_enable} = $value;
+   });
+   $table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+      audio_shutdown ();
+      audio_init ();
    });
 
    $dialog
@@ -168,6 +199,8 @@
 }
 
 sub update_metaserver {
+   my ($HOST) = @_;
+
    status "fetching metaserver list...";
 
    my $buf;
@@ -183,7 +216,50 @@
       } elsif ($res == 0) {
          $_[0]->w->cancel;
          status "server list retrieved";
-         warn $buf;
+
+         my $table = $METASERVER->{table};
+
+         $table->clear;
+
+         my @col = qw(Use #Users Host Uptime Version Description);
+         $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
+            for 0 .. $#col;
+
+         my @align = qw(1 0 1 1 -1);
+
+         my $y = 0;
+         for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
+            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
+
+            for ($desc) {
+               s/<br>/\n/gi;
+               s/<li>/\n· /gi;
+               s/<.*?>//sgi;
+               s/&/&amp;/g;
+               s/</&lt;/g;
+               s/>/&gt;/g;
+            }
+
+            $uptime = sprintf "%dd %02d:%02d:%02d",
+               (int $m->[8] / 86400),
+               (int $m->[8] / 3600) % 24,
+               (int $m->[8] / 60) % 60,
+               $m->[8] % 60;
+
+            $m = [$users, $host, $uptime, $version, $desc];
+
+            $y++;
+
+            $table->add (0, $y, new CFClient::UI::VBox children => [
+               (new CFClient::UI::Button text => " ", connect_activate => sub {
+                  $HOST->set_text ($CFG->{host} = $host);
+               }),
+               (new CFClient::UI::Empty expand => 1),
+            ]);
+            
+            $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
+               for 0 .. $#$m;
+         }
       }
    });
 }
@@ -199,7 +275,7 @@
    {
       $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
 
-      $vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
+      $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
          my ($self, $value) = @_;
          $CFG->{host} = $value;
       });
@@ -207,18 +283,18 @@
       $METASERVER = metaserver_dialog;
 
       $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
-         update_metaserver;
+         update_metaserver $HOST;
       });
    }
 
    $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
-   $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
+   $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
       my ($self, $value) = @_;
       $CFG->{user} = $value;
    });
 
    $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
-   $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
+   $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
       my ($self, $value) = @_;
       $CFG->{password} = $value;
    });
@@ -251,8 +327,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
@@ -260,23 +336,36 @@
       fontsize => $::CFG->{log_fontsize},
    );
 
-   $vbox->add (my $input = new CFClient::UI::LineEntry);
-      $input->connect (activate => sub {
+   $vbox->add (my $input = new CFClient::UI::Entry
+      connect_focus_in => sub {
+         my ($input, $prev_focus) = @_;
+
+         delete $input->{refocus_map};
+
+         if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
+            $input->{refocus_map} = 1;
+         }
+         delete $input->{auto_activated};
+      },
+      connect_activate => sub {
          my ($input, $text) = @_;
          $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");
          }
-         1
-      });
-      $input->connect (escape => sub {
+         if ($input->{refocus_map}) {
+            delete $input->{refocus_map};
+            $MAPWIDGET->focus_in
+         }
+      },
+      connect_escape => sub {
          $MAPWIDGET->focus_in
-      });
-      $input->focus_in;
+      },
+   );
 
    $CONSOLE = {
       window => $window,
@@ -292,7 +381,7 @@
       and die "SDL::Init failed!\n";
 }
 
-sub init_screen {
+sub video_init {
    sdl_init;
 
    ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
@@ -302,7 +391,7 @@
    SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
    SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
    SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
-   SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
+   SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
 
    SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
    SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
@@ -342,10 +431,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);
@@ -354,6 +443,7 @@
       my ($mapwidget, $preset) = @_;
 
       if ($CONSOLE) {
+         $CONSOLE->{input}->{auto_activated} = 1;
          $CONSOLE->{input}->focus_in;
 
          if ($preset && $CONSOLE->{input}->get_text eq '') {
@@ -373,14 +463,63 @@
       status "Configuration Saved";
    });
 
-   $BUTTONBAR->{children}[0]->emit ("activate");
+   $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 {
+sub video_shutdown {
    $CFClient::UI::ROOT->{children} = [];
    undef $SDL_ACTIVE;
    undef $SDL_EV;
-   SDL::Quit;
+}
+
+my $bgmusic;#TODO#hack#d#
+
+sub audio_init {
+   if ($CFG->{sound} || 1) {
+      if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
+         $SDL_MIXER = new SDL::Mixer;
+         $SDL_MIXER->allocate_channels (8);
+
+         if ($CFG->{bg_music_enable}) {
+            $bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
+            $SDL_MIXER->play_music ($bgmusic, -1);
+         }
+
+         while (<$fh>) {
+            next if /^\s*#/;
+            next if /^\s*$/;
+
+            my ($file, $volume, $event) = split /\s+/, $_, 3;
+
+            push @SOUNDS, "$volume,$file";
+
+            $AUDIO_CHUNKS{"$volume,$file"} ||= do {
+               my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
+               $chunk->volume ($volume * 128 / 100);
+               $chunk
+            };
+         }
+      } else {
+         status "unable to open sound config: $!";
+      }
+   }
+}
+
+sub audio_shutdown {
+   undef $SDL_MIXER;
+   @SOUNDS = ();
+   %AUDIO_CHUNKS = ();
 }
 
 my %animate_object;
@@ -439,54 +578,208 @@
 
 @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;
 }
 
+sub conn::map_scroll {
+   my ($self, $dx, $dy) = @_;
+
+   $MAP->scroll ($dx, $dy);
+}
+
 sub conn::feed_map1a {
    my ($self, $data) = @_;
 
 #   $self->Crossfire::Protocol::feed_map1a ($data);
 
-   $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
    $MAP->map1a_update ($data);
    $MAPWIDGET->update;
 }
 
-#sub conn::map_update {
-#   my ($self, $dirty) = @_;
-#
-#   $MAPWIDGET->update;
-#}
+sub conn::flush_map {
+   my ($self) = @_;
+
+   my $map_info = delete $self->{map_info}
+      or return;
+
+   my ($hash, $x, $y, $w, $h) = @$map_info;
+
+   my $data = $MAP->get_rect ($x, $y, $w, $h);
+   $MAPCACHE->put ($hash => Compress::LZF::compress $data);
+
+   warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
+   
+}
 
 sub conn::map_clear {
    my ($self) = @_;
 
+   $self->flush_map;
+   delete $self->{neigh};
+
    $MAP->clear;
+}
+
+
+sub conn::load_map($$$) {
+   my ($self, $hash, $x, $y) = @_;
+
+   if (defined (my $data = $MAPCACHE->get ($hash))) {
+      $data = Compress::LZF::decompress $data;
+      warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
+      for my $id ($MAP->set_rect ($x, $y, $data)) {
+         my $data = $TILECACHE->get ($id)
+            or next;
+
+         $self->set_texture ($id => $data);
+      }
+   }
+}
+
+sub conn::flood_fill {
+   my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
+
+   # the server does not allow map paths > 6
+   return if 6 <= length $path;
+
+   for my $tile (1..4) {
+      next if $self->{neigh}{$hash}[$tile];
+      next unless $flags & (1 << ($tile - 1));
+
+      my $neigh = $self->{neigh}{$hash} ||= [];
+
+      $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#
+         return if $mode ne "spatial";
+
+         $x += $MAP->ox;
+         $y += $MAP->oy;
+         
+         $self->load_map ($hash, $x, $y)
+            unless $self->{neigh}{$hash}[5]++;#d#
+
+         $neigh->[$tile] = [$x, $y, $w, $h];
+
+         $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
+            if $x >= $x0 && $x + $w < $x1 && $y >= $y0  && $y + $h < $y1;
+      });
+   }
+}
+
+sub conn::map_change {
+   my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+   $self->flush_map;
+
+   my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
+
+   my $mapmapw = 250;
+   my $mapmaph = 250;
+   
+   $self->flood_fill ("", $hash, $flags,
+                      $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
+                      $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
+
+   $x += $ox;
+   $y += $oy;
 
-#   refresh;
+   $self->{map_info} = [$hash, $x, $y, $w, $h];
+
+   $self->load_map ($hash, $x, $y);
 }
 
 sub conn::face_find {
-   my ($self, $face) = @_;
+   my ($self, $facenum, $face) = @_;
+
+   my $hash = "$face->{chksum},$face->{name}";
+
+   my $id = $FACEMAP->get ($hash);
+
+   unless ($id) {
+      # create new id for face
+      # i love transactions
+      for (1..100) {
+         my $txn = $CFClient::DB_ENV->txn_begin;
+         my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
+         if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
+            $id++;
+            if ($FACEMAP->put (id => $id) == 0
+                && $FACEMAP->put ($hash => $id) == 0) {
+               $txn->txn_commit;
 
-   $FACECACHE->{"$face->{chksum},$face->{name}"}
+               goto gotid;
+            }
+         }
+         $txn->abort;
+      }
+
+      CFClient::fatal "maximum number of transaction retries reached - database problems?";
+   }
+
+gotid:
+   $face->{id} = $id;
+   $MAP->set_face ($facenum => $id);
+   $TILECACHE->get ($id)
 }
 
 sub conn::face_update {
    my ($self, $facenum, $face) = @_;
 
-   $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
+   $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
+
+   $self->set_texture ($face->{id} => delete $face->{image});
+}
 
-   my $tex = $face->{texture} =
-      new_from_image CFClient::Texture
-         delete $face->{image}, minify => 1;
+sub conn::set_texture {
+   my ($self, $id, $data) = @_;
 
-   $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
-   $MAPWIDGET->update;
+   $self->{texture}[$id] ||= do {
+      my $tex =
+         new_from_image CFClient::Texture
+            $data, minify => 1;
+
+      $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+      $MAPWIDGET->update;
+
+      $tex
+   };
+}
+
+sub conn::sound_play {
+   my ($self, $x, $y, $soundnum, $type) = @_;
+
+   my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
+      or return;
+
+   $SDL_MIXER->play_channel (-1, $chunk);
+   warn "sound $x,$y,$soundnum,$type\n";#d#
 }
 
 sub conn::query {
@@ -502,7 +795,7 @@
    my @color = (
       [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
       [1.00, 1.00, 1.00],
-      [0.00, 0.00, 0.55],
+      [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
       [1.00, 0.00, 0.00],
       [1.00, 0.54, 0.00],
       [0.11, 0.56, 1.00],
@@ -530,9 +823,9 @@
    SDL_KEYDOWN() => sub {
       if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
          # alt-enter
-         destroy_screen;
+         video_shutdown;
          $CFG->{fullscreen} = !$CFG->{fullscreen};
-         init_screen;
+         video_init;
       } else {
          CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
       }
@@ -556,6 +849,11 @@
 
 #############################################################################
 
+$SIG{INT} = $SIG{TERM} = sub { exit };
+
+$TILECACHE = CFClient::db_table "tilecache";
+$FACEMAP   = CFClient::db_table "facemap";
+
 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
 
 my %DEF_CFG = (
@@ -588,8 +886,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);
 
@@ -597,9 +893,11 @@
    CFClient::set_font $fonts[0];
 }
 
-$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
+video_init;
+audio_init;
 
 Event::loop;
 
-Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
+END { SDL::Quit }
+