[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

 #!/opt/bin/perl
+my $startup_done = sub { };
+our $PANGO = "1.5.0";
+# 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) {
       @INC = grep ref, @INC; # weed out all paths except pars loader refs
+      my $tmp = $ENV{PAR_TEMP};
       while (my ($filename, $zip) = each %PAR::LibCache) {
          for ($zip->memberNames) {
-            next unless /^\/root\/(.*)/;
+            next unless /^root\/(.*)/;
-            $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
+            $zip->extractMember ($_, "$tmp/$1")
-               unless -e "$ENV{PAR_TEMP}/$1";
+               unless -e "$tmp/$1";
          }
       }
-      # TODO: pango-rc file, anybody?
+      if ($^O eq "MSWin32") {
+         # relocatable
+      } else {
+         # unix, need to patch pango rc file
+         open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
+            or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
+         local $/;
+         my $rc = <$fh>;
+         $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
-      unshift @INC, $ENV{PAR_TEMP};
+         mkdir "$tmp/pango-modules";
+         open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
+            or die "$tmp/pango-modules/pango.modules: $!";
+         print $fh $rc;
+         $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
+         open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
+            or die "$ENV{PANGO_RC_FILE}: $!";
+         print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
+      }
+      unshift @INC, $tmp;
    }
 }
 # need to do it again because that pile of garbage called PAR nukes it before main
 unshift @INC, $ENV{PAR_TEMP}
 use Compress::LZF;
 use CFPlus;
 use CFPlus::OpenGL ();
 use CFPlus::Protocol;
+use CFPlus::DB;
 use CFPlus::UI;
+use CFPlus::UI::Inventory;
+use CFPlus::UI::SpellList;
 use CFPlus::Pod;
-use CFPlus::BindingEditor;
 use CFPlus::MapWidget;
+use CFPlus::Macro;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $SIG{PIPE} = 'IGNORE';
-$Event::Eval = 0;
+$Event::Eval = 1;
 $Event::DIED = sub {
-   # TODO: display dialog box or so
+   CFPlus::fatal Carp::longmess $_[1]
-   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]);
-};
-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;
 our $CAN_REFRESH;
 our $INVENTORY_PAGE;
 our $STATS_PAGE;
 our $SKILL_PAGE;
 our $SPELL_PAGE;
+our $SPELL_LIST;
 our $HELP_WINDOW;
 our $MESSAGE_WINDOW;
 our $FLOORBOX;
 our $GAUGES;
 our $INV;
 our $INVR;
 our $INV_RIGHT_HB;
-our $BIND_EDITOR;
-our $BIND_UPD_CB;
 our $PICKUP_CFG;
+our $IN_BUILD_MODE;
+our $BUILD_BUTTON;
 sub status {
    $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
 sub debug {
    $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};
 }
+# FIXME: a very ugly hack to wait for stat update look below! #d#
+our $QUERY_TIMER; #d#
 # server query dialog
 sub server_query {
    my ($conn, $flags, $prompt) = @_;
+   # FIXME: a very ugly hack to wait for stat update #d#
+   if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
+      unless ($QUERY_TIMER) {
+         $QUERY_TIMER =
+            Event->timer (
+               after => 1,
+               cb => sub {
+                  server_query ($conn, $flags, $prompt, 1);
+                  $QUERY_TIMER = undef
+               }
+           );
+         return;
+      }
+   }
-   $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
+   $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
       x     => "center",
       y     => "center",
       title => "Server Query",
       child => my $vbox = new CFPlus::UI::VBox,
    ;
    my @dialog = my $label = new CFPlus::UI::Label
-      max_w     => $::WIDTH * 0.4,
+      max_w     => $::WIDTH * 0.8,
       ellipsise => 0,
       text      => $prompt;
    if ($flags & CS_QUERY_YESNO) {
       push @dialog, my $hbox = new CFPlus::UI::HBox;
       );
       $dialog->grab_focus;
    } elsif ($flags & CS_QUERY_SINGLECHAR) {
-      $dialog->{tooltip} = "#charcreation_focus";
       if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
-         $MESSAGE_WINDOW->show;
+         $dialog->{tooltip} = "#charcreation_focus";
          unshift @dialog, new CFPlus::UI::Label
-            max_w     => $::WIDTH * 0.4,
+            max_w     => $::WIDTH * 0.8,
             ellipsise => 0,
             markup    => "\nOr use your keyboard and the text entry below:\n";
          unshift @dialog, my $table = new CFPlus::UI::Table;
                 $conn->send ("reply d");
                 destroy_query_dialog $conn;
                 0
              },
          );
+         if ($conn->{chargen_race_description}) {
+            unshift @dialog, new CFPlus::UI::Label
+               max_w     => $::WIDTH * 0.8,
+               ellipsise => 0,
+               markup    => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
+            ;
+         }
+         unshift @dialog, new CFPlus::UI::Face
+            face  => $conn->{player}{face},
+            bg    => [.2, .2, .2, 1],
+            min_w => 64,
+            min_h => 64,
+         ;
+         if ($conn->{chargen_race_title}) {
+            unshift @dialog, new CFPlus::UI::Label
+               allign => 1,
+               ellipsise => 0,
+               markup    => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
+            ;
+         }
          unshift @dialog, new CFPlus::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
             markup    => (CFPlus::Pod::section_label ui => "chargen_race"),
    $LOGIN_BUTTON->set_text ("Logout");
    $SETUP_DIALOG->hide;
    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},
+         user => $PROFILE->{user},
-         pass => $CFG->{profile}{default}{password},
+         pass => $PROFILE->{password},
          mapw => $mapsize,
          maph => $mapsize,
+         client => "cfplus $CFPlus::VERSION $] $^O",
          map_widget => $MAPWIDGET,
          logview    => $LOGVIEW,
          statusbox  => $STATUSBOX,
          map        => $MAP,
          mapmap     => $MAPMAP,
          query      => \&server_query,
+         setup_req  => {
+            smoothing => $CFG->{map_smoothing}*1,
+         },
          sound_play => sub {
             my ($x, $y, $soundnum, $type) = @_;
             $SDL_MIXER
                or return;
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
-   $SPELL_PAGE->clear_spells;
+   $SPELL_LIST->clear_spells;
+   $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
    return unless $CONN;
    status "connection closed";
 sub graphics_setup {
    my $vbox = new CFPlus::UI::VBox;
    $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+   my $row = 0;
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
+   $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
+                                                 can_events => 1,
+                                                 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
-   $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
-   $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
+   $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
    $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
    $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
    $mode_slider->connect (changed => sub {
       $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
       $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
    });
    $mode_slider->emit (changed => $mode_slider->{range}[0]);
-   my $row = 1;
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
    $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
       state => $CFG->{fullscreen},
       tooltip => "Bring the client into fullscreen mode.",
       state => $CFG->{fast},
       tooltip => "Lower the visual quality considerably to speed up rendering.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
    );
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+   $table->add (1, $row++, new CFPlus::UI::Slider
+      range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
+      tooltip => "The base font size used by most GUI elements that do not have their own setting.",
+      on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
+   );
+   $table->add (1, $row++, new CFPlus::UI::Button
+      expand => 1, align => 0, text => "Apply",
+      tooltip => "Apply the video settings above.",
+      on_activate => sub {
+         video_shutdown ();
+         video_init ();
+         0
+      }
+   );
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
    $table->add (1, $row++, new CFPlus::UI::Slider
       range      => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
       tooltip    => "Enlarge or shrink the displayed map. Changes are instant.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
+   );
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
+   $table->add (1, $row++, new CFPlus::UI::CheckBox
+      state => $CFG->{map_smoothing},
+      tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
+               . "This increases load on the graphics subsystem and works only with 2.x servers. "
+               . "Changes take effect at next connection only.",
+      on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
    );
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
    $table->add (1, $row++, new CFPlus::UI::CheckBox
       state => $CFG->{fow_enable},
          status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
          0
       }
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
-   $table->add (1, $row++, new CFPlus::UI::Slider
-      range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
-      tooltip => "The base font size used by most GUI elements that do not have their own setting.",
-      on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
-   );
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
    $table->add (1, $row++, new CFPlus::UI::Slider
       range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
       tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
       on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
       range      => [$CFG->{gauge_size}, 0.2, 0.8],
       tooltip    => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
       on_changed => sub {
          $CFG->{gauge_size} = $_[1];
          $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
-         0
-      }
-   );
-   $table->add (1, $row++, new CFPlus::UI::Button
-      expand => 1, align => 0, text => "Apply",
-      tooltip => "Apply the video settings",
-      on_activate => sub {
-         video_shutdown ();
-         video_init ();
          0
       }
    );
    $vbox
    $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
    $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
    $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 { &CFPlus::debug() } );
    my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
    for my $x (0..2) {
       for my $y (0 .. 2) {
                on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
          );
       }
    }
+   $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
    $table
 }
 sub stats_window {
       expand => 1,
       scroll_y => 1
    );
    $r->add (my $vb = new CFPlus::UI::VBox);
+   $vb->add (new CFPlus::UI::FancyFrame
+      label => "Player",
+      child => (my $pi = new CFPlus::UI::VBox),
+   );
-   $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
+   $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
-   $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+   $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The map you are currently on (if supported by the server).");
-   $vb->add (my $hb0 = new CFPlus::UI::HBox);
+   $pi->add (my $hb0 = new CFPlus::UI::HBox);
    $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The weight of the player including all inventory items.");
    $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
       can_hover => 1, can_events => 1,
       tooltip => "The weight limit: you cannot carry more than this.");
+   $vb->add (new CFPlus::UI::FancyFrame
+      label => "Primary/Secondary Statistics",
-   $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+      child => (my $hb = new CFPlus::UI::HBox expand => 1),
+   );
    $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
    my $color2 = [1, 1, 0];
    for (
       $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
          font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
          align => -1, text => $label, tooltip => "#stat_$label");
    }
+   $vb->add (new CFPlus::UI::FancyFrame
+      label => "Resistancies",
-   $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
+      child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
+   );
    my $row = 0;
    my $col = 0;
    my %resist_names = (
    my $table = $METASERVER->{table};
    $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;
+   CFPlus::background {
+      my $ua = CFPlus::lwp_useragent;
-   unless ($fh) {
+      CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
-      $label->set_text ("unable to contact metaserver: $!");
+   } sub {
-      return;
+      my ($msg) = @_;
-   }
+      if ($msg) {
-   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;
          $table->clear;
          my @tip = (
             "The current number of users logged in on the server.",
             "The hostname of the server.",
                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) {
+         for my $m (@{ $msg->{servers} }) {
-            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
+            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
+               @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
             for ($desc) {
                s/<br>/\n/gi;
                s/<li>/\n· /gi;
                s/<.*?>//sgi;
-               s/&/&amp;/g;
+               s/&amp;/&/g;
-               s/</&lt;/g;
+               s/&lt;/</g;
-               s/>/&gt;/g;
+               s/&gt;/>/g;
             }
             $uptime = sprintf "%dd %02d:%02d:%02d",
-               (int $m->[8] / 86400),
+               (int $uptime / 86400),
-               (int $m->[8] / 3600) % 24,
+               (int $uptime / 3600) % 24,
-               (int $m->[8] / 60) % 60,
+               (int $uptime / 60) % 60,
-               $m->[8] % 60;
+               $uptime % 60;
             $m = [$users, $host, $uptime, $version, $desc];
             $y++;
                ),
                (new CFPlus::UI::Empty expand => 1),
             ]);
             $table->add ($_, $y, new CFPlus::UI::Label
+                  max_w      => $::WIDTH * 0.4,
                   ellipsise  => 0,
                   align      => $align[$_],
                   text       => $m->[$_],
                   tooltip    => $tip[$_],
+                  fg         => ($highlight ? [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 {
    my $vbox  = new CFPlus::UI::VBox;
    my $table = new CFPlus::UI::Table;
    $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
-   my $dialog = new CFPlus::UI::FancyFrame
+   my $dialog = new CFPlus::UI::Toplevel
       title   => "Server List",
       name    => 'metaserver_dialog',
       x       => 'center',
       y       => 'center',
       z       => 3,
+      force_w => $::WIDTH  * 0.9,
-      force_h => $::HEIGHT * 0.4,
+      force_h => $::HEIGHT * 0.7,
       child   => $vbox,
       has_close_button => 1,
       table   => $table,
       on_visibility_change => sub {
          update_metaserver ($_[0]) if $_[1];
 }
 sub server_setup {
    my $vbox = new CFPlus::UI::VBox;
+   $vbox->add (new CFPlus::UI::FancyFrame
+      label => "Connection Settings",
-   $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+      child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+   );
    $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
    {
       $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
                . "so only set it if you really need to prefetch images. "
                . "This option can be set and unset any time.",
       on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
    );
-   $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+   $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
    $table->add (1, 9, new CFPlus::UI::Entry
+      text => $CFG->{output_rate},
+      tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
+               . "when sending images, to ensure interactiveness. When 0 or unset, the server "
+               . "default will be used, which is usually around 100kb/s.",
+      on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
+   );
+   $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+   $table->add (1, 10, new CFPlus::UI::Entry
       text => $CFG->{output_count},
       tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
       on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
    );
-   $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
+   $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
-   $table->add (1, 10, new CFPlus::UI::Entry
+   $table->add (1, 11, new CFPlus::UI::Entry
       text => $CFG->{output_sync},
       tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
       on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
    );
-   $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
+   $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
       expand => 1,
       align => 0,
       text => "Login",
       on_activate => sub {
          $CONN ? stop_game
                : start_game;
          0
       },
    );
+   $vbox->add (new CFPlus::UI::FancyFrame
+      label => "Server Info",
+      child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+   );
+   $vbox
+}
+sub client_setup {
+   my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
+   my $row = 0;
-   $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
-   $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
+   $table->add (1, $row++, 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. "
+               . "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.",
+               . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
       on_changed => sub {
          my ($self, $value) = @_;
          $CFG->{say_command} = $value;
          0
       }
    );
-   $vbox->add (new CFPlus::UI::Label
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
-      text      => "Server Info",
+   $table->add (1, $row++, new CFPlus::UI::CheckBox
-      fontsize  => 1.2,
+      state   => $CFG->{show_tips},
-      padding_y => 8,
+      tooltip => "Show the <b>Tip of the day</b> window at startup?",
-      fg        => [1, 1, 0, 1],
+      on_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{show_tips} = $value;
+         0
+      }
    );
-   $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
+   $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
+      text    => $CFG->{logview_max_par},
+      tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
+               . "sends more messages than this number, older messages get removed to save memory and "
+               . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
+      on_changed => sub {
+         my ($self, $value) = @_;
+         $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
+         0
+      },
+   );
-   $vbox
+   $table
 }
 sub message_window {
-   my $window = new CFPlus::UI::FancyFrame
+   my $window = new CFPlus::UI::Toplevel
       name      => "message_window",
       title     => "Messages",
       border_bg => [1, 1, 1, 1],
       x         => "max",
       y         => 0,
       window => $window,
       input  => $input,
    };
    $window
-}
-sub open_string_query {
-   my $cb = $_[1];
-   my $dialog = new CFPlus::UI::FancyFrame
-      x => "center",
-      y => "center",
-      z => 50,
-      force_w => $WIDTH * 4/5,
-      title => $_[0];
-   $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 },
-   );
-   $e->grab_focus;
-   $dialog->show;
-}
-sub open_quit_dialog {
-   unless ($QUIT_DIALOG) {
-      $QUIT_DIALOG = new CFPlus::UI::FancyFrame
-         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;
             ["Boots"                   => PICKUP_BOOTS],
             ["Gloves"                  => PICKUP_GLOVES],
             ["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],
             ["Keys"                    => PICKUP_KEY],
             ["Magical Items"           => PICKUP_MAGICAL],
             ["Potions"                 => PICKUP_POTION],
             ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
             ["Ignore cursed"           => PICKUP_NOT_CURSED],
             ["Jewelery"                => PICKUP_JEWELS],
+            ["Flesh"                   => PICKUP_FLESH],
          ],
          ["Weight/Value ratio", 2, 17]
        )
    {
       my ($title, $x, $y, @bits) = @$_;
    $table
 }
 my %SORT_ORDER = (
    type   => undef,
-   mtime  => sub { sort {
+   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)
+                   ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
-                   or $b->{mtime} <=> $a->{mtime}
+                      or $btime <=> $atime
-                   or $a->{type} <=> $b->{type}
+                      or $a->{type} <=> $b->{type}
+                } @_
-             } @_ },
+             },
    weight => sub { sort {
                 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
                    or $a->{type} <=> $b->{type}
              } @_ },
 );
    #TODO# update to weigh/maxweight
    $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
    $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);
    $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
       $PL_WINDOW->show;
    }
 }
 sub player_window {
-   my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
+   my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
       x       => "center",
       y       => "center",
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Player",
       has_close_button => 1
    ;
    my $ntb =
       $PL_NOTEBOOK =
-         new CFPlus::UI::Notebook expand => 1, debug => 1;
+         new CFPlus::UI::Notebook expand => 1;
    $ntb->add (
       "Statistics (F2)" => $STATS_PAGE = stats_window,
       "Shows statistics, where all your Stats and Resistances are shown."
    );
    $ntb->add (
       "Skills (F3)" => $SKILL_PAGE = skill_window,
       "Shows all your Skills."
    );
-   my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+   my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
-   $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
+   $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."
    );
    $ntb->add (
       "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
       "Toggles the inventory window, where you can manage your loot (or treasures :). "
       . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
    );
+   $ntb->add (Pickup   => autopickup_setup,
+      "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
    $ntb->set_current_page ($INVENTORY_PAGE);
    $plwin->add ($ntb);
    $plwin
 }
-sub update_bindings {
-   $BIND_UPD_CB->() if $BIND_UPD_CB;
-}
 sub keyboard_setup {
-   my $binding_list = new CFPlus::UI::VBox;
+   CFPlus::Macro::keyboard_setup
-   my $refresh;
-   $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};
-            next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
-            my $lbl = join "; ", @$cmds;
-            my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
-            $binding_list->add (my $hb = new CFPlus::UI::HBox);
-            $hb->add (new CFPlus::UI::Button
-                  text => "delete",
-                  tooltip => "Deletes the binding",
-                  on_activate => sub {
-                     $binding_list->remove ($hb);
-                     delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
-                     0
-                  });
-            $hb->add (new CFPlus::UI::Button
-                  text => "edit",
-                  tooltip => "Edits the binding",
-                  on_activate => sub {
-                     $::BIND_EDITOR->set_binding (
-                        $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
-                        sub {
-                           my ($nmod, $nsym, $ncmds) = @_;
-                           $::BIND_EDITOR->cfg_unbind ($mod, $sym);
-                           $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
-                           $refresh->();
-                           $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
-                           $SETUP_DIALOG->show;
-                        },
-                        sub {
-                           $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
-                           $SETUP_DIALOG->show;
-                        });
-                     $::BIND_EDITOR->show;
-                     $SETUP_DIALOG->hide;
-                     0
-                  });
-            $hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
-            $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
-         }
-      }
-   };
-   my $vb = new CFPlus::UI::VBox;
-   $vb->add (my $hb = new CFPlus::UI::HBox);
-   $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
-   $hb->add (new CFPlus::UI::CheckBox
-         expand => 1,
-         state => $CFG->{shift_fire_stop},
-         tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
-         on_changed => sub {
-            my ($cbox, $value) = @_;
-            $CFG->{shift_fire_stop} = $value;
-            0
-         });
-   $vb->add ($binding_list);
-   $vb->add (my $hb = new CFPlus::UI::HBox);
-   $hb->add (new CFPlus::UI::Button
-      text => "record new",
-      expand => 1,
-      tooltip => "This button opens the binding editor with an empty binding.",
-      on_activate => sub {
-         $::BIND_EDITOR->set_binding (undef, undef, [],
-            sub {
-               my ($mod, $sym, $cmds) = @_;
-               $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
-               $refresh->();
-               $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
-               $SETUP_DIALOG->show;
-            },
-            sub {
-               $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
-               $SETUP_DIALOG->show;
-            },
-         );
-         $SETUP_DIALOG->hide;
-         $::BIND_EDITOR->show;
-         0
-      },
-   );
-   $hb->add (new CFPlus::UI::Button
-      text => "close",
-      tooltip => "Closes the binding window",
-      expand => 1,
-      on_activate => sub {
-         $SETUP_DIALOG->hide;
-         0
-      }
-   );
-   $refresh->();
-   $vb
 }
 sub help_window {
-   my $win = new CFPlus::UI::FancyFrame
+   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,
       title   => "Help Browser",
       has_close_button => 1;
    $win->add (my $vbox = new CFPlus::UI::VBox);
+   $vbox->add (new CFPlus::UI::FancyFrame
+      label => "Navigation",
-   $vbox->add (my $buttons = new CFPlus::UI::HBox);
+      child => (my $buttons = new CFPlus::UI::HBox),
+   );
    $vbox->add (my $viewer  = new CFPlus::UI::TextScroller
-      expand => 1, fontsize => 0.8, padding_x => 4);
+                   expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
    my @history;
    my @future;
    my $curnode;
    my $load_node; $load_node = sub {
-      my ($node) = @_;
+      my ($node, $para) = @_;
       $buttons->clear;
+      $buttons->add (new CFPlus::UI::Button
+         text        => "⇤",
+         tooltip     => "back to the starting page",
+         on_activate => sub {
+            unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
+            unshift @future, @history;
+            @history = ();
+            $load_node->(@{shift @future});
+         },
+      );
       if (@history) {
          $buttons->add (new CFPlus::UI::Button
-            text        => "<",
+            text        => "⋘",
-            tooltip     => "back to " . CFPlus::Pod::full_path_of $history[-1],
+            tooltip     => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
             on_activate => sub {
-               unshift @future, $curnode if $curnode;
+               unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
-               $load_node->(pop @history);
+               $load_node->(@{pop @history});
+            },
-         });
+         );
       }
       if (@future) {
          $buttons->add (new CFPlus::UI::Button
-            text        => ">",
+            text        => "⋙",
-            tooltip     => "forward to " . CFPlus::Pod::full_path_of $future[0],
+            tooltip     => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
             on_activate => sub {
-               push @history, $curnode;
+               push @history, [$curnode, $viewer->current_paragraph];
-               $load_node->(shift @future);
+               $load_node->(@{shift @future});
+            },
-         });
+         );
       }
+      $buttons->add (new CFPlus::UI::Label text => " ");
+      my @path = CFPlus::Pod::full_path_of $node;
+      pop @path; # drop current node
+      for my $node (@path) {
+         $buttons->add (new CFPlus::UI::Button
+            text        => $node->{kw}[0],
+            tooltip     => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
+            on_activate => sub {
+               push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
+               $load_node->($node);
+            },
+         );
+         $buttons->add (new CFPlus::UI::Label text => "/");
+      }
+      $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
       $curnode = $node;
       $viewer->clear;
       $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
-      $viewer->set_offset (0);
+      $viewer->scroll_to ($para);
    };
    $load_node->(CFPlus::Pod::find pod => "mainpage");
-   $CFPlus::Pod::on_link = sub {
+   $CFPlus::Pod::goto_document = sub {
       my (@path) = @_;
-      push @history, $curnode if $curnode;
+      push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
-      @future = ();
-      $load_node->(CFPlus::Pod::find @path);
+      $load_node->((CFPlus::Pod::find @path)[0]);
       $win->show;
    };
    $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 => "*";
+   CFPlus::DB::get state => "tip_of_the_day", sub {
+      my ($todindex) = @_;
+      $todindex = 0 if $todindex >= @tod;
+      CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
+      # 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 col_expand => [0, 1]);
+      $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";
          z       => 100,
          force_x => "max",
          force_y => 0;
       $DEBUG_STATUS->show;
-      $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
       $STATUSBOX = new CFPlus::UI::Statusbox;
       $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
       (new CFPlus::UI::Frame
          bg      => [0, 0, 0, 0.4],
          force_x => 0,
          force_y => "max",
          child   => $STATUSBOX,
       )->show;
-      CFPlus::UI::FancyFrame->new (
+      CFPlus::UI::Toplevel->new (
          title     => "Map",
          name      => "mapmap",
          x         => 0,
          y         => $FONTSIZE + 8,
          border_bg => [1, 1, 1, 192/255],
          font       => $FONT_FIXED,
          fontsize   => $::CFG->{log_fontsize},
          indent     => -4,
          can_hover  => 1,
          can_events => 1,
+         max_par    => $CFG->{logview_max_par},
-         tooltip    => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
+         tooltip    => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
       ;
-      $SETUP_DIALOG = new CFPlus::UI::FancyFrame
+      $SETUP_DIALOG = new CFPlus::UI::Toplevel
          title   => "Setup",
          name    => "setup_dialog",
          x       => 'center',
          y       => 'center',
          z       => 2,
       $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
          filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
       $SETUP_NOTEBOOK->add (Server   => $SETUP_SERVER = server_setup,
          "Configure the server to play on, your username, password and other server-related options.");
-      $SETUP_NOTEBOOK->add (Pickup   => autopickup_setup,
+      $SETUP_NOTEBOOK->add (Client   => client_setup,
-         "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
+         "Configure various client-specific settings.");
       $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
          "Configure the video mode, performance, fonts and other graphical aspects of the game.");
       $SETUP_NOTEBOOK->add (Audio    => audio_setup,
          "Configure the use of audio, sound effects and background music.");
       $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
       );
       $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
          tooltip => "View Documentation");
       $BUTTONBAR->add (new CFPlus::UI::Button
          text        => "Quit",
          tooltip     => "Terminates the program",
          on_activate => sub {
             if ($CONN) {
    }
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
+sub setup_build_button {
+   my ($enabled) = @_;
+   if ($enabled) {
+      $BUILD_BUTTON->hide if $BUILD_BUTTON;
+      $BUILD_BUTTON ||= new CFPlus::UI::Button
+         text        => "Build",
+         tooltip     => "Opens the ingame builder",
+         on_activate => sub {
+            if ($CONN) {
+               $CONN->send_ext_req (builder_player_items => sub {
+                  open_ingame_editor ($_[0]) if exists $_[0]->{items};
+               });
+            }
+            0
+         };
+      $BUTTONBAR->add ($BUILD_BUTTON);
+   } else {
+      $BUILD_BUTTON->hide if $BUILD_BUTTON;
+   }
+}
+sub open_ingame_editor {
+   my ($msg) = @_;
+   my $win = new CFPlus::UI::Toplevel
+      x       => 0,
+      y       => 'center',
+      z       => 4,
+      name    => 'builder_window',
+      force_w => int $WIDTH  * 1/4,
+      force_h => int $HEIGHT * 3/4,
+      title   => "In game builder",
+      has_close_button => 1;
+   my $r = new CFPlus::UI::ScrolledWindow (
+      expand => 1,
+      scroll_y => 1
+   );
+   $r->add (my $vb = new CFPlus::UI::VBox);
+   $win->add ($r);
+   $vb->add (
+      new CFPlus::UI::Button
+         text => "Disable build mode",
+         on_activate => sub { $::IN_BUILD_MODE = undef }
+   );
+   $vb->add (
+      new CFPlus::UI::Button
+         text => "ERASE",
+         on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
+   );
+   for my $itemarchname (
+      sort {
+         $msg->{items}->{$a}->{build_arch_name}
+            cmp $msg->{items}->{$b}->{build_arch_name}
+      } keys %{$msg->{items}}
+   ) {
+      my $info = $msg->{items}->{$itemarchname};
+      $vb->add (
+         new CFPlus::UI::Button text => $info->{build_arch_name},
+         on_activate => sub {
+            $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
+            if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
+               build_mode_query_arch_info ();
+            }
+         }
+      );
+   }
+   $win->show;
+}
+sub build_mode_query_arch_info {
+   my ($iteminfo) = $::IN_BUILD_MODE;
+   my $itemarchname = $iteminfo->{item};
+   my $info = $iteminfo->{info};
+   my $dialog = new CFPlus::UI::Toplevel
+      x     => "center",
+      y     => "center",
+      z     => 50,
+      force_w => int $WIDTH  * 1/2,
+      title => "Enter information for placement of '$itemarchname'",
+      has_close_button => 1;
+   $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
+   $vb->add (my $table = new CFPlus::UI::Table expand => 1);
+      my $row = 0;
+      if ($info->{has_name}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
+         $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
+      }
+      if ($info->{has_text}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
+         $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
+      }
+      if ($info->{has_connection}) {
+         $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
+         $table->add (1, $row++,
+            new CFPlus::UI::Entry
+               expand => 1,
+               on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
+               tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
+         );
+      }
+   $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+   $hb->add (new CFPlus::UI::Button
+      text => "Close",
+      expand => 1,
+      on_activate => sub { $dialog->hide; 0 },
+   );
+   $dialog->show;
+}
 sub video_shutdown {
    CFPlus::OpenGL::shutdown;
    undef $SDL_ACTIVE;
 }
          CFPlus::Mix_AllocateChannels 8;
          CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
          audio_music_finished;
+         local $_;
          while (<$fh>) {
             next if /^\s*#/;
             next if /^\s*$/;
             my ($file, $volume, $event) = split /\s+/, $_, 3;
       if $CONN;
 });
 %SDL_CB = (
    CFPlus::SDL_QUIT => sub {
-      Event::unloop -1;
+      exit;
    },
    CFPlus::SDL_VIDEORESIZE => sub {
    },
    CFPlus::SDL_VIDEOEXPOSE => sub {
       CFPlus::UI::full_refresh;
    },
    CFPlus::SDL_ACTIVEEVENT => sub {
-#      printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
+#      not useful, as APPACTIVE include sonly iconified state, not unmapped
+#      printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
+#      printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
+#      printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
+#      printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
    },
    CFPlus::SDL_KEYDOWN => sub {
       if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
          # alt-enter
          $FULLSCREEN_ENABLE->toggle;
 $SIG{INT} = $SIG{TERM} = sub { exit };
 {
    CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
+   CFPlus::DB::Server::run;
    CFPlus::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
-      sdl_mode       => 0,
+      sdl_mode        => 0,
-      width          => 640,
+      width           => 640,
-      height         => 480,
+      height          => 480,
-      fullscreen     => 0,
+      fullscreen      => 0,
-      fast           => 0,
+      fast            => 0,
-      map_scale      => 1,
+      map_scale       => 1,
-      fow_enable     => 1,
+      fow_enable      => 1,
-      fow_intensity  => 0.45,
+      fow_intensity   => 0.45,
-      fow_smooth     => 0,
+      fow_smooth      => 0,
+      map_smoothing   => 1,
-      gui_fontsize   => 1,
+      gui_fontsize    => 1,
-      log_fontsize   => 0.7,
+      log_fontsize    => 0.7,
-      gauge_fontsize => 1,
+      gauge_fontsize  => 1,
-      gauge_size     => 0.35,
+      gauge_size      => 0.35,
-      stat_fontsize  => 0.7,
+      stat_fontsize   => 0.7,
-      mapsize        => 100,
+      mapsize         => 100,
-      say_command    => 'say',
+      say_command     => 'chat',
-      audio_enable   => 1,
+      audio_enable    => 1,
-      bgm_enable     => 1,
+      bgm_enable      => 1,
-      bgm_volume     => 0.25,
+      bgm_volume      => 0.25,
-      face_prefetch  => 0,
+      face_prefetch   => 0,
-      output_sync    => 1,
+      output_sync     => 1,
-      output_count   => 1,
+      output_count    => 1,
+      output_rate     => "",
-      pickup         => 0,
+      pickup          => 0,
-      inv_sort       => "mtime",
+      inv_sort        => "mtime",
-      default        => "profile", # default profile
+      default         => "profile", # default profile
+      show_tips       => 1,
+      logview_max_par => 1000,
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};
    }
    $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
+   $PROFILE = $CFG->{profile}{default};
+   # convert old bindings (only default profile matters)
+   if (my $bindings = delete $PROFILE->{bindings}) {
+      while (my ($mod, $syms) = each %$bindings) {
+         while (my ($sym, $cmds) = each %$syms) {
+            push @{ $PROFILE->{macro} }, {
+               accelkey => [$mod*1, $sym*1],
+               action   => $cmds,
+            };
+         }
+      }
+   }
    sdl_init;
    @SDL_MODES = reverse
                    grep $_->[0] >= 640 && $_->[1] >= 480,
 #      }
 #      my $t2 = Time::HiRes::time;
 #      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;
+END {
-END { CFPlus::SDL_Quit }
+   CFPlus::SDL_Quit;
+   CFPlus::DB::Server::stop;
+}
 =head1 NAME
 cfplus - A Crossfire+ and Crossfire game client

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC vs. Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.112 by root, Sun Aug 13 20:01:14 2006 UTC vs.
Revision 1.162 by root, Thu Jul 5 07:06:05 2007 UTC