--- deliantra/Deliantra-Client/bin/cfplus 2006/08/13 19:47:05 1.111 +++ deliantra/Deliantra-Client/bin/cfplus 2007/09/02 09:48:42 1.227 @@ -1,24 +1,70 @@ #!/opt/bin/perl +# do splash-screen thingy on win32 +my $startup_done = sub { }; +BEGIN { + if (%PAR::LibCache && $^O eq "MSWin32") { + while (my ($filename, $zip) = each %PAR::LibCache) { + $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); + } + + require Win32::GUI::SplashScreen; + + Win32::GUI::SplashScreen::Show ( + -file => "$ENV{PAR_TEMP}/SPLASH.bmp", + ); + + $startup_done = sub { + Win32::GUI::SplashScreen::Done (1); + }; + } +} + use strict; use utf8; +use Carp 'verbose'; + # do things only needed for single-binary version (par) BEGIN { if (%PAR::LibCache) { @INC = grep ref, @INC; # weed out all paths except pars loader refs + my $root = $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"; + next unless /^root\/(.*)/; + $zip->extractMember ($_, "$root/$1") + unless -e "$root/$1"; } } - # TODO: pango-rc file, anybody? + if ($^O eq "MSWin32") { + # pango is relocatable on win32 + } else { + open my $fh, "<:perlio", "$root/pangoversion" + or die "pangoversion: $!"; + my $PANGO = <$fh>; + # unix, need to patch pango rc file + open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" + or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; + local $/; + my $rc = <$fh>; + $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones + + mkdir "$root/pango-modules"; + open my $fh, ">:perlio", "$root/pango-modules/pango.modules" + or die "$root/pango-modules/pango.modules: $!"; + print $fh $rc; + + $ENV{PANGO_RC_FILE} = "$root/pango.rc"; + open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} + or die "$ENV{PANGO_RC_FILE}: $!"; + print $fh "[Pango]\nModuleFiles = $root/pango-modules\n"; + } - unshift @INC, $ENV{PAR_TEMP}; + unshift @INC, $root; } } @@ -28,6 +74,7 @@ use Time::HiRes 'time'; use Event; +use List::Util qw(max min); use Crossfire; use Crossfire::Protocol::Constants; @@ -37,46 +84,40 @@ use CFPlus; use CFPlus::OpenGL (); use CFPlus::Protocol; +use CFPlus::DB; use CFPlus::UI; +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::BindingEditor; use CFPlus::MapWidget; +use CFPlus::Macro; $SIG{QUIT} = sub { Carp::cluck "QUIT" }; $SIG{PIPE} = 'IGNORE'; -$Event::Eval = 0; +$Event::Eval = 1; $Event::DIED = sub { - # TODO: display dialog box or so - Carp::cluck $_[1];#d#TODO: remove when stable - CFPlus::error $_[1]; -}; - -$SIG{__DIE__} = sub { - return if CFPlus::in_destruct; - Carp::cluck $_[0]; - CFPlus::error $_[0]; - return;#d# - #return unless defined $^S && !$^S; - $Event::DIED->(undef, $_[0]); + CFPlus::fatal Carp::longmess $_[1] }; -our $VERSION = '0.1'; - my $MAX_FPS = 60; my $MIN_FPS = 5; # unused as of yet -our $META_SERVER = "crossfire.real-time.com:13326"; +our $META_SERVER = "http://metaserver.schmorp.de/current.json"; our $LAST_REFRESH; our $NOW; our $CFG; our $CONN; +our $PROFILE; # current profile our $FAST; # fast, low-quality mode, possibly useful for software-rendering our $WANT_REFRESH; -our $CAN_REFRESH; our @SDL_MODES; our $WIDTH; @@ -90,9 +131,8 @@ our $MAP; our $MAPMAP; our $MAPWIDGET; +our $COMPLETER; our $BUTTONBAR; -our $LOGVIEW; -our $CONSOLE; our $METASERVER; our $LOGIN_BUTTON; our $QUIT_DIALOG; @@ -109,10 +149,15 @@ 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; our $SPELL_PAGE; +our $SPELL_LIST; our $HELP_WINDOW; our $MESSAGE_WINDOW; @@ -123,22 +168,15 @@ our $SDL_ACTIVE; our %SDL_CB; -our $SDL_MIXER; -our @SOUNDS; # event => file mapping -our %AUDIO_CHUNKS; # audio files - our $ALT_ENTER_MESSAGE; our $STATUSBOX; our $DEBUG_STATUS; our $INV; our $INVR; -our $INV_RIGHT_HB; +our $INVR_HB; -our $BIND_EDITOR; -our $BIND_UPD_CB; - -our $PICKUP_CFG; +############################################################################# sub status { $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); @@ -148,16 +186,289 @@ $DEBUG_STATUS->set_text ($_[0]); } +sub message { + $MESSAGE_WINDOW->message (@_); +} + +############################################################################# +#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; + + $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); + $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->{face}[$face] + or return; + + $meta->{data} + or return; + + # if its a jingle, play it as ambient music + 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 + 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); + }; + } + } +} + +sub audio_sound_play { + my ($face, $dx, $dy, $vol) = @_; + + $SDL_MIXER + or return; + $CFG->{effects_enable} + or return; + + my $queue = $AUDIO_PLAY{$face} ||= []; + 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->{data}{volume} || 1; + my $base = $MUSIC_PLAYING_META->{data}{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; + + $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 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, 700, $pos); + $MUSIC_START = time - $pos; + } else { + $MUSIC_PLAYER->play (0); + $MUSIC_START = time; + } + + delete $meta->{stop_time}; + delete $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 $_ && $_->{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 = 700; + } + + # if the currently playing song is acceptable, let it continue + return if 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. + audio_music_set_meta + $MUSIC_HAVE[-1]{stop_pos} && $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 { + 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; + + 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}; } +# FIXME: a very ugly hack to wait for stat update look below! #d# +our $QUERY_TIMER; #d# + # server query dialog sub server_query { my ($conn, $flags, $prompt) = @_; - $conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame + # FIXME: a very ugly hack to wait for stat update #d# + if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) { + unless ($QUERY_TIMER) { + $QUERY_TIMER = + Event->timer ( + after => 1, + cb => sub { + server_query ($conn, $flags, $prompt, 1); + $QUERY_TIMER = undef + } + ); + return; + } + } + + $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel x => "center", y => "center", title => "Server Query", @@ -165,7 +476,7 @@ ; my @dialog = my $label = new CFPlus::UI::Label - max_w => $::WIDTH * 0.4, + max_w => $::WIDTH * 0.8, ellipsise => 0, text => $prompt; @@ -192,19 +503,17 @@ $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"; unshift @dialog, my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFPlus::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Next Race", on_activate => sub { $conn->send ("reply n"); @@ -212,7 +521,7 @@ 0 }, ); - $table->add (2, 0, new CFPlus::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply d"); @@ -221,6 +530,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, @@ -234,9 +566,6 @@ return; } - $STATS_PAGE->show; - $MESSAGE_WINDOW->hide; - unshift @dialog, new CFPlus::UI::Label max_w => $::WIDTH * 0.4, ellipsise => 0, @@ -245,7 +574,7 @@ unshift @dialog, my $table = new CFPlus::UI::Table; # left: re-roll - $table->add (0, 0, new CFPlus::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Roll Again", on_activate => sub { $conn->send ("reply y"); @@ -269,7 +598,7 @@ ], ), 1 .. 2; - $table->add (2, 0, new CFPlus::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Swap Stats", on_activate => sub { $conn->{stat_change_with} = $sw2->{value}; @@ -278,10 +607,10 @@ 0 }, ); - $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); + $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); # right: accept - $table->add (4, 0, new CFPlus::UI::Button + $table->add_at (4, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply n"); @@ -356,36 +685,29 @@ my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; - my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; + my ($host, $port) = split /:/, $PROFILE->{host}; - $MAP = new CFPlus::Map $mapsize, $mapsize; + $MAP = new CFPlus::Map; $CONN = eval { new CFPlus::Protocol host => $host, port => $port || 13327, - user => $CFG->{profile}{default}{user}, - pass => $CFG->{profile}{default}{password}, + user => $PROFILE->{user}, + pass => $PROFILE->{password}, mapw => $mapsize, maph => $mapsize, + client => "cfplus $CFPlus::VERSION $] $^O", + map_widget => $MAPWIDGET, - logview => $LOGVIEW, statusbox => $STATUSBOX, map => $MAP, mapmap => $MAPMAP, query => \&server_query, - sound_play => sub { - my ($x, $y, $soundnum, $type) = @_; - - $SDL_MIXER - or return; - - my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]} - or return; - - $chunk->play; + setup_req => { + smoothing => $CFG->{map_smoothing}*1, }, }; @@ -404,7 +726,10 @@ $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); $SETUP_DIALOG->show; $PL_WINDOW->hide; - $SPELL_PAGE->clear_spells; + $SPELL_LIST->clear_spells; + $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); + + &audio_music_set_ambient ([]); return unless $CONN; @@ -422,85 +747,128 @@ $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); - $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); + my $row = 0; - $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); - $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); + $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, + can_events => 1, + tooltip => "" . (CFPlus::OpenGL::gl_extensions) . ""); + + my $vidmode_tooltip = + "Video Mode. The video mode to use for fullscreen (and the window size for windowed operation). " + . "The format is width x height \@ depth-per-channel + alpha-channel."; + + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); + $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox); + + $hbox->add (my $mode_slider = new CFPlus::UI::Slider + force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], + tooltip => $vidmode_tooltip); + $hbox->add (my $mode_label = new CFPlus::UI::Label + align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9", + can_events => 1, tooltip => $vidmode_tooltip); $mode_slider->connect (changed => sub { my ($self, $value) = @_; $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; - $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); + $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); }); $mode_slider->emit (changed => $mode_slider->{range}[0]); - my $row = 1; - - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); - $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); + $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox state => $CFG->{fullscreen}, tooltip => "Bring the client into fullscreen mode.", on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $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}, tooltip => "Lower the visual quality considerably to speed up rendering.", on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); + $table->add_at (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_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 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 => "Fog of War"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing"); + $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 TRT servers. " + . "Changes take effect at next login only.", + on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } + ); + + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); + $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{fow_enable}, tooltip => "Fog-of-War marks areas that cannot be seen by the player. Changes are instant.", on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], tooltip => "Fog of War Lightness. The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth"); - $table->add (1, $row++, new CFPlus::UI::CheckBox - state => $CFG->{fow_smooth}, - tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", - on_changed => sub { - my ($self, $value) = @_; - $CFG->{fow_smooth} = $value; - status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; - 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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider + $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.", - on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, + 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 }, ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", on_changed => sub { @@ -510,8 +878,8 @@ } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); - $table->add (1, $row++, new CFPlus::UI::Slider + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); + $table->add_at (1, $row++, new CFPlus::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8], tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", on_changed => sub { @@ -521,51 +889,63 @@ } ); - $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 } 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; - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); - $table->add (1, $row++, new CFPlus::UI::CheckBox + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); + $table->add_at (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{audio_enable}, tooltip => "Master Audio Enable. 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]; 0 } ); -# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); -# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { +# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); +# $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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); - $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); - $hbox->add (new CFPlus::UI::CheckBox + + $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]; + $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 (rightmost) 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, 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 + } ); - $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 (1, $row++, new CFPlus::UI::Button - expand => 1, align => 0, text => "Apply", + $table->add_at (1, $row++, new CFPlus::UI::Button + c_colspan => 2, expand => 1, align => 0, text => "Apply", tooltip => "Apply the audio settings", on_activate => sub { audio_shutdown (); @@ -617,12 +997,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; @@ -633,27 +1016,50 @@ sub debug_setup { my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); - $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); - $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); - $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); - $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); - $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 }); - - my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); - - for my $x (0..2) { - for my $y (0 .. 2) { - $table->add ($x + 3, $y, - new CFPlus::UI::Entry - text => $default_smooth[$x * 3 + $y], - on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, - ); - } - } + $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders"); + $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); + $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); + $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); + $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS"); + $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); + $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); + $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); + $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); + + $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 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 } @@ -665,14 +1071,19 @@ ); $r->add (my $vb = new CFPlus::UI::VBox); - $vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, + $vb->add (new CFPlus::UI::FancyFrame + label => "Player", + child => (my $pi = new CFPlus::UI::VBox), + ); + + $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, can_hover => 1, can_events => 1, tooltip => "Your name and title. You can change your title by using the title command, if supported by the server."); - $vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, + $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, can_hover => 1, can_events => 1, tooltip => "The map you are currently on (if supported by the server)."); - $vb->add (my $hb0 = new CFPlus::UI::HBox); + $pi->add (my $hb0 = new CFPlus::UI::HBox); $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, can_hover => 1, can_events => 1, tooltip => "The weight of the player including all inventory items."); @@ -680,7 +1091,10 @@ can_hover => 1, can_events => 1, tooltip => "The weight limit: you cannot carry more than this."); - $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); + $vb->add (new CFPlus::UI::FancyFrame + label => "Primary/Secondary Statistics", + child => (my $hb = new CFPlus::UI::HBox expand => 1), + ); $hb->add (my $tbl = new CFPlus::UI::Table expand => 1); my $color2 = [1, 1, 0]; @@ -703,15 +1117,18 @@ ) { my ($col, $row, $id, $label, $template) = @$_; - $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label + $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => "#stat_$label"); - $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label + $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => "#stat_$label"); } - $vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1); + $vb->add (new CFPlus::UI::FancyFrame + label => "Resistancies", + child => (my $tbl2 = new CFPlus::UI::Table expand => 1), + ); my $row = 0; my $col = 0; @@ -754,11 +1171,12 @@ ghit => ["Ghost hit", "Ghost hit (special attack used by ghosts and ghost-like beings)"], ); + for (qw/slow holyw conf fire depl magic drain acid pois para deat phys blind fear tund elec cold ghit/) { - $tbl2->add ($col, $row, + $tbl2->add_at ($col, $row, $STATWIDS->{"res_$_"} = new CFPlus::UI::Label font => $FONT_FIXED, @@ -769,14 +1187,14 @@ can_hover => 1, tooltip => $resist_names{$_}->[1], ); - $tbl2->add ($col + 1, $row, new CFPlus::UI::Image + $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image font => $FONT_FIXED, can_hover => 1, can_events => 1, path => "ui/resist/resist_$_.png", tooltip => $resist_names{$_}->[1], ); - $tbl2->add ($col + 2, $row, new CFPlus::UI::Label + $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label text => $resist_names{$_}->[0], font => $FONT_FIXED, can_hover => 1, @@ -798,7 +1216,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 } @@ -819,29 +1239,17 @@ my $table = $METASERVER->{table}; $table->clear; - $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); - - my $buf; - - my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; + $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); - unless ($fh) { - $label->set_text ("unable to contact metaserver: $!"); - return; - } - - Event->io (fd => $fh, poll => 'r', cb => sub { - my $res = sysread $fh, $buf, 8192, length $buf; + my $ok = 0; - if (!defined $res) { - $_[0]->w->cancel; - $label->set_text ("error while retrieving server list: $!"); - } elsif ($res == 0) { - $_[0]->w->cancel; - status "server list retrieved"; - - utf8::decode $buf if utf8::valid $buf; + CFPlus::background { + my $ua = CFPlus::lwp_useragent; + CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content; + } sub { + my ($msg) = @_; + if ($msg) { $table->clear; my @tip = ( @@ -852,7 +1260,7 @@ "Short information about this server provided by its admins.", ); my @col = qw(#Users Host Uptime Version Description); - $table->add ($_, 0, new CFPlus::UI::Label + $table->add_at ($_, 0, new CFPlus::UI::Label can_hover => 1, can_events => 1, align => 0, fg => [1, 1, 0], text => $col[$_], tooltip => $tip[$_]) @@ -861,29 +1269,30 @@ my @align = qw(1 0 1 1 -1); my $y = 0; - for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { - my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; + for my $m (@{ $msg->{servers} }) { + my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) = + @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)}; for ($desc) { s/
/\n/gi; s/
  • /\n· /gi; s/<.*?>//sgi; - s/&/&/g; - s//>/g; + s/&/&/g; + s/<//g; } $uptime = sprintf "%dd %02d:%02d:%02d", - (int $m->[8] / 86400), - (int $m->[8] / 3600) % 24, - (int $m->[8] / 60) % 60, - $m->[8] % 60; + (int $uptime / 86400), + (int $uptime / 3600) % 24, + (int $uptime / 60) % 60, + $uptime % 60; $m = [$users, $host, $uptime, $version, $desc]; $y++; - $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ + $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [ (new CFPlus::UI::Button text => "Use", tooltip => "Put this server into the Host:Port field", @@ -896,18 +1305,23 @@ (new CFPlus::UI::Empty expand => 1), ]); - $table->add ($_, $y, new CFPlus::UI::Label + $table->add_at ($_, $y, new CFPlus::UI::Label + max_w => $::WIDTH * 0.4, ellipsise => 0, align => $align[$_], text => $m->[$_], tooltip => $tip[$_], + fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]), can_hover => 1, can_events => 1, fontsize => 0.8) for 0 .. $#$m; } + } else { + $ok or $label->set_text ("error while contacting metaserver"); } - }); + }; + } sub metaserver_dialog { @@ -915,13 +1329,14 @@ my $table = new CFPlus::UI::Table; $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); - my $dialog = new CFPlus::UI::FancyFrame + my $dialog = new CFPlus::UI::Toplevel title => "Server List", name => 'metaserver_dialog', x => 'center', y => 'center', z => 3, - force_h => $::HEIGHT * 0.4, + force_w => $::WIDTH * 0.9, + force_h => $::HEIGHT * 0.7, child => $vbox, has_close_button => 1, table => $table, @@ -937,11 +1352,14 @@ sub server_setup { my $vbox = new CFPlus::UI::VBox; - $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); + $vbox->add (new CFPlus::UI::FancyFrame + label => "Connection Settings", + child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), + ); + $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); { - $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); + $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox); $vbox->add ( $HOST_ENTRY = new CFPlus::UI::Entry @@ -951,7 +1369,7 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{host} = $value; - 0 + 1 } ); @@ -961,220 +1379,120 @@ 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 }, ); } - $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); - $table->add (1, 4, new CFPlus::UI::Entry + $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); + $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 (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); - $table->add (1, 5, new CFPlus::UI::Entry + $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); + $table->add_at (1, 5, new CFPlus::UI::Entry 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 (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); - $table->add (1, 7, new CFPlus::UI::Slider + $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); + $table->add_at (1, 7, new CFPlus::UI::Slider force_w => 100, range => [$CFG->{mapsize}, 10, 100, 0, 1], tooltip => "This is the size of the portion of the map update the server sends you. " . "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 }, + on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 }, ); - $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); - $table->add (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 }, + $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 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 (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); - $table->add (1, 9, 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 (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); - $table->add (1, 10, 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 (1, 11, $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 }, ); - $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); - $table->add (1, 12, 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 - } - ); - - $vbox->add (new CFPlus::UI::Label - text => "Server Info", - fontsize => 1.2, - padding_y => 8, - fg => [1, 1, 0, 1], + $vbox->add (new CFPlus::UI::FancyFrame + label => "Server Info", + child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), ); - $vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0); - $vbox } -sub message_window { - my $window = new CFPlus::UI::FancyFrame - 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 (''); +sub client_setup { + my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; - 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 - } + my $row = 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}, + tooltip => "Show the Tip of the day window at startup?", + on_changed => sub { + my ($self, $value) = @_; + $CFG->{show_tips} = $value; 0 - }, - on_escape => sub { - $MAPWIDGET->grab_focus; + } + ); + $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); + $table->add_at (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) = @_; + $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1); 0 }, ); - $CONSOLE = { - window => $window, - input => $input, - }; - - $window -} - -sub open_string_query { - my $cb = $_[1]; - my $dialog = new CFPlus::UI::FancyFrame - x => "center", - y => "center", - z => 50, - force_w => $WIDTH * 4/5, - title => $_[0]; - - $dialog->add ( - my $e = new CFPlus::UI::Entry - on_activate => sub { $cb->(@_); $dialog->hide; 0 }, - on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, - ); - - $e->grab_focus; - $dialog->show; -} - -sub open_quit_dialog { - unless ($QUIT_DIALOG) { - $QUIT_DIALOG = new CFPlus::UI::FancyFrame - x => "center", - y => "center", - z => 50, - title => "Really Quit?", - on_key_down => sub { - my ($dialog, $ev) = @_; - $ev->{sym} == 27 and $dialog->hide; - } - ; - - $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); - - $vb->add (new CFPlus::UI::Label - text => "You should find a savebed and apply it first!", - max_w => $WIDTH * 0.25, - ellipsize => 0, - ); - $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); - $hb->add (new CFPlus::UI::Button - text => "Ok", - expand => 1, - on_activate => sub { $QUIT_DIALOG->hide; 0 }, - ); - $hb->add (new CFPlus::UI::Button - text => "Quit anyway", - expand => 1, - on_activate => sub { exit }, - ); - } - - $QUIT_DIALOG->show; - $QUIT_DIALOG->grab_focus; + $table } sub autopickup_setup { - my $table = new CFPlus::UI::Table; + my $r = new CFPlus::UI::ScrolledWindow ( + expand => 1, + scroll_y => 1 + ); + $r->add (my $table = new CFPlus::UI::Table + row_expand => [0], + col_expand => [0, 1, 0, 1], + ); for ( ["General", 0, 0, @@ -1198,12 +1516,12 @@ ["Cloaks" => PICKUP_CLOAK], ], - ["Readables", 2, 2, + ["Readables", 2, 0, ["Spellbooks" => PICKUP_SPELLBOOK], ["Skillscrolls" => PICKUP_SKILLSCROLL], ["Normal Books/Scrolls" => PICKUP_READABLES], ], - ["Misc", 2, 7, + ["Misc", 2, 5, ["Food" => PICKUP_FOOD], ["Drinks" => PICKUP_DRINK], ["Valuables (Money, Gems)" => PICKUP_VALUABLES], @@ -1213,19 +1531,20 @@ ["Magic Devices" => PICKUP_MAGIC_DEVICE], ["Ignore cursed" => PICKUP_NOT_CURSED], ["Jewelery" => PICKUP_JEWELS], + ["Flesh" => PICKUP_FLESH], ], ["Weight/Value ratio", 2, 17] ) { my ($title, $x, $y, @bits) = @$_; - $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); + $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); for (@bits) { ++$y; my $mask = $_->[1]; - $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); - $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox + $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); + $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox state => $::CFG->{pickup} & $mask, on_changed => sub { my ($box, $value) = @_; @@ -1246,7 +1565,7 @@ } } - $table->add (2, 18, new CFPlus::UI::ValSlider + $table->add_at (2, 18, new CFPlus::UI::ValSlider range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], template => ">= 99", to_value => sub { ">= " . 5 * $_[0] }, @@ -1259,7 +1578,7 @@ 1; }); - $table->add (3, 18, new CFPlus::UI::Button + $table->add_at (3, 18, new CFPlus::UI::Button text => "set", on_activate => sub { $::CONN->send_command ("pickup $::CFG->{pickup}") @@ -1267,16 +1586,22 @@ 0 }); - $table + $r } my %SORT_ORDER = ( type => undef, - mtime => sub { sort { - ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) - or $b->{mtime} <=> $a->{mtime} - or $a->{type} <=> $b->{type} - } @_ }, + mtime => sub { + my $NOW = time; + sort { + 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; + + ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) + or $btime <=> $atime + or $a->{type} <=> $b->{type} + } @_ + }, weight => sub { sort { $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) or $a->{type} <=> $b->{type} @@ -1311,10 +1636,11 @@ $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); $sw1->add ($INV = new CFPlus::UI::Inventory); + $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); $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); @@ -1325,6 +1651,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) = @_; @@ -1337,7 +1703,7 @@ } sub player_window { - my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame + my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel x => "center", y => "center", force_w => $WIDTH * 9/10, @@ -1349,28 +1715,33 @@ my $ntb = $PL_NOTEBOOK = - new CFPlus::UI::Notebook expand => 1, debug => 1; + 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 = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); - $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); - $ntb->add ( + my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); + $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); + $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_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); @@ -1378,123 +1749,15 @@ $plwin } -sub update_bindings { - $BIND_UPD_CB->() if $BIND_UPD_CB; -} - sub keyboard_setup { - my $binding_list = new CFPlus::UI::VBox; - - my $refresh; - $refresh = $BIND_UPD_CB = sub { - $binding_list->clear (); - - for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { - for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { - my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; - next unless ref $cmds eq 'ARRAY' and @$cmds > 0; - - my $lbl = join "; ", @$cmds; - my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); - $binding_list->add (my $hb = new CFPlus::UI::HBox); - $hb->add (new CFPlus::UI::Button - text => "delete", - tooltip => "Deletes the binding", - on_activate => sub { - $binding_list->remove ($hb); - delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; - 0 - }); - - $hb->add (new CFPlus::UI::Button - text => "edit", - tooltip => "Edits the binding", - on_activate => sub { - $::BIND_EDITOR->set_binding ( - $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, - sub { - my ($nmod, $nsym, $ncmds) = @_; - $::BIND_EDITOR->cfg_unbind ($mod, $sym); - $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); - $refresh->(); - $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); - $SETUP_DIALOG->show; - }, - sub { - $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); - $SETUP_DIALOG->show; - }); - $::BIND_EDITOR->show; - $SETUP_DIALOG->hide; - 0 - }); - - $hb->add (new CFPlus::UI::Label text => "(Key: $nam)"); - $hb->add (new CFPlus::UI::Label text => $lbl, expand => 1); - } - } - }; - - my $vb = new CFPlus::UI::VBox; - $vb->add (my $hb = new CFPlus::UI::HBox); - $hb->add (new CFPlus::UI::Label text => "only shift-up stops fire"); - $hb->add (new CFPlus::UI::CheckBox - expand => 1, - state => $CFG->{shift_fire_stop}, - tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift", - on_changed => sub { - my ($cbox, $value) = @_; - $CFG->{shift_fire_stop} = $value; - 0 - }); - - $vb->add ($binding_list); - $vb->add (my $hb = new CFPlus::UI::HBox); - - $hb->add (new CFPlus::UI::Button - text => "record new", - expand => 1, - tooltip => "This button opens the binding editor with an empty binding.", - on_activate => sub { - $::BIND_EDITOR->set_binding (undef, undef, [], - sub { - my ($mod, $sym, $cmds) = @_; - $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); - $refresh->(); - $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); - $SETUP_DIALOG->show; - }, - sub { - $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); - $SETUP_DIALOG->show; - }, - ); - $SETUP_DIALOG->hide; - $::BIND_EDITOR->show; - 0 - }, - ); - - $hb->add (new CFPlus::UI::Button - text => "close", - tooltip => "Closes the binding window", - expand => 1, - on_activate => sub { - $SETUP_DIALOG->hide; - 0 - } - ); - - $refresh->(); - - $vb + CFPlus::Macro::keyboard_setup } sub help_window { - my $win = new CFPlus::UI::FancyFrame + my $win = new CFPlus::UI::Toplevel x => 'center', y => 'center', - z => 2, + z => 4, name => 'doc_browser', force_w => int $WIDTH * 7/8, force_h => int $HEIGHT * 7/8, @@ -1503,69 +1766,229 @@ $win->add (my $vbox = new CFPlus::UI::VBox); - $vbox->add (my $buttons = new CFPlus::UI::HBox); + $vbox->add (new CFPlus::UI::FancyFrame + label => "Navigation", + child => (my $buttons = new CFPlus::UI::HBox), + ); $vbox->add (my $viewer = new CFPlus::UI::TextScroller - expand => 1, fontsize => 0.8, padding_x => 4); + expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); my @history; my @future; - my $node; + my $curnode; my $load_node; $load_node = sub { - my ($node) = @_; + my ($node, $para) = @_; $buttons->clear; + $buttons->add (new CFPlus::UI::Button + text => "⇤", + tooltip => "back to the starting page", + on_activate => sub { + unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; + unshift @future, @history; + @history = (); + $load_node->(@{shift @future}); + }, + ); + if (@history) { - $buttons->add (new CFPlus::UI::Button label => "<", on_activate => sub { - unshift @future, $node if $node; - $node = pop @history; + $buttons->add (new CFPlus::UI::Button + text => "⋘", + tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "", + on_activate => sub { + unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; + $load_node->(@{pop @history}); + }, + ); + } + + if (@future) { + $buttons->add (new CFPlus::UI::Button + text => "⋙", + tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "", + on_activate => sub { + push @history, [$curnode, $viewer->current_paragraph]; + $load_node->(@{shift @future}); + }, + ); + } + + $buttons->add (new CFPlus::UI::Label text => " "); - }); + my @path = CFPlus::Pod::full_path_of $node; + pop @path; # drop current node + + for my $node (@path) { + $buttons->add (new CFPlus::UI::Button + text => $node->{kw}[0], + tooltip => "go to " . (CFPlus::asxml CFPlus::Pod::full_path $node) . "", + on_activate => sub { + push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); + $load_node->($node); + }, + ); + $buttons->add (new CFPlus::UI::Label text => "/"); } + + $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); + + $curnode = $node; + $viewer->clear; - $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $node); - $viewer->set_offset (0); + $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); + $viewer->scroll_to ($para); }; $load_node->(CFPlus::Pod::find pod => "mainpage"); - $CFPlus::Pod::on_link = sub { + $CFPlus::Pod::goto_document = sub { my (@path) = @_; - push @history, $node if $node; - @future = (); + push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); - $load_node->(CFPlus::Pod::find @path); + $load_node->((CFPlus::Pod::find @path)[0]); $win->show; }; $win } +sub open_string_query { + my ($title, $cb, $txt, $tooltip) = @_; + my $dialog = new CFPlus::UI::Toplevel + x => "center", + y => "center", + z => 50, + force_w => $WIDTH * 4/5, + title => $title; + + $dialog->add ( + my $e = new CFPlus::UI::Entry + on_activate => sub { $cb->(@_); $dialog->hide; 0 }, + on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 }, + tooltip => $tooltip + ); + + $e->grab_focus; + $e->set_text ($txt) if $txt; + $dialog->show; +} + +sub open_quit_dialog { + unless ($QUIT_DIALOG) { + $QUIT_DIALOG = new CFPlus::UI::Toplevel + x => "center", + y => "center", + z => 50, + title => "Really Quit?", + on_key_down => sub { + my ($dialog, $ev) = @_; + $ev->{sym} == 27 and $dialog->hide; + } + ; + + $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); + + $vb->add (new CFPlus::UI::Label + text => "You should find a savebed and apply it first!", + max_w => $WIDTH * 0.25, + ellipsize => 0, + ); + $vb->add (my $hb = new CFPlus::UI::HBox expand => 1); + $hb->add (new CFPlus::UI::Button + text => "Ok", + expand => 1, + on_activate => sub { $QUIT_DIALOG->hide; 0 }, + ); + $hb->add (new CFPlus::UI::Button + text => "Quit anyway", + expand => 1, + on_activate => sub { Event::unloop_all }, + ); + } + + $QUIT_DIALOG->show; + $QUIT_DIALOG->grab_focus; +} + +sub show_tip_of_the_day { + # find all tips + my @tod = CFPlus::Pod::find tip_of_the_day => "*"; + + CFPlus::DB::get state => "tip_of_the_day", sub { + my ($todindex) = @_; + $todindex = 0 if $todindex >= @tod; + CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { }; + + # create dialog + my $dialog; + + my $close = sub { + $dialog->destroy; + }; + + $dialog = new CFPlus::UI::Toplevel + x => "center", + y => "center", + z => 3, + name => 'tip_of_the_day', + force_w => int $WIDTH * 4/9, + force_h => int $WIDTH * 2/9, + title => "Tip of the day #" . (1 + $todindex), + child => my $vbox = new CFPlus::UI::VBox, + has_close_button => 1, + on_delete => $close, + ; + + $vbox->add (my $viewer = new CFPlus::UI::TextScroller + expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); + $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); + + $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); + + $table->add_at (0, 0, new CFPlus::UI::Button + text => "Close", + tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the Server Setup.", + on_activate => $close, + ); + + $table->add_at (2, 0, new CFPlus::UI::Button + text => "Next", + tooltip => "Show the next Tip of the day.", + on_activate => sub { + $close->(); + &show_tip_of_the_day; + }, + ); + + $dialog->show; + }; +} + sub sdl_init { CFPlus::SDL_Init and die "SDL::Init failed!\n"; } sub video_init { - sdl_init; - $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; my ($old_w, $old_h) = ($WIDTH, $HEIGHT); - ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; + ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; $FULLSCREEN = $CFG->{fullscreen}; $FAST = $CFG->{fast}; - CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN + CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; $SDL_ACTIVE = 1; $LAST_REFRESH = time - 0.01; CFPlus::OpenGL::init; + CFPlus::Macro::init; $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; @@ -1576,7 +1999,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, @@ -1585,8 +2020,6 @@ force_y => 0; $DEBUG_STATUS->show; - $BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0); - $STATUSBOX = new CFPlus::UI::Statusbox; $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); @@ -1597,7 +2030,7 @@ child => $STATUSBOX, )->show; - CFPlus::UI::FancyFrame->new ( + CFPlus::UI::Toplevel->new ( title => "Map", name => "mapmap", x => 0, @@ -1613,29 +2046,18 @@ $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, - tooltip => "Server Log. This text viewer contains all the messages sent by the server.", + $COMPLETER = new CFPlus::MapWidget::Command:: + command => { }, + tooltip => "#completer_help", ; - $SETUP_DIALOG = new CFPlus::UI::FancyFrame + $SETUP_DIALOG = new CFPlus::UI::Toplevel title => "Setup", name => "setup_dialog", x => 'center', @@ -1647,26 +2069,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 (Pickup => autopickup_setup, - "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); - $SETUP_NOTEBOOK->add (Graphics => graphics_setup, + $SETUP_NOTEBOOK->add_tab (Client => client_setup, + "Configure various client-specific settings."); + $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 @@ -1674,7 +2097,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 @@ -1696,6 +2119,7 @@ $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, tooltip => "View Documentation"); + $BUTTONBAR->add (new CFPlus::UI::Button text => "Quit", tooltip => "Terminates the program", @@ -1703,7 +2127,7 @@ if ($CONN) { open_quit_dialog; } else { - exit; + Event::unloop_all; } 0 }, @@ -1711,6 +2135,7 @@ $BUTTONBAR->show; $SETUP_DIALOG->show; + $MESSAGE_WINDOW->show; } $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); @@ -1722,102 +2147,34 @@ 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 { - 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); - - push @bgmusic, shift @bgmusic; -} - -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; - - 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; + 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}" })->($_) - for CFPlus::SDL_PollEvent; + for CFPlus::poll_events; 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; } }); @@ -1831,18 +2188,9 @@ 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 { - Event::unloop -1; + Event::unloop_all; }, CFPlus::SDL_VIDEORESIZE => sub { }, @@ -1850,7 +2198,12 @@ CFPlus::UI::full_refresh; }, CFPlus::SDL_ACTIVEEVENT => sub { -# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# +# not useful, as APPACTIVE include sonly iconified state, not unmapped +# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d# +# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d# +# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; +# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; +# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; }, CFPlus::SDL_KEYDOWN => sub { if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { @@ -1881,34 +2234,39 @@ { CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; + CFPlus::DB::Server::run; + 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 => 'say', - audio_enable => 1, - bgm_enable => 1, - bgm_volume => 0.25, - face_prefetch => 0, - output_sync => 1, - output_count => 1, - pickup => 0, - inv_sort => "mtime", - default => "profile", # default profile + 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) { @@ -1916,15 +2274,28 @@ } $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; + $PROFILE = $CFG->{profile}{default}; - sdl_init; + # convert old bindings (only default profile matters) + if (my $bindings = delete $PROFILE->{bindings}) { + while (my ($mod, $syms) = each %$bindings) { + while (my ($sym, $cmds) = each %$syms) { + push @{ $PROFILE->{macro} }, { + accelkey => [$mod*1, $sym*1], + action => $cmds, + }; + } + } + } - @SDL_MODES = reverse - grep $_->[0] >= 640 && $_->[1] >= 480, - CFPlus::SDL_ListModes; + sdl_init; + @SDL_MODES = CFPlus::SDL_ListModes 8, 8; + @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES; @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; + @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; + $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; { @@ -1966,15 +2337,23 @@ 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 } +#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 @@ -1982,8 +2361,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