--- deliantra/Deliantra-Client/bin/cfplus 2007/04/09 04:39:11 1.148 +++ deliantra/Deliantra-Client/bin/cfplus 2007/05/09 11:46:49 1.154 @@ -31,17 +31,38 @@ 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"; + $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/1.5.0/module-files.d/libpango1.0-0.modules" + or die "$tmp/usr/lib/1.5.0/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; } } @@ -209,7 +230,7 @@ ; my @dialog = my $label = new CFPlus::UI::Label - max_w => $::WIDTH * 0.4, + max_w => $::WIDTH * 0.8, ellipsise => 0, text => $prompt; @@ -236,13 +257,11 @@ $dialog->grab_focus; } elsif ($flags & CS_QUERY_SINGLECHAR) { - $dialog->{tooltip} = "#charcreation_focus"; - if ($prompt =~ /Now choose a character|Press any key for the next race/i) { - $MESSAGE_WINDOW->show; + $dialog->{tooltip} = "#charcreation_focus"; unshift @dialog, new CFPlus::UI::Label - max_w => $::WIDTH * 0.4, + max_w => $::WIDTH * 0.8, ellipsise => 0, markup => "\nOr use your keyboard and the text entry below:\n"; @@ -265,6 +284,29 @@ }, ); + if ($conn->{chargen_race_description}) { + unshift @dialog, new CFPlus::UI::Label + max_w => $::WIDTH * 0.8, + ellipsise => 0, + markup => "$conn->{chargen_race_description}", + ; + } + + unshift @dialog, new CFPlus::UI::Face + face => $conn->{player}{face}, + bg => [.2, .2, .2, 1], + min_w => 64, + min_h => 64, + ; + + if ($conn->{chargen_race_title}) { + unshift @dialog, new CFPlus::UI::Label + allign => 1, + ellipsise => 0, + markup => "Race: $conn->{chargen_race_title}", + ; + } + unshift @dialog, new CFPlus::UI::Label max_w => $::WIDTH * 0.4, ellipsise => 0, @@ -422,6 +464,10 @@ mapmap => $MAPMAP, query => \&server_query, + setup_req => { + smoothing => $CFG->{map_smoothing}*1, + }, + sound_play => sub { my ($x, $y, $soundnum, $type) = @_; @@ -503,6 +549,23 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } ); + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); + $table->add (1, $row++, new CFPlus::UI::Slider + range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], + tooltip => "The base font size used by most GUI elements that do not have their own setting.", + on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, + ); + + $table->add (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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); $table->add (1, $row++, new CFPlus::UI::Slider range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], @@ -510,6 +573,15 @@ on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } ); + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); + $table->add (1, $row++, new CFPlus::UI::CheckBox + state => $CFG->{map_smoothing}, + tooltip => "Map Smoothing tries to make tile borders less square. " + . "This increases load on the graphics subsystem and works only with 2.x servers. " + . "Changes take effect at next connection only.", + on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } + ); + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); $table->add (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{fow_enable}, @@ -536,13 +608,6 @@ } ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); - $table->add (1, $row++, new CFPlus::UI::Slider - range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], - tooltip => "The base font size used by most GUI elements that do not have their own setting.", - on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, - ); - $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); $table->add (1, $row++, new CFPlus::UI::Slider range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], @@ -572,16 +637,6 @@ } ); - $table->add (1, $row++, new CFPlus::UI::Button - expand => 1, align => 0, text => "Apply", - tooltip => "Apply the video settings", - on_activate => sub { - video_shutdown (); - video_init (); - 0 - } - ); - $vbox } @@ -1100,12 +1155,25 @@ }, ); - $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); - $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry + $vbox->add (new CFPlus::UI::FancyFrame + label => "Server Info", + child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), + ); + + $vbox +} + +sub client_setup { + my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; + + my $row = 0; + + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); + $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry text => $CFG->{say_command}, tooltip => "This is the command that will be used if you write a line in the message window entry or press \" in the map window. " - . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " - . "But you could also set it to tell playername to only chat with that user.", + . "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; @@ -1113,8 +1181,8 @@ } ); - $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); - $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); + $table->add (1, $row++, new CFPlus::UI::CheckBox state => $CFG->{show_tips}, tooltip => "Show the Tip of the day window at startup?", on_changed => sub { @@ -1124,12 +1192,20 @@ } ); - $vbox->add (new CFPlus::UI::FancyFrame - label => "Server Info", - child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), + $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); + $table->add (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) = @_; + $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; + 0 + }, ); - $vbox + $table } sub message_window { @@ -1713,7 +1789,8 @@ indent => -4, can_hover => 1, can_events => 1, - tooltip => "Server Log. This text viewer contains all the messages sent by the server.", + max_par => $CFG->{logview_max_par}, + tooltip => "Server Log. This text viewer contains all recent messages sent by the server.", ; $SETUP_DIALOG = new CFPlus::UI::Toplevel @@ -1734,6 +1811,8 @@ $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, "Configure the server to play on, your username, password and other server-related options."); + $SETUP_NOTEBOOK->add (Client => client_setup, + "Configure various client-specific settings."); $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, @@ -2044,7 +2123,7 @@ %SDL_CB = ( CFPlus::SDL_QUIT => sub { - Event::unloop -1; + exit; }, CFPlus::SDL_VIDEORESIZE => sub { }, @@ -2092,33 +2171,35 @@ 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 => 'chat', - audio_enable => 1, - bgm_enable => 1, - bgm_volume => 0.25, - face_prefetch => 0, - output_sync => 1, - output_count => 1, - output_rate => "", - pickup => 0, - inv_sort => "mtime", - default => "profile", # default profile - show_tips => 1, + sdl_mode => 0, + width => 640, + height => 480, + fullscreen => 0, + fast => 0, + map_scale => 1, + fow_enable => 1, + fow_intensity => 0.45, + fow_smooth => 0, + map_smoothing => 1, + gui_fontsize => 1, + log_fontsize => 0.7, + gauge_fontsize => 1, + gauge_size => 0.35, + stat_fontsize => 0.7, + mapsize => 100, + say_command => 'chat', + audio_enable => 1, + bgm_enable => 1, + bgm_volume => 0.25, + face_prefetch => 0, + 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) { @@ -2197,7 +2278,10 @@ #CFPlus::SDL_Quit; #CFPlus::_exit 0; -END { CFPlus::SDL_Quit } +END { + CFPlus::SDL_Quit; + CFPlus::DB::Server::stop; +} =head1 NAME