--- deliantra/Deliantra-Client/bin/cfplus 2006/05/29 19:49:33 1.25
+++ deliantra/Deliantra-Client/bin/cfplus 2006/07/23 16:11:12 1.100
@@ -27,7 +27,6 @@
if %PAR::LibCache;
use Time::HiRes 'time';
-use Pod::POM;
use Event;
use Crossfire;
@@ -39,10 +38,16 @@
use CFClient::OpenGL ();
use CFClient::Protocol;
use CFClient::UI;
+use CFClient::Pod;
+use CFClient::BindingEditor;
use CFClient::MapWidget;
+$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+$SIG{PIPE} = 'IGNORE';
+
$Event::DIED = sub {
# TODO: display dialog box or so
+ Carp::confess $_[1];#d#TODO: remove when stable
CFClient::error $_[1];
};
@@ -83,8 +88,26 @@
our $METASERVER;
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
-our $SERVER_SETUP;
+our $HOST_ENTRY;
+our $FULLSCREEN_ENABLE;
+our $PICKUP_ENABLE;
+our $SERVER_INFO;
+
+our $SETUP_DIALOG;
+our $SETUP_NOTEBOOK;
+our $SETUP_SERVER;
+our $SETUP_KEYBOARD;
+
+our $PL_NOTEBOOK;
+our $PL_WINDOW;
+
+our $INVENTORY_PAGE;
+our $STATS_PAGE;
+our $SKILL_PAGE;
+our $SPELL_PAGE;
+our $HELP_WINDOW;
+our $MESSAGE_WINDOW;
our $FLOORBOX;
our $GAUGES;
our $STATWIDS;
@@ -100,32 +123,244 @@
our $STATUSBOX;
our $DEBUG_STATUS;
-our $INV_WINDOW;
our $INV;
our $INVR;
-our $INVR_LBL;
+our $INV_RIGHT_HB;
+
+our $BIND_EDITOR;
+our $BIND_UPD_CB;
-our $BIND_WINDOW;
+our $PICKUP_CFG;
sub status {
- $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
+ $STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
}
sub debug {
$DEBUG_STATUS->set_text ($_[0]);
- my ($w, $h) = $DEBUG_STATUS->size_request;
- $DEBUG_STATUS->move ($WIDTH - $w, 0);
+}
+
+sub destroy_query_dialog {
+ (delete $_[0]{query_dialog})->destroy
+ if $_[0]{query_dialog};
+}
+
+# server query dialog
+sub server_query {
+ my ($conn, $flags, $prompt) = @_;
+
+ $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
+ x => "center",
+ y => "center",
+ title => "Server Query",
+ child => my $vbox = new CFClient::UI::VBox,
+ ;
+
+ my @dialog = my $label = new CFClient::UI::Label
+ max_w => $::WIDTH * 0.4,
+ ellipsise => 0,
+ text => $prompt;
+
+ if ($flags & CS_QUERY_YESNO) {
+ push @dialog, my $hbox = new CFClient::UI::HBox;
+
+ $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->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) {
+ $MESSAGE_WINDOW->show;
+
+ unshift @dialog, new CFClient::UI::Label
+ max_w => $::WIDTH * 0.4,
+ ellipsise => 0,
+ markup => "\nOr use your keyboard and the text entry below:\n";
+
+ unshift @dialog, my $table = new CFClient::UI::Table;
+
+ $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,
+ ellipsise => 0,
+ markup =>
+ "Character Creation: Race\n\n"
+ . "Look at the Messages window to see a description of this race "
+ . "and the center of the screen to see how this race looks like "
+ . "(below this dialog window: you may need to move the dialog away and "
+ . "click into the display area to make it visible).\n\n"
+ . "You can look at another race, or accept this race (you will cycle back to "
+ . "this race eventually, so you can take your time making this important choice."
+ ;
+
+ } elsif ($prompt =~ /roll new stats/) {
+ if (my $stat = delete $conn->{stat_change_with}) {
+ $conn->send ("reply $stat");
+ destroy_query_dialog $conn;
+ return;
+ }
+
+ $STATS_PAGE->show;
+ $MESSAGE_WINDOW->hide;
+
+ unshift @dialog, new CFClient::UI::Label
+ max_w => $::WIDTH * 0.4,
+ ellipsise => 0,
+ markup => "\nOr use your keyboard and the text entry below:\n";
+
+ unshift @dialog, my $table = new CFClient::UI::Table;
+
+ # left: re-roll
+ $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
+ expand => 1,
+ value => $_,
+ options => [
+ [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
+ [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
+ [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
+ [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
+ [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
+ [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
+ [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
+ $table->add (4, 0, new CFClient::UI::Button
+ text => "Accept",
+ on_activate => sub {
+ $conn->send ("reply n");
+ $STATS_PAGE->hide;
+ destroy_query_dialog $conn;
+ 0
+ },
+ );
+
+ unshift @dialog, my $hbox = new CFClient::UI::HBox;
+ for (
+ [Str => CS_STAT_STR],
+ [Dex => CS_STAT_DEX],
+ [Con => CS_STAT_CON],
+ [Int => CS_STAT_INT],
+ [Wis => CS_STAT_WIS],
+ [Pow => CS_STAT_POW],
+ [Cha => CS_STAT_CHA],
+ ) {
+ my ($name, $id) = @$_;
+ $hbox->add (new CFClient::UI::Label
+ markup => "$conn->{stat}{$id} $name",
+ align => 0,
+ expand => 1,
+ can_events => 1,
+ can_hover => 1,
+ tooltip => $CFClient::STAT_TOOLTIP{$name},
+ );
+ }
+
+ unshift @dialog, new CFClient::UI::Label
+ max_w => $::WIDTH * 0.4,
+ ellipsise => 0,
+ markup =>
+ "Character Creation: Stats\n\n"
+ . "Stats are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
+ . "The stats generated by the server are always sorted from Str (highest) to Cha (lowest). "
+ . "They will be modified later by both the race and the class you choose.\n\n"
+ . "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
+ ;
+ }
+
+ push @dialog, my $entry = new CFClient::UI::Entry
+ on_changed => sub {
+ $conn->send ("reply $_[1]");
+ destroy_query_dialog $conn;
+ 0
+ },
+ ;
+
+ $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->grab_focus;
+ }
+
+ $vbox->add (@dialog);
+ $dialog->show;
}
sub start_game {
status "logging in...";
$LOGIN_BUTTON->set_text ("Logout");
- $SERVER_SETUP->hide;
+ $SETUP_DIALOG->hide;
my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
- my ($host, $port) = split /:/, $CFG->{host};
+ my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
$MAP = new CFClient::Map $mapsize, $mapsize;
@@ -133,8 +368,8 @@
new CFClient::Protocol
host => $host,
port => $port || 13327,
- user => $CFG->{user},
- pass => $CFG->{password},
+ user => $CFG->{profile}{default}{user},
+ pass => $CFG->{profile}{default}{password},
mapw => $mapsize,
maph => $mapsize,
@@ -143,6 +378,7 @@
statusbox => $STATUSBOX,
map => $MAP,
mapmap => $MAPMAP,
+ query => \&server_query,
sound_play => sub {
my ($x, $y, $soundnum, $type) = @_;
@@ -169,31 +405,31 @@
sub stop_game {
$LOGIN_BUTTON->set_text ("Login");
- $SERVER_SETUP->show;
- $INV_WINDOW->hide;
- $LOGVIEW->hide;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
+ $SETUP_DIALOG->show;
+ $PL_WINDOW->hide;
+ $SPELL_PAGE->clear_spells;
return unless $CONN;
status "connection closed";
+ destroy_query_dialog $CONN;
$CONN->destroy;
$CONN = 0; # false, does not autovivify
+
+ undef $MAP;
}
-sub client_setup {
- my $dialog = new CFClient::UI::FancyFrame
- req_x => 1,
- req_y => $HEIGHT * (1/8),
- name => "client_setup",
- title => "Client Setup",
- child => (my $vbox = new CFClient::UI::VBox);
+sub graphics_setup {
+ my $vbox = new CFClient::UI::VBox;
+
$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
- $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
+ $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
$mode_slider->connect (changed => sub {
@@ -207,53 +443,38 @@
my $row = 1;
$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
- $table->add (1, $row++, new CFClient::UI::CheckBox
+ $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
state => $CFG->{fullscreen},
tooltip => "Bring the client into fullscreen mode.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{fullscreen} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
);
$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 {
- my ($self, $value) = @_;
- $CFG->{fast} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
);
$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 {
- my ($self, $value) = @_;
- $CFG->{map_scale} = 2 ** $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
);
$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 => "Fog-of-War marks areas that cannot be seen by the player. Changes are instant.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{fow_enable} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
);
$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 => "Fog of War Lightness. The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{fow_intensity} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
);
$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
@@ -264,6 +485,7 @@
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
}
);
@@ -271,25 +493,14 @@
$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 message/server log window only. Changes are instant.",
- on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
- );
-
- $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 statistics window only. Changes are instant.",
- on_changed => sub {
- $CFG->{stat_fontsize} = $_[1];
- &set_stats_window_fontsize;
- }
+ on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
);
$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
@@ -299,6 +510,7 @@
on_changed => sub {
$CFG->{gauge_fontsize} = $_[1];
&set_gauge_window_fontsize;
+ 0
}
);
@@ -309,6 +521,7 @@
on_changed => sub {
$CFG->{gauge_size} = $_[1];
$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
+ 0
}
);
@@ -318,16 +531,25 @@
on_activate => sub {
video_shutdown ();
video_init ();
+ 0
}
);
+ $vbox
+}
+
+sub audio_setup {
+ my $vbox = new CFClient::UI::VBox;
+
+ $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+
+ my $row = 0;
+
$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 => "Master Audio Enable. 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 {
- $CFG->{audio_enable} = $_[1];
- }
+ on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
);
# $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 {
@@ -338,17 +560,12 @@
$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 {
- $CFG->{bgm_enable} = $_[1];
- }
+ on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
);
$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 {
- $CFG->{bgm_volume} = $_[1];
- CFClient::MixMusic::volume $_[1] * 128;
- }
+ on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
);
$table->add (1, $row++, new CFClient::UI::Button
@@ -357,28 +574,11 @@
on_activate => sub {
audio_shutdown ();
audio_init ();
+ 0
}
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add (1, $row++, my $saycmd = new CFClient::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.",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{say_command} = $value;
- }
- );
-
- $dialog
-}
-
-sub set_stats_window_fontsize {
- for (values %{$STATWIDS}) {
- $_->set_fontsize ($::CFG->{stat_fontsize});
- }
+ $vbox
}
sub set_gauge_window_fontsize {
@@ -391,10 +591,10 @@
my $gh = int $HEIGHT * $CFG->{gauge_size};
my $win = new CFClient::UI::Frame (
- req_x => 0,
- req_y => -1,
- def_w => $WIDTH,
- def_h => $gh,
+ force_x => 0,
+ force_y => "max",
+ force_w => $WIDTH,
+ force_h => $gh,
);
$win->add (my $hbox = new CFClient::UI::HBox
@@ -440,15 +640,41 @@
$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 },
+ );
+ }
+ }
-sub make_stats_window {
- my $tgw = new CFClient::UI::FancyFrame
- req_y => $HEIGHT * (2/8),
- req_x => -1,
- title => "Stats",
- name => "stats_window";
- $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
+ $table
+}
+
+sub stats_window {
+ my $r = new CFClient::UI::ScrolledWindow (
+ expand => 1,
+ scroll_y => 1
+ );
+ $r->add (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 title command, if supported by the server.");
@@ -471,53 +697,73 @@
my $color2 = [1, 1, 0];
for (
- [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
- [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
- [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
- [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
- [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
- [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
- [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
-
- [2, 0, st_wc => "Wc", -120, "Weapon Class, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
- [2, 1, st_ac => "Ac", -120, "Armour Class, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
- [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
- [2, 3, st_arm => "Arm", 120, "Armour, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],
- [2, 4, st_spd => "Spd", 10.54, "Speed, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
- [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
+ [0, 0, st_str => "Str", 30],
+ [0, 1, st_dex => "Dex", 30],
+ [0, 2, st_con => "Con", 30],
+ [0, 3, st_int => "Int", 30],
+ [0, 4, st_wis => "Wis", 30],
+ [0, 5, st_pow => "Pow", 30],
+ [0, 6, st_cha => "Cha", 30],
+
+ [2, 0, st_wc => "Wc", -120],
+ [2, 1, st_ac => "Ac", -120],
+ [2, 2, st_dam => "Dam", 120],
+ [2, 3, st_arm => "Arm", 120],
+ [2, 4, st_spd => "Spd", 10.54],
+ [2, 5, st_wspd => "WSp", 10.54],
) {
- my ($col, $row, $id, $label, $template, $tooltip) = @$_;
+ my ($col, $row, $id, $label, $template) = @$_;
$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
- font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
+ font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
+ align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});
$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
- font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);
+ font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
+ align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});
}
- $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
+ $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
my $row = 0;
my $col = 0;
my %resist_names = (
- slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
- holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
- conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
- fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
- depl => "Depletion (some monsters and other effects can cause stats depletion)",
- magic => "Magic (resistance to magic spells like magic missile or similar)",
- drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
- acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
- pois => "Poison (resistance to getting poisoned)",
- para => "Paralysation (this resistance affects the chance you get paralysed)",
- deat => "Death (resistance against death spells)",
- phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
- blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
- fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
- tund => "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
- elec => "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)",
- cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
- ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
+ slow => ["Slow",
+ "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
+ holyw => ["Holy Word",
+ "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
+ conf => ["Confusion",
+ "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
+ fire => ["Fire",
+ "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
+ depl => ["Depletion",
+ "Depletion (some monsters and other effects can cause stats depletion)"],
+ magic => ["Magic",
+ "Magic (resistance to magic spells like magic missile or similar)"],
+ drain => ["Draining",
+ "Draining (some monsters (e.g. vampires) and other effects can steal experience)"],
+ acid => ["Acid",
+ "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
+ pois => ["Poison",
+ "Poison (resistance to getting poisoned)"],
+ para => ["Paralysation",
+ "Paralysation (this resistance affects the chance you get paralysed)"],
+ deat => ["Death",
+ "Death (resistance against death spells)"],
+ phys => ["Physical",
+ "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
+ blind => ["Blind",
+ "Blind (blind resistance affects the chance of a successful blinding attack)"],
+ fear => ["Fear",
+ "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
+ tund => ["Turn undead",
+ "Turn undead (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
+ elec => ["Electricity",
+ "Electricity (resistance against electricity, spells like large lightning, small lightning, ...)"],
+ cold => ["Cold",
+ "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
+ ghit => ["Ghost hit",
+ "Ghost hit (special attack used by ghosts and ghost-like beings)"],
);
for (qw/slow holyw conf fire depl magic
drain acid pois para deat phys
@@ -532,116 +778,52 @@
valign => 0,
can_events => 1,
can_hover => 1,
- tooltip => $resist_names{$_},
+ tooltip => $resist_names{$_}->[1],
);
$tbl2->add ($col + 1, $row, new CFClient::UI::Image
font => $FONT_FIXED,
can_hover => 1,
can_events => 1,
- image => "ui/resist/resist_$_.png",
- tooltip => $resist_names{$_},
+ path => "ui/resist/resist_$_.png",
+ tooltip => $resist_names{$_}->[1],
+ );
+ $tbl2->add ($col + 2, $row, new CFClient::UI::Label
+ text => $resist_names{$_}->[0],
+ font => $FONT_FIXED,
+ can_hover => 1,
+ can_events => 1,
+ tooltip => $resist_names{$_}->[1],
);
$row++;
if ($row % 6 == 0) {
- $col += 2;
+ $col += 3;
$row = 0;
}
}
- &set_stats_window_fontsize;
- update_stats_window ({});
+ #update_stats_window ({});
- $tgw
+ $r
}
-sub formsep {
- reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
+sub skill_window {
+ my $sw = new CFClient::UI::ScrolledWindow (expand => 1);
+ $sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
+ $sw
}
-sub update_stats_window {
- my ($stats) = @_;
-
- # I love text protocols...
-
- my $hp = $stats->{+CS_STAT_HP} * 1;
- my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
- my $sp = $stats->{+CS_STAT_SP} * 1;
- my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
- my $fo = $stats->{+CS_STAT_FOOD} * 1;
- my $fo_m = 999;
- my $gr = $stats->{+CS_STAT_GRACE} * 1;
- my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
-
- $GAUGES->{hp} ->set_value ($hp, $hp_m);
- $GAUGES->{mana} ->set_value ($sp, $sp_m);
- $GAUGES->{food} ->set_value ($fo, $fo_m);
- $GAUGES->{grace} ->set_value ($gr, $gr_m);
- $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
- . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
- my $rng = $stats->{+CS_STAT_RANGE};
- $rng =~ s/^Range: //; # thank you so much dear server
- $GAUGES->{range} ->set_text ("Rng: " . $rng);
- my $title = $stats->{+CS_STAT_TITLE};
- $title =~ s/^Player: //;
- $STATWIDS->{title} ->set_text ("Title: " . $title);
-
- $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
- $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
- $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
- $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
- $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
- $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
- $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
- $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
- $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
- $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
- $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
- $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,
- magic => 101,
- fire => 102,
- elec => 103,
- cold => 104,
- conf => 105,
- acid => 106,
- drain => 107,
- ghit => 108,
- pois => 109,
- slow => 110,
- para => 111,
- tund => 112,
- fear => 113,
- depl => 113,
- deat => 115,
- holyw => 116,
- blind => 117,
- );
-
- $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
- for keys %tbl;
-}
-
-sub metaserver_dialog {
- my $dialog = new CFClient::UI::FancyFrame
- title => "Server List",
- child => (my $vbox = new CFClient::UI::VBox);
-
- $vbox->add ($dialog->{table} = new CFClient::UI::Table);
-
- $dialog
+sub formsep($) {
+ scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
}
my $METASERVER_ATIME;
sub update_metaserver {
- my ($HOST) = @_;
+ my ($metaserver_dialog) = @_;
+
+ $METASERVER = $metaserver_dialog
+ if defined $metaserver_dialog;
return if $METASERVER_ATIME > time;
$METASERVER_ATIME = time + 60;
@@ -673,9 +855,19 @@
$table->clear;
- my @col = qw(Use #Users Host Uptime Version Description);
- $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
- for 0 .. $#col;
+ 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(#Users Host Uptime Version Description);
+ $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;
my @align = qw(1 0 1 1 -1);
@@ -702,34 +894,60 @@
$y++;
- $table->add (0, $y, new CFClient::UI::VBox children => [
- (new CFClient::UI::Button text => "Use", on_activate => sub {
- $HOST->set_text ($CFG->{host} = $host);
- }),
+ $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
+ (new CFClient::UI::Button
+ text => "Use",
+ tooltip => "Put this server into the Host:Port field",
+ on_activate => sub {
+ $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
+ $METASERVER->hide;
+ 0
+ },
+ ),
(new CFClient::UI::Empty expand => 1),
]);
- $table->add ($_ + 1, $y, new CFClient::UI::Label
- ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
+ $table->add ($_, $y, new CFClient::UI::Label
+ ellipsise => 0,
+ align => $align[$_],
+ text => $m->[$_],
+ tooltip => $tip[$_],
+ can_hover => 1,
+ can_events => 1,
+ fontsize => 0.8)
for 0 .. $#$m;
}
}
});
}
-sub server_setup {
- my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
- x => $WIDTH * (1/3),
- y => $HEIGHT * (1/8),
- name => "server_setup",
- title => "Server Setup",
- child => (my $vbox = new CFClient::UI::VBox),
+sub metaserver_dialog {
+ my $vbox = new CFClient::UI::VBox;
+ my $table = new CFClient::UI::Table;
+ $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
+
+ my $dialog = new CFClient::UI::FancyFrame
+ title => "Server List",
+ name => 'metaserver_dialog',
+ x => 'center',
+ y => 'center',
+ z => 3,
+ force_h => $::HEIGHT * 0.4,
+ child => $vbox,
+ has_close_button => 1,
+ table => $table,
on_visibility_change => sub {
- my ($self, $visible) = @_;
- $self->center if $visible;
+ update_metaserver ($_[0]) if $_[1];
+ 0
},
;
+ $dialog
+}
+
+sub server_setup {
+ my $vbox = new CFClient::UI::VBox;
+
$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
@@ -737,63 +955,51 @@
$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
$vbox->add (
- my $HOST = new CFClient::UI::Entry
+ $HOST_ENTRY = new CFClient::UI::Entry
expand => 1,
- text => $CFG->{host},
+ text => $CFG->{profile}{default}{host},
tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
on_changed => sub {
my ($self, $value) = @_;
- $CFG->{host} = $value;
+ $CFG->{profile}{default}{host} = $value;
+ 0
}
);
- $METASERVER = metaserver_dialog;
-
- $vbox->add (new CFClient::UI::Flopper
- expand => 1,
- text => "Server List",
- other => $METASERVER,
+ $vbox->add (new CFClient::UI::Button
+ expand => 1,
+ text => "Server List",
+ other => $METASERVER,
tooltip => "Show a list of available crossfire servers",
- on_open => sub {
- update_metaserver $HOST;
- }
+ 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},
+ text => $CFG->{profile}{default}{user},
tooltip => "The name of your character on the server",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{user} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{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},
+ text => $CFG->{profile}{default}{password},
hidden => 1,
tooltip => "The password for your character",
- on_changed => sub {
- my ($self, $value) = @_;
- $CFG->{password} = $value;
- }
+ on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{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
- req_w => 100,
+ 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 {
- my ($self, $value) = @_;
-
- $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
- },
+ on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
);
$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
@@ -806,21 +1012,21 @@
. "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
@@ -830,10 +1036,33 @@
on_activate => sub {
$CONN ? stop_game
: start_game;
+ 0
},
);
- $dialog
+ $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
+ 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.",
+ 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 {
@@ -841,12 +1070,12 @@
name => "message_window",
title => "Messages",
border_bg => [1, 1, 1, 1],
- bg => [0, 0, 0, 0.75],
- req_x => -1,
- req_y => 0,
- def_w => int $::WIDTH / 3,
- def_h => int $::HEIGHT / 5,
- child => (my $vbox = new CFClient::UI::VBox);
+ x => "max",
+ y => 0,
+ force_w => $::WIDTH * 0.4,
+ force_h => $::HEIGHT * 0.5,
+ child => (my $vbox = new CFClient::UI::VBox),
+ has_close_button => 1;
$vbox->add ($LOGVIEW);
@@ -864,14 +1093,14 @@
$input->{refocus_map} = 1;
}
delete $input->{auto_activated};
+
+ 0
},
on_activate => sub {
my ($input, $text) = @_;
$input->set_text ('');
- if ($text =~ /^\/bind\s+(.*)$/) {
- CFClient::Recorder::open_binding_dialog ([$1]);
- } elsif ($text =~ /^\/(.*)/) {
+ if ($text =~ /^\/(.*)/) {
$::CONN->user_send ($1);
} else {
my $say_cmd = $::CFG->{say_command} || 'say';
@@ -881,15 +1110,19 @@
delete $input->{refocus_map};
$MAPWIDGET->focus_in
}
+
+ 0
},
on_escape => sub {
- $MAPWIDGET->focus_in
+ $MAPWIDGET->grab_focus;
+
+ 0
},
);
$CONSOLE = {
window => $window,
- input => $input
+ input => $input,
};
$window
@@ -897,7 +1130,12 @@
sub open_quit_dialog {
unless ($QUIT_DIALOG) {
- $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
+ $QUIT_DIALOG = new CFClient::UI::FancyFrame
+ x => "center",
+ y => "center",
+ z => 50,
+ title => "Really Quit?",
+ ;
$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
@@ -910,7 +1148,7 @@
$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",
@@ -920,124 +1158,461 @@
}
$QUIT_DIALOG->show;
- $QUIT_DIALOG->center;
}
-sub make_inventory_window {
- my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
- def_w => $WIDTH * 7/8,
- def_h => $HEIGHT * 7/8,
- title => "Inventory",
- name => "inventory_window",
- on_visibility_change => sub {
- my ($self, $visible) = @_;
- $self->center if $visible;
- },
- ;
+sub autopickup_setup {
+ my $table = new CFClient::UI::Table;
+
+ for (
+ ["General", 0, 0,
+ ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
+ ["Inhibit autopickup" => PICKUP_INHIBIT],
+ ["Stop before pickup" => PICKUP_STOP],
+ ["Debug autopickup" => PICKUP_DEBUG],
+ ],
+ ["Weapons", 0, 6,
+ ["All weapons" => PICKUP_ALLWEAPON],
+ ["Missile weapons" => PICKUP_MISSILEWEAPON],
+ ["Bows" => PICKUP_BOW],
+ ["Arrows" => PICKUP_ARROW],
+ ],
+ ["Armour", 0, 12,
+ ["Helmets" => PICKUP_HELMET],
+ ["Shields" => PICKUP_SHIELD],
+ ["Body Armour" => PICKUP_ARMOUR],
+ ["Boots" => PICKUP_BOOTS],
+ ["Gloves" => PICKUP_GLOVES],
+ ["Cloaks" => PICKUP_CLOAK],
+ ],
+
+ ["Readables", 2, 2,
+ ["Spellbooks" => PICKUP_SPELLBOOK],
+ ["Skillscrolls" => PICKUP_SKILLSCROLL],
+ ["Normal Books/Scrolls" => PICKUP_READABLES],
+ ],
+ ["Misc", 2, 7,
+ ["Food" => PICKUP_FOOD],
+ ["Drinks" => PICKUP_DRINK],
+ ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
+ ["Keys" => PICKUP_KEY],
+ ["Magical Items" => PICKUP_MAGICAL],
+ ["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]);
+
+ for (@bits) {
+ ++$y;
+
+ my $mask = $_->[1];
+ $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
+ $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
+ state => $::CFG->{pickup} & $mask,
+ on_changed => sub {
+ my ($box, $value) = @_;
- $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
+ if ($value) {
+ $::CFG->{pickup} |= $mask;
+ } else {
+ $::CFG->{pickup} &= ~$mask;
+ }
+
+ $::CONN->send_command ("pickup $::CFG->{pickup}")
+ if defined $::CONN;
+
+ 0
+ });
+
+ ${$_->[2]} = $checkbox if $_->[2];
+ }
+ }
+
+ $table->add (2, 18, new CFClient::UI::ValSlider
+ range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
+ template => ">= 99",
+ to_value => sub { ">= " . 5 * $_[0] },
+ on_changed => sub {
+ my ($slider, $value) = @_;
+
+ $::CFG->{pickup} &= ~0xF;
+ $::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_widget {
+ my $hb = new CFClient::UI::HBox homogeneous => 1;
$hb->add (my $vb1 = new CFClient::UI::VBox);
$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
- $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
- $hb->add (my $vb2 = new CFClient::UI::VBox);
+ $vb1->add (my $hb1 = new CFClient::UI::HBox);
- $vb2->add (my $hb2 = new CFClient::UI::HBox);
- $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
- $hb2->add (new CFClient::UI::Button
- text => "Close",
- tooltip => "Close the currently open container (if one is open)",
- on_activate => sub {
- $CONN->send ("apply $CONN->{open_container}")
- if $CONN->{open_container} != 0;
+ use sort 'stable';
+
+ $hb1->add (new CFClient::UI::Combobox
+ value => undef,
+ options => [
+ [undef, "Type/Name"],
+ [
+ sub { sort {
+ $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+ or $a->{type} <=> $b->{type}
+ } @_ },
+ "Weight/Type",
+ ],
+ [sub { } => "#TODO#"],
+ ],
+ on_changed => sub {
+ $INV->set_sort_order ($_[1]);
},
);
+ $hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);
+ #TODO# update to weigh/maxweight
+ $hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);
+
+ $vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw1->add ($INV = new CFClient::UI::Inventory);
+
+ $hb->add (my $vb2 = new CFClient::UI::VBox);
- $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
+ $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
- $invwin
+ $vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw2->add ($INVR = new CFClient::UI::Inventory);
+
+ # XXX: Call after $INVR = ... because set_opencont sets the items
+ CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
+
+ $hb
}
-sub make_binding_window {
+sub toggle_player_page {
+ my ($widget) = @_;
+
+ if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
+ $PL_WINDOW->hide;
+ } else {
+ $PL_NOTEBOOK->set_current_page ($widget);
+ $PL_WINDOW->show;
+ }
+}
+
+sub player_window {
+ my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
+ x => "center",
+ y => "center",
+ force_w => $WIDTH * 9/10,
+ force_h => $HEIGHT * 9/10,
+ title => "Player",
+ name => "playerbook",
+ has_close_button => 1
+ ;
+
+ my $ntb =
+ $PL_NOTEBOOK =
+ new CFClient::UI::Notebook expand => 1, debug => 1;
+
+ $ntb->add (
+ "Statistics (F2)" => $STATS_PAGE = stats_window,
+ "Shows statistics, where all your Stats and Resistances are shown."
+ );
+ $ntb->add (
+ "Skills (F3)" => $SKILL_PAGE = skill_window,
+ "Shows all your Skills."
+ );
+
+ my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+ $spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);
+ $ntb->add (
+ "Spellbook (F4)" => $spellsw,
+ "Displays all spells you have and lets you edit keyboard shortcuts for them."
+ );
+ $ntb->add (
+ "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
+ "Toggles the inventory window, where you can manage your loot (or treasures :). "
+ . "You can also hit the Tab-key to show/hide the Inventory."
+ );
+
+ $ntb->set_current_page ($INVENTORY_PAGE);
+
+ $plwin->add ($ntb);
+ $plwin
+}
+
+sub update_bindings {
+ $BIND_UPD_CB->() if $BIND_UPD_CB;
+}
+
+sub keyboard_setup {
my $binding_list = new CFClient::UI::VBox;
- my $refresh = sub {
+ my $refresh;
+ $refresh = $BIND_UPD_CB = sub {
$binding_list->clear ();
- for my $mod (keys %{$::CFG->{bindings}}) {
- for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
- my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
+ for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
+ for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
+ my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
my $lbl = join "; ", @$cmds;
- my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
+ my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
$binding_list->add (my $hb = new CFClient::UI::HBox);
$hb->add (new CFClient::UI::Button
text => "delete",
+ tooltip => "Deletes the binding",
on_activate => sub {
$binding_list->remove ($hb);
- delete $::CFG->{bindings}->{$mod}->{$sym};
+ delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
+ 0
+ });
+
+ $hb->add (new CFClient::UI::Button
+ text => "edit",
+ tooltip => "Edits the binding",
+ on_activate => sub {
+ $::BIND_EDITOR->set_binding (
+ $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
+ sub {
+ my ($nmod, $nsym, $ncmds) = @_;
+ $::BIND_EDITOR->cfg_unbind ($mod, $sym);
+ $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
+ $refresh->();
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
+ },
+ sub {
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
+ });
+ $::BIND_EDITOR->show;
+ $SETUP_DIALOG->hide;
+ 0
});
- $hb->add (new CFClient::UI::Label text => "($nam)");
+
+ $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
}
}
};
- $BIND_WINDOW = new CFClient::UI::FancyFrame
- title => "Bindings",
- def_w => int $WIDTH * 7/8,
- def_h => int $HEIGHT * 7/8,
- on_visibility_change => sub {
- my ($self, $visible) = @_;
- if ($visible) {
- $self->center;
- $refresh->()
- }
- };
+ 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",
+ expand => 1,
+ tooltip => "This button opens the binding editor with an empty binding.",
+ on_activate => sub {
+ $::BIND_EDITOR->set_binding (undef, undef, [],
+ sub {
+ my ($mod, $sym, $cmds) = @_;
+ $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
+ $refresh->();
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
+ },
+ sub {
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $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
+ }
+ );
- $BIND_WINDOW->add ($binding_list);
$refresh->();
- $BIND_WINDOW
+
+ $vb
}
-sub make_help_window {
+# just weirdness, pls. ignore
+sub load_html_page {
+ my ($viewer, $base) = @_;
+
+ $viewer->clear;
+
+ require LWP::Simple;
+ require HTML::Parser;
+ require URI;
+
+ my $page = LWP::Simple::get ($base)
+ or return;
+
+ my @s = { };
+ my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
+
+ my $parser = HTML::Parser->new (
+ text_h => [sub {
+ my ($text) = @_;
+ $text =~ s/\s+/ /g;
+ $s[-1]{text} .= CFClient::asxml $text;
+ }, "dtext"],
+ start_h => [sub {
+ my ($tag, $attr) = @_;
+ if ($passthrough{$tag}) {
+ $s[-1]{text} .= "<$tag>";
+ } elsif ($tag eq "h1") {
+ push @s, { text => "" };
+ } elsif ($tag eq "h2") {
+ push @s, { text => "" };
+ } elsif ($tag eq "h3") {
+ push @s, { text => "" };
+ } elsif ($tag eq "a") {
+ push @s, { text => "", url => $attr->{href} };
+ } elsif ($tag eq "p") {
+ push @s, { };
+ } elsif ($tag eq "img") {
+ eval {
+ push @{$s[-1]{obj}}, new CFClient::UI::Image
+ tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
+ $s[-1]{text} .= "\x{fffc}";
+ };
+ }
+ }, "tagname, attr"],
+ end_h => [sub {
+ my ($tag) = @_;
+ if ($passthrough{$tag}) {
+ $s[-1]{text} .= "";
+ } elsif ($tag =~ /^h\d$/) {
+ $s[-1]{text} .= "";
+ push @s, { };
+ } elsif ($tag eq "a") {
+ my $S = pop @s;
+ $s[-1]{text} .= "\x{fffc}";
+ push @{$s[-1]{obj}}, new CFClient::UI::Label
+ fg => [0.8, 0.8, 1],
+ markup => "$S->{text}",
+ fontsize => 0.8,
+ can_events => 1,
+ can_focus => 1,
+ on_button_up => sub {
+ load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
+ },
+ ;
+ }
+ }, "tagname"],
+ );
+
+ $parser->parse ($page);
+ $parser->eof;
+
+ $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
+ for @s;
+
+ $viewer->set_offset (0);
+}
+
+sub help_window {
my $win = new CFClient::UI::FancyFrame
- def_w => int $WIDTH * 7/8,
- def_h => int $HEIGHT * 7/8,
- title => "Documentation";
+ x => 'center',
+ y => 'center',
+ z => 2,
+ name => 'doc_browser',
+ force_w => int $WIDTH * 7/8,
+ force_h => int $HEIGHT * 7/8,
+ title => "Help Browser",
+ has_close_button => 1;
$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 (
- [intro => "Introduction"],
- [manual => "Manual"],
- [command_help => "Commands"],
- [skill_help => "Skills"],
- ) {
- my ($pod, $label) = @$_;
+ $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"],
+ [manual => "Main Manual"],
+ [skill_help => "Skill Reference"],
+ [command_help => "Command Reference"],
+ [dmcommand_help => "DM Commands"],
+ [COPYING => "License Terms"],
+ [test => "test (do not select)"], #d#TODO
+ ],
+ on_changed => sub {
+ my ($self, $pod) = @_;
- $buttons->add (new CFClient::UI::Button
- text => $label,
- on_activate => sub {
- my $parser = new Pod::POM;
- my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
+ if ($pod eq "test") {#d#TODO
+ eval {
+ load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
+ };
+ warn "$@" if $@;
+ return;
+ }
- $viewer->clear;
-
- $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
- for @{ CFClient::pod_to_pango_list $pom };
+ my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
+ doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
- $viewer->set_offset (0);
- },
- );
- }
+ #use Data::Dumper; warn Dumper $pom;#d#
- $viewer->add_paragraph ([1, 1, 0, 1], "Use one of the buttons above to display a document.");
+ $viewer->clear;
+
+# $viewer->add_paragraph ([1, 1, 1, 1], ["Test\n\n \x{fffc} \x{fffc}\n",
+# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
+# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
+# ]);#d#
+
+ $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
+ for @$pom;
+
+ $viewer->set_offset (0);
+
+ 0
+ },
+ on_visibility_change => sub {
+ my ($self, $visible) = @_;
+ return unless $visible;
+ return if $self->{value};
+ $self->set_value ("intro");
+ 0
+ },
+ );
$win
}
@@ -1077,19 +1652,30 @@
} else {
# create the widgets
- $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
+ $DEBUG_STATUS = new CFClient::UI::Label
+ padding => 0,
+ z => 100,
+ force_x => "max",
+ force_y => 0;
$DEBUG_STATUS->show;
-
+
+ $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
+
$STATUSBOX = new CFClient::UI::Statusbox;
- $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
+ $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
(new CFClient::UI::Frame
bg => [0, 0, 0, 0.4],
- req_y => -1,
+ force_x => 0,
+ force_y => "max",
child => $STATUSBOX,
)->show;
CFClient::UI::FancyFrame->new (
+ title => "Map",
+ name => "mapmap",
+ x => 0,
+ y => $FONTSIZE + 8,
border_bg => [1, 1, 1, 192/255],
bg => [1, 1, 1, 0],
child => ($MAPMAP = new CFClient::MapWidget::MapMap
@@ -1103,7 +1689,7 @@
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);
@@ -1111,54 +1697,79 @@
}
});
$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,
can_events => 1,
tooltip => "Server Log. This text viewer contains all the messages sent by the server.",
;
- $BUTTONBAR = new CFClient::UI::HBox;
+ $SETUP_DIALOG = new CFClient::UI::FancyFrame
+ title => "Setup",
+ name => "setup_dialog",
+ x => 'center',
+ y => 'center',
+ z => 2,
+ force_w => $::WIDTH * 0.6,
+ force_h => $::HEIGHT * 0.6,
+ has_close_button => 1,
+ ;
+
+ $METASERVER = metaserver_dialog;
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
- tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
- tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
+ $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
+ filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
+
+ $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 (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,
+ "Configure the video mode, performance, fonts and other graphical aspects of the game.");
+ $SETUP_NOTEBOOK->add (Audio => audio_setup,
+ "Configure the use of audio, sound effects and background music.");
+ $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
+ "Lets you define, edit and delete key bindings."
+ . "There is a shortcut for making bindings: Control-Insert opens the binding editor "
+ . "with nothing set and the recording started. After doing the actions you "
+ . "want to record press Insert 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 (Debug => debug_setup,
+ "Some debuggin' 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.");
+
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
tooltip => "Toggles the server message log, where the client collects all messages from the server.");
make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
- tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
- tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
+ tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
$BUTTONBAR->add (new CFClient::UI::Button
text => "Save Config",
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/pclientrc";
+ 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 = help_window,
tooltip => "View Documentation");
- $BUTTONBAR->add (new CFClient::UI::Flopper
- text => "Bindings",
- other => make_binding_window,
- tooltip => "Lets you delete bindings you have made with the recorder"
- );
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
- tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
-
$BUTTONBAR->add (new CFClient::UI::Button
text => "Quit",
tooltip => "Terminates the program",
@@ -1168,18 +1779,20 @@
} else {
exit;
}
+ 0
},
);
$BUTTONBAR->show;
-
- $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
-
- $SERVER_SETUP->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;
}
@@ -1253,7 +1866,7 @@
sub force_refresh {
$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
- debug sprintf "%3.2f", $fps;
+ debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
$CFClient::UI::ROOT->draw;
@@ -1261,64 +1874,10 @@
$CAN_REFRESH = 0;
$LAST_REFRESH = $NOW;
-0 && do {
- # some weird model-drawing code, just a joke right now
- use CFClient::OpenGL;
-
- $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
- $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
- $demo{r} ||= do {
- my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
- $mod->{v} = pack "f*", @{$mod->{v}};
- $_ = [scalar @$_, pack "S!*", @$_]
- for values %{$mod->{g}};
- $mod
- };
-
- my $r = $demo{r} or die;
-
- glDepthMask 1;
- glClear GL_DEPTH_BUFFER_BIT;
- glEnable GL_TEXTURE_2D;
- glEnable GL_DEPTH_TEST;
- glEnable GL_CULL_FACE;
- glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
-
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
- #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
- glMatrixMode GL_MODELVIEW;
- glLoadIdentity;
-
- glPushMatrix;
- glTranslate 0, 0, -800;
- glScale 1, -1, 1;
- glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
- glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
- glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
- glScale 50, 50, 50;
-
- glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
- while (my ($k, $v) = each %{$r->{g}}) {
- glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
- glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
- }
-
- glPopMatrix;
-
- glShadeModel GL_FLAT;
- glDisable GL_DEPTH_TEST;
- glDisable GL_TEXTURE_2D;
- glDepthMask 0;
-
- $WANT_REFRESH++;
-};
-
CFClient::SDL_GL_SwapBuffers;
}
-my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
+my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
$NOW = time;
($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
@@ -1370,8 +1929,8 @@
CFClient::SDL_KEYDOWN => sub {
if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
# alt-enter
+ $FULLSCREEN_ENABLE->toggle;
video_shutdown;
- $CFG->{fullscreen} = !$CFG->{fullscreen};
video_init;
} else {
CFClient::UI::feed_sdl_key_down_event ($_[0]);
@@ -1395,41 +1954,48 @@
$SIG{INT} = $SIG{TERM} = sub { exit };
{
- local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
+ local $SIG{__DIE__} = sub {
+ return unless defined $^S && !$^S;
+ Carp::confess $_[0];#d#TODO: remove when stable
+ CFClient::fatal $_[0];
+ };
- CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
+ CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
CFClient::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 => 1,
- gauge_fontsize=> 1,
- gauge_size => 0.35,
- stat_fontsize => 1,
- mapsize => 100,
- host => "crossfire.schmorp.de",
- say_command => 'say',
- audio_enable => 1,
- bgm_enable => 1,
- bgm_volume => 0.25,
- face_prefetch => 0,
- output_sync => 1,
- output_count => 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,
+ gui_fontsize => 1,
+ log_fontsize => 0.7,
+ gauge_fontsize => 1,
+ gauge_size => 0.35,
+ stat_fontsize => 0.7,
+ mapsize => 100,
+ say_command => 'say',
+ audio_enable => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.25,
+ face_prefetch => 0,
+ output_sync => 1,
+ output_count => 1,
+ pickup => 0,
+ default => "profile", # default profile
);
-
+
while (my ($k, $v) = each %DEF_CFG) {
$CFG->{$k} = $v unless exists $CFG->{$k};
}
+ $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
+
sdl_init;
@SDL_MODES = reverse
@@ -1480,12 +2046,14 @@
}
Event::loop;
+#CFClient::SDL_Quit;
+#CFClient::_exit 0;
END { CFClient::SDL_Quit }
=head1 NAME
-pclient - A Crossfire+ and Crossfire game client
+cfplus - A Crossfire+ and Crossfire game client
=head1 SYNOPSIS
@@ -1493,9 +2061,19 @@
=head1 USAGE
-Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used
+cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
fullscreen and interactively.
+=head1 DEBUGGING
+
+
+CFPLUS_DEBUG - environment variable
+
+ 1 draw borders around widgets
+ 2 add low-level widget info to tooltips
+ 4 show fps
+ 8 suppress tooltips
+
=head1 AUTHOR
Marc Lehmann , Robin Redeker