--- deliantra/Deliantra-Client/bin/cfplus 2007/08/17 21:18:01 1.215
+++ deliantra/Deliantra-Client/bin/cfplus 2007/09/01 07:22:21 1.226
@@ -88,7 +88,9 @@
use CFPlus::UI::Canvas;
use CFPlus::UI::Inventory;
use CFPlus::UI::SpellList;
+use CFPlus::UI::Dockable;
use CFPlus::UI::MessageWindow;
+use CFPlus::UI::ChatView;
use CFPlus::Pod;
use CFPlus::MapWidget;
use CFPlus::Macro;
@@ -128,6 +130,7 @@
our $MAP;
our $MAPMAP;
our $MAPWIDGET;
+our $COMPLETER;
our $BUTTONBAR;
our $METASERVER;
our $LOGIN_BUTTON;
@@ -148,6 +151,7 @@
our $MUSIC_PLAYING_WIDGET;
our $LICENSE_WIDGET;
+our $PICKUP_PAGE;
our $INVENTORY_PAGE;
our $STATS_PAGE;
our $SKILL_PAGE;
@@ -182,8 +186,7 @@
}
sub message {
- my ($para) = @_;
- $MESSAGE_WINDOW->message ($para);
+ $MESSAGE_WINDOW->message (@_);
}
#############################################################################
@@ -230,11 +233,14 @@
}
} else {
# sound_meta not set means data is in flight either way
- my $meta = $CONN->{sound_meta}{$face}
+ my $meta = $CONN->{face}[$face]
+ or return;
+
+ $meta->{data}
or return;
# if its a jingle, play it as ambient music
- if ($meta->{meta}{jingle}) {
+ if ($meta->{data}{jingle}) {
if (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);
@@ -245,7 +251,7 @@
my $rwops = new CFPlus::RW $_[0];
my $chunk = new CFPlus::MixChunk $rwops
or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
- $chunk->volume (($meta->{meta}{volume} || 1) * 128);
+ $chunk->volume (($meta->{data}{volume} || 1) * 128);
$AUDIO_CHUNK{$face} = $chunk;
audio_sound_push ($face);
@@ -273,17 +279,17 @@
$MUSIC_PLAYING_META = $meta;
$MUSIC_PLAYING_WIDGET->set_markup (
- "Name: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
- . "Author: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
- . "Source: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
- . "License: " . (CFPlus::asxml $meta->{meta}{license})
+ "Name: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
+ . "Author: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
+ . "Source: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
+ . "License: " . (CFPlus::asxml $meta->{data}{license})
);
}
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};
+ my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
+ my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
CFPlus::MixMusic::volume $base * $volume * 128;
}
@@ -312,7 +318,7 @@
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_PLAYER->fade_in_pos (0, 700, $pos);
$MUSIC_START = time - $pos;
} else {
$MUSIC_PLAYER->play (0);
@@ -336,16 +342,19 @@
return unless $CFG->{bgm_enable};
my @have =
- grep $_,
- map $CONN->{music_meta}{$_},
+ grep $_ && $_->{data},
+ map $CONN->{face}[$_],
@$MUSIC_WANT;
+ # randomize music a bit so that the order is not always the same
+ $_->{stop_time} ||= rand for @have;
+
@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;
+ $fade_out = 700;
}
# if the currently playing song is acceptable, let it continue
@@ -364,7 +373,7 @@
# if the most recently-played piece played very recently,
# resume it, else choose the oldest piece for rotation.
audio_music_set_meta
- $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
+ $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
? $MUSIC_HAVE[-1]
: $MUSIC_HAVE[0];
@@ -380,6 +389,10 @@
}
sub audio_music_finished {
+ if ($MUSIC_PLAYING_META) {
+ $MUSIC_PLAYING_META->{stop_time} = time;
+ }
+
# we compress multiple jingles of the same type
shift @MUSIC_JINGLE
while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
@@ -771,14 +784,24 @@
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
$table->add_at (1, $row++, new CFPlus::UI::CheckBox
- state => $CFG->{opengl11},
+ state => $CFG->{force_opengl11},
tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
. "higher memory usage and slower performance. It will, however, help tremendously on "
. "cards that claim to support a feature but fall back to software rendering. "
. "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
. "but cards and drivers from other vendors (ATI) are often just as bad. If you "
. "experience extremely low framerates and your card should do better, try this option.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
+ );
+
+ $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
+ $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ state => $CFG->{texture_compression},
+ tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
+ . "will save a lot of memory and increase performance. The compression algorithm "
+ . "can differ form card to card, so your mileage may vary. This setting is ignored in "
+ . "forced OpenGL 1.1 mode.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
);
$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
@@ -910,6 +933,7 @@
on_changed => sub {
$CFG->{bgm_enable} = $_[1];
$CONN->update_fx_want if $CONN;
+ audio_music_push;
0
}
);
@@ -972,12 +996,15 @@
$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
- $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
- $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
+ $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
+ $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
+ $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
+ $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
$GAUGES = {
- exp => $exp, win => $win, range => $rng,
- food => $fg, mana => $mg, hp => $hg, grace => $gg
+ exp => $exp, prg => $prg, sklprg => $sklprg,
+ win => $win, range => $rng,
+ hp => $hg, mana => $mg, grace => $gg, food => $fg,
};
&set_gauge_window_fontsize;
@@ -1188,7 +1215,9 @@
sub skill_window {
my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
- $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
+
+ $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
+
$sw
}
@@ -1643,7 +1672,7 @@
sub add_license {
my ($meta) = @_;
- $meta = $meta->{meta}
+ $meta = $meta->{data}
or return;
$meta->{license} || $meta->{author} || $meta->{source}
@@ -1707,7 +1736,7 @@
"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_tab (Pickup => autopickup_setup,
+ $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
$ntb->add_tab (Media => media_window,
@@ -1958,6 +1987,7 @@
$LAST_REFRESH = time - 0.01;
CFPlus::OpenGL::init;
+ CFPlus::Macro::init;
$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
@@ -1968,7 +1998,19 @@
if ($DEBUG_STATUS) {
CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
} else {
- # create the widgets
+ # create/configure the widgets
+
+ $CFPlus::UI::ROOT->connect (key_down => sub {
+ my (undef, $ev) = @_;
+
+ if (my @macros = CFPlus::Macro::find $ev) {
+ CFPlus::Macro::execute $_ for @macros;
+
+ return 1;
+ }
+
+ 0
+ });
$DEBUG_STATUS = new CFPlus::UI::Label
padding => 0,
@@ -2009,6 +2051,11 @@
$MAPWIDGET->show;
$MAPWIDGET->grab_focus;
+ $COMPLETER = new CFPlus::MapWidget::Command::
+ command => { },
+ tooltip => "#completer_help",
+ ;
+
$SETUP_DIALOG = new CFPlus::UI::Toplevel
title => "Setup",
name => "setup_dialog",
@@ -2142,7 +2189,7 @@
%SDL_CB = (
CFPlus::SDL_QUIT => sub {
- exit;
+ Event::unloop_all;
},
CFPlus::SDL_VIDEORESIZE => sub {
},
@@ -2191,33 +2238,34 @@
CFPlus::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
- sdl_mode => 0,
- fullscreen => 0,
- fast => 0,
- opengl11 => 0,
- map_scale => 1,
- fow_enable => 1,
- fow_intensity => 0,
- map_smoothing => 1,
- gui_fontsize => 1,
- log_fontsize => 0.7,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- mapsize => 100,
- audio_enable => 1,
- effects_enable => 1,
- effects_volume => 1,
- bgm_enable => 1,
- bgm_volume => 0.5,
- output_sync => 1,
- output_count => 1,
- output_rate => "",
- pickup => 0,
- inv_sort => "mtime",
- default => "profile", # default profile
- show_tips => 1,
- logview_max_par => 1000,
+ sdl_mode => 0,
+ fullscreen => 0,
+ fast => 0,
+ force_opengl11 => undef,
+ texture_compression => 1,
+ map_scale => 1,
+ fow_enable => 1,
+ fow_intensity => 0,
+ map_smoothing => 1,
+ gui_fontsize => 1,
+ log_fontsize => 0.7,
+ gauge_fontsize => 1,
+ gauge_size => 0.35,
+ stat_fontsize => 0.7,
+ mapsize => 100,
+ audio_enable => 1,
+ effects_enable => 1,
+ effects_volume => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.5,
+ 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) {
@@ -2284,14 +2332,17 @@
# warn $t2-$t1;
# }
- $startup_done->();
-
video_init;
audio_init;
}
show_tip_of_the_day if $CFG->{show_tips};
+Event->idle (cb => sub {
+ $_[0]->w->cancel;
+ $startup_done->();
+});
+
Event::loop;
#video_shutdown;