[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

 use Compress::LZF;
 use CFPlus;
 use CFPlus::OpenGL ();
 use CFPlus::Protocol;
+use CFPlus::DB;
 use CFPlus::UI;
 use CFPlus::UI::Inventory;
 use CFPlus::UI::SpellList;
 use CFPlus::Pod;
 use CFPlus::MapWidget;
 use CFPlus::Macro;
 $SIG{QUIT} = sub { Carp::cluck "QUIT" };
 $SIG{PIPE} = 'IGNORE';
-$Event::Eval = 0;
+$Event::Eval = 1;
 $Event::DIED = sub {
    CFPlus::fatal Carp::longmess $_[1]
 };
 my $MAX_FPS = 60;
 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) = @_;
+   # 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",
 sub graphics_setup {
    my $vbox = new CFPlus::UI::VBox;
    $vbox->add (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 => "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 => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
-   $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+   $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
-   $table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
+   $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");
    $mode_slider->connect (changed => sub {
       $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
       $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
    });
    $mode_slider->emit (changed => $mode_slider->{range}[0]);
-   my $row = 1;
    $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
    $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
       state => $CFG->{fullscreen},
       tooltip => "Bring the client into fullscreen mode.",
                for 0 .. $#col;
          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} }
+         for my $m (@{ $msg->{servers} }) {
-         ) {
-            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
+            my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
-               @$m{qw(ip age hostname users version description ibytes obytes uptime)};
+               @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
             for ($desc) {
                s/<br>/\n/gi;
                s/<li>/\n· /gi;
                s/<.*?>//sgi;
                   max_w      => $::WIDTH * 0.4,
                   ellipsise  => 0,
                   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)
                for 0 .. $#$m;
          }
                . "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 (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 (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
-   $table->add (1, 10, new CFPlus::UI::Entry
+   $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",
       on_activate => sub {
          $CONN ? stop_game
                : start_game;
          0
       },
    );
-   $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
+   $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
-   $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
+   $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 <b>\"</b> in the map window. "
                 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
                 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
       on_changed => sub {
          $CFG->{say_command} = $value;
          0
       }
    );
-   $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+   $table->add (0, 14, 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 (1, 14, my $saycmd = new CFPlus::UI::CheckBox
       state   => $CFG->{show_tips},
       tooltip => "Show the <b>Tip of the day</b> window at startup?",
       on_changed => sub {
          my ($self, $value) = @_;
          $CFG->{show_tips} = $value;
 }
 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",
          on_activate => sub {
             if ($CONN) {
 $SIG{INT} = $SIG{TERM} = sub { exit };
 {
    CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
+   CFPlus::DB::Server::run;
    CFPlus::UI::set_layout ($::CFG->{layout});
    my %DEF_CFG = (
       sdl_mode       => 0,
       width          => 640,
       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,
    );
    audio_init;
 }
 show_tip_of_the_day if $CFG->{show_tips};
-#CFPlus::Macro::quick_macro ["test"];#d#
 Event::loop;
 #CFPlus::SDL_Quit;
 #CFPlus::_exit 0;
 END { CFPlus::SDL_Quit }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC vs. Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.147 by root, Fri Apr 6 07:45:35 2007 UTC