--- deliantra/Deliantra-Client/bin/cfplus 2006/12/09 22:06:51 1.139
+++ deliantra/Deliantra-Client/bin/cfplus 2007/04/09 04:39:11 1.148
@@ -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;
@@ -178,10 +179,28 @@
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) = @_;
+ # 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",
@@ -449,8 +468,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");
@@ -463,8 +489,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},
@@ -889,15 +913,9 @@
my @align = qw(1 0 1 1 -1);
my $y = 0;
- for my $m (
- sort {
- $b->{version} <=> $a->{version}
- or $b->{users} <=> $a->{users}
- }
- @{ $msg->{servers} }
- ) {
- my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
- @$m{qw(ip age hostname users version description ibytes obytes uptime)};
+ 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;
@@ -937,7 +955,7 @@
align => $align[$_],
text => $m->[$_],
tooltip => $tip[$_],
- fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
+ fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
can_hover => 1,
can_events => 1,
fontsize => 0.8)
@@ -1048,21 +1066,30 @@
on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
);
- $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+ $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
$table->add (1, 9, new CFPlus::UI::Entry
+ text => $CFG->{output_rate},
+ tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
+ . "when sending images, to ensure interactiveness. When 0 or unset, the server "
+ . "default will be used, which is usually around 100kb/s.",
+ on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
+ );
+
+ $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+ $table->add (1, 10, 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 },
);
- $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
- $table->add (1, 10, new CFPlus::UI::Entry
+ $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
+ $table->add (1, 11, 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 },
);
- $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
+ $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
expand => 1,
align => 0,
text => "Login",
@@ -1073,8 +1100,8 @@
},
);
- $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
+ $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
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. "
@@ -1086,8 +1113,8 @@
}
);
- $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
- $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
+ $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
state => $CFG->{show_tips},
tooltip => "Show the Tip of the day window at startup?",
on_changed => sub {
@@ -1549,52 +1576,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 {
@@ -1772,6 +1801,7 @@
sub setup_build_button {
my ($enabled) = @_;
if ($enabled) {
+ $BUILD_BUTTON->hide if $BUILD_BUTTON;
$BUILD_BUTTON ||= new CFPlus::UI::Button
text => "Build",
tooltip => "Opens the ingame builder",
@@ -2057,6 +2087,8 @@
{
CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
+ CFPlus::DB::Server::run;
+
CFPlus::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
@@ -2082,6 +2114,7 @@
face_prefetch => 0,
output_sync => 1,
output_count => 1,
+ output_rate => "",
pickup => 0,
inv_sort => "mtime",
default => "profile", # default profile