--- deliantra/Deliantra-Client/bin/cfplus	2006/08/15 06:30:05	1.117
+++ deliantra/Deliantra-Client/bin/cfplus	2006/11/19 00:07:51	1.129
@@ -1,5 +1,26 @@
 #!/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;
 
@@ -10,7 +31,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";
          }
@@ -49,30 +70,21 @@
 $Event::DIED = sub {
    # TODO: display dialog box or so
    Carp::cluck $_[1];#d#TODO: remove when stable
-   CFPlus::error $_[1];
-};
-
-$SIG{__DIE__} = sub {
-   return if CFPlus::in_destruct;
-   Carp::cluck $_[0];
-   CFPlus::error $_[0];
    return;#d#
-   #return unless defined $^S && !$^S;
-   $Event::DIED->(undef, $_[0]);
+   CFPlus::fatal ($_[1]);
 };
 
-our $VERSION = '0.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;
 
 our $CFG;
 our $CONN;
+our $PROFILE; # current profile
 our $FAST; # fast, low-quality mode, possibly useful for software-rendering
 
 our $WANT_REFRESH;
@@ -148,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};
@@ -354,21 +377,25 @@
    $LOGIN_BUTTON->set_text ("Logout");
    $SETUP_DIALOG->hide;
 
+   $PROFILE = $CFG->{profile}{default};
+
    my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
 
-   my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
+   my ($host, $port) = split /:/, $PROFILE->{host};
 
-   $MAP = new CFPlus::Map $mapsize, $mapsize;
+   $MAP = new CFPlus::Map;
    
    $CONN = eval {
       new CFPlus::Protocol
          host => $host,
          port => $port || 13327,
-         user => $CFG->{profile}{default}{user},
-         pass => $CFG->{profile}{default}{password},
+         user => $PROFILE->{user},
+         pass => $PROFILE->{password},
          mapw => $mapsize,
          maph => $mapsize,
 
+         client => "cfplus $CFPlus::VERSION $] $^O",
+
          map_widget => $MAPWIDGET,
          logview    => $LOGVIEW,
          statusbox  => $STATUSBOX,
@@ -832,27 +859,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 $ok = 0;
 
-   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";
-
-         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 = (
@@ -872,23 +887,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];
 
@@ -908,17 +930,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 {
@@ -932,7 +959,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,
@@ -1045,7 +1073,7 @@
 
    $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
    $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
-      text => $CFG->{say_command},
+      text    => $CFG->{say_command},
       tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
                 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
                 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
@@ -1056,6 +1084,17 @@
       }
    );
 
+   $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+   $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
+      state   => $CFG->{show_tips},
+      tooltip => "Show the <b>Tip of the day</b> window at startup?",
+      on_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{show_tips} = $value;
+         0
+      }
+   );
+
    $vbox->add (new CFPlus::UI::FancyFrame
       label => "Server Info",
       child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
@@ -1127,64 +1166,6 @@
    $window
 }
 
-sub open_string_query {
-   my ($title, $cb, $txt, $tooltip) = @_;
-   my $dialog = new CFPlus::UI::Toplevel
-      x => "center",
-      y => "center",
-      z => 50,
-      force_w => $WIDTH * 4/5,
-      title => $title;
-
-   $dialog->add (
-      my $e = new CFPlus::UI::Entry
-         on_activate => sub { $cb->(@_); $dialog->hide; 0 },
-         on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
-         tooltip => $tooltip
-   );
-
-   $e->grab_focus;
-   $e->set_text ($txt) if $txt;
-   $dialog->show;
-}
-
-sub open_quit_dialog {
-   unless ($QUIT_DIALOG) {
-      $QUIT_DIALOG = new CFPlus::UI::Toplevel
-         x     => "center",
-         y     => "center",
-         z     => 50,
-         title => "Really Quit?",
-         on_key_down => sub {
-            my ($dialog, $ev) = @_;
-            $ev->{sym} == 27 and $dialog->hide;
-         }
-      ;
-
-      $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
-
-      $vb->add (new CFPlus::UI::Label
-         text      => "You should find a savebed and apply it first!",
-         max_w     => $WIDTH * 0.25,
-         ellipsize => 0,
-      );
-      $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
-      $hb->add (new CFPlus::UI::Button
-         text => "Ok",
-         expand => 1,
-         on_activate => sub { $QUIT_DIALOG->hide; 0 },
-      );
-      $hb->add (new CFPlus::UI::Button
-         text => "Quit anyway",
-         expand => 1,
-         on_activate => sub { exit },
-      );
-   }
-
-   $QUIT_DIALOG->show;
-   $QUIT_DIALOG->grab_focus;
-}
-
 sub autopickup_setup {
    my $table = new CFPlus::UI::Table;
 
@@ -1323,6 +1304,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);
 
@@ -1401,9 +1383,11 @@
    $refresh = $BIND_UPD_CB = sub {
       $binding_list->clear ();
 
-      for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
-         for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
-            my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
+      return unless $PROFILE;
+
+      for my $mod (keys %{$PROFILE->{bindings}}) {
+         for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
+            my $cmds = $PROFILE->{bindings}{$mod}{$sym};
             next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
 
             my $lbl = join "; ", @$cmds;
@@ -1414,7 +1398,7 @@
                   tooltip => "Deletes the binding",
                   on_activate => sub {
                      $binding_list->remove ($hb);
-                     delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
+                     delete $PROFILE->{bindings}{$mod}{$sym};
                      0
                   });
 
@@ -1423,7 +1407,7 @@
                   tooltip => "Edits the binding",
                   on_activate => sub {
                      $::BIND_EDITOR->set_binding (
-                        $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
+                        $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
                         sub {
                            my ($nmod, $nsym, $ncmds) = @_;
                            $::BIND_EDITOR->cfg_unbind ($mod, $sym);
@@ -1511,7 +1495,7 @@
    my $win = new CFPlus::UI::Toplevel
       x       => 'center',
       y       => 'center',
-      z       => 2,
+      z       => 4,
       name    => 'doc_browser',
       force_w => int $WIDTH  * 7/8,
       force_h => int $HEIGHT * 7/8,
@@ -1609,6 +1593,116 @@
    $win
 }
 
+sub open_string_query {
+   my ($title, $cb, $txt, $tooltip) = @_;
+   my $dialog = new CFPlus::UI::Toplevel
+      x => "center",
+      y => "center",
+      z => 50,
+      force_w => $WIDTH * 4/5,
+      title => $title;
+
+   $dialog->add (
+      my $e = new CFPlus::UI::Entry
+         on_activate => sub { $cb->(@_); $dialog->hide; 0 },
+         on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
+         tooltip => $tooltip
+   );
+
+   $e->grab_focus;
+   $e->set_text ($txt) if $txt;
+   $dialog->show;
+}
+
+sub open_quit_dialog {
+   unless ($QUIT_DIALOG) {
+      $QUIT_DIALOG = new CFPlus::UI::Toplevel
+         x     => "center",
+         y     => "center",
+         z     => 50,
+         title => "Really Quit?",
+         on_key_down => sub {
+            my ($dialog, $ev) = @_;
+            $ev->{sym} == 27 and $dialog->hide;
+         }
+      ;
+
+      $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
+
+      $vb->add (new CFPlus::UI::Label
+         text      => "You should find a savebed and apply it first!",
+         max_w     => $WIDTH * 0.25,
+         ellipsize => 0,
+      );
+      $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+      $hb->add (new CFPlus::UI::Button
+         text => "Ok",
+         expand => 1,
+         on_activate => sub { $QUIT_DIALOG->hide; 0 },
+      );
+      $hb->add (new CFPlus::UI::Button
+         text => "Quit anyway",
+         expand => 1,
+         on_activate => sub { exit },
+      );
+   }
+
+   $QUIT_DIALOG->show;
+   $QUIT_DIALOG->grab_focus;
+}
+
+sub show_tip_of_the_day {
+   # find all tips
+   my @tod = CFPlus::Pod::find tip_of_the_day => "*";
+
+   my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
+   $todindex = 0 if $todindex >= @tod;
+   $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
+
+   # create dialog
+   my $dialog;
+
+   my $close = sub {
+      $dialog->destroy;
+   };
+
+   $dialog = new CFPlus::UI::Toplevel
+      x => "center",
+      y => "center",
+      z => 3,
+      name    => 'tip_of_the_day',
+      force_w => int $WIDTH  * 4/9,
+      force_h => int $WIDTH  * 2/9,
+      title   => "Tip of the day #" . (1 + $todindex),
+      child   => my $vbox = new CFPlus::UI::VBox,
+      has_close_button => 1,
+      on_delete => $close,
+   ;
+
+   $vbox->add (my $viewer  = new CFPlus::UI::TextScroller
+                   expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
+   $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
+
+   $vbox->add (my $table = new CFPlus::UI::Table);
+
+   $table->add (0, 0, new CFPlus::UI::Button
+      text => "Close",
+      tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
+      on_activate => $close,
+   );
+
+   $table->add (2, 0, new CFPlus::UI::Button
+      text => "Next",
+      tooltip => "Show the next <b>Tip of the day</b>.",
+      on_activate => sub {
+         $close->();
+         &show_tip_of_the_day;
+      },
+   );
+
+   $dialog->show;
+}
+
 sub sdl_init {
    CFPlus::SDL_Init
       and die "SDL::Init failed!\n";
@@ -1822,7 +1916,9 @@
 
          audio_music_finished;
 
+         local $_;
          while (<$fh>) {
+            last;
             next if /^\s*#/;
             next if /^\s*$/;
 
@@ -1965,7 +2061,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,
@@ -1975,6 +2071,7 @@
       pickup         => 0,
       inv_sort       => "mtime",
       default        => "profile", # default profile
+      show_tips      => 1,
    );
    
    while (my ($k, $v) = each %DEF_CFG) {
@@ -2028,10 +2125,14 @@
 #      warn $t2-$t1;
 #   }
 
+   $startup_done->();
+
    video_init;
    audio_init;
 }
 
+show_tip_of_the_day if $CFG->{show_tips};
+
 Event::loop;
 #CFPlus::SDL_Quit;
 #CFPlus::_exit 0;