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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC

 our $CONSOLE;
 our $METASERVER;
 our $LOGIN_BUTTON;
 our $QUIT_DIALOG;
 our $HOST_ENTRY;
+our $SERVER_INFO;
 our $SETUP_DIALOG;
 our $SETUP_NOTEBOOK;
 our $SETUP_SERVER;
 our $SETUP_KEYBOARD;
       $hbox->add (new CFClient::UI::Button
          text => "No",
          on_activate => sub {
             $conn->send ("reply n");
             $dialog->destroy;
+            0
          }
       );
       $hbox->add (new CFClient::UI::Button
          text => "Yes",
          on_activate => sub {
             $conn->send ("reply y");
             destroy_query_dialog $conn;
+            0
          },
       );
-      $dialog->focus_in;
+      $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) {
          $table->add (0, 0, new CFClient::UI::Button
              text => "Next Race",
              on_activate => sub {
                 $conn->send ("reply n");
                 destroy_query_dialog $conn;
+                0
              },
          );
          $table->add (2, 0, new CFClient::UI::Button
              text => "Accept",
              on_activate => sub {
                 $conn->send ("reply d");
                 destroy_query_dialog $conn;
+                0
              },
          );
          unshift @dialog, new CFClient::UI::Label
             max_w     => $::WIDTH * 0.4,
          $table->add (0, 0, new CFClient::UI::Button
             text => "Roll Again",
             on_activate => sub {
                $conn->send ("reply y");
                destroy_query_dialog $conn;
+               0
             },
          );
          # center: swap stats
          my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
                value   => $_,
                options => [
-                  [Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
+                  [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
-                  [Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
+                  [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
-                  [Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
+                  [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
-                  [Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
+                  [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
-                  [Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
+                  [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
-                  [Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
+                  [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
-                  [Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
+                  [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
                ],
             ), 1 .. 2;
          $table->add (2, 0, new CFClient::UI::Button
             text => "Swap Stats",
             on_activate => sub {
                $conn->{stat_change_with} = $sw2->{value};
                $conn->send ("reply $sw1->{value}");
                destroy_query_dialog $conn;
+               0
             },
          );
          $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
          # right: accept
             text => "Accept",
             on_activate => sub {
                $conn->send ("reply n");
                $STATS_WINDOW->hide;
                destroy_query_dialog $conn;
+               0
             },
          );
          unshift @dialog, new CFClient::UI::Label
             max_w     => $::WIDTH * 0.4,
       push @dialog, my $entry = new CFClient::UI::Entry
          on_changed => sub {
             $conn->send ("reply $_[1]");
             destroy_query_dialog $conn;
+            0
          },
       ;
-      $entry->focus_in;
+      $entry->grab_focus;
    } 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
          $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
          on_activate => sub {
             $conn->send ("reply $_[1]");
             destroy_query_dialog $conn;
+            0
          },
       ;
-      $entry->focus_in;
+      $entry->grab_focus;
    }
    $vbox->add (@dialog);
    $dialog->show;
 }
 sub stop_game {
    $LOGIN_BUTTON->set_text ("Login");
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $INV_WINDOW->hide;
+   $SETUP_SPELLS->clear_spells;
    return unless $CONN;
    status "connection closed";
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
    $table->add (1, $row++, new CFClient::UI::CheckBox
       state => $CFG->{fullscreen},
       tooltip => "Bring the client into fullscreen mode.",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{fullscreen} = $value;
-      }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
    $table->add (1, $row++, new CFClient::UI::CheckBox
       state => $CFG->{fast},
       tooltip => "Lower the visual quality considerably to speed up rendering.",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{fast} = $value;
-      }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
    $table->add (1, $row++, new CFClient::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 {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{map_scale} = 2 ** $value;
-      }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
    $table->add (1, $row++, new CFClient::UI::CheckBox
       state => $CFG->{fow_enable},
       tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{fow_enable} = $value;
-      }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
    $table->add (1, $row++, new CFClient::UI::Slider
       range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
       tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{fow_intensity} = $value;
-      }
    );
    $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] },
+      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
       range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
       tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
-      on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
+      on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
    $table->add (1, $row++, new CFClient::UI::Slider
       range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
       tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
       on_changed => sub {
          $CFG->{stat_fontsize} = $_[1];
          &set_stats_window_fontsize;
+         0
       }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
    $table->add (1, $row++, new CFClient::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 {
          $CFG->{gauge_fontsize} = $_[1];
          &set_gauge_window_fontsize;
+         0
       }
    );
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
    $table->add (1, $row++, new CFClient::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 {
          $CFG->{gauge_size} = $_[1];
          $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
+         0
       }
    );
    $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
 }
    $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
    $table->add (1, $row++, new CFClient::UI::CheckBox
       state => $CFG->{audio_enable},
       tooltip => "<b>Master Audio Enable.</b> 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 {
+      on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
-         $CFG->{audio_enable} = $_[1];
-      }
    );
 #   $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 {
 #      $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
       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 {
+      on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
-         $CFG->{bgm_enable} = $_[1];
-      }
    );
    $hbox->add (new CFClient::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 {
+      on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
-         $CFG->{bgm_volume} = $_[1];
-         CFClient::MixMusic::volume $_[1] * 128;
-      }
    );
    $table->add (1, $row++, new CFClient::UI::Button
       expand => 1, align => 0, text => "Apply",
       tooltip => "Apply the audio settings",
       on_activate => sub {
          audio_shutdown ();
          audio_init ();
+         0
       }
    );
    $vbox
 }
    &set_gauge_window_fontsize;
    $win
 }
+sub debug_setup {
+   my $table = new CFClient::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
+}
 sub stats_window {
    my $tgw = new CFClient::UI::FancyFrame
       y     => $HEIGHT * (2/8),
       x     => "max",
       title => "Stats",
-      name  => "stats_window";
+      name  => "stats_window",
+      has_close_button => 1;
    $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
    $vb->add ($STATWIDS->{title} = new CFClient::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 <b>title</b> command, if supported by the server.");
    $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
    $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
    $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
-   # TODO: replace by CS_STAT_RES_xxx constants
    my %tbl = (
-      phys  => 100,
+      phys  => CS_STAT_RES_PHYS,
-      magic => 101,
+      magic => CS_STAT_RES_MAG,
-      fire  => 102,
+      fire  => CS_STAT_RES_FIRE,
-      elec  => 103,
+      elec  => CS_STAT_RES_ELEC,
-      cold  => 104,
+      cold  => CS_STAT_RES_COLD,
-      conf  => 105,
+      conf  => CS_STAT_RES_CONF,
-      acid  => 106,
+      acid  => CS_STAT_RES_ACID,
-      drain => 107,
+      drain => CS_STAT_RES_DRAIN,
-      ghit  => 108,
+      ghit  => CS_STAT_RES_GHOSTHIT,
-      pois  => 109,
+      pois  => CS_STAT_RES_POISON,
-      slow  => 110,
+      slow  => CS_STAT_RES_SLOW,
-      para  => 111,
+      para  => CS_STAT_RES_PARA,
-      tund  => 112,
+      tund  => CS_STAT_TURN_UNDEAD,
-      fear  => 113,
+      fear  => CS_STAT_RES_FEAR,
-      depl  => 113,
+      depl  => CS_STAT_RES_DEPLETE,
-      deat  => 115,
+      deat  => CS_STAT_RES_DEATH,
-      holyw => 116,
+      holyw => CS_STAT_RES_HOLYWORD,
-      blind => 117,
+      blind => CS_STAT_RES_BLIND,
    );
    $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
       for keys %tbl;
 }
          utf8::decode $buf if utf8::valid $buf;
          $table->clear;
+         my @tip = (
+            "The current number of users logged in on the server.",
+            "The hostname of the server.",
+            "The time this server has been running without being restarted.",
+            "The server software version - a '+' indicates a Crossfire+ server.",
+            "Short information about this server provided by its admins.",
+         );
-         my @col = qw(Use #Users Host Uptime Version Description);
+         my @col = qw(#Users Host Uptime Version Description);
-         $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
+         $table->add ($_, 0, new CFClient::UI::Label
+            can_hover => 1, can_events => 1,
+            align => 0, fg => [1, 1, 0],
+            text => $col[$_], tooltip => $tip[$_])
-            for 0 .. $#col;
+               for 0 .. $#col;
          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) {
             $m = [$users, $host, $uptime, $version, $desc];
             $y++;
-            $table->add (0, $y, new CFClient::UI::VBox children => [
+            $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
-               (new CFClient::UI::Button text => "Use", on_activate => sub {
+               (new CFClient::UI::Button
+                  text        => "Use",
+                  tooltip     => "Put this server into the <b>Host:Port</b> field",
+                  on_activate => sub {
-                  $HOST_ENTRY->set_text ($CFG->{host} = $host);
+                     $HOST_ENTRY->set_text ($CFG->{host} = $host);
-                  $METASERVER->toggle_visibility;
+                     $METASERVER->hide;
+                     0
+                  },
-               }),
+               ),
                (new CFClient::UI::Empty expand => 1),
             ]);
-            $table->add ($_ + 1, $y, new CFClient::UI::Label
+            $table->add ($_, $y, new CFClient::UI::Label
-                  ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
+                  ellipsise  => 0,
+                  align      => $align[$_],
+                  text       => $m->[$_],
+                  tooltip    => $tip[$_],
+                  can_hover  => 1,
+                  can_events => 1,
+                  fontsize   => 0.8)
                for 0 .. $#$m;
          }
       }
    });
 }
 sub metaserver_dialog {
    my $dialog = new CFClient::UI::FancyFrame
-      title => "Server List",
+      title   => "Server List",
-      name  => 'metaserver_dialog',
+      name    => 'metaserver_dialog',
-      x     => 'center',
+      x       => 'center',
-      y     => 'center',
+      y       => 'center',
-      z     => 3,
+      z       => 3,
+      force_h => $::HEIGHT * 0.4,
-      child => (my $vbox = new CFClient::UI::VBox),
+      child   => (my $vbox = new CFClient::UI::VBox),
       on_visibility_change => sub {
          update_metaserver if $_[1];
+         0
       },
    ;
-   $vbox->add ($dialog->{table} = new CFClient::UI::Table);
+   $dialog->{table} = new CFClient::UI::Table;
+   $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
    $dialog
 }
 sub server_setup {
             text => $CFG->{host},
             tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
             on_changed => sub {
                my ($self, $value) = @_;
                $CFG->{host} = $value;
+               0
             }
       );
       $METASERVER = metaserver_dialog;
       $vbox->add (new CFClient::UI::Button
          expand  => 1,
          text    => "Server List",
          other   => $METASERVER,
          tooltip => "Show a list of available crossfire servers",
-         on_activate => sub { $METASERVER->toggle_visibility },
+         on_activate => sub { $METASERVER->toggle_visibility; 0 },
+         on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
       );
    }
    $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
    $table->add (1, 4, new CFClient::UI::Entry
       text => $CFG->{user},
       tooltip => "The name of your character on the server",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{user} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{user} = $value;
-      }
    );
    $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
    $table->add (1, 5, new CFClient::UI::Entry
       text => $CFG->{password},
       hidden => 1,
       tooltip => "The password for your character",
-      on_changed => sub {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{password} = $value; 0 }
-         my ($self, $value) = @_;
-         $CFG->{password} = $value;
-      }
    );
    $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
    $table->add (1, 7, new CFClient::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 {
+      on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
-         my ($self, $value) = @_;
-         $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
-      },
    );
    $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},
                . "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] },
+      on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
    );
    $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
    $table->add (1, 9, new CFClient::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] },
+      on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
    );
    $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
    $table->add (1, 10, new CFClient::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] },
+      on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
    );
    $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
       expand => 1,
       align => 0,
       text => "Login",
       on_activate => sub {
          $CONN ? stop_game
                : start_game;
+         0
       },
    );
    $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
                 . "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 {
          my ($self, $value) = @_;
          $CFG->{say_command} = $value;
+         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 {
       bg        => [0, 0, 0, 0.75],
       x         => "max",
       y         => 0,
       force_w   => $::WIDTH  * 0.4,
       force_h   => $::HEIGHT * 0.5,
-      child     => (my $vbox = new CFClient::UI::VBox);
+      child     => (my $vbox = new CFClient::UI::VBox),
+      has_close_button => 1;
    $vbox->add ($LOGVIEW);
    $vbox->add (my $input = new CFClient::UI::Entry
       tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
          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 ($input->{refocus_map}) {
             delete $input->{refocus_map};
             $MAPWIDGET->focus_in
          }
+         0
       },
       on_escape => sub {
-         $MAPWIDGET->focus_in
+         $MAPWIDGET->grab_focus;
+         0
       },
    );
    $CONSOLE = {
       window => $window,
       );
       $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 },
+         on_activate => sub { $QUIT_DIALOG->hide; 0 },
       );
       $hb->add (new CFClient::UI::Button
          text => "Quit anyway",
          expand => 1,
          on_activate => sub { exit },
             ["Potions"                 => PICKUP_POTION],
             ["Magic Devices"           => PICKUP_MAGIC_DEVICE],
             ["Ignore cursed"           => PICKUP_NOT_CURSED],
             ["Jewelery"                => PICKUP_JEWELS],
          ],
+         ["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 ($x  , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
          $table->add ($x+1, $y, new CFClient::UI::CheckBox
             state => $CFG->{pickup} & $mask,
             on_changed => sub {
                my ($box, $value) = @_;
                if ($value) {
                   $::CFG->{pickup} |= $mask;
                } else {
-                  $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
+                  $::CFG->{pickup} &= ~$mask;
                }
-               $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
+               $::CONN->send_command ("pickup $::CFG->{pickup}")
                   if defined $::CONN;
+               0
             });
       }
    }
+   $table->add (2, 18, new CFClient::UI::ValSlider
+      range => [0, 0, 16, 1, 1],
+      to_value => sub { ">= " . 5 * $_[0] },
+      on_changed => sub {
+         my ($slider, $value) = @_;
+         $::CFG->{pickup} &= ~0x7;
+         $::CFG->{pickup} |= int $value
+            if $value;
+         1;
+      });
+   $table->add (3, 18, new CFClient::UI::Button
+      text => "set",
+      on_activate => sub {
+         $::CONN->send_command ("pickup $::CFG->{pickup}")
+            if defined $::CONN;
+         0
+      });
    $table
 }
 sub inventory_window {
       x       => "center",
       y       => "center",
       force_w => $WIDTH  * 9/10,
       force_h => $HEIGHT * 9/10,
       title   => "Inventory",
+      has_close_button => 1,
    ;
    $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
    $hb->add (my $vb1 = new CFClient::UI::VBox);
                   text => "delete",
                   tooltip => "Deletes the binding",
                   on_activate => sub {
                      $binding_list->remove ($hb);
                      delete $::CFG->{bindings}->{$mod}->{$sym};
+                     0
                   });
             $hb->add (new CFClient::UI::Button
                   text => "edit",
                   tooltip => "Edits the binding",
                            $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
                            $SETUP_DIALOG->show;
                         });
                      $::BIND_EDITOR->show;
                      $SETUP_DIALOG->hide;
+                     0
                   });
             $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
             $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
          }
       }
    };
    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
+         });
    $vb->add ($binding_list);
    $vb->add (my $hb = new CFClient::UI::HBox);
    $hb->add (new CFClient::UI::Button
       text => "record new",
                $SETUP_DIALOG->show;
             },
          );
          $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
       }
    );
    $refresh->();
    $vb
 }
-sub make_help_window {
+sub help_window {
    my $win = new CFClient::UI::FancyFrame
       x       => 'center',
       y       => 'center',
       z       => 2,
       name    => 'doc_browser',
       title   => "Documentation";
    $win->add (my $vbox = new CFClient::UI::VBox);
    $vbox->add (my $buttons = new CFClient::UI::HBox);
-   $vbox->add (my $viewer  = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
+   $vbox->add (my $viewer  = new CFClient::UI::TextScroller
+      expand => 1, fontsize => 0.8, padding_x => 4);
-   for (
+   $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"],
+         [intro          => "Introduction"],
-      [manual       => "Manual"],
+         [manual         => "Manual"],
+         [skill_help     => "Skills"],
-      [command_help => "Commands"],
+         [command_help   => "Commands"],
-      [skill_help   => "Skills"],
+         [dmcommand_help => "DM Commands"],
-   ) {
+         [COPYING        => "License Terms"],
-      my ($pod, $label) = @$_;
+      ],
+      on_changed => sub {
+         my ($self, $pod) = @_;
-      $buttons->add (new CFClient::UI::Button
-         text => $label,
-         on_activate => sub {
-            my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
+         my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
-               doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
+            doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
-            $viewer->clear;
+         $viewer->clear;
-            $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
+         $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
-               for @$pom;
+            for @$pom;
-            $viewer->set_offset (0);
+         $viewer->set_offset (0);
-         },
+         0
+      },
+      on_visibility_change => sub {
+         my ($self, $visible) = @_;
+         return unless $visible;
+         return if $self->{value};
+         $self->set_value ("intro");
+         0
+      },
-      );
+   );
-   }
-   $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
    $win
 }
 sub sdl_init {
       $MAPWIDGET->connect (activate_console => sub {
          my ($mapwidget, $preset) = @_;
          if ($CONSOLE) {
             $CONSOLE->{input}->{auto_activated} = 1;
-            $CONSOLE->{input}->focus_in;
+            $CONSOLE->{input}->grab_focus;
             if ($preset && $CONSOLE->{input}->get_text eq '') {
                $CONSOLE->{input}->set_text ($preset);
             }
          }
       });
       $MAPWIDGET->show;
-      $MAPWIDGET->focus_in;
+      $MAPWIDGET->grab_focus;
-      $LOGVIEW = new CFClient::UI::TextView
+      $LOGVIEW = new CFClient::UI::TextScroller
          expand     => 1,
          font       => $FONT_FIXED,
          fontsize   => $::CFG->{log_fontsize},
          indent     => -4,
          can_hover  => 1,
          x       => 'center',
          y       => 'center',
          z       => 2,
          force_w => $::WIDTH  * 0.6,
          force_h => $::HEIGHT * 0.6,
+         has_close_button => 1,
       ;
       $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
          filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
        . "want to record press <b>Insert</b> 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 (Spells   => $SETUP_SPELLS = spell_setup,
          "Displays all spells you have and lets you edit keyboard shortcuts for them.");
+      $SETUP_NOTEBOOK->add (Debug    => debug_setup,
+         "Some debuggign options. Do not ask.");
       $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
       $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
          tooltip => "Toggles a dialog where you can configure all aspects of this client.");
          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";
             status "Configuration Saved";
+            0
          },
       );
-      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
+      $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
          tooltip => "View Documentation");
       $BUTTONBAR->add (new CFClient::UI::Button
          text        => "Quit",
          tooltip     => "Terminates the program",
             if ($CONN) {
                open_quit_dialog;
             } else {
                exit;
             }
+            0
          },
       );
       $BUTTONBAR->show;
       $SETUP_DIALOG->show;
    $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
 }
 sub video_shutdown {
+   CFClient::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#
       bgm_enable    => 1,
       bgm_volume    => 0.25,
       face_prefetch => 0,
       output_sync   => 1,
       output_count  => 1,
+      pickup        => 0,
    );
    while (my ($k, $v) = each %DEF_CFG) {
       $CFG->{$k} = $v unless exists $CFG->{$k};
    }
    video_init;
    audio_init;
 }
 Event::loop;
+#CFClient::SDL_Quit;
+#CFClient::_exit 0;
 END { CFClient::SDL_Quit }
 =head1 NAME

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs. Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.61 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.74 by root, Sun Jun 18 17:13:12 2006 UTC