--- deliantra/Deliantra-Client/bin/cfplus 2007/07/21 13:37:09 1.180
+++ deliantra/Deliantra-Client/bin/cfplus 2007/08/01 14:27:21 1.199
@@ -73,6 +73,7 @@
use Time::HiRes 'time';
use Event;
+use List::Util qw(max min);
use Crossfire;
use Crossfire::Protocol::Constants;
@@ -84,8 +85,10 @@
use CFPlus::Protocol;
use CFPlus::DB;
use CFPlus::UI;
+use CFPlus::UI::Canvas;
use CFPlus::UI::Inventory;
use CFPlus::UI::SpellList;
+use CFPlus::UI::MessageWindow;
use CFPlus::Pod;
use CFPlus::MapWidget;
use CFPlus::Macro;
@@ -127,8 +130,6 @@
our $MAPMAP;
our $MAPWIDGET;
our $BUTTONBAR;
-our $LOGVIEW;
-our $CONSOLE;
our $METASERVER;
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
@@ -160,16 +161,6 @@
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 $DEBUG_STATUS;
@@ -180,8 +171,7 @@
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]);
@@ -193,15 +183,238 @@
sub message {
my ($para) = @_;
+ $MESSAGE_WINDOW->message ($para);
+}
+
+#############################################################################
+#TODO: maybe move into own audio module...
+
+our $SDL_MIXER;
+
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our $MUSIC_WANT; # arryref of ambient music we want to play
+our @MUSIC_HAVE; # ambient music we have on disk
+our $MUSIC_START;
+our @MUSIC_JINGLE; # which jingles to play next
+our $MUSIC_PLAYING_DATA;
+our $MUSIC_PLAYING_META;
+our $MUSIC_PLAYER;
+our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
+
+our %AUDIO_CHUNK; # audio "files"
+our %AUDIO_PLAY; # which audio faces should be played
+
+sub audio_channel_finished {
+ my ($channel) = @_;
+
+# warn "channel $channel finished\n";#d#
+}
+
+sub audio_sound_push($) {
+ my ($face) = @_;
+
+ $CFG->{effects_enable}
+ or return;
+
+ if (my $chunk = $AUDIO_CHUNK{$face}) {
+ for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
+ my (undef, $dx, $dy, $vol) = @$_;
+
+ my $channel = CFPlus::Channel::find;
+ $channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
+ $dx = $dx / 10 * 255;
+ $channel->set_panning (255 - $dx, 255 + $dx);
+
+# my $angle = $dx ? : $dx < 0 ?
+# my $distance = -$vol;
+# $channel->set_position ($angle, $distance);
+
+ $chunk->play ($channel);
+ }
+ } else {
+ # sound_meta not set means data is in flight either way
+ my $meta = $CONN->{sound_meta}{$face}
+ or return;
+
+ # if its a jingle, play it as ambient music
+ if ($meta->{meta}{jingle}) {
+ delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue
+ push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
+ &audio_music_push ($face);
+ } else {
+ # fetch from database
+ CFPlus::DB::get res_data => $meta->{name}, sub {
+ my $rwops = new CFPlus::RW $_[0];
+ my $chunk = new CFPlus::MixChunk $rwops;
+ $chunk->volume (($meta->{meta}{volume} || 1) * 128);
+ $AUDIO_CHUNK{$face} = $chunk;
+
+ audio_sound_push ($face);
+ };
+ }
+ }
+}
+
+sub audio_sound_play {
+ my ($face, $dx, $dy, $vol) = @_;
+
+ $SDL_MIXER
+ or return;
+ $CFG->{effects_enable}
+ or return;
- my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+ my $queue = $AUDIO_PLAY{$face} ||= [];
+ push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
+ audio_sound_push $face
+ unless @$queue > 1;
+}
+
+sub audio_music_update_volume {
+ return unless $MUSIC_PLAYING_META;
+ my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
+ my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
+ CFPlus::MixMusic::volume $base * $volume * 128;
+}
+
+sub audio_music_start {
+ my $meta = $MUSIC_PLAYING_META;
+
+ CFPlus::DB::get res_data => $meta->{name}, sub {
+ return unless $SDL_MIXER;
+
+ # music might have changed...
+ $meta eq $MUSIC_PLAYING_META
+ or return &audio_music_start ();
+
+ audio_music_update_volume;
- $para->{markup} = "$time $para->{markup}";
+ $MUSIC_PLAYING_DATA = \$_[0];
+
+ my $rwops = $meta->{path}
+ ? new_from_file CFPlus::RW $meta->{path}
+ : new CFPlus::RW $$MUSIC_PLAYING_DATA;
+
+ $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
+ or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
+
+ my $NOW = time;
+
+ if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
+ my $pos = $MUSIC_PLAYING_META->{stop_pos};
+ $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
+ $MUSIC_START = time - $pos;
+ } else {
+ $MUSIC_PLAYER->play (0);
+ $MUSIC_START = time;
+ }
- $LOGVIEW->add_paragraph ($para);
- $LOGVIEW->scroll_to_bottom;
+ delete $MUSIC_PLAYING_META->{stop_time};
+ delete $MUSIC_PLAYING_META->{stop_pos};
+ }
}
+sub audio_music_push {
+ return unless $SDL_MIXER;
+
+ my $fade_out;
+
+ if (@MUSIC_JINGLE) {
+ @MUSIC_HAVE = $MUSIC_JINGLE[0];
+ $fade_out = 333;
+ } else {
+ return unless $CFG->{bgm_enable};
+
+ my @have =
+ grep $_,
+ map $CONN->{music_meta}{$_},
+ @$MUSIC_WANT;
+
+ @MUSIC_HAVE = @have
+ if @have;
+
+ # default MUSIC_HAVE == MUSIC_DEFAULT
+ @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
+ $fade_out = 1000;
+ }
+
+ # if the currently playing song is acceptable, let it continue
+ return if $MUSIC_PLAYING_META
+ && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
+
+ my $NOW = time;
+
+ if ($MUSIC_PLAYING_META) {
+ $MUSIC_PLAYING_META->{stop_time} = $NOW;
+ $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
+ CFPlus::MixMusic::fade_out $fade_out;
+ } else {
+ # sort by stop time, oldest first
+ @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
+
+ # if the most recently-played piece played very recently,
+ # resume it, else choose the oldest piece for rotation.
+ $MUSIC_PLAYING_META =
+ $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
+ ? $MUSIC_HAVE[-1]
+ : $MUSIC_HAVE[0];
+
+ audio_music_start;
+ }
+}
+
+sub audio_music_set_ambient {
+ my ($songs) = @_;
+
+ $MUSIC_WANT = $songs;
+ audio_music_push;
+}
+
+sub audio_music_finished {
+ # we compress multiple jingles of the same type
+ shift @MUSIC_JINGLE
+ while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
+
+ undef $MUSIC_PLAYER;
+ undef $MUSIC_PLAYING_META;
+ undef $MUSIC_PLAYING_DATA;
+
+ audio_music_push;
+}
+
+sub audio_init {
+ if ($CFG->{audio_enable}) {
+ $ENV{MIX_EFFECTSMAXSPEED} = 1;
+ $SDL_MIXER = !CFPlus::Mix_OpenAudio;
+
+ unless ($SDL_MIXER) {
+ status "Unable to open sound device: there will be no sound";
+ return;
+ }
+
+ CFPlus::Mix_AllocateChannels 16;
+
+ audio_music_finished;
+ } else {
+ undef $SDL_MIXER;
+ }
+}
+
+sub audio_shutdown {
+ undef $MUSIC_PLAYER;
+ undef $MUSIC_PLAYING_META;
+ undef $MUSIC_PLAYING_DATA;
+
+ $MUSIC_WANT = [];
+ @MUSIC_JINGLE = ();
+ %AUDIO_PLAY = ();
+ %AUDIO_CHUNK = ();
+
+ CFPlus::Mix_CloseAudio if $SDL_MIXER;
+ undef $SDL_MIXER;
+}
+
+#############################################################################
+
sub destroy_query_dialog {
(delete $_[0]{query_dialog})->destroy
if $_[0]{query_dialog};
@@ -462,7 +675,6 @@
client => "cfplus $CFPlus::VERSION $] $^O",
map_widget => $MAPWIDGET,
- logview => $LOGVIEW,
statusbox => $STATUSBOX,
map => $MAP,
mapmap => $MAPMAP,
@@ -471,18 +683,6 @@
setup_req => {
smoothing => $CFG->{map_smoothing}*1,
},
-
- sound_play => sub {
- my ($x, $y, $soundnum, $type) = @_;
-
- $SDL_MIXER
- or return;
-
- my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
- or return;
-
- $chunk->play;
- },
};
if ($CONN) {
@@ -503,7 +703,7 @@
$SPELL_LIST->clear_spells;
$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
- &audio_music_set ([]);
+ &audio_music_set_ambient ([]);
return unless $CONN;
@@ -615,7 +815,7 @@
$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 message/server log window only. Changes are instant.",
- on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
+ on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
);
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
@@ -646,7 +846,7 @@
sub audio_setup {
my $vbox = new CFPlus::UI::VBox;
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+ $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
my $row = 0;
@@ -660,21 +860,34 @@
# $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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
+ $table->add_at (1, $row, new CFPlus::UI::CheckBox
+ expand => 1, state => $CFG->{effects_enable},
+ tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
+ on_changed => sub { $CFG->{effects_enable} = $_[1]; 0 }
+ );
+ $table->add_at (2, $row++, new CFPlus::UI::Slider
+ expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
+ tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
+ . "is set highest and you use your operating system volume setting. Changes are instant.",
+ on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
+ );
+
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
- $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
- $hbox->add (new CFPlus::UI::CheckBox
+ $table->add_at (1, $row, 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 }
);
- $hbox->add (new CFPlus::UI::Slider
+ $table->add_at (2, $row++, new CFPlus::UI::Slider
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 }
+ on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
);
$table->add_at (1, $row++, new CFPlus::UI::Button
- expand => 1, align => 0, text => "Apply",
+ c_colspan => 2, expand => 1, align => 0, text => "Apply",
tooltip => "Apply the audio settings",
on_activate => sub {
audio_shutdown ();
@@ -754,13 +967,39 @@
$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
- $table->add_at (7,7, my $t = new CFPlus::UI::Table);
- $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
- $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
- $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
- $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
+ $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
+ $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
+ $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
+ $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
+ $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
$t->add_at (1,1, new CFPlus::UI::Label text => "e");
+ $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
+
+ $c->add_items ({
+ type => "line_loop",
+ color => [0, 1, 0],
+ width => 9,
+ coord_mode => "abs",
+ coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
+ });
+
+ $c->add_items ({
+ type => "lines",
+ color => [1, 1, 0],
+ width => 2,
+ coord_mode => "rel",
+ coord => [[0,0], [1,1], [1,0], [0,1]],
+ });
+
+ $c->add_items ({
+ type => "polygon",
+ color => [0, 0.43, 0],
+ width => 2,
+ coord_mode => "rel",
+ coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
+ });
+
$table
}
@@ -1067,7 +1306,7 @@
on_changed => sub {
my ($self, $value) = @_;
$CFG->{profile}{default}{host} = $value;
- 0
+ 1
}
);
@@ -1077,7 +1316,7 @@
other => $METASERVER,
tooltip => "Show a list of available crossfire servers",
on_activate => sub { $METASERVER->toggle_visibility; 0 },
- on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
+ on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
);
}
@@ -1085,7 +1324,7 @@
$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 }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
);
$table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
@@ -1093,7 +1332,7 @@
text => $CFG->{profile}{default}{password},
hidden => 1,
tooltip => "The password for your character",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
);
$table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
@@ -1104,53 +1343,41 @@
. "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_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
- $table->add_at (1, 8, new CFPlus::UI::CheckBox
- state => $CFG->{face_prefetch},
- tooltip => "Background Image Prefetch\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. "
- . "It also uses up server bandwidth on every connect, "
- . "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 },
+ on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
);
- $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
+ $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
+ $table->add_at (1, 8, 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 },
+ tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
+ . "when sending data. When 0 or unset, the server "
+ . "default will be used, which is usually around 100kb/s. Most servers will "
+ . "dynamically find an optimal rate, so adjust this only when necessary.",
+ on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
);
- $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
- $table->add_at (1, 10, new CFPlus::UI::Entry
+ $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+ $table->add_at (1, 9, 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 },
+ on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
);
- $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
- $table->add_at (1, 11, new CFPlus::UI::Entry
+ $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
+ $table->add_at (1, 10, 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 },
+ on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
);
- $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
+ $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
expand => 1,
align => 0,
text => "Login",
on_activate => sub {
$CONN ? stop_game
: start_game;
- 0
+ 1
},
);
@@ -1167,19 +1394,6 @@
my $row = 0;
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
- $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 \" 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.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{say_command} = $value;
- 0
- }
- );
-
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
$table->add_at (1, $row++, new CFPlus::UI::CheckBox
state => $CFG->{show_tips},
@@ -1199,7 +1413,7 @@
. "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;
+ $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
0
},
);
@@ -1207,69 +1421,6 @@
$table
}
-sub message_window {
- my $window = new CFPlus::UI::Toplevel
- name => "message_window",
- title => "Messages",
- border_bg => [1, 1, 1, 1],
- x => "max",
- y => 0,
- force_w => $::WIDTH * 0.4,
- force_h => $::HEIGHT * 0.5,
- child => (my $vbox = new CFPlus::UI::VBox),
- has_close_button => 1;
-
- $vbox->add ($LOGVIEW);
-
- $vbox->add (my $input = new CFPlus::UI::Entry
- tooltip => "Chat Box. If you enter a text and press return/enter here, the current communication command "
- . "from the client setup will be prepended (e.g. shout, chat...). "
- . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
- . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
- on_focus_in => sub {
- my ($input, $prev_focus) = @_;
-
- delete $input->{refocus_map};
-
- if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
- $input->{refocus_map} = 1;
- }
- delete $input->{auto_activated};
-
- 0
- },
- on_activate => sub {
- my ($input, $text) = @_;
- $input->set_text ('');
-
- if ($text =~ /^\/(.*)/) {
- $::CONN->user_send ($1);
- } else {
- my $say_cmd = $::CFG->{say_command} || 'say';
- $::CONN->user_send ("$say_cmd $text");
- }
- if ($input->{refocus_map}) {
- delete $input->{refocus_map};
- $MAPWIDGET->focus_in
- }
-
- 0
- },
- on_escape => sub {
- $MAPWIDGET->grab_focus;
-
- 0
- },
- );
-
- $CONSOLE = {
- window => $window,
- input => $input,
- };
-
- $window
-}
-
sub autopickup_setup {
my $r = new CFPlus::UI::ScrolledWindow (
expand => 1,
@@ -1463,27 +1614,27 @@
$PL_NOTEBOOK =
new CFPlus::UI::Notebook expand => 1;
- $ntb->add (
+ $ntb->add_tab (
"Statistics (F2)" => $STATS_PAGE = stats_window,
"Shows statistics, where all your Stats and Resistances are shown."
);
- $ntb->add (
+ $ntb->add_tab (
"Skills (F3)" => $SKILL_PAGE = skill_window,
"Shows all your Skills."
);
my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
- $ntb->add (
+ $ntb->add_tab (
"Spellbook (F4)" => $spellsw,
"Displays all spells you have and lets you edit keyboard shortcuts for them."
);
- $ntb->add (
+ $ntb->add_tab (
"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
"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,
+ $ntb->add_tab (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);
@@ -1776,29 +1927,12 @@
$MAPWIDGET->connect (activate_console => sub {
my ($mapwidget, $preset) = @_;
- if ($CONSOLE) {
- $CONSOLE->{input}->{auto_activated} = 1;
- $CONSOLE->{input}->grab_focus;
-
- if ($preset && $CONSOLE->{input}->get_text eq '') {
- $CONSOLE->{input}->set_text ($preset);
- }
- }
+ $MESSAGE_WINDOW->activate_console ($preset)
+ if $MESSAGE_WINDOW;
});
$MAPWIDGET->show;
$MAPWIDGET->grab_focus;
- $LOGVIEW = new CFPlus::UI::TextScroller
- expand => 1,
- font => $FONT_FIXED,
- fontsize => $::CFG->{log_fontsize},
- indent => -4,
- can_hover => 1,
- can_events => 1,
- 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
title => "Setup",
name => "setup_dialog",
@@ -1811,26 +1945,27 @@
;
$METASERVER = metaserver_dialog;
+ $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
$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,
+ $SETUP_NOTEBOOK->add_tab (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,
+ $SETUP_NOTEBOOK->add_tab (Client => client_setup,
"Configure various client-specific settings.");
- $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
+ $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
"Configure the video mode, performance, fonts and other graphical aspects of the game.");
- $SETUP_NOTEBOOK->add (Audio => audio_setup,
+ $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
"Configure the use of audio, sound effects and background music.");
- $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
+ $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
"Lets you define, edit and delete key bindings."
. "There is a shortcut for making bindings: Control-Insert opens the binding editor "
. "with nothing set and the recording started. After doing the actions you "
. "want to record press Insert and you will be asked to press a key-combo. "
. "After pressing the combo the binding will be saved automatically and the "
. "binding editor closes");
- $SETUP_NOTEBOOK->add (Debug => debug_setup,
+ $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
@@ -1838,7 +1973,7 @@
$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
tooltip => "Toggles a dialog where you can configure all aspects of this client.");
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
+ $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
tooltip => "Toggles the server message log, where the client collects all messages from the server.");
make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
@@ -1881,266 +2016,17 @@
$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;
}
-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 {
- $MUSIC_PLAYING = undef;
- undef $MUSIC_PLAYER;
-
- audio_music_changed;
-}
-
-sub audio_init {
- if ($CFG->{audio_enable}) {
- if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
- $SDL_MIXER = !CFPlus::Mix_OpenAudio;
-
- unless ($SDL_MIXER) {
- status "Unable to open sound device: there will be no sound";
- return;
- }
-
- CFPlus::Mix_AllocateChannels 8;
- CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
-
- audio_music_finished;
-
- local $_;
- while (<$fh>) {
- next if /^\s*#/;
- next if /^\s*$/;
-
- my ($file, $volume, $event) = split /\s+/, $_, 3;
-
- push @SOUNDS, "$volume,$file";
-
- $AUDIO_CHUNKS{"$volume,$file"} ||= do {
- my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
- $chunk->volume ($volume * 128 / 100);
- $chunk
- };
- }
- } else {
- status "unable to open sound config: $!";
- }
- }
-}
-
-sub audio_shutdown {
- CFPlus::Mix_CloseAudio if $SDL_MIXER;
- undef $SDL_MIXER;
- @SOUNDS = ();
- %AUDIO_CHUNKS = ();
-}
-
my %animate_object;
my $animate_timer;
my $fps = 9;
-my %demo;#d#
-
sub force_refresh {
$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
@@ -2182,15 +2068,6 @@
delete $animate_object{$widget};
}
-# check once/second for faces that need to be prefetched
-# this should, of course, only run on demand, but
-# SDL forces worse things on us....
-
-Event->timer (after => 1, interval => 0.25, cb => sub {
- $CONN->face_prefetch
- if $CONN;
-});
-
%SDL_CB = (
CFPlus::SDL_QUIT => sub {
exit;
@@ -2243,8 +2120,6 @@
my %DEF_CFG = (
sdl_mode => 0,
- width => 640,
- height => 480,
fullscreen => 0,
fast => 0,
map_scale => 1,
@@ -2257,11 +2132,11 @@
gauge_size => 0.35,
stat_fontsize => 0.7,
mapsize => 100,
- say_command => 'chat',
audio_enable => 1,
+ effects_enable => 1,
+ effects_volume => 1,
bgm_enable => 1,
- bgm_volume => 0.25,
- face_prefetch => 0,
+ bgm_volume => 0.5,
output_sync => 1,
output_count => 1,
output_rate => "",