--- deliantra/Deliantra-Client/bin/pclient	2006/04/14 14:55:28	1.104
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/15 22:56:00	1.115
@@ -23,6 +23,8 @@
 my $MAX_FPS = 60;
 my $MIN_FPS =  5; # unused as of yet
 
+our $META_SERVER = "crossfire.real-time.com:13326";
+
 our $FACECACHE;
 
 our $LAST_REFRESH;
@@ -40,6 +42,10 @@
 
 our $MAP;
 our $MAPWIDGET;
+our $BUTTONBAR;
+our $LOGVIEW;
+our $CONSOLE;
+our $METASERVER;
 
 our $SDL_ACTIVE;
 our $SDL_EV;
@@ -48,9 +54,6 @@
 our $ALT_ENTER_MESSAGE;
 our $STATUS_LINE;
 our $DEBUG_STATUS;
-our $BUTTONBAR;
-our $LOGVIEW;
-our $CONSOLE;
 
 sub status {
    $STATUS_LINE->set_text ($_[0]);
@@ -67,13 +70,15 @@
 sub start_game {
    status "logging in...";
 
-   my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+   my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
 
    $MAP = new CFClient::Map $mapsize, $mapsize;
+
+   my ($host, $port) = split /:/, $CFG->{host};
    
    $CONN = new conn
-      host => $CFG->{host},
-      port => $CFG->{port},
+      host => $host,
+      port => $port || 13327,
       user => $CFG->{user},
       pass => $CFG->{password},
       mapw => $mapsize,
@@ -89,7 +94,7 @@
    undef $CONN;
 }
 
-sub config_dialog {
+sub client_setup {
    my $dialog = new CFClient::UI::FancyFrame
       child => (my $vbox = new CFClient::UI::VBox);
    $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
@@ -139,33 +144,126 @@
       $CFG->{fow_smooth} = $value;
    });
 
-   $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+   $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
+   $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
+      my ($self, $value) = @_;
+      $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
+   });
+
+   $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
       destroy_screen ();
       init_screen ();
    });
+
+   $dialog
+}
+
+sub metaserver_dialog {
+   my $dialog = new CFClient::UI::FancyFrame
+      child => (my $vbox = new CFClient::UI::VBox);
+
+   $vbox->add ($dialog->{table} = new CFClient::UI::Table);
+
+   $dialog
+}
+
+sub update_metaserver {
+   my ($HOST) = @_;
+
+   status "fetching metaserver list...";
+
+   my $buf;
+
+   my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
+
+   Event->io (fd => $fh, poll => 'r', cb => sub {
+      my $res = sysread $fh, $buf, 8192, length $buf;
+
+      if (!defined $res) {
+         $_[0]->w->cancel;
+         status "metaserver: $!";
+      } elsif ($res == 0) {
+         $_[0]->w->cancel;
+         status "server list retrieved";
+
+         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;
+         }
+      }
+   });
+}
+
+sub server_setup {
+   my $dialog = new CFClient::UI::FancyFrame
+      child => (my $vbox = new CFClient::UI::VBox);
    
    $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
    $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
-   $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
-   $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{host} = $value;
-   });
+   $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
 
-   $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
-   $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{port} = $value;
-   });
+   {
+      $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
+
+      $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{host} = $value;
+      });
+
+      $METASERVER = metaserver_dialog;
+
+      $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
+         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;
    });
@@ -191,23 +289,22 @@
       start_game;
    });
 
-   $vbox->add (my $hbox = new CFClient::UI::HBox);
-
-   $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
-      CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
-      status "Configuration Saved";
-   });
-
    $dialog
 }
 
-sub console_window {
+sub message_window {
    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,
       child     => (my $vbox = new CFClient::UI::VBox);
 
-   $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
+   $vbox->add ($LOGVIEW = new CFClient::UI::TextView
+      expand   => 1,
+      fontsize => $::CFG->{log_fontsize},
+   );
+
    $vbox->add (my $input = new CFClient::UI::LineEntry);
       $input->connect (activate => sub {
          my ($input, $text) = @_;
@@ -235,6 +332,7 @@
 }
 
 sub sdl_init {
+   #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";
 }
@@ -249,7 +347,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;
@@ -281,21 +379,21 @@
    #############################################################################
 
    $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
-   $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
+   $CFClient::UI::ROOT->add ($DEBUG_STATUS);
    
    $STATUS_LINE = new CFClient::UI::Label
                      padding => 0,
                      y => $HEIGHT * 44 / 45 - $FONTSIZE;
-   $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
+   $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";
-   $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
+   $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
 
-   $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
+   $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
    $MAPWIDGET->focus_in;
    $MAPWIDGET->connect (activate_console => sub {
       my ($mapwidget, $preset) = @_;
@@ -309,14 +407,22 @@
       }
    });
 
-   $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
+   $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
 
-   $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup",   other => config_dialog, state => 1);
-   $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
+   $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup",   other => client_setup);
+   $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup);
+   $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
+
+   $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
+      CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+      status "Configuration Saved";
+   });
+
+   $BUTTONBAR->{children}[0]->emit ("activate");
 }
 
 sub destroy_screen {
-   $CFClient::UI::TOPLEVEL->{children} = [];
+   $CFClient::UI::ROOT->{children} = [];
    undef $SDL_ACTIVE;
    undef $SDL_EV;
    SDL::Quit;
@@ -337,17 +443,7 @@
    $want_refresh = 0;
    $can_refresh = 0;
 
-   glViewport 0, 0, $WIDTH, $HEIGHT;
-   glClearColor +($CFG->{fow_intensity}) x 3, 1;
-   glClear GL_COLOR_BUFFER_BIT;
-
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
-   glMatrixMode GL_MODELVIEW;
-   glLoadIdentity;
-
-   $CFClient::UI::TOPLEVEL->draw;
+   $CFClient::UI::ROOT->draw;
 
    SDL::GLSwapBuffers;
 
@@ -419,20 +515,30 @@
 #   refresh;
 }
 
+sub conn::map_info {
+   my ($self, $mode, $x, $y, $w, $h, $hash) = @_;
+
+   warn "mapinfo <$mode,$x,$y,$w,$h,$hash>\n";#d#
+}
+
 sub conn::face_find {
    my ($self, $face) = @_;
 
-   $FACECACHE->{"$face->{chksum},$face->{name}"}
+   my $data;
+
+   $FACECACHE->get ("$face->{chksum},$face->{name}")
 }
 
 sub conn::face_update {
    my ($self, $facenum, $face) = @_;
 
-   $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
+   $FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
 
-   my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
+   my $tex = $face->{texture} =
+      new_from_image CFClient::Texture
+         delete $face->{image}, minify => 1;
 
-   $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
+   $MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    $MAPWIDGET->update;
 }
 
@@ -503,20 +609,22 @@
 
 #############################################################################
 
+$FACECACHE = CFClient::db_table "facecache";
+
 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
 
 my %DEF_CFG = (
+   sdl_mode      => 0,
    width         => 640,
    height        => 480,
+   fullscreen    => 0,
    fast          => 0,
    fow_enable    => 1,
    fow_intensity => 0.45,
    fow_smooth    => 0,
-   fullscreen    => 0,
-   sdl_mode      => 0,
+   log_fontsize  => 14,
    mapsize       => 100,
    host          => "crossfire.schmorp.de",
-   port          => 13327,
    say_command   => 'say',
 );
 
@@ -544,9 +652,6 @@
    CFClient::set_font $fonts[0];
 }
 
-$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
-
 Event::loop;
 
-Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";