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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC vs.
Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC

       use Coro;
       use Coro::EV;
       use Coro::Debug;
       our $debug = new_unix_server Coro::Debug "/tmp/dc";
    ';
+   die if $@;
 }
 # do splash-screen thingy on win32
 my $startup_done = sub { };
 BEGIN {
          $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
       }
       require Win32::GUI::SplashScreen;
-      # initialise the resolver now, as vista forces us back to the desktop
-      # when doing this.
-      use AnyEvent::DNS ();
-      AnyEvent::DNS::resolver;
       Win32::GUI::SplashScreen::Show (
          -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
       );
+      # initialise the resolver now, as vista forces us back to the desktop
+      # when doing this later.
+      require AnyEvent::DNS;
+      AnyEvent::DNS::resolver ();
       $startup_done = sub {
          Win32::GUI::SplashScreen::Done (1);
       };
    }
 our $NOW;
 our $CFG;
 our $PROFILE; # current profile
 our $FAST; # fast, low-quality mode, possibly useful for software-rendering
+our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
 our $WANT_REFRESH;
 our $MODE_SLIDER;
 our $CAVEAT_LABEL;
    audio_music_push;
 }
 sub audio_init {
    if ($CFG->{audio_enable}) {
+      if (length $CFG->{audio_driver}) {
+         local $ENV{SDL_AUDIODRIVER} = $CFG->{audio_driver};
+         DC::SDL_Init DC::SDL_INIT_AUDIO
+            and die "SDL::Init failed!\n";
+      } else {
+         DC::SDL_Init DC::SDL_INIT_AUDIO
+            and die "SDL::Init failed!\n";
+      }
       $ENV{MIX_EFFECTSMAXSPEED} = 1;
       $SDL_MIXER = !DC::Mix_OpenAudio
          $CFG->{audio_hw_frequency},
          DC::MIX_DEFAULT_FORMAT,
          $CFG->{audio_hw_channels},
    %AUDIO_PLAY   = ();
    %AUDIO_CHUNK  = ();
    DC::Mix_CloseAudio if $SDL_MIXER;
    undef $SDL_MIXER;
+   DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
 }
 #############################################################################
 sub destroy_query_dialog {
          user => $PROFILE->{user},
          pass => $PROFILE->{password},
          mapw => $mapw,
          maph => $maph,
+         c_version => {
+            client     => "deliantra",
-         client => "$DC::VERSION $] $^O",
+            clientver  => $DC::VERSION,
+            gl_vendor  => DC::OpenGL::gl_vendor,
+            gl_version => DC::OpenGL::gl_version,
+         },
          map_widget => $MAPWIDGET,
          statusbox  => $STATUSBOX,
          map        => $MAP,
          mapmap     => $MAPMAP,
    # hack to make SURE we find the IP address all right
    # can be removed once AnyEvent::DNS is proven stable.
    if ($host eq "gameserver.deliantra.net") {
       AnyEvent::DNS::a "dnstest.deliantra.net", sub {
-         if ($_[0] ne "80.101.114.108") { # Perl
+         if ($_[0] ne "80.101.114.108") { # P-e-r-l
             status "dns failure, trying differently";
             $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
             unless (defined $host) {
                status "dns failure, using hardcoded address";
-               $host = "129.13.162.95";
+               $host = "194.126.175.154";
             }
          }
          dc_connect $host, $port;
       };
    ]);
    my $text = !$freq
       ? "audio is off"
       : "audio is enabled\n"
+         . "driver: " . DC::SDL_AudioDriverName . "\n"
-      . "frequency (Hz): $freq\n"
+         . "frequency (Hz): $freq\n"
-      . "channels: $chans\n"
+         . "channels: $chans\n"
-      . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
+         . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
-      . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
+         . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
    $AUDIO_INFO->set_text ($text);
 }
 sub audio_setup {
    $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
    my $row = 0;
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
-   $table->add_at (1, $row++, new DC::UI::CheckBox
+   $table->add_at (1, $row, new DC::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]; 1 }
+   );
+   $table->add_at (2, $row++, my $driver = new DC::UI::HBox expand => 1);
+   $driver->add (new DC::UI::Label align => 1, text => "     Audio driver override");
+   $driver->add (new DC::UI::Entry
+      text => $CFG->{audio_driver},
+      template => "dsound1234",
+      tooltip => "You can override the audio driver to use here. Leaving it empty will result "
+               . "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
+               . "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
+               . "or other system-specific drivers. Selecting the wrong driver here will simply result"
+               . "in no sound.",
+      on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
    );
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
    $table->add_at (1, $row, new DC::UI::CheckBox
       expand => 1, state => $CFG->{effects_enable},
    );
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
    $table->add_at (1, $row, new DC::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.",
+      tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
       on_changed => sub {
          $CFG->{bgm_enable} = $_[1];
          $CONN->update_fx_want if $CONN;
          audio_music_push;
          1
       c_colspan => 2, expand => 1,
       value => $CFG->{audio_hw_frequency},
       options => [
          [    0, "default" , "Use System Default"],
          [11025, "11 kHz"  , "11kHz (low quality)"],
-         [22050, "22 kHz"  , "22kHz (reduced quality)"],
+         [22050, "22 kHz"  , "22kHz (reduced quality, recommended)"],
          [44100, "44.1 kHz", "44.1kHz (cd quality)"],
-         [48000, "48 kHz"  , "48kHz (studio quality)"],
+         [48000, "48 kHz"  , "48kHz (studio quality, not recommended)"],
       ],
       tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
       on_changed => sub {
          $CFG->{audio_hw_frequency} = $_[1];
          audio_tab_update;
    $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
    $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
       c_colspan => 2, expand => 1,
       value => $CFG->{audio_hw_chunksize},
       tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
-                 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
+                 . "is stuttering, increase this value. Values of 50-150ms are optimal.",
       on_changed => sub {
          $CFG->{audio_hw_chunksize} = $_[1];
          audio_tab_update;
          1
       }
    &set_gauge_window_fontsize;
    $win
 }
+our $BW_WATCHER;
+sub debug_toggle($) {
+   $DELIANTRA_DEBUG ^= $_[0];
+   if ($DELIANTRA_DEBUG & 16) {
+      $BW_WATCHER = EV::periodic 0, 1, 0, sub {
+         return unless $CONN;
+         debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
+         $CONN->{octets_in} = 0;
+      };
+   } else {
+      undef $BW_WATCHER;
+   }
+}
 sub debug_setup {
    my $table = new DC::UI::Table;
    $table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
-   $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
+   $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle  1; 0 });
    $table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
-   $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
+   $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle  2; 0 });
    $table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
-   $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
+   $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle  4; 0 });
    $table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
-   $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+   $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle  8; 0 });
+   $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
+   $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
-   $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
+   $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
-   $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
+   $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
    $table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
    $t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
    $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
    $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
       para  => ["Paralysation",
          "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
       deat  => ["Death",
          "<b>Death</b> (resistance against death spells)"],
       phys  => ["Physical",
-         "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
+         "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed as the 'Arm' secondary stat.)"],
       blind => ["Blind",
          "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
       fear  => ["Fear",
          "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
       tund  => ["Turn undead",
    $r
 }
 my %SORT_ORDER = (
    type   => sub {
+      use sort 'stable';
       sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
    },
    mtime  => sub {
+      use sort 'stable';
-                my $NOW = time;
+      my $NOW = time;
-                sort {
+      sort {
-                   my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
+         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;
+         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 $btime <=> $atime
+            or $btime <=> $atime
-                      or $a->{type} <=> $b->{type}
+            or $a->{type} <=> $b->{type}
-                } @_
+      } @_
-             },
+   },
-   weight => sub { sort {
+   weight => sub {
+      use sort 'stable';
+      sort {
-                $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+         $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
-                   or $a->{type} <=> $b->{type}
+            or $a->{type} <=> $b->{type}
-             } @_ },
+      } @_
+   },
 );
 sub inventory_widget {
    my $hb = new DC::UI::HBox homogeneous => 1;
       $dialog->show;
    };
 }
-sub sdl_init {
-   DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
-      and die "SDL::Init failed!\n";
-}
 sub video_init {
    DC::set_theme $CFG->{uitheme};
    DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
    $SDL_REINIT = 0;
       $DEBUG_STATUS = new DC::UI::Label
          padding => 0,
          z       => 100,
          force_x => "max",
-         force_y => 0;
+         force_y => 20;
       $DEBUG_STATUS->show;
       $STATUSBOX = new DC::UI::Statusbox;
       $MODBOX = new DC::UI::Label
 my $animate_timer;
 my $fps = 9;
 sub force_refresh {
-   if ($ENV{CFPLUS_DEBUG} & 4) {
+   if ($DELIANTRA_DEBUG & 4) {
       $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
       debug sprintf "%3.2f", $fps;
    }
    undef $WANT_REFRESH;
          $CFG->{$k} = $v unless exists $CFG->{$k};
       }
       my @args = @ARGV;
+      # OS X passes some process serial number of other shit. they
+      # could have used an env var or any other sane mechanism. but
+      # would it be os x then? no...
+      shift @args if $args[0] =~ /^-psn_/;
       my $profile = 'default';
       for (my $i = 0; $i < @args; $i++) {
          if ($args[$i] =~ /^--?profile$/) {
             $profile = $args[$i + 1];
                   action   => $cmds,
                };
             }
          }
       }
-      sdl_init;
       $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
       $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
       {
 #      }
 #      my $t2 = Time::HiRes::time;
 #      warn $t2-$t1;
 #   }
+      DC::IMG_Init;
       video_init;
       audio_init;
    }
    show_tip_of_the_day if $CFG->{show_tips};
    our $STARTUP_CANCEL = EV::idle sub {
       undef $::STARTUP_CANCEL;
       $startup_done->();
    };
+   debug_toggle 0;
    delete $SIG{__DIE__};
    EV::loop;
    DC::write_cfg if $CFG->{config_autosave};
 The deliantra client utilises OpenGL for all UI elements and the game. It
 is supposed to be used in fullscreen mode and interactively.
 =head1 DEBUGGING
-CFPLUS_DEBUG - environment variable
+DELIANTRA_DEBUG - environment variable
    1   draw borders around widgets
    2   add low-level widget info to tooltips
    4   show fps
    8   suppress tooltips
+  16   show bandwidth downstream
 =head1 AUTHOR
 Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents): Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC vs. Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.105 by root, Sat Apr 3 02:58:25 2010 UTC vs.
Revision 1.118 by root, Mon Dec 26 03:58:12 2011 UTC