--- deliantra/Deliantra-Client/bin/cfplus 2006/05/27 20:46:54 1.18
+++ deliantra/Deliantra-Client/bin/cfplus 2006/06/05 03:33:09 1.55
@@ -43,6 +43,7 @@
$Event::DIED = sub {
# TODO: display dialog box or so
+ Carp::confess $_[1];#d#TODO: remove when stable
CFClient::error $_[1];
};
@@ -83,6 +84,13 @@
our $METASERVER;
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
+our $HOST_ENTRY;
+
+our $SETUP_DIALOG;
+our $SETUP_NOTEBOOK;
+our $SETUP_SERVER;
+our $SETUP_KEYBOARD;
+our $SETUP_SPELLS;
our $FLOORBOX;
our $GAUGES;
@@ -99,9 +107,14 @@
our $STATUSBOX;
our $DEBUG_STATUS;
+our $INV_WINDOW;
our $INV;
our $INVR;
-our $INVR_LBL;
+our $INV_RIGHT_HB;
+
+our $BIND_EDITOR;
+
+our $PICKUP_CFG;
sub status {
$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
@@ -109,13 +122,14 @@
sub debug {
$DEBUG_STATUS->set_text ($_[0]);
- my ($w, $h) = $DEBUG_STATUS->size_request;
- $DEBUG_STATUS->move ($WIDTH - $w, 0);
}
sub start_game {
status "logging in...";
+ $LOGIN_BUTTON->set_text ("Logout");
+ $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};
@@ -153,12 +167,7 @@
if ($CONN) {
CFClient::lowdelay fileno $CONN->{fh};
- $LOGIN_BUTTON->set_text ("Logout");
status "login successful";
-
- $BUTTONBAR->{children}[1]->emit ("activate")
- if $BUTTONBAR->{children}[1]->{state};
-
} else {
status "unable to connect";
stop_game();
@@ -166,28 +175,28 @@
}
sub stop_game {
+ $LOGIN_BUTTON->set_text ("Login");
+ $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
+ $SETUP_DIALOG->show;
+ $INV_WINDOW->hide;
+
return unless $CONN;
status "connection closed";
- $LOGIN_BUTTON->set_text ("Login");
+
$CONN->destroy;
$CONN = 0; # false, does not autovivify
-
- $BUTTONBAR->{children}[1]->emit ("activate")
- unless $BUTTONBAR->{children}[1]->{state};
}
-sub client_setup {
- my $dialog = new CFClient::UI::FancyFrame
- 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 {
@@ -315,6 +324,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},
@@ -354,19 +373,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 {
@@ -385,9 +392,10 @@
my $gh = int $HEIGHT * $CFG->{gauge_size};
my $win = new CFClient::UI::Frame (
- req_y => -1,
- user_w => $WIDTH,
- user_h => $gh,
+ force_x => 0,
+ force_y => "max",
+ force_w => $WIDTH,
+ force_h => $gh,
);
$win->add (my $hbox = new CFClient::UI::HBox
@@ -433,8 +441,13 @@
$win
}
+
sub make_stats_window {
- my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window";
+ my $tgw = new CFClient::UI::FancyFrame
+ y => $HEIGHT * (2/8),
+ x => "max",
+ title => "Stats",
+ name => "stats_window";
$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,
@@ -543,8 +556,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 {
@@ -616,21 +629,9 @@
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
-}
-
my $METASERVER_ATIME;
sub update_metaserver {
- my ($HOST) = @_;
-
return if $METASERVER_ATIME > time;
$METASERVER_ATIME = time + 60;
@@ -692,7 +693,8 @@
$table->add (0, $y, new CFClient::UI::VBox children => [
(new CFClient::UI::Button text => "Use", on_activate => sub {
- $HOST->set_text ($CFG->{host} = $host);
+ $HOST_ENTRY->set_text ($CFG->{host} = $host);
+ $METASERVER->toggle_visibility;
}),
(new CFClient::UI::Empty expand => 1),
]);
@@ -705,12 +707,26 @@
});
}
-sub server_setup {
+sub metaserver_dialog {
my $dialog = new CFClient::UI::FancyFrame
- name => "server_setup",
- title => "Server Setup",
- child => (my $vbox = new CFClient::UI::VBox);
-
+ title => "Server List",
+ name => 'metaserver_dialog',
+ x => 'center',
+ y => 'center',
+ child => (my $vbox = new CFClient::UI::VBox),
+ on_visibility_change => sub {
+ update_metaserver if $_[1];
+ },
+ ;
+
+ $vbox->add ($dialog->{table} = new CFClient::UI::Table);
+
+ $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");
@@ -718,7 +734,7 @@
$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},
tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
@@ -730,14 +746,12 @@
$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 },
);
}
@@ -764,7 +778,7 @@
$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, "
@@ -814,7 +828,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 {
@@ -823,8 +849,10 @@
title => "Messages",
border_bg => [1, 1, 1, 1],
bg => [0, 0, 0, 0.75],
- user_w => int $::WIDTH / 3,
- user_h => int $::HEIGHT / 5,
+ x => "max",
+ y => 0,
+ force_w => $::WIDTH / 3,
+ force_h => $::HEIGHT / 5,
child => (my $vbox = new CFClient::UI::VBox);
$vbox->add ($LOGVIEW);
@@ -866,7 +894,7 @@
$CONSOLE = {
window => $window,
- input => $input
+ input => $input,
};
$window
@@ -874,8 +902,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);
@@ -895,46 +927,212 @@
expand => 1,
on_activate => sub { exit },
);
+ }
- $QUIT_DIALOG->show_centered;
- } else {
- $QUIT_DIALOG->show_centered;
+ $QUIT_DIALOG->show;
+}
+
+sub autopickup_setup {
+ my $table = new CFClient::UI::Table;
+
+ for (
+ ["General", 0, 0,
+ ["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", 0, 6,
+ ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
+ ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
+ ["Bows" => CFClient::Pickup::PU_BOW],
+ ["Arrows" => CFClient::Pickup::PU_ARROW],
+ ],
+ ["Armour", 0, 12,
+ ["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", 2, 2,
+ ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
+ ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
+ ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
+ ],
+ ["Misc", 2, 7,
+ ["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],
+ ],
+ )
+ {
+ 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, 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;
+ }
+ $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
+ if defined $::CONN;
+ });
+ }
}
+
+ $table
}
sub make_inventory_window {
- my $invwin = new CFClient::UI::FancyFrame
- user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";
+ my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
+ x => "center",
+ y => "center",
+ force_w => $WIDTH * 9/10,
+ force_h => $HEIGHT * 9/10,
+ title => "Inventory",
+ ;
+
+ $invwin->add (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);
+
+ $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
+
+ $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
+
+ # XXX: Call after $INVR = ... because set_opencont sets the items
+ CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
+
+ $invwin
+}
+
+sub spell_setup {
+ new CFClient::UI::SpellList
+}
+
+sub keyboard_setup {
+ my $binding_list = new CFClient::UI::VBox;
- $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
+ my $refresh;
+ $refresh = sub {
+ $binding_list->clear ();
+
+ for my $mod (keys %{$::CFG->{bindings}}) {
+ for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
+ my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
+ next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
+
+ my $lbl = join "; ", @$cmds;
+ my $nam = CFClient::Binder::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};
+ });
+
+ $hb->add (new CFClient::UI::Button
+ text => "edit",
+ tooltip => "Edits the binding",
+ on_activate => sub {
+ $::BIND_EDITOR->set_binding (
+ $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
+ sub {
+ my ($nmod, $nsym, $ncmds) = @_;
+ delete $::CFG->{bindings}->{$mod}->{$sym};
+ $::CFG->{bindings}->{$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;
+ });
- $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
- $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
- $lbl->set_text ("Player");
- $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
-
- $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
-
- $vb2->add (my $hb2 = new CFClient::UI::HBox);
- $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
- $hb2->add (new CFClient::UI::Button
- text => "Close",
- tooltip => "Close the currently open container (if one is open)",
+ $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 ($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 {
- $CONN->send ("apply $CONN->{open_container}")
- if $CONN->{open_container} != 0;
+ $::BIND_EDITOR->set_binding (undef, undef, [],
+ sub {
+ my ($mod, $sym, $cmds) = @_;
+ $::CFG->{bindings}->{$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;
},
);
- $INVR_LBL->set_text ("Floor");
- $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
+ $hb->add (new CFClient::UI::Button
+ text => "close",
+ tooltip => "Closes the binding window",
+ expand => 1,
+ on_activate => sub {
+ $SETUP_DIALOG->hide;
+ }
+ );
- $invwin
+ $refresh->();
+
+ $vb
}
sub make_help_window {
my $win = new CFClient::UI::FancyFrame
- user_w => $WIDTH * (7/8), user_h => $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 => "Documentation";
$win->add (my $vbox = new CFClient::UI::VBox);
@@ -1005,19 +1203,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::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],
- 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
@@ -1050,12 +1259,42 @@
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,
+ ;
+
+ $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 autopicking stetings, i.e. which items you will pick up automatically when walking 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::HBox x => 0, y => 0;
+
+ $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.");
@@ -1064,14 +1303,15 @@
$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 :).");
+ 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",
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";
},
);
@@ -1092,17 +1332,10 @@
);
$BUTTONBAR->show;
-
- $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
-
- # delay till geometry is constant
- $CFClient::UI::ROOT->on_post_alloc (startup => sub {
- $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
- my $widget = $GAUGES->{win};
- $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
- });
- force_refresh ();
+ $SETUP_DIALOG->show;
}
+
+ $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
sub video_shutdown {
@@ -1179,7 +1412,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;
@@ -1244,7 +1477,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}" })->($_)
@@ -1321,9 +1554,13 @@
$SIG{INT} = $SIG{TERM} = sub { exit };
{
- local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
+ 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/pclientrc";
+ CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
CFClient::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
@@ -1411,7 +1648,7 @@
=head1 NAME
-pclient - A Crossfire+ and Crossfire game client
+cfplus - A Crossfire+ and Crossfire game client
=head1 SYNOPSIS
@@ -1419,9 +1656,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