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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 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}
 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;
       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 ("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";
    $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>");
+   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, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
    $table->add (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]);
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
    $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
       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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map 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.",
       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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smoothing");
    $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 => "Message Fontsize");
    $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 { die "violator" } );
+   $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) {
-         $table->add ($x + 3, $y,
-            new CFPlus::UI::Entry
-               text       => $default_smooth[$x * 3 + $y],
-               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
 }
    $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],
          $::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
    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;
       $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 (Client   => client_setup,
          "Configure various client-specific settings.");
-      $SETUP_NOTEBOOK->add (Pickup   => autopickup_setup,
-         "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
       $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,
    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 {
    CFPlus::SDL_VIDEOEXPOSE => sub {
       CFPlus::UI::full_refresh;
    },
    CFPlus::SDL_ACTIVEEVENT => sub {
 #      not useful, as APPACTIVE include sonly iconified state, not unmapped
-#      printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
+#      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 {
       height          => 480,
       fullscreen      => 0,
       fast            => 0,
       map_scale       => 1,
       fow_enable      => 1,
-      fow_intensity   => 0.45,
+      fow_intensity   => 0,
-      fow_smooth      => 0,
+      fow_smooth      => 1,
       map_smoothing   => 1,
       gui_fontsize    => 1,
       log_fontsize    => 0.7,
       gauge_fontsize  => 1,
       gauge_size      => 0.35,
       }
    }
    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)";
    $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
    {

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC vs. Revision 1.174 by root, Tue Jul 17 18:34:24 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.151 by root, Mon Apr 16 21:12:51 2007 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 2007 UTC