--- deliantra/Deliantra-Client/bin/cfplus 2007/08/01 14:27:21 1.199 +++ deliantra/Deliantra-Client/bin/cfplus 2007/08/30 07:57:59 1.224 @@ -115,7 +115,6 @@ our $FAST; # fast, low-quality mode, possibly useful for software-rendering our $WANT_REFRESH; -our $CAN_REFRESH; our @SDL_MODES; our $WIDTH; @@ -129,6 +128,7 @@ our $MAP; our $MAPMAP; our $MAPWIDGET; +our $COMPLETER; our $BUTTONBAR; our $METASERVER; our $LOGIN_BUTTON; @@ -146,6 +146,10 @@ our $PL_NOTEBOOK; our $PL_WINDOW; +our $MUSIC_PLAYING_WIDGET; +our $LICENSE_WIDGET; + +our $PICKUP_PAGE; our $INVENTORY_PAGE; our $STATS_PAGE; our $SKILL_PAGE; @@ -167,9 +171,7 @@ our $INV; our $INVR; -our $INV_RIGHT_HB; - -our $PICKUP_CFG; +our $INVR_HB; ############################################################################# @@ -216,37 +218,39 @@ $CFG->{effects_enable} or return; + $AUDIO_PLAY{$face} + 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); - + $channel->set_position_r ($dx, $dy, 20); $chunk->play ($channel); } } 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}) { - 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); + 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); + } } 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); + my $chunk = new CFPlus::MixChunk $rwops + or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; + $chunk->volume (($meta->{data}{volume} || 1) * 128); $AUDIO_CHUNK{$face} = $chunk; audio_sound_push ($face); @@ -264,15 +268,27 @@ or return; my $queue = $AUDIO_PLAY{$face} ||= []; - push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s + push @$queue, [Event::time + 0.6, $dx, $dy, $vol]; # do not play sound for outdated events audio_sound_push $face unless @$queue > 1; } +sub audio_music_set_meta { + my ($meta) = @_; + + $MUSIC_PLAYING_META = $meta; + $MUSIC_PLAYING_WIDGET->set_markup ( + "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; } @@ -295,21 +311,21 @@ : new CFPlus::RW $$MUSIC_PLAYING_DATA; $MUSIC_PLAYER = new CFPlus::MixMusic $rwops - or ((warn CFPlus::Mix_GetError), return); # pretty fatal error + or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError; 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_PLAYER->fade_in_pos (0, 700, $pos); $MUSIC_START = time - $pos; } else { $MUSIC_PLAYER->play (0); $MUSIC_START = time; } - delete $MUSIC_PLAYING_META->{stop_time}; - delete $MUSIC_PLAYING_META->{stop_pos}; + delete $meta->{stop_time}; + delete $meta->{stop_pos}; } } @@ -325,21 +341,23 @@ 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 - return if $MUSIC_PLAYING_META - && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; + return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; my $NOW = time; @@ -353,8 +371,8 @@ # 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 + audio_music_set_meta + $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME ? $MUSIC_HAVE[-1] : $MUSIC_HAVE[0]; @@ -370,10 +388,16 @@ } 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]; + $MUSIC_PLAYING_WIDGET->clear; + undef $MUSIC_PLAYER; undef $MUSIC_PLAYING_META; undef $MUSIC_PLAYING_DATA; @@ -757,6 +781,28 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } ); + $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->{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->{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"); $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{fast}, @@ -792,8 +838,8 @@ $table->add_at (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.", + . "This increases load on the graphics subsystem and works only with TRT servers. " + . "Changes take effect at next login only.", on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } ); @@ -814,7 +860,8 @@ $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); $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.", + tooltip => "The font size used by the message/server log window only. Changes are instant, " + . "but you still need to press apply to correctly re-layout the widget.", on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, ); @@ -861,16 +908,20 @@ # $CFG->{effects_volume} = $_[1]; # }); - $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); $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 } + on_changed => sub { + $CFG->{effects_enable} = $_[1]; + $CONN->update_fx_want if $CONN; + 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.", + . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } ); @@ -878,7 +929,12 @@ $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 } + on_changed => sub { + $CFG->{bgm_enable} = $_[1]; + $CONN->update_fx_want if $CONN; + audio_music_push; + 0 + } ); $table->add_at (2, $row++, new CFPlus::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], @@ -939,12 +995,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; @@ -1155,7 +1214,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 } @@ -1577,7 +1638,7 @@ $hb->add (my $vb2 = new CFPlus::UI::VBox); - $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); + $vb2->add ($INVR_HB = new CFPlus::UI::HBox); $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); $sw2->add ($INVR = new CFPlus::UI::Inventory); @@ -1588,6 +1649,46 @@ $hb } +sub media_window { + my $vb = new CFPlus::UI::VBox; + + $vb->add (new CFPlus::UI::FancyFrame + label => "Currently playing music", + child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0, + child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8), + ); + + $vb->add (new CFPlus::UI::FancyFrame + label => "Other media used in this session", + expand => 1, + child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller + expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4), + ); + + $vb +} + +sub add_license { + my ($meta) = @_; + + $meta = $meta->{data} + or return; + + $meta->{license} || $meta->{author} || $meta->{source} + or return; + + $LICENSE_WIDGET->add_paragraph ({ + fg => [1, 1, 1, 1], + markup => "" + . "Name: " . (CFPlus::asxml $meta->{name}) . "\n" + . "Author: " . (CFPlus::asxml $meta->{author}) . "\n" + . "Source: " . (CFPlus::asxml $meta->{source}) . "\n" + . "License: " . (CFPlus::asxml $meta->{license}) . "\n" + . "", + }); + $LICENSE_WIDGET->scroll_to_bottom; +} + sub toggle_player_page { my ($widget) = @_; @@ -1634,9 +1735,12 @@ "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, + "License, Author and Source info for media sent by the server."); + $ntb->set_current_page ($INVENTORY_PAGE); $plwin->add ($ntb); @@ -1799,7 +1903,7 @@ $hb->add (new CFPlus::UI::Button text => "Quit anyway", expand => 1, - on_activate => sub { exit }, + on_activate => sub { Event::unloop_all }, ); } @@ -1882,6 +1986,7 @@ $LAST_REFRESH = time - 0.01; CFPlus::OpenGL::init; + CFPlus::Macro::init; $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; @@ -1892,7 +1997,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, @@ -1933,6 +2050,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", @@ -2003,7 +2125,7 @@ if ($CONN) { open_quit_dialog; } else { - exit; + Event::unloop_all; } 0 }, @@ -2011,6 +2133,7 @@ $BUTTONBAR->show; $SETUP_DIALOG->show; + $MESSAGE_WINDOW->show; } $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); @@ -2028,19 +2151,20 @@ my $fps = 9; 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; + if ($ENV{CFPLUS_DEBUG} & 4) { + $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; + debug sprintf "%3.2f", $fps; + } $CFPlus::UI::ROOT->draw; - - $WANT_REFRESH = 0; - $CAN_REFRESH = 0; - $LAST_REFRESH = $NOW; - CFPlus::SDL_GL_SwapBuffers; + $LAST_REFRESH = $NOW; + $WANT_REFRESH->stop; } -my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { +$WANT_REFRESH = Event->idle (min => 0.001, max => 0.06, parked => 1, cb => \&force_refresh); + +my $input = Event->timer (after => 0, hard => 0, interval => 1 / 50, cb => sub { $NOW = time; ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) @@ -2048,13 +2172,7 @@ if (%animate_object) { $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; - ++$WANT_REFRESH; - } - - if ($WANT_REFRESH) { - force_refresh; - } else { - $CAN_REFRESH = 1; + $WANT_REFRESH->start; } }); @@ -2070,7 +2188,7 @@ %SDL_CB = ( CFPlus::SDL_QUIT => sub { - exit; + Event::unloop_all; }, CFPlus::SDL_VIDEORESIZE => sub { }, @@ -2119,32 +2237,34 @@ CFPlus::UI::set_layout ($::CFG->{layout}); my %DEF_CFG = ( - sdl_mode => 0, - fullscreen => 0, - fast => 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) { @@ -2211,26 +2331,27 @@ # 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; -#CFPlus::SDL_Quit; -#CFPlus::_exit 0; -END { - CFPlus::SDL_Quit; - CFPlus::DB::Server::stop; -} +#video_shutdown; +#audio_shutdown; +CFPlus::SDL_Quit; +CFPlus::DB::Server::stop; =head1 NAME -cfplus - A Crossfire+ and Crossfire game client +cfplus - A Crossfire TRT and Crossfire game client =head1 SYNOPSIS @@ -2238,8 +2359,8 @@ =head1 USAGE -cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used -fullscreen and interactively. +cfplus utilises OpenGL for all UI elements and the game. It is supposed to +be used in fullscreen mode and interactively. =head1 DEBUGGING