--- deliantra/Deliantra-Client/bin/cfplus 2006/07/23 17:03:44 1.101 +++ deliantra/Deliantra-Client/bin/cfplus 2007/08/21 02:39:17 1.220 @@ -1,24 +1,69 @@ #!/opt/bin/perl +my $startup_done = sub { }; +our $PANGO = "1.5.0"; + +# do splash-screen thingy on win32 +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 $tmp = $ENV{PAR_TEMP}; + while (my ($filename, $zip) = each %PAR::LibCache) { for ($zip->memberNames) { - next unless /^\/root\/(.*)/; - $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") - unless -e "$ENV{PAR_TEMP}/$1"; + next unless /^root\/(.*)/; + $zip->extractMember ($_, "$tmp/$1") + unless -e "$tmp/$1"; } } - # TODO: pango-rc file, anybody? + if ($^O eq "MSWin32") { + # relocatable + } else { + # unix, need to patch pango rc file + open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" + or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; + local $/; + my $rc = <$fh>; + $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones + + mkdir "$tmp/pango-modules"; + open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" + or die "$tmp/pango-modules/pango.modules: $!"; + print $fh $rc; + + $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; + open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} + or die "$ENV{PANGO_RC_FILE}: $!"; + print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; + } - unshift @INC, $ENV{PAR_TEMP}; + unshift @INC, $tmp; } } @@ -28,47 +73,48 @@ use Time::HiRes 'time'; use Event; +use List::Util qw(max min); use Crossfire; use Crossfire::Protocol::Constants; use Compress::LZF; -use CFClient; -use CFClient::OpenGL (); -use CFClient::Protocol; -use CFClient::UI; -use CFClient::Pod; -use CFClient::BindingEditor; -use CFClient::MapWidget; +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::MessageWindow; +use CFPlus::Pod; +use CFPlus::MapWidget; +use CFPlus::Macro; $SIG{QUIT} = sub { Carp::cluck "QUIT" }; $SIG{PIPE} = 'IGNORE'; +$Event::Eval = 1; $Event::DIED = sub { - # TODO: display dialog box or so - Carp::confess $_[1];#d#TODO: remove when stable - CFClient::error $_[1]; + CFPlus::fatal Carp::longmess $_[1] }; -#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# - -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; @@ -83,8 +129,6 @@ our $MAPMAP; our $MAPWIDGET; our $BUTTONBAR; -our $LOGVIEW; -our $CONSOLE; our $METASERVER; our $LOGIN_BUTTON; our $QUIT_DIALOG; @@ -101,10 +145,14 @@ our $PL_NOTEBOOK; our $PL_WINDOW; +our $MUSIC_PLAYING_WIDGET; +our $LICENSE_WIDGET; + our $INVENTORY_PAGE; our $STATS_PAGE; our $SKILL_PAGE; our $SPELL_PAGE; +our $SPELL_LIST; our $HELP_WINDOW; our $MESSAGE_WINDOW; @@ -115,56 +163,316 @@ 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 $BIND_EDITOR; -our $BIND_UPD_CB; +our $INVR_HB; -our $PICKUP_CFG; +############################################################################# sub status { - $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); + $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); } sub debug { $DEBUG_STATUS->set_text ($_[0]); } +sub message { + my ($para) = @_; + $MESSAGE_WINDOW->message ($para); +} + +############################################################################# +#TODO: maybe move into own audio module... + +our $SDL_MIXER; + +our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; +our $MUSIC_WANT; # arryref of ambient music we want to play +our @MUSIC_HAVE; # ambient music we have on disk +our $MUSIC_START; +our @MUSIC_JINGLE; # which jingles to play next +our $MUSIC_PLAYING_DATA; +our $MUSIC_PLAYING_META; +our $MUSIC_PLAYER; +our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before + +our %AUDIO_CHUNK; # audio "files" +our %AUDIO_PLAY; # which audio faces should be played + +sub audio_channel_finished { + my ($channel) = @_; + +# warn "channel $channel finished\n";#d# +} + +sub audio_sound_push($) { + my ($face) = @_; + + $CFG->{effects_enable} + or return; + + $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, 1000, $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; + + @MUSIC_HAVE = @have + if @have; + + # default MUSIC_HAVE == MUSIC_DEFAULT + @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; + $fade_out = 1000; + } + + # if the currently playing song is acceptable, let it continue + return if 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_time} > $NOW - $MUSIC_RESUME + ? $MUSIC_HAVE[-1] + : $MUSIC_HAVE[0]; + + audio_music_start; + } +} + +sub audio_music_set_ambient { + my ($songs) = @_; + + $MUSIC_WANT = $songs; + audio_music_push; +} + +sub audio_music_finished { + # we compress multiple jingles of the same type + shift @MUSIC_JINGLE + while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; + + $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 CFClient::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", - child => my $vbox = new CFClient::UI::VBox, + child => my $vbox = new CFPlus::UI::VBox, ; - my @dialog = my $label = new CFClient::UI::Label - max_w => $::WIDTH * 0.4, + my @dialog = my $label = new CFPlus::UI::Label + max_w => $::WIDTH * 0.8, ellipsise => 0, text => $prompt; if ($flags & CS_QUERY_YESNO) { - push @dialog, my $hbox = new CFClient::UI::HBox; + push @dialog, my $hbox = new CFPlus::UI::HBox; - $hbox->add (new CFClient::UI::Button + $hbox->add (new CFPlus::UI::Button text => "No", on_activate => sub { $conn->send ("reply n"); @@ -172,7 +480,7 @@ 0 } ); - $hbox->add (new CFClient::UI::Button + $hbox->add (new CFPlus::UI::Button text => "Yes", on_activate => sub { $conn->send ("reply y"); @@ -184,19 +492,17 @@ $dialog->grab_focus; } elsif ($flags & CS_QUERY_SINGLECHAR) { - $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard 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 CFClient::UI::Label - max_w => $::WIDTH * 0.4, + unshift @dialog, new CFPlus::UI::Label + max_w => $::WIDTH * 0.8, ellipsise => 0, markup => "\nOr use your keyboard and the text entry below:\n"; - unshift @dialog, my $table = new CFClient::UI::Table; + unshift @dialog, my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFClient::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Next Race", on_activate => sub { $conn->send ("reply n"); @@ -204,7 +510,7 @@ 0 }, ); - $table->add (2, 0, new CFClient::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply d"); @@ -213,17 +519,33 @@ }, ); - unshift @dialog, new CFClient::UI::Label + 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, - markup => - "Character Creation: Race\n\n" - . "Look at the Messages window to see a description of this race " - . "and the center of the screen to see how this race looks like " - . "(below this dialog window: you may need to move the dialog away and " - . "click into the display area to make it visible).\n\n" - . "You can look at another race, or accept this race (you will cycle back to " - . "this race eventually, so you can take your time making this important choice." + markup => (CFPlus::Pod::section_label ui => "chargen_race"), ; } elsif ($prompt =~ /roll new stats/) { @@ -233,18 +555,15 @@ return; } - $STATS_PAGE->show; - $MESSAGE_WINDOW->hide; - - unshift @dialog, new CFClient::UI::Label + unshift @dialog, new CFPlus::UI::Label max_w => $::WIDTH * 0.4, ellipsise => 0, markup => "\nOr use your keyboard and the text entry below:\n"; - unshift @dialog, my $table = new CFClient::UI::Table; + unshift @dialog, my $table = new CFPlus::UI::Table; # left: re-roll - $table->add (0, 0, new CFClient::UI::Button + $table->add_at (0, 0, new CFPlus::UI::Button text => "Roll Again", on_activate => sub { $conn->send ("reply y"); @@ -254,7 +573,7 @@ ); # center: swap stats - my ($sw1, $sw2) = map +(new CFClient::UI::Combobox + my ($sw1, $sw2) = map +(new CFPlus::UI::Selector expand => 1, value => $_, options => [ @@ -268,7 +587,7 @@ ], ), 1 .. 2; - $table->add (2, 0, new CFClient::UI::Button + $table->add_at (2, 0, new CFPlus::UI::Button text => "Swap Stats", on_activate => sub { $conn->{stat_change_with} = $sw2->{value}; @@ -277,10 +596,10 @@ 0 }, ); - $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); + $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); # right: accept - $table->add (4, 0, new CFClient::UI::Button + $table->add_at (4, 0, new CFPlus::UI::Button text => "Accept", on_activate => sub { $conn->send ("reply n"); @@ -290,7 +609,7 @@ }, ); - unshift @dialog, my $hbox = new CFClient::UI::HBox; + unshift @dialog, my $hbox = new CFPlus::UI::HBox; for ( [Str => CS_STAT_STR], [Dex => CS_STAT_DEX], @@ -301,29 +620,24 @@ [Cha => CS_STAT_CHA], ) { my ($name, $id) = @$_; - $hbox->add (new CFClient::UI::Label + $hbox->add (new CFPlus::UI::Label markup => "$conn->{stat}{$id} $name", align => 0, expand => 1, can_events => 1, can_hover => 1, - tooltip => $CFClient::STAT_TOOLTIP{$name}, + tooltip => "#stat_$name", ); } - unshift @dialog, new CFClient::UI::Label + unshift @dialog, new CFPlus::UI::Label max_w => $::WIDTH * 0.4, ellipsise => 0, - markup => - "Character Creation: Stats\n\n" - . "Stats are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n" - . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). " - . "They will be modified later by both the race and the class you choose.\n\n" - . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n" + markup => (CFPlus::Pod::section_label ui => "chargen_stats"), ; } - push @dialog, my $entry = new CFClient::UI::Entry + push @dialog, my $entry = new CFPlus::UI::Entry on_changed => sub { $conn->send ("reply $_[1]"); destroy_query_dialog $conn; @@ -336,7 +650,7 @@ } else { $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; - push @dialog, my $entry = new CFClient::UI::Entry + push @dialog, my $entry = new CFPlus::UI::Entry $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), on_activate => sub { $conn->send ("reply $_[1]"); @@ -360,41 +674,34 @@ 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 CFClient::Map $mapsize, $mapsize; + $MAP = new CFPlus::Map; $CONN = eval { - new CFClient::Protocol + 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, }, }; if ($CONN) { - CFClient::lowdelay fileno $CONN->{fh}; + CFPlus::lowdelay fileno $CONN->{fh}; status "login successful"; } else { @@ -408,7 +715,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,89 +732,132 @@ } sub graphics_setup { - my $vbox = new CFClient::UI::VBox; + my $vbox = new CFPlus::UI::VBox; - $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); + $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); - $table->add (1, 0, my $hbox = new CFClient::UI::HBox); + my $row = 0; - $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); - $hbox->add (my $mode_label = new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); - $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); - $table->add (1, $row++, new CFClient::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 $CFClient::OpenGL::GL_VERSION < 1.2; - 0 - } - ); - - $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); - $table->add (1, $row++, new CFClient::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 { @@ -514,8 +867,8 @@ } ); - $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); - $table->add (1, $row++, new CFClient::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 { @@ -525,51 +878,63 @@ } ); - $table->add (1, $row++, new CFClient::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 CFClient::UI::VBox; + my $vbox = new CFPlus::UI::VBox; - $vbox->add (my $table = new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); - $table->add (1, $row++, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); -# $table->add (1, 8, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); - $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); - $hbox->add (new CFClient::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 CFClient::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]; CFClient::MixMusic::volume $_[1] * 128; 0 } + on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } ); - $table->add (1, $row++, new CFClient::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 (); @@ -590,48 +955,43 @@ sub make_gauge_window { my $gh = int $HEIGHT * $CFG->{gauge_size}; - my $win = new CFClient::UI::Frame ( + my $win = new CFPlus::UI::Frame ( force_x => 0, force_y => "max", force_w => $WIDTH, force_h => $gh, ); - $win->add (my $hbox = new CFClient::UI::HBox + $win->add (my $hbox = new CFPlus::UI::HBox children => [ - (new CFClient::UI::HBox expand => 1), - (new CFClient::UI::VBox children => [ - (new CFClient::UI::Empty expand => 1), - (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), + (new CFPlus::UI::HBox expand => 1), + (new CFPlus::UI::VBox children => [ + (new CFPlus::UI::Empty expand => 1), + (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)), ]), - (my $vbox = new CFClient::UI::VBox), + (my $vbox = new CFPlus::UI::VBox), ], ); - $vbox->add (new CFClient::UI::HBox + $vbox->add (new CFPlus::UI::HBox expand => 1, children => [ - (new CFClient::UI::Empty expand => 1), - (my $hb = new CFClient::UI::HBox), + (new CFPlus::UI::Empty expand => 1), + (my $hb = new CFPlus::UI::HBox), ], ); - $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', - tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment."); - $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', - tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana."); - $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', - tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods."); - $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', - tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too."); - - $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, - tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100."); - $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, - tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); + $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); + $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); + $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 $prg = 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, + exp => $exp, prg => $prg, win => $win, range => $rng, food => $fg, mana => $mg, hp => $hg, grace => $gg }; @@ -641,58 +1001,88 @@ } sub debug_setup { - my $table = new CFClient::UI::Table; + my $table = new CFPlus::UI::Table; - $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); - $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); - $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); - $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); - $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); - $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); - $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); - $table->add (1, 3, new CFClient::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 CFClient::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 } sub stats_window { - my $r = new CFClient::UI::ScrolledWindow ( + my $r = new CFPlus::UI::ScrolledWindow ( expand => 1, scroll_y => 1 ); - $r->add (my $vb = new CFClient::UI::VBox); + $r->add (my $vb = new CFPlus::UI::VBox); + + $vb->add (new CFPlus::UI::FancyFrame + label => "Player", + child => (my $pi = new CFPlus::UI::VBox), + ); - $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, + $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 CFClient::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 CFClient::UI::HBox); - $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, + $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."); - $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, + $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, can_hover => 1, can_events => 1, tooltip => "The weight limit: you cannot carry more than this."); - - $vb->add (my $hb = new CFClient::UI::HBox expand => 1); - $hb->add (my $tbl = new CFClient::UI::Table 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]; @@ -714,15 +1104,18 @@ ) { my ($col, $row, $id, $label, $template) = @$_; - $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::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 => $CFClient::STAT_TOOLTIP{$label}); - $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label + align => +1, template => $template, tooltip => "#stat_$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 => $CFClient::STAT_TOOLTIP{$label}); + align => -1, text => $label, tooltip => "#stat_$label"); } - $vb->add (my $tbl2 = new CFClient::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; @@ -765,13 +1158,14 @@ 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 CFClient::UI::Label + new CFPlus::UI::Label font => $FONT_FIXED, template => "-100%", align => +1, @@ -780,14 +1174,14 @@ can_hover => 1, tooltip => $resist_names{$_}->[1], ); - $tbl2->add ($col + 1, $row, new CFClient::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 CFClient::UI::Label + $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label text => $resist_names{$_}->[0], font => $FONT_FIXED, can_hover => 1, @@ -808,8 +1202,10 @@ } sub skill_window { - my $sw = new CFClient::UI::ScrolledWindow (expand => 1); - $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); + my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); + + $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]); + $sw } @@ -830,29 +1226,17 @@ my $table = $METASERVER->{table}; $table->clear; - $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); + $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); - my $buf; + my $ok = 0; - my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; - - 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; - - 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 = ( @@ -863,7 +1247,7 @@ "Short information about this server provided by its admins.", ); my @col = qw(#Users Host Uptime Version Description); - $table->add ($_, 0, new CFClient::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[$_]) @@ -872,30 +1256,31 @@ 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 CFClient::UI::VBox children => [ - (new CFClient::UI::Button + $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", on_activate => sub { @@ -904,35 +1289,41 @@ 0 }, ), - (new CFClient::UI::Empty expand => 1), + (new CFPlus::UI::Empty expand => 1), ]); - $table->add ($_, $y, new CFClient::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 { - my $vbox = new CFClient::UI::VBox; - my $table = new CFClient::UI::Table; - $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); + my $vbox = new CFPlus::UI::VBox; + my $table = new CFPlus::UI::Table; + $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table); - my $dialog = new CFClient::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, @@ -946,227 +1337,149 @@ } sub server_setup { - my $vbox = new CFClient::UI::VBox; + my $vbox = new CFPlus::UI::VBox; - $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); - $table->add (0, 2, new CFClient::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 CFClient::UI::VBox); + $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox); $vbox->add ( - $HOST_ENTRY = new CFClient::UI::Entry + $HOST_ENTRY = new CFPlus::UI::Entry expand => 1, text => $CFG->{profile}{default}{host}, tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{host} = $value; - 0 + 1 } ); - $vbox->add (new CFClient::UI::Button + $vbox->add (new CFPlus::UI::Button expand => 1, text => "Server List", 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 CFClient::UI::Label valign => 0, align => 1, text => "Username"); - $table->add (1, 4, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Password"); - $table->add (1, 5, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); - $table->add (1, 7, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); - $table->add (1, 8, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); - $table->add (1, 9, new CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); - $table->add (1, 10, new CFClient::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 CFClient::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 CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); - $table->add (1, 12, my $saycmd = new CFClient::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::FancyFrame + label => "Server Info", + child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), ); - $vbox->add (new CFClient::UI::Label - text => "Server Info", - fontsize => 1.2, - padding_y => 8, - fg => [1, 1, 0, 1], - ); - - $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); - $vbox } -sub message_window { - my $window = new CFClient::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 CFClient::UI::VBox), - has_close_button => 1; - - $vbox->add ($LOGVIEW); - - $vbox->add (my $input = new CFClient::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}; +sub client_setup { + my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; - if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { - $input->{refocus_map} = 1; - } - delete $input->{auto_activated}; - - 0 - }, - on_activate => sub { - my ($input, $text) = @_; - $input->set_text (''); - - if ($text =~ /^\/(.*)/) { - $::CONN->user_send ($1); - } else { - my $say_cmd = $::CFG->{say_command} || 'say'; - $::CONN->user_send ("$say_cmd $text"); - } - if ($input->{refocus_map}) { - delete $input->{refocus_map}; - $MAPWIDGET->focus_in - } + 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_quit_dialog { - unless ($QUIT_DIALOG) { - $QUIT_DIALOG = new CFClient::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 CFClient::UI::VBox expand => 1); - - $vb->add (new CFClient::UI::Label - text => "You should find a savebed and apply it first!", - max_w => $WIDTH * 0.25, - ellipsize => 0, - ); - $vb->add (my $hb = new CFClient::UI::HBox expand => 1); - $hb->add (new CFClient::UI::Button - text => "Ok", - expand => 1, - on_activate => sub { $QUIT_DIALOG->hide; 0 }, - ); - $hb->add (new CFClient::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 CFClient::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, @@ -1190,12 +1503,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], @@ -1205,19 +1518,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 CFClient::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 CFClient::UI::Label text => $_->[0], align => 1, expand => 1); - $table->add ($x+1, $y, my $checkbox = new CFClient::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) = @_; @@ -1238,7 +1552,7 @@ } } - $table->add (2, 18, new CFClient::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] }, @@ -1251,7 +1565,7 @@ 1; }); - $table->add (3, 18, new CFClient::UI::Button + $table->add_at (3, 18, new CFPlus::UI::Button text => "set", on_activate => sub { $::CONN->send_command ("pickup $::CFG->{pickup}") @@ -1259,56 +1573,111 @@ 0 }); - $table + $r } +my %SORT_ORDER = ( + type => undef, + 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} + } @_ }, +); + sub inventory_widget { - my $hb = new CFClient::UI::HBox homogeneous => 1; + my $hb = new CFPlus::UI::HBox homogeneous => 1; - $hb->add (my $vb1 = new CFClient::UI::VBox); - $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); + $hb->add (my $vb1 = new CFPlus::UI::VBox); + $vb1->add (new CFPlus::UI::Label align => 0, text => "Player"); - $vb1->add (my $hb1 = new CFClient::UI::HBox); + $vb1->add (my $hb1 = new CFPlus::UI::HBox); use sort 'stable'; - $hb1->add (new CFClient::UI::Combobox - value => undef, + $hb1->add (new CFPlus::UI::Selector + value => $::CFG->{inv_sort}, options => [ - [undef, "Type/Name"], - [ - sub { sort { - $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) - or $a->{type} <=> $b->{type} - } @_ }, - "Weight/Type", - ], - [sub { } => "#TODO#"], + [type => "Type/Name"], + [mtime => "Recent/Normal/Locked"], + [weight => "Weight/Type"], ], on_changed => sub { - $INV->set_sort_order ($_[1]); + $::CFG->{inv_sort} = $_[1]; + $INV->set_sort_order ($SORT_ORDER{$_[1]}); }, ); - $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1); + $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1); #TODO# update to weigh/maxweight - $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1); + $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); - $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); - $sw1->add ($INV = new CFClient::UI::Inventory); + $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 CFClient::UI::VBox); + $hb->add (my $vb2 = new CFPlus::UI::VBox); - $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); + $vb2->add ($INVR_HB = new CFPlus::UI::HBox); - $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); - $sw2->add ($INVR = new CFClient::UI::Inventory); + $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); + $sw2->add ($INVR = new CFPlus::UI::Inventory); # XXX: Call after $INVR = ... because set_opencont sets the items - CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); + CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor"); $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) = @_; @@ -1321,7 +1690,7 @@ } sub player_window { - my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame + my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel x => "center", y => "center", force_w => $WIDTH * 9/10, @@ -1333,28 +1702,33 @@ my $ntb = $PL_NOTEBOOK = - new CFClient::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 CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1); - $spellsw->add ($SPELL_PAGE = new CFClient::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 => 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); @@ -1362,359 +1736,297 @@ $plwin } -sub update_bindings { - $BIND_UPD_CB->() if $BIND_UPD_CB; +sub keyboard_setup { + CFPlus::Macro::keyboard_setup } -sub keyboard_setup { - my $binding_list = new CFClient::UI::VBox; +sub help_window { + my $win = new CFPlus::UI::Toplevel + x => 'center', + y => 'center', + z => 4, + name => 'doc_browser', + force_w => int $WIDTH * 7/8, + force_h => int $HEIGHT * 7/8, + title => "Help Browser", + has_close_button => 1; - 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 = CFClient::BindingEditor::keycombo_to_name ($mod, $sym); - $binding_list->add (my $hb = new CFClient::UI::HBox); - $hb->add (new CFClient::UI::Button - text => "delete", - tooltip => "Deletes the binding", - on_activate => sub { - $binding_list->remove ($hb); - delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; - 0 - }); + $win->add (my $vbox = new CFPlus::UI::VBox); - $hb->add (new CFClient::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 - }); + $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, padding_y => 4); - $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); - $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); - } - } - }; + my @history; + my @future; + my $curnode; - my $vb = new CFClient::UI::VBox; - $vb->add (my $hb = new CFClient::UI::HBox); - $hb->add (new CFClient::UI::Label text => "only shift-up stops fire"); - $hb->add (new CFClient::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 - }); + my $load_node; $load_node = sub { + my ($node, $para) = @_; - $vb->add ($binding_list); - $vb->add (my $hb = new CFClient::UI::HBox); + $buttons->clear; - $hb->add (new CFClient::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; + $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 + 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}); }, ); - $SETUP_DIALOG->hide; - $::BIND_EDITOR->show; - 0 - }, - ); + } - $hb->add (new CFClient::UI::Button - text => "close", - tooltip => "Closes the binding window", - expand => 1, - on_activate => sub { - $SETUP_DIALOG->hide; - 0 + 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}); + }, + ); } - ); - $refresh->(); + $buttons->add (new CFPlus::UI::Label text => " "); - $vb -} + my @path = CFPlus::Pod::full_path_of $node; + pop @path; # drop current node -# just weirdness, pls. ignore -sub load_html_page { - my ($viewer, $base) = @_; + 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 => "/"); + } - $viewer->clear; + $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4); - require LWP::Simple; - require HTML::Parser; - require URI; + $curnode = $node; - my $page = LWP::Simple::get ($base) - or return; + $viewer->clear; + $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); + $viewer->scroll_to ($para); + }; - my @s = { }; - my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup); + $load_node->(CFPlus::Pod::find pod => "mainpage"); - my $parser = HTML::Parser->new ( - text_h => [sub { - my ($text) = @_; - $text =~ s/\s+/ /g; - $s[-1]{text} .= CFClient::asxml $text; - }, "dtext"], - start_h => [sub { - my ($tag, $attr) = @_; - if ($passthrough{$tag}) { - $s[-1]{text} .= "<$tag>"; - } elsif ($tag eq "h1") { - push @s, { text => "" }; - } elsif ($tag eq "h2") { - push @s, { text => "" }; - } elsif ($tag eq "h3") { - push @s, { text => "" }; - } elsif ($tag eq "a") { - push @s, { text => "", url => $attr->{href} }; - } elsif ($tag eq "p") { - push @s, { }; - } elsif ($tag eq "img") { - eval { - push @{$s[-1]{obj}}, new CFClient::UI::Image - tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base))); - $s[-1]{text} .= "\x{fffc}"; - }; - } - }, "tagname, attr"], - end_h => [sub { - my ($tag) = @_; - if ($passthrough{$tag}) { - $s[-1]{text} .= ""; - } elsif ($tag =~ /^h\d$/) { - $s[-1]{text} .= ""; - push @s, { }; - } elsif ($tag eq "a") { - my $S = pop @s; - $s[-1]{text} .= "\x{fffc}"; - push @{$s[-1]{obj}}, new CFClient::UI::Label - fg => [0.8, 0.8, 1], - markup => "$S->{text}", - fontsize => 0.8, - can_events => 1, - can_focus => 1, - on_button_up => sub { - load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base)); - }, - ; - } - }, "tagname"], - ); + $CFPlus::Pod::goto_document = sub { + my (@path) = @_; - $parser->parse ($page); - $parser->eof; + push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); - $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent}) - for @s; - - $viewer->set_offset (0); -} + $load_node->((CFPlus::Pod::find @path)[0]); + $win->show; + }; -sub help_window { - my $win = new CFClient::UI::FancyFrame - x => 'center', - y => 'center', - z => 2, - name => 'doc_browser', - force_w => int $WIDTH * 7/8, - force_h => int $HEIGHT * 7/8, - title => "Help Browser", - has_close_button => 1; + $win +} - $win->add (my $vbox = new CFClient::UI::VBox); +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 + ); - $vbox->add (my $buttons = new CFClient::UI::HBox); - $vbox->add (my $viewer = new CFClient::UI::TextScroller - expand => 1, fontsize => 0.8, padding_x => 4); - - $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); - $buttons->add (my $combo = new CFClient::UI::Combobox - value => undef, - options => [ - [intro => "Introduction"], - [manual => "Main Manual"], - [skill_help => "Skill Reference"], - [command_help => "Command Reference"], - [dmcommand_help => "DM Commands"], - [COPYING => "License Terms"], - [test => "test (do not select)"], #d#TODO - ], - on_changed => sub { - my ($self, $pod) = @_; + $e->grab_focus; + $e->set_text ($txt) if $txt; + $dialog->show; +} - if ($pod eq "test") {#d#TODO - eval { - load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html"; - }; - warn "$@" if $@; - return; +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; } + ; - my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod", - doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] }; + $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1); - #use Data::Dumper; warn Dumper $pom;#d# + $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 }, + ); + } - $viewer->clear; + $QUIT_DIALOG->show; + $QUIT_DIALOG->grab_focus; +} -# $viewer->add_paragraph ([1, 1, 1, 1], ["Test\n\n \x{fffc} \x{fffc}\n", -# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1), -# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"), -# ]);#d# - - $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent}) - for @$pom; +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, + ; - $viewer->set_offset (0); + $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, + ); - 0 - }, - on_visibility_change => sub { - my ($self, $visible) = @_; - return unless $visible; - return if $self->{value}; - $self->set_value ("intro"); - 0 - }, - ); + $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; + }, + ); - $win + $dialog->show; + }; } sub sdl_init { - CFClient::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}; - CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN - or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; + 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; - CFClient::OpenGL::init; + CFPlus::OpenGL::init; $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; - $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# + $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# ############################################################################# if ($DEBUG_STATUS) { - CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; + CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; } else { # create the widgets - $DEBUG_STATUS = new CFClient::UI::Label + $DEBUG_STATUS = new CFPlus::UI::Label padding => 0, z => 100, force_x => "max", force_y => 0; $DEBUG_STATUS->show; - $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0); - - $STATUSBOX = new CFClient::UI::Statusbox; + $STATUSBOX = new CFPlus::UI::Statusbox; $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); - (new CFClient::UI::Frame + (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], force_x => 0, force_y => "max", child => $STATUSBOX, )->show; - CFClient::UI::FancyFrame->new ( + CFPlus::UI::Toplevel->new ( title => "Map", name => "mapmap", x => 0, y => $FONTSIZE + 8, border_bg => [1, 1, 1, 192/255], bg => [1, 1, 1, 0], - child => ($MAPMAP = new CFClient::MapWidget::MapMap + child => ($MAPMAP = new CFPlus::MapWidget::MapMap tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.", ), )->show; - $MAPWIDGET = new CFClient::MapWidget; + $MAPWIDGET = new CFPlus::MapWidget; $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 CFClient::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.", - ; - - $SETUP_DIALOG = new CFClient::UI::FancyFrame + $SETUP_DIALOG = new CFPlus::UI::Toplevel title => "Setup", name => "setup_dialog", x => 'center', @@ -1726,63 +2038,65 @@ ; $METASERVER = metaserver_dialog; + $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow; - $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, - filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); + $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 CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top + $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, + $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 CFClient::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 - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, + $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); - $BUTTONBAR->add (new CFClient::UI::Button + $BUTTONBAR->add (new CFPlus::UI::Button text => "Save Config", tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", on_activate => sub { - $::CFG->{layout} = CFClient::UI::get_layout; - CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; + $::CFG->{layout} = CFPlus::UI::get_layout; + CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc"; status "Configuration Saved"; 0 }, ); - $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, + $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, tooltip => "View Documentation"); - $BUTTONBAR->add (new CFClient::UI::Button + + $BUTTONBAR->add (new CFPlus::UI::Button text => "Quit", tooltip => "Terminates the program", on_activate => sub { if ($CONN) { open_quit_dialog; } else { - exit; + Event::unloop_all; } 0 }, @@ -1790,113 +2104,46 @@ $BUTTONBAR->show; $SETUP_DIALOG->show; + $MESSAGE_WINDOW->show; } $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); } sub video_shutdown { - CFClient::OpenGL::shutdown; + CFPlus::OpenGL::shutdown; 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 CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]"; - $bgmusic->play (0); - - push @bgmusic, shift @bgmusic; -} - -sub audio_init { - if ($CFG->{audio_enable}) { - if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { - $SDL_MIXER = !CFClient::Mix_OpenAudio; - - unless ($SDL_MIXER) { - status "Unable to open sound device: there will be no sound"; - return; - } - - CFClient::Mix_AllocateChannels 8; - CFClient::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 CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; - $chunk->volume ($volume * 128 / 100); - $chunk - }; - } - } else { - status "unable to open sound config: $!"; - } - } -} - -sub audio_shutdown { - CFClient::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; - - $CFClient::UI::ROOT->draw; + if ($ENV{CFPLUS_DEBUG} & 4) { + $fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02; + debug sprintf "%3.2f", $fps; + } - $WANT_REFRESH = 0; - $CAN_REFRESH = 0; + $CFPlus::UI::ROOT->draw; + CFPlus::SDL_GL_SwapBuffers; $LAST_REFRESH = $NOW; - - CFClient::SDL_GL_SwapBuffers; + $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 CFClient::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; } }); @@ -1910,42 +2157,38 @@ 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 = ( - CFClient::SDL_QUIT => sub { - Event::unloop -1; + CFPlus::SDL_QUIT => sub { + exit; }, - CFClient::SDL_VIDEORESIZE => sub { + CFPlus::SDL_VIDEORESIZE => sub { }, - CFClient::SDL_VIDEOEXPOSE => sub { - CFClient::UI::full_refresh; + CFPlus::SDL_VIDEOEXPOSE => sub { + CFPlus::UI::full_refresh; }, - CFClient::SDL_ACTIVEEVENT => sub { -# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# + CFPlus::SDL_ACTIVEEVENT => sub { +# 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; }, - CFClient::SDL_KEYDOWN => sub { - if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { + CFPlus::SDL_KEYDOWN => sub { + if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) { # alt-enter $FULLSCREEN_ENABLE->toggle; video_shutdown; video_init; } else { - CFClient::UI::feed_sdl_key_down_event ($_[0]); + CFPlus::UI::feed_sdl_key_down_event ($_[0]); } }, - CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, - CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, - CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, - CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, - CFClient::SDL_USEREVENT => sub { + CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event, + CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event, + CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event, + CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event, + CFPlus::SDL_USEREVENT => sub { if ($_[0]{code} == 1) { audio_channel_finished $_[0]{data1}; } elsif ($_[0]{code} == 0) { @@ -1959,40 +2202,40 @@ $SIG{INT} = $SIG{TERM} = sub { exit }; { - local $SIG{__DIE__} = sub { - return unless defined $^S && !$^S; - Carp::confess $_[0];#d#TODO: remove when stable - CFClient::fatal $_[0]; - }; + CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; + CFPlus::DB::Server::run; - CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; - CFClient::UI::set_layout ($::CFG->{layout}); + 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, - 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) { @@ -2000,19 +2243,32 @@ } $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; + $PROFILE = $CFG->{profile}{default}; + + # 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_init; - @SDL_MODES = reverse - grep $_->[0] >= 640 && $_->[1] >= 480, - CFClient::SDL_ListModes; + @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 or CFClient::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; { - my @fonts = map CFClient::find_rcfile "fonts/$_", qw( + my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( DejaVuSans.ttf DejaVuSansMono.ttf DejaVuSans-Bold.ttf @@ -2023,12 +2279,12 @@ DejaVuSansMono-BoldOblique.ttf ); - CFClient::add_font $_ for @fonts; + CFPlus::add_font $_ for @fonts; - CFClient::pango_init; + CFPlus::pango_init; - $FONT_PROP = new_from_file CFClient::Font $fonts[0]; - $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; + $FONT_PROP = new_from_file CFPlus::Font $fonts[0]; + $FONT_FIXED = new_from_file CFPlus::Font $fonts[1]; $FONT_PROP->make_default; } @@ -2038,7 +2294,7 @@ # for my $rgba (0..1) { # my $t1 = Time::HiRes::time; # for (1..1000) { -# my $layout = CFClient::Layout->new ($rgba); +# my $layout = CFPlus::Layout->new ($rgba); # $layout->set_text ("hallo" x 100); # $layout->render; # } @@ -2046,19 +2302,24 @@ # warn $t2-$t1; # } + $startup_done->(); + video_init; audio_init; } +show_tip_of_the_day if $CFG->{show_tips}; + Event::loop; -#CFClient::SDL_Quit; -#CFClient::_exit 0; -END { CFClient::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 @@ -2066,8 +2327,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