--- deliantra/Deliantra-Client/bin/cfplus 2007/04/09 04:39:11 1.148
+++ deliantra/Deliantra-Client/bin/cfplus 2007/07/12 19:13:20 1.166
@@ -1,6 +1,7 @@
#!/opt/bin/perl
my $startup_done = sub { };
+our $PANGO = "1.5.0";
# do splash-screen thingy on win32
BEGIN {
@@ -31,17 +32,38 @@
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")
- unless -e "$ENV{PAR_TEMP}/$1";
+ $zip->extractMember ($_, "$tmp/$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
+
+ 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, $ENV{PAR_TEMP};
+ unshift @INC, $tmp;
}
}
@@ -139,6 +161,10 @@
our %SDL_CB;
our $SDL_MIXER;
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our @MUSIC_WANT;
+our $MUSIC_PLAYING;
+our $MUSIC_PLAYER;
our @SOUNDS; # event => file mapping
our %AUDIO_CHUNKS; # audio files
@@ -209,7 +235,7 @@
;
my @dialog = my $label = new CFPlus::UI::Label
- max_w => $::WIDTH * 0.4,
+ max_w => $::WIDTH * 0.8,
ellipsise => 0,
text => $prompt;
@@ -236,13 +262,11 @@
$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";
@@ -265,6 +289,29 @@
},
);
+ if ($conn->{chargen_race_description}) {
+ unshift @dialog, new CFPlus::UI::Label
+ max_w => $::WIDTH * 0.8,
+ ellipsise => 0,
+ markup => "$conn->{chargen_race_description}",
+ ;
+ }
+
+ 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 => "Race: $conn->{chargen_race_title}",
+ ;
+ }
+
unshift @dialog, new CFPlus::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
@@ -422,6 +469,10 @@
mapmap => $MAPMAP,
query => \&server_query,
+ setup_req => {
+ smoothing => $CFG->{map_smoothing}*1,
+ },
+
sound_play => sub {
my ($x, $y, $soundnum, $type) = @_;
@@ -451,6 +502,9 @@
$SETUP_DIALOG->show;
$PL_WINDOW->hide;
$SPELL_LIST->clear_spells;
+ $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+
+ &audio_music_set ([]);
return unless $CONN;
@@ -503,6 +557,23 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
);
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+ $table->add (1, $row++, new CFPlus::UI::Slider
+ range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
+ tooltip => "The base font size used by most GUI elements that do not have their own setting.",
+ on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
+ );
+
+ $table->add (1, $row++, new CFPlus::UI::Button
+ expand => 1, align => 0, text => "Apply",
+ tooltip => "Apply the video settings above.",
+ on_activate => sub {
+ video_shutdown ();
+ video_init ();
+ 0
+ }
+ );
+
$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
$table->add (1, $row++, new CFPlus::UI::Slider
range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
@@ -510,6 +581,15 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
);
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
+ $table->add (1, $row++, new CFPlus::UI::CheckBox
+ state => $CFG->{map_smoothing},
+ tooltip => "Map Smoothing tries to make tile borders less square. "
+ . "This increases load on the graphics subsystem and works only with 2.x servers. "
+ . "Changes take effect at next connection only.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
+ );
+
$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
$table->add (1, $row++, new CFPlus::UI::CheckBox
state => $CFG->{fow_enable},
@@ -536,13 +616,6 @@
}
);
- $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
- $table->add (1, $row++, new CFPlus::UI::Slider
- range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The base font size used by most GUI elements that do not have their own setting.",
- on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
- );
-
$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
$table->add (1, $row++, new CFPlus::UI::Slider
range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
@@ -572,16 +645,6 @@
}
);
- $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
}
@@ -692,7 +755,7 @@
$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);
@@ -1100,12 +1163,25 @@
},
);
- $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry
+ $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, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
+ $table->add (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 \" in the map window. "
- . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
- . "But you could also set it to tell playername to only chat with that user.",
+ . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
+ . "But you could also set it to tell playername to only chat with that user.",
on_changed => sub {
my ($self, $value) = @_;
$CFG->{say_command} = $value;
@@ -1113,8 +1189,8 @@
}
);
- $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
- $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+ $table->add (1, $row++, new CFPlus::UI::CheckBox
state => $CFG->{show_tips},
tooltip => "Show the Tip of the day window at startup?",
on_changed => sub {
@@ -1124,12 +1200,20 @@
}
);
- $vbox->add (new CFPlus::UI::FancyFrame
- label => "Server Info",
- child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
+ $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
+ text => $CFG->{logview_max_par},
+ tooltip => "This is maximum number of messages remembered in the Messages window. If the server "
+ . "sends more messages than this number, older messages get removed to save memory and "
+ . "computing time. A value of 0 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 {
@@ -1379,7 +1463,7 @@
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,
@@ -1401,6 +1485,8 @@
"Toggles the inventory window, where you can manage your loot (or treasures :). "
. "You can also hit the Tab-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);
@@ -1713,7 +1799,8 @@
indent => -4,
can_hover => 1,
can_events => 1,
- tooltip => "Server Log. This text viewer contains all the messages sent by the server.",
+ max_par => $CFG->{logview_max_par},
+ tooltip => "Server Log. This text viewer contains all recent messages sent by the server.",
;
$SETUP_DIALOG = new CFPlus::UI::Toplevel
@@ -1734,8 +1821,8 @@
$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,
- "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
+ $SETUP_NOTEBOOK->add (Client => client_setup,
+ "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,
@@ -1923,23 +2010,65 @@
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_finished {
+sub audio_music_set {
+ my ($songs) = @_;
+
+ my $count = @$songs;
+ my @meta;
+
+ for my $name (@$songs) {
+ CFPlus::DB::get resmap => $name, sub {
+ my ($data) = @_;
+
+ if ($data) {
+ $data = JSON::XS->new->utf8->decode ($data);
+ $data->{path} = CFPlus::DB::path_of $name;
+ push @meta, $data;
+ }
+
+ unless (--$count) {
+ if (@meta) {
+ @MUSIC_WANT = @meta;
+ &audio_music_changed ();
+ }
+ }
+ };
+ }
+}
+
+sub audio_music_changed {
return unless $CFG->{bgm_enable};
- # TODO: hack, do play loop and mood music
- $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
- $bgmusic->play (0);
+ # 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;
+
+ if ($MUSIC_PLAYING) {
+ CFPlus::MixMusic::fade_out 1000;
+ } else {
+ my $music = $MUSIC_WANT [rand @MUSIC_WANT];
+
+ $MUSIC_PLAYING = $music;
- push @bgmusic, shift @bgmusic;
+ $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
+ $MUSIC_PLAYER->play (0);
+ }
+}
+
+sub audio_music_finished {
+ $MUSIC_PLAYING = undef;
+ undef $MUSIC_PLAYER;
+
+ audio_music_changed;
}
sub audio_init {
@@ -2044,7 +2173,7 @@
%SDL_CB = (
CFPlus::SDL_QUIT => sub {
- Event::unloop -1;
+ exit;
},
CFPlus::SDL_VIDEORESIZE => sub {
},
@@ -2092,33 +2221,35 @@
CFPlus::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
- sdl_mode => 0,
- width => 640,
- height => 480,
- fullscreen => 0,
- fast => 0,
- map_scale => 1,
- fow_enable => 1,
- fow_intensity => 0.45,
- fow_smooth => 0,
- gui_fontsize => 1,
- log_fontsize => 0.7,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- mapsize => 100,
- say_command => 'chat',
- audio_enable => 1,
- bgm_enable => 1,
- bgm_volume => 0.25,
- face_prefetch => 0,
- output_sync => 1,
- output_count => 1,
- output_rate => "",
- pickup => 0,
- inv_sort => "mtime",
- default => "profile", # default profile
- show_tips => 1,
+ sdl_mode => 0,
+ width => 640,
+ height => 480,
+ fullscreen => 0,
+ fast => 0,
+ map_scale => 1,
+ fow_enable => 1,
+ fow_intensity => 0.45,
+ fow_smooth => 0,
+ map_smoothing => 1,
+ gui_fontsize => 1,
+ log_fontsize => 0.7,
+ gauge_fontsize => 1,
+ gauge_size => 0.35,
+ stat_fontsize => 0.7,
+ mapsize => 100,
+ say_command => 'chat',
+ audio_enable => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.25,
+ face_prefetch => 0,
+ output_sync => 1,
+ output_count => 1,
+ output_rate => "",
+ pickup => 0,
+ inv_sort => "mtime",
+ default => "profile", # default profile
+ show_tips => 1,
+ logview_max_par => 1000,
);
while (my ($k, $v) = each %DEF_CFG) {
@@ -2197,7 +2328,10 @@
#CFPlus::SDL_Quit;
#CFPlus::_exit 0;
-END { CFPlus::SDL_Quit }
+END {
+ CFPlus::SDL_Quit;
+ CFPlus::DB::Server::stop;
+}
=head1 NAME