--- deliantra/Deliantra-Client/bin/cfplus 2007/03/16 02:33:50 1.143
+++ deliantra/Deliantra-Client/bin/cfplus 2007/04/16 21:06:37 1.150
@@ -60,6 +60,7 @@
use CFPlus;
use CFPlus::OpenGL ();
use CFPlus::Protocol;
+use CFPlus::DB;
use CFPlus::UI;
use CFPlus::UI::Inventory;
use CFPlus::UI::SpellList;
@@ -421,6 +422,10 @@
mapmap => $MAPMAP,
query => \&server_query,
+ setup_req => {
+ smoothing => $CFG->{map_smoothing}*1,
+ },
+
sound_play => sub {
my ($x, $y, $soundnum, $type) = @_;
@@ -467,8 +472,15 @@
$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
- $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
- $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
+ my $row = 0;
+
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
+ $table->add (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) . "");
+
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+ $table->add (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]);
$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
@@ -481,8 +493,6 @@
});
$mode_slider->emit (changed => $mode_slider->{range}[0]);
- my $row = 1;
-
$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
state => $CFG->{fullscreen},
@@ -497,6 +507,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],
@@ -504,6 +531,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},
@@ -530,13 +566,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],
@@ -566,16 +595,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
}
@@ -1094,12 +1113,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;
@@ -1107,8 +1139,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 {
@@ -1118,12 +1150,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 {
@@ -1570,52 +1610,54 @@
# find all tips
my @tod = CFPlus::Pod::find tip_of_the_day => "*";
- my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
- $todindex = 0 if $todindex >= @tod;
- $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
-
- # create dialog
- my $dialog;
-
- my $close = sub {
- $dialog->destroy;
- };
-
- $dialog = new CFPlus::UI::Toplevel
- x => "center",
- y => "center",
- z => 3,
- name => 'tip_of_the_day',
- force_w => int $WIDTH * 4/9,
- force_h => int $WIDTH * 2/9,
- title => "Tip of the day #" . (1 + $todindex),
- child => my $vbox = new CFPlus::UI::VBox,
- has_close_button => 1,
- on_delete => $close,
- ;
-
- $vbox->add (my $viewer = new CFPlus::UI::TextScroller
- expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
- $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
-
- $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
+ 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,
+ ;
- $table->add (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,
- );
+ $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 (0, 0, new CFPlus::UI::Button
+ text => "Close",
+ tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the Server Setup.",
+ on_activate => $close,
+ );
- $table->add (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;
- },
- );
+ $table->add (2, 0, new CFPlus::UI::Button
+ text => "Next",
+ tooltip => "Show the next Tip of the day.",
+ on_activate => sub {
+ $close->();
+ &show_tip_of_the_day;
+ },
+ );
- $dialog->show;
+ $dialog->show;
+ };
}
sub sdl_init {
@@ -1705,7 +1747,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
@@ -1726,6 +1769,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,
@@ -2079,36 +2124,40 @@
{
CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
+ CFPlus::DB::Server::run;
+
CFPlus::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
- sdl_mode => 0,
- width => 640,
- height => 480,
- fullscreen => 0,
- fast => 0,
- map_scale => 1,
- fow_enable => 1,
- fow_intensity => 0.45,
- fow_smooth => 0,
- gui_fontsize => 1,
- log_fontsize => 0.7,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- mapsize => 100,
- say_command => '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) {
@@ -2187,7 +2236,10 @@
#CFPlus::SDL_Quit;
#CFPlus::_exit 0;
-END { CFPlus::SDL_Quit }
+END {
+ CFPlus::DB::Server::stop;
+ CFPlus::SDL_Quit;
+}
=head1 NAME