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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC vs.
Revision 1.180 by root, Sat Jul 21 13:37:09 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) {
 # 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\/(.*)/;
-            $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 {
    CFPlus::fatal Carp::longmess $_[1]
 };
 my $MAX_FPS = 60;
 our $SDL_ACTIVE;
 our %SDL_CB;
 our $SDL_MIXER;
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our @MUSIC_WANT;
+our $MUSIC_START;
+our $MUSIC_PLAYING;
+our $MUSIC_PLAYER;
+our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
 our @SOUNDS;       # event => file mapping
 our %AUDIO_CHUNKS; # audio files
 our $ALT_ENTER_MESSAGE;
 our $STATUSBOX;
 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 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::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;
-         $table->add (0, 0, new CFPlus::UI::Button
+         $table->add_at (0, 0, new CFPlus::UI::Button
              text => "Next Race",
              on_activate => sub {
                 $conn->send ("reply n");
                 destroy_query_dialog $conn;
                 0
              },
          );
-         $table->add (2, 0, new CFPlus::UI::Button
+         $table->add_at (2, 0, new CFPlus::UI::Button
              text => "Accept",
              on_activate => sub {
                 $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"),
          ;
             $conn->send ("reply $stat");
             destroy_query_dialog $conn;
             return;
          }
-         $STATS_PAGE->show;
-         $MESSAGE_WINDOW->hide;
          unshift @dialog, new CFPlus::UI::Label
             max_w     => $::WIDTH * 0.4,
             ellipsise => 0,
             markup    => "\nOr use your keyboard and the text entry below:\n";
          unshift @dialog, my $table = new CFPlus::UI::Table;
          # left: re-roll
-         $table->add (0, 0, new CFPlus::UI::Button
+         $table->add_at (0, 0, new CFPlus::UI::Button
             text => "Roll Again",
             on_activate => sub {
                $conn->send ("reply y");
                destroy_query_dialog $conn;
                0
                   [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
                   [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
                ],
             ), 1 .. 2;
-         $table->add (2, 0, new CFPlus::UI::Button
+         $table->add_at (2, 0, new CFPlus::UI::Button
             text => "Swap Stats",
             on_activate => sub {
                $conn->{stat_change_with} = $sw2->{value};
                $conn->send ("reply $sw1->{value}");
                destroy_query_dialog $conn;
                0
             },
          );
-         $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
+         $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
          # right: accept
-         $table->add (4, 0, new CFPlus::UI::Button
+         $table->add_at (4, 0, new CFPlus::UI::Button
             text => "Accept",
             on_activate => sub {
                $conn->send ("reply n");
                $STATS_PAGE->hide;
                destroy_query_dialog $conn;
    status "logging in...";
    $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 /:/, $PROFILE->{host};
    $MAP = new CFPlus::Map;
          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;
    $LOGIN_BUTTON->set_text ("Login");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
    $SPELL_LIST->clear_spells;
+   $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+   &audio_music_set ([]);
    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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
+   $table->add_at (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>");
+   my $vidmode_tooltip =
+      "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
+    . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
-   $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+   $table->add_at (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_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
+   $hbox->add (my $mode_slider = new CFPlus::UI::Slider
-   $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]);
+      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");
+      tooltip => $vidmode_tooltip);
+   $hbox->add (my $mode_label = new CFPlus::UI::Label
+      align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
+      can_events => 1, tooltip => $vidmode_tooltip);
    $mode_slider->connect (changed => sub {
       my ($self, $value) = @_;
       $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
-      $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
+      $mode_label->set_text (sprintf '%dx%d@%d+%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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
-   $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
       state => $CFG->{fullscreen},
       tooltip => "Bring the client into fullscreen mode.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
-   $table->add (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
       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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+   $table->add_at (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_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
-   $table->add (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
+   $table->add_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
-   $table->add (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
       state => $CFG->{fow_enable},
       tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
-   $table->add (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new CFPlus::UI::Slider
       range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
       tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
-   $table->add (1, $row++, new CFPlus::UI::CheckBox
-      state => $CFG->{fow_smooth},
-      tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
-      on_changed => sub {
-         my ($self, $value) = @_;
-         $CFG->{fow_smooth} = $value;
-         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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
-   $table->add (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (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 },
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
-   $table->add (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new CFPlus::UI::Slider
       range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
       tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
       on_changed => sub {
          $CFG->{gauge_fontsize} = $_[1];
          &set_gauge_window_fontsize;
          0
       }
    );
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
-   $table->add (1, $row++, new CFPlus::UI::Slider
+   $table->add_at (1, $row++, new CFPlus::UI::Slider
       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
 }
 sub audio_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 => "Audio Enable");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
-   $table->add (1, $row++, new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, new CFPlus::UI::CheckBox
       state => $CFG->{audio_enable},
       tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
       on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
    );
-#   $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
+#   $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
-#   $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
+#   $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
 #      $CFG->{effects_volume} = $_[1];
 #   });
-   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
-   $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
+   $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
    $hbox->add (new CFPlus::UI::CheckBox
       expand => 1, state => $CFG->{bgm_enable},
       tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
       on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
    );
       expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
       tooltip => "The volume of the background music. Changes are instant.",
       on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
    );
-   $table->add (1, $row++, new CFPlus::UI::Button
+   $table->add_at (1, $row++, new CFPlus::UI::Button
       expand => 1, align => 0, text => "Apply",
       tooltip => "Apply the audio settings",
       on_activate => sub {
          audio_shutdown ();
          audio_init ();
 }
 sub debug_setup {
    my $table = new CFPlus::UI::Table;
-   $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
+   $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
-   $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
+   $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
-   $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
+   $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
-   $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
+   $table->add_at (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_at (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_at (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_at (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_at (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" } );
+   $table->add_at (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);
+   $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
-   for my $x (0..2) {
+   $table->add_at (7,7, my $t = new CFPlus::UI::Table);
-      for my $y (0 .. 2) {
+   $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
-         $table->add ($x + 3, $y,
+   $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
-            new CFPlus::UI::Entry
+   $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
-               text       => $default_smooth[$x * 3 + $y],
+   $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
-               on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
+   $t->add_at (1,1, new CFPlus::UI::Label text => "e");
-         );
-      }
-   }
    $table
 }
 sub stats_window {
       [2, 4, st_spd  => "Spd", 10.54],
       [2, 5, st_wspd => "WSp", 10.54],
    ) {
       my ($col, $row, $id, $label, $template) = @$_;
-      $tbl->add ($col    , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
+      $tbl->add_at ($col    , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
          font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
          align => +1, template => $template, tooltip => "#stat_$label");
-      $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
+      $tbl->add_at ($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
       cold  => ["Cold",
          "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
       ghit  => ["Ghost hit",
          "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
    );
    for (qw/slow holyw conf fire depl magic
            drain acid pois para deat phys
            blind fear tund elec cold ghit/)
    {
-      $tbl2->add ($col, $row,
+      $tbl2->add_at ($col, $row,
          $STATWIDS->{"res_$_"} =
             new CFPlus::UI::Label
                font       => $FONT_FIXED,
                template   => "-100%",
                align      => +1,
                valign     => 0,
                can_events => 1,
                can_hover  => 1,
                tooltip    => $resist_names{$_}->[1],
       );
-      $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
+      $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
          font       => $FONT_FIXED,
          can_hover  => 1,
          can_events => 1,
          path       => "ui/resist/resist_$_.png",
          tooltip    => $resist_names{$_}->[1],
       );
-      $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
+      $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
          text       => $resist_names{$_}->[0],
          font       => $FONT_FIXED,
          can_hover  => 1,
          can_events => 1,
          tooltip    => $resist_names{$_}->[1],
    return if $METASERVER_ATIME > time;
    $METASERVER_ATIME = time + 60;
    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...");
+   $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
    my $ok = 0;
    CFPlus::background {
       my $ua = CFPlus::lwp_useragent;
             "The time this server has been running without being restarted.",
             "The server software version - a '+' indicates a Crossfire+ server.",
             "Short information about this server provided by its admins.",
          );
          my @col = qw(#Users Host Uptime Version Description);
-         $table->add ($_, 0, new CFPlus::UI::Label
+         $table->add_at ($_, 0, new CFPlus::UI::Label
             can_hover => 1, can_events => 1,
             align => 0, fg => [1, 1, 0],
             text => $col[$_], tooltip => $tip[$_])
                for 0 .. $#col;
          my @align = qw(1 0 1 1 -1);
          my $y = 0;
-         for my $m (
-            sort {
-               $b->{version} <=> $a->{version}
-                  or $b->{users} <=> $a->{users}
-            }
-            @{ $msg->{servers} }
+         for my $m (@{ $msg->{servers} }) {
-         ) {
-            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
+            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
-               @$m{qw(ip age hostname users version description ibytes obytes uptime)};
+               @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
             for ($desc) {
                s/<br>/\n/gi;
                s/<li>/\n· /gi;
                s/<.*?>//sgi;
             $m = [$users, $host, $uptime, $version, $desc];
             $y++;
-            $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
+            $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
                (new CFPlus::UI::Button
                   text        => "Use",
                   tooltip     => "Put this server into the <b>Host:Port</b> field",
                   on_activate => sub {
                      $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
                   },
                ),
                (new CFPlus::UI::Empty expand => 1),
             ]);
-            $table->add ($_, $y, new CFPlus::UI::Label
+            $table->add_at ($_, $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]),
+                  fg         => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
                   can_hover  => 1,
                   can_events => 1,
                   fontsize   => 0.8)
                for 0 .. $#$m;
          }
    $vbox->add (new CFPlus::UI::FancyFrame
       label => "Connection Settings",
       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_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
    {
-      $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
+      $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
       $vbox->add (
          $HOST_ENTRY = new CFPlus::UI::Entry
             expand => 1,
             text => $CFG->{profile}{default}{host},
          on_activate => sub { $METASERVER->toggle_visibility; 0 },
          on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
       );
    }
-   $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
+   $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
-   $table->add (1, 4, new CFPlus::UI::Entry
+   $table->add_at (1, 4, new CFPlus::UI::Entry
       text => $CFG->{profile}{default}{user},
       tooltip => "The name of your character on the server",
       on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
    );
-   $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
+   $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
-   $table->add (1, 5, new CFPlus::UI::Entry
+   $table->add_at (1, 5, new CFPlus::UI::Entry
       text => $CFG->{profile}{default}{password},
       hidden => 1,
       tooltip => "The password for your character",
       on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
    );
-   $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
+   $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
-   $table->add (1, 7, new CFPlus::UI::Slider
+   $table->add_at (1, 7, new CFPlus::UI::Slider
       force_w => 100,
       range => [$CFG->{mapsize}, 10, 100, 0, 1],
       tooltip => "This is the size of the portion of the map update the server sends you. "
                . "If you set this to a high value you will be able to see further, "
                . "but you also increase bandwidth requirements and latency. "
                . "This option is only used once at log-in.",
       on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
    );
-   $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
+   $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
-   $table->add (1, 8, new CFPlus::UI::CheckBox
+   $table->add_at (1, 8, new CFPlus::UI::CheckBox
       state => $CFG->{face_prefetch},
       tooltip => "<b>Background Image Prefetch</b>\n\n"
                . "If enabled, the client automatically pre-fetches images from the server. "
                . "This might increase or create lag, but increases the chances "
                . "of faces being ready for display when you encounter them. "
                . "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_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
+   $table->add_at (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, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+   $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
-   $table->add (1, 9, new CFPlus::UI::Entry
+   $table->add_at (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_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
-   $table->add (1, 10, new CFPlus::UI::Entry
+   $table->add_at (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_at (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_at (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_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
       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
       }
    );
-   $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
-   $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
+   $table->add_at (1, $row++, 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
+   $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
-      label => "Server Info",
+   $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
-      child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+      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::Toplevel
       name      => "message_window",
    $window
 }
 sub autopickup_setup {
+   my $r = new CFPlus::UI::ScrolledWindow (
+      expand   => 1,
+      scroll_y => 1
+   );
-   my $table = new CFPlus::UI::Table;
+   $r->add (my $table = new CFPlus::UI::Table
+      row_expand => [0],
+      col_expand => [0, 1, 0, 1],
+   );
    for (
          ["General", 0, 0,
             ["Enable autopickup"       => PICKUP_NEWMODE, \$PICKUP_ENABLE],
             ["Inhibit autopickup"      => PICKUP_INHIBIT],
          ],
          ["Weight/Value ratio", 2, 17]
        )
    {
       my ($title, $x, $y, @bits) = @$_;
-      $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
+      $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
       for (@bits) {
          ++$y;
          my $mask = $_->[1];
-         $table->add ($x  , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
+         $table->add_at ($x  , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
-         $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
+         $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
             state => $::CFG->{pickup} & $mask,
             on_changed => sub {
                my ($box, $value) = @_;
                if ($value) {
          ${$_->[2]} = $checkbox if $_->[2];
       }
    }
-   $table->add (2, 18, new CFPlus::UI::ValSlider
+   $table->add_at (2, 18, new CFPlus::UI::ValSlider
       range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
       template => ">= 99",
       to_value => sub { ">= " . 5 * $_[0] },
       on_changed => sub {
          my ($slider, $value) = @_;
          $::CFG->{pickup} |= int $value
             if $value;
          1;
       });
-   $table->add (3, 18, new CFPlus::UI::Button
+   $table->add_at (3, 18, new CFPlus::UI::Button
       text => "set",
       on_activate => sub {
          $::CONN->send_command ("pickup $::CFG->{pickup}")
             if defined $::CONN;
          0
       });
-   $table
+   $r
 }
 my %SORT_ORDER = (
    type   => undef,
    mtime  => sub {
       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 (
       "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 ();
-      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;
-            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 $PROFILE->{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, $PROFILE->{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 (new CFPlus::UI::FancyFrame
-      label => "Options",
-      child => (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 (new CFPlus::UI::FancyFrame
-      label => "Bindings",
-      child => $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::Toplevel
       x       => 'center',
 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");
+   CFPlus::DB::get state => "tip_of_the_day", sub {
+      my ($todindex) = @_;
-   $todindex = 0 if $todindex >= @tod;
+      $todindex = 0 if $todindex >= @tod;
-   $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
+      CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
-   # create dialog
+      # create dialog
-   my $dialog;
+      my $dialog;
-   my $close = sub {
+      my $close = sub {
-      $dialog->destroy;
+         $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_at (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_at (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;
    };
-   $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";
 }
 sub video_init {
-   sdl_init;
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
    my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
-   ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
+   ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
    $FULLSCREEN = $CFG->{fullscreen};
    $FAST       = $CFG->{fast};
-   CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
+   CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
       or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
    $SDL_ACTIVE = 1;
    $LAST_REFRESH = time - 0.01;
          padding => 0,
          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
          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::Toplevel
          title   => "Setup",
          name    => "setup_dialog",
       $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_at (0, $row, new CFPlus::UI::Label text => "Name:");
+         $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
+      }
+      if ($info->{has_text}) {
+         $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
+         $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
+      }
+      if ($info->{has_connection}) {
+         $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
+         $table->add_at (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;
 }
-my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
-my $bgmusic;#TODO#hack#d#
 sub audio_channel_finished {
    my ($channel) = @_;
    #warn "channel $channel finished\n";#d#
 }
+sub audio_music_set {
+   my ($songs) = @_;
+   my @want =
+      grep $_,
+         map $CONN->{music_meta}{$_},
+            @$songs;
+   if (@want) {
+      @MUSIC_WANT = @want;
+      &audio_music_changed ();
+   }
+}
+sub audio_music_start {
+   my $path = $MUSIC_PLAYING->{path}
+      or return;
+   CFPlus::DB::prefetch_file $path, 1024_000, sub {
+      # music might have changed...
+      $path eq $MUSIC_PLAYING->{path}
+         or return &audio_music_start ();
+      $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
+      my $NOW = time;
+      if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
+         my $pos = $MUSIC_PLAYING->{stop_pos};
+         $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
+         $MUSIC_START = time - $pos;
+      } else {
+         $MUSIC_PLAYER->play (0);
+         $MUSIC_START = time;
+      }
+      delete $MUSIC_PLAYING->{stop_time};
+      delete $MUSIC_PLAYING->{stop_pos};
+   }
+}
+sub audio_music_changed {
+   return unless $CFG->{bgm_enable};
+   # default MUSIC_WANT == MUSIC_DEFAULT
+   @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
+   # if the currently playing song is acceptable, let it continue
+   return if $MUSIC_PLAYING
+             && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
+   my $NOW = time;
+   if ($MUSIC_PLAYING) {
+      $MUSIC_PLAYING->{stop_time} = $NOW;
+      $MUSIC_PLAYING->{stop_pos}  = $NOW - $MUSIC_START;
+      CFPlus::MixMusic::fade_out 1000;
+   } else {
+      # sort by stop time, oldest first
+      @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
+      # if the most recently-played piece played very recently,
+      # resume it, else choose the oldest piece for rotation.
+      $MUSIC_PLAYING =
+         $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
+            ? $MUSIC_WANT[-1]
+            : $MUSIC_WANT[0];
+      audio_music_start;
+   }
+}
 sub audio_music_finished {
-   return unless $CFG->{bgm_enable};
+   $MUSIC_PLAYING = undef;
+   undef $MUSIC_PLAYER;
-   # TODO: hack, do play loop and mood music
+   audio_music_changed;
-   $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
-   $bgmusic->play (0);
-   push @bgmusic, shift @bgmusic;
 }
 sub audio_init {
    if ($CFG->{audio_enable}) {
       if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
    debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
    $CFPlus::UI::ROOT->draw;
    $WANT_REFRESH = 0;
-   $CAN_REFRESH = 0;
+   $CAN_REFRESH  = 0;
    $LAST_REFRESH = $NOW;
    CFPlus::SDL_GL_SwapBuffers;
 }
 my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
    $NOW = time;
    ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
-      for CFPlus::SDL_PollEvent;
+      for CFPlus::poll_events;
    if (%animate_object) {
       $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
-      $WANT_REFRESH++;
+      ++$WANT_REFRESH;
    }
    if ($WANT_REFRESH) {
       force_refresh;
    } else {
       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 %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
+#      printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#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,
-      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    => 'chat',
+      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,
+      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
+   @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
-                   grep $_->[0] >= 640 && $_->[1] >= 480,
+   @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
-                      CFPlus::SDL_ListModes;
    @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+   @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
    {
       my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
 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.133 by root, Sun Dec 3 01:03:49 2006 UTC vs. Revision 1.180 by root, Sat Jul 21 13:37:09 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.133 by root, Sun Dec 3 01:03:49 2006 UTC vs.
Revision 1.180 by root, Sat Jul 21 13:37:09 2007 UTC