--- deliantra/Deliantra-Client/bin/cfplus	2006/10/01 18:17:38	1.121
+++ deliantra/Deliantra-Client/bin/cfplus	2006/12/03 01:03:49	1.133
@@ -1,8 +1,31 @@
 #!/opt/bin/perl
 
+my $startup_done = sub { };
+
+# do splash-screen thingy on win32
+BEGIN {
+   if (%PAR::LibCache && $^O eq "MSWin32") {
+      while (my ($filename, $zip) = each %PAR::LibCache) {
+         $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
+      }
+
+      require Win32::GUI::SplashScreen;
+
+      Win32::GUI::SplashScreen::Show (
+         -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
+      );
+
+      $startup_done = sub {
+         Win32::GUI::SplashScreen::Done (1);
+      };
+   }
+}
+
 use strict;
 use utf8;
 
+use Carp 'verbose';
+
 # do things only needed for single-binary version (par)
 BEGIN {
    if (%PAR::LibCache) {
@@ -10,7 +33,7 @@
 
       while (my ($filename, $zip) = each %PAR::LibCache) {
          for ($zip->memberNames) {
-            next unless /^\/root\/(.*)/;
+            next unless /^root\/(.*)/;
             $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
                unless -e "$ENV{PAR_TEMP}/$1";
          }
@@ -47,16 +70,13 @@
 
 $Event::Eval = 0;
 $Event::DIED = sub {
-   # TODO: display dialog box or so
-   Carp::cluck $_[1];#d#TODO: remove when stable
-   return;#d#
-   CFPlus::fatal ($_[1]);
+   CFPlus::fatal Carp::longmess $_[1]
 };
 
 my $MAX_FPS = 60;
 my $MIN_FPS =  5; # unused as of yet
 
-our $META_SERVER = "crossfire.real-time.com:13326";
+our $META_SERVER = "http://metaserver.schmorp.de/current.json";
 
 our $LAST_REFRESH;
 our $NOW;
@@ -104,6 +124,7 @@
 our $STATS_PAGE;
 our $SKILL_PAGE;
 our $SPELL_PAGE;
+our $SPELL_LIST;
 
 our $HELP_WINDOW;
 our $MESSAGE_WINDOW;
@@ -139,6 +160,17 @@
    $DEBUG_STATUS->set_text ($_[0]);
 }
 
+sub message {
+   my ($para) = @_;
+
+   my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+
+   $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
+
+   $LOGVIEW->add_paragraph ($para);
+   $LOGVIEW->scroll_to_bottom;
+}
+
 sub destroy_query_dialog {
    (delete $_[0]{query_dialog})->destroy
       if $_[0]{query_dialog};
@@ -351,7 +383,7 @@
 
    my ($host, $port) = split /:/, $PROFILE->{host};
 
-   $MAP = new CFPlus::Map $mapsize, $mapsize;
+   $MAP = new CFPlus::Map;
    
    $CONN = eval {
       new CFPlus::Protocol
@@ -399,7 +431,7 @@
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
-   $SPELL_PAGE->clear_spells;
+   $SPELL_LIST->clear_spells;
 
    return unless $CONN;
 
@@ -636,6 +668,7 @@
    $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
    $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
    $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
 
    my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
 
@@ -827,27 +860,15 @@
    $table->clear;
    $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
 
-   my $buf;
-
-   my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
-
-   unless ($fh) {
-      $label->set_text ("unable to contact metaserver: $!");
-      return;
-   }
-
-   Event->io (fd => $fh, poll => 'r', cb => sub {
-      my $res = sysread $fh, $buf, 8192, length $buf;
-
-      if (!defined $res) {
-         $_[0]->w->cancel;
-         $label->set_text ("error while retrieving server list: $!");
-      } elsif ($res == 0) {
-         $_[0]->w->cancel;
-         status "server list retrieved";
+   my $ok = 0;
 
-         utf8::decode $buf if utf8::valid $buf;
+   CFPlus::background {
+      my $ua = CFPlus::lwp_useragent;
 
+      CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
+   } sub {
+      my ($msg) = @_;
+      if ($msg) {
          $table->clear;
 
          my @tip = (
@@ -867,23 +888,30 @@
          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 my $m (
+            sort {
+               $b->{version} <=> $a->{version}
+                  or $b->{users} <=> $a->{users}
+            }
+            @{ $msg->{servers} }
+         ) {
+            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 
+               @$m{qw(ip age hostname users version description ibytes obytes uptime)};
 
             for ($desc) {
                s/<br>/\n/gi;
                s/<li>/\n· /gi;
                s/<.*?>//sgi;
-               s/&/&amp;/g;
-               s/</&lt;/g;
-               s/>/&gt;/g;
+               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;
+               (int $uptime / 86400),
+               (int $uptime / 3600) % 24,
+               (int $uptime / 60) % 60,
+               $uptime % 60;
 
             $m = [$users, $host, $uptime, $version, $desc];
 
@@ -903,17 +931,22 @@
             ]);
             
             $table->add ($_, $y, new CFPlus::UI::Label
+                  max_w      => $::WIDTH * 0.4,
                   ellipsise  => 0,
                   align      => $align[$_],
                   text       => $m->[$_],
                   tooltip    => $tip[$_],
+                  fg         => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
                   can_hover  => 1,
                   can_events => 1,
                   fontsize   => 0.8)
                for 0 .. $#$m;
          }
+      } else {
+         $ok or $label->set_text ("error while contacting metaserver");
       }
-   });
+   };
+
 }
 
 sub metaserver_dialog {
@@ -927,7 +960,8 @@
       x       => 'center',
       y       => 'center',
       z       => 3,
-      force_h => $::HEIGHT * 0.4,
+      force_w => $::WIDTH  * 0.9,
+      force_h => $::HEIGHT * 0.7,
       child   => $vbox,
       has_close_button => 1,
       table   => $table,
@@ -1158,12 +1192,12 @@
             ["Cloaks"                  => PICKUP_CLOAK],
          ],
 
-         ["Readables", 2, 2,
+         ["Readables", 2, 0,
             ["Spellbooks"              => PICKUP_SPELLBOOK],
             ["Skillscrolls"            => PICKUP_SKILLSCROLL],
             ["Normal Books/Scrolls"    => PICKUP_READABLES],
          ],
-         ["Misc", 2, 7,
+         ["Misc", 2, 5,
             ["Food"                    => PICKUP_FOOD],
             ["Drinks"                  => PICKUP_DRINK],
             ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
@@ -1173,6 +1207,7 @@
             ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
             ["Ignore cursed"           => PICKUP_NOT_CURSED],
             ["Jewelery"                => PICKUP_JEWELS],
+            ["Flesh"                   => PICKUP_FLESH],
          ],
          ["Weight/Value ratio", 2, 17]
        )
@@ -1232,11 +1267,17 @@
 
 my %SORT_ORDER = (
    type   => undef,
-   mtime  => sub { sort {
-                ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
-                   or $b->{mtime} <=> $a->{mtime}
-                   or $a->{type} <=> $b->{type}
-             } @_ },
+   mtime  => sub {
+                my $NOW = time;
+                sort {
+                   my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
+                   my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
+
+                   ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+                      or $btime <=> $atime
+                      or $a->{type} <=> $b->{type}
+                } @_
+             },
    weight => sub { sort {
                 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
                    or $a->{type} <=> $b->{type}
@@ -1271,6 +1312,7 @@
 
    $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
    $sw1->add ($INV = new CFPlus::UI::Inventory);
+   $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
 
    $hb->add (my $vb2 = new CFPlus::UI::VBox);
 
@@ -1320,8 +1362,8 @@
       "Shows all your Skills."
    );
 
-   my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
-   $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
+   my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+   $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
    $ntb->add (
       "Spellbook (F4)" => $spellsw,
       "Displays all spells you have and lets you edit keyboard shortcuts for them."
@@ -1882,6 +1924,7 @@
 
          audio_music_finished;
 
+         local $_;
          while (<$fh>) {
             next if /^\s*#/;
             next if /^\s*$/;
@@ -2025,7 +2068,7 @@
       gauge_size     => 0.35,
       stat_fontsize  => 0.7,
       mapsize        => 100,
-      say_command    => 'say',
+      say_command    => 'chat',
       audio_enable   => 1,
       bgm_enable     => 1,
       bgm_volume     => 0.25,
@@ -2089,6 +2132,8 @@
 #      warn $t2-$t1;
 #   }
 
+   $startup_done->();
+
    video_init;
    audio_init;
 }