--- deliantra/Deliantra-Client/bin/cfplus 2006/06/02 18:46:16 1.46
+++ deliantra/Deliantra-Client/bin/cfplus 2006/06/05 22:30:35 1.59
@@ -27,7 +27,6 @@
if %PAR::LibCache;
use Time::HiRes 'time';
-use Pod::POM;
use Event;
use Crossfire;
@@ -41,8 +40,11 @@
use CFClient::UI;
use CFClient::MapWidget;
+$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+
$Event::DIED = sub {
# TODO: display dialog box or so
+ Carp::confess $_[1];#d#TODO: remove when stable
CFClient::error $_[1];
};
@@ -84,7 +86,12 @@
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
our $HOST_ENTRY;
-our $SERVER_SETUP;
+
+our $SETUP_DIALOG;
+our $SETUP_NOTEBOOK;
+our $SETUP_SERVER;
+our $SETUP_KEYBOARD;
+our $SETUP_SPELLS;
our $FLOORBOX;
our $GAUGES;
@@ -106,10 +113,8 @@
our $INVR;
our $INV_RIGHT_HB;
-our $BIND_WINDOW;
our $BIND_EDITOR;
-our $SPELL_LIST;
our $PICKUP_CFG;
sub status {
@@ -124,7 +129,7 @@
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;
@@ -172,9 +177,9 @@
sub stop_game {
$LOGIN_BUTTON->set_text ("Login");
- $SERVER_SETUP->show;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
+ $SETUP_DIALOG->show;
$INV_WINDOW->hide;
- $LOGVIEW->hide;
return unless $CONN;
@@ -184,13 +189,8 @@
$CONN = 0; # false, does not autovivify
}
-sub client_setup {
- my $dialog = new CFClient::UI::FancyFrame
- x => 1,
- 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]);
@@ -325,6 +325,16 @@
}
);
+ $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},
@@ -364,19 +374,7 @@
}
);
- $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
+ $vbox
}
sub set_stats_window_fontsize {
@@ -559,8 +557,8 @@
$tgw
}
-sub formsep {
- reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
+sub formsep($) {
+ scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
}
sub update_stats_window {
@@ -716,6 +714,7 @@
name => 'metaserver_dialog',
x => 'center',
y => 'center',
+ z => 3,
child => (my $vbox = new CFClient::UI::VBox),
on_visibility_change => sub {
update_metaserver if $_[1];
@@ -728,13 +727,7 @@
}
sub server_setup {
- my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
- x => "center",
- y => "center",
- name => "server_setup",
- title => "Server Setup",
- child => (my $vbox = new CFClient::UI::VBox),
- ;
+ 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");
@@ -837,7 +830,19 @@
},
);
- $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;
+ }
+ );
+
+ $vbox
}
sub message_window {
@@ -902,6 +907,7 @@
$QUIT_DIALOG = new CFClient::UI::FancyFrame
x => "center",
y => "center",
+ z => 50,
title => "Really Quit?",
;
@@ -928,68 +934,58 @@
$QUIT_DIALOG->show;
}
-sub make_pickup_cfg_window {
- $PICKUP_CFG = new CFClient::UI::FancyFrame
- title => "Autopickup configuration",
- x => "center",
- y => "center",
- force_w => $WIDTH * 6/10,
- force_h => $HEIGHT * 9/10;
-
-
- $PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
- $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
- $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
- $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
- $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
-
- my $tbl = 0;
- my $tblrow = 0;
+sub autopickup_setup {
+ my $table = new CFClient::UI::Table;
for (
- ["General", $gen_tbl],
- ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
- ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
- ["Stop before pickup" => CFClient::Pickup::PU_STOP],
- ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
- ["Weapons", $ltbl],
- ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
- ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
- ["Bows" => CFClient::Pickup::PU_BOW],
- ["Arrows" => CFClient::Pickup::PU_ARROW],
- ["Armour"],
- ["Helmets" => CFClient::Pickup::PU_HELMET],
- ["Shields" => CFClient::Pickup::PU_SHIELD],
- ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
- ["Boots" => CFClient::Pickup::PU_BOOTS],
- ["Gloves" => CFClient::Pickup::PU_GLOVES],
- ["Cloaks" => CFClient::Pickup::PU_CLOAK],
- ["Readables", $rtbl],
- ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
- ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
- ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
- ["Misc"],
- ["Food" => CFClient::Pickup::PU_FOOD],
- ["Drinks" => CFClient::Pickup::PU_DRINK],
- ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
- ["Keys" => CFClient::Pickup::PU_KEY],
- ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
- ["Potions" => CFClient::Pickup::PU_POTION],
- ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
- ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
- ["Jewelery" => CFClient::Pickup::PU_JEWELS],
+ ["General", 0, 0,
+ ["Enable autopickup" => PICKUP_NEWMODE],
+ ["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],
+ ],
)
{
- if (ref $_->[1]) {
- $tbl = $_->[1];
- $tblrow = 0;
- $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
- } elsif (not defined $_->[1]) {
- $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
- } else {
+ 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];
- $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
- $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
+ $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) = @_;
@@ -1004,7 +1000,7 @@
}
}
- $PICKUP_CFG
+ $table
}
sub make_inventory_window {
@@ -1034,14 +1030,11 @@
$invwin
}
-sub make_spell_list {
- $SPELL_LIST = new CFClient::UI::SpellList
- force_w => $WIDTH * (9/10),
- force_h => $HEIGHT * (9/10);
- $SPELL_LIST
+sub spell_setup {
+ new CFClient::UI::SpellList
}
-sub make_binding_window {
+sub keyboard_setup {
my $binding_list = new CFClient::UI::VBox;
my $refresh;
@@ -1075,13 +1068,15 @@
delete $::CFG->{bindings}->{$mod}->{$sym};
$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
$refresh->();
- $::BIND_WINDOW->show;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
},
sub {
- $::BIND_WINDOW->show;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
});
$::BIND_EDITOR->show;
- $::BIND_WINDOW->hide;
+ $SETUP_DIALOG->hide;
});
$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
@@ -1090,20 +1085,10 @@
}
};
- $BIND_WINDOW = new CFClient::UI::FancyFrame
- title => "Bindings",
- x => "center",
- y => "center",
- def_w => int $WIDTH * 9/10,
- def_h => int $HEIGHT * 9/10,
- on_visibility_change => sub {
- my ($self, $visible) = @_;
- $refresh->() if $visible;
- };
-
- $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
+ my $vb = new CFClient::UI::VBox;
$vb->add ($binding_list);
$vb->add (my $hb = new CFClient::UI::HBox);
+
$hb->add (new CFClient::UI::Button
text => "record new",
expand => 1,
@@ -1114,32 +1099,38 @@
my ($mod, $sym, $cmds) = @_;
$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
$refresh->();
- $::BIND_WINDOW->show;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
},
sub {
- $::BIND_WINDOW->show;
- });
- $::BIND_WINDOW->hide;
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
+ $SETUP_DIALOG->show;
+ },
+ );
+ $SETUP_DIALOG->hide;
$::BIND_EDITOR->show;
},
);
+
$hb->add (new CFClient::UI::Button
text => "close",
tooltip => "Closes the binding window",
expand => 1,
on_activate => sub {
- $::BIND_WINDOW->hide;
+ $SETUP_DIALOG->hide;
}
);
$refresh->();
- $BIND_WINDOW
+
+ $vb
}
sub make_help_window {
my $win = new CFClient::UI::FancyFrame
x => 'center',
y => 'center',
+ z => 2,
name => 'doc_browser',
force_w => int $WIDTH * 7/8,
force_h => int $HEIGHT * 7/8,
@@ -1161,13 +1152,13 @@
$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");
+ my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
+ doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
$viewer->clear;
$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
- for @{ CFClient::pod_to_pango_list $pom };
+ for @$pom;
$viewer->set_offset (0);
},
@@ -1224,7 +1215,7 @@
$BIND_EDITOR = new CFClient::UI::BindEditor (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],
@@ -1234,7 +1225,7 @@
)->show;
CFClient::UI::FancyFrame->new (
- title => "Mini Map",
+ title => "Map",
name => "mapmap",
x => 0,
y => $FONTSIZE + 8,
@@ -1270,12 +1261,42 @@
tooltip => "Server Log. This text viewer contains all the messages sent by the server.",
;
- $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
+ $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,
+ ;
+
+ $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
+ filter => new CFClient::UI::ScrolledWindow xxx => 1, 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 bindings."
+ . "There is a shortcut for making bindings: Left 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 (Spells => $SETUP_SPELLS = spell_setup,
+ "Displays all spells you have and lets you edit keyboard shortcuts for them.");
+
+ $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 => "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,
tooltip => "Toggles the server message log, where the client collects all messages from the server.");
@@ -1284,8 +1305,8 @@
$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 :)."
- ."You can also hit the Tab-key to show/hide the Inventory.");
+ tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
+ . "You can also hit the Tab-key to show/hide the Inventory.");
$BUTTONBAR->add (new CFClient::UI::Button
text => "Save Config",
@@ -1300,28 +1321,6 @@
$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
tooltip => "View Documentation");
- $BUTTONBAR->add (new CFClient::UI::Flopper
- text => "Bindings",
- other => make_binding_window,
- tooltip =>
- "Lets you define, edit and delete bindings."
- ."There is a shortcut for making bindings: LCTRL+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");
-
- $BUTTONBAR->add (new CFClient::UI::Flopper
- text => "Spells",
- other => make_spell_list,
- tooltip => "The spell list");
-
- $BUTTONBAR->add (new CFClient::UI::Flopper
- text => "Pickup",
- other => make_pickup_cfg_window,
- tooltip => "The pickup dialog");
-
-
$BUTTONBAR->add (new CFClient::UI::Button
text => "Quit",
tooltip => "Terminates the program",
@@ -1335,10 +1334,10 @@
);
$BUTTONBAR->show;
- $SERVER_SETUP->show;
-
- $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
+ $SETUP_DIALOG->show;
}
+
+ $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
sub video_shutdown {
@@ -1480,7 +1479,7 @@
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}" })->($_)
@@ -1557,7 +1556,11 @@
$SIG{INT} = $SIG{TERM} = sub { exit };
{
- local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
+ local $SIG{__DIE__} = sub {
+ return unless defined $^S && !$^S;
+ Carp::confess $_[1];#d#TODO: remove when stable
+ CFClient::fatal $_[0];
+ };
CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
CFClient::UI::set_layout ($::CFG->{layout});