--- deliantra/Deliantra-Client/bin/cfplus 2006/06/13 14:35:18 1.71
+++ deliantra/Deliantra-Client/bin/cfplus 2007/07/12 19:13:20 1.166
@@ -1,24 +1,69 @@
#!/opt/bin/perl
+my $startup_done = sub { };
+our $PANGO = "1.5.0";
+
+# do splash-screen thingy on win32
+BEGIN {
+ if (%PAR::LibCache && $^O eq "MSWin32") {
+ while (my ($filename, $zip) = each %PAR::LibCache) {
+ $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
+ }
+
+ require Win32::GUI::SplashScreen;
+
+ Win32::GUI::SplashScreen::Show (
+ -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
+ );
+
+ $startup_done = sub {
+ Win32::GUI::SplashScreen::Done (1);
+ };
+ }
+}
+
use strict;
use utf8;
+use Carp 'verbose';
+
# do things only needed for single-binary version (par)
BEGIN {
if (%PAR::LibCache) {
@INC = grep ref, @INC; # weed out all paths except pars loader refs
+ my $tmp = $ENV{PAR_TEMP};
+
while (my ($filename, $zip) = each %PAR::LibCache) {
for ($zip->memberNames) {
- next unless /^\/root\/(.*)/;
- $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
- unless -e "$ENV{PAR_TEMP}/$1";
+ next unless /^root\/(.*)/;
+ $zip->extractMember ($_, "$tmp/$1")
+ unless -e "$tmp/$1";
}
}
- # TODO: pango-rc file, anybody?
+ if ($^O eq "MSWin32") {
+ # relocatable
+ } else {
+ # unix, need to patch pango rc file
+ open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
+ or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
+ local $/;
+ my $rc = <$fh>;
+ $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
+
+ mkdir "$tmp/pango-modules";
+ open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
+ or die "$tmp/pango-modules/pango.modules: $!";
+ print $fh $rc;
+
+ $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
+ open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
+ or die "$ENV{PANGO_RC_FILE}: $!";
+ print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
+ }
- unshift @INC, $ENV{PAR_TEMP};
+ unshift @INC, $tmp;
}
}
@@ -34,34 +79,36 @@
use Compress::LZF;
-use CFClient;
-use CFClient::OpenGL ();
-use CFClient::Protocol;
-use CFClient::UI;
-use CFClient::MapWidget;
+use CFPlus;
+use CFPlus::OpenGL ();
+use CFPlus::Protocol;
+use CFPlus::DB;
+use CFPlus::UI;
+use CFPlus::UI::Inventory;
+use CFPlus::UI::SpellList;
+use CFPlus::Pod;
+use CFPlus::MapWidget;
+use CFPlus::Macro;
$SIG{QUIT} = sub { Carp::cluck "QUIT" };
+$SIG{PIPE} = 'IGNORE';
+$Event::Eval = 1;
$Event::DIED = sub {
- # TODO: display dialog box or so
- Carp::confess $_[1];#d#TODO: remove when stable
- CFClient::error $_[1];
+ CFPlus::fatal Carp::longmess $_[1]
};
-#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
-
-our $VERSION = '0.1';
-
my $MAX_FPS = 60;
my $MIN_FPS = 5; # unused as of yet
-our $META_SERVER = "crossfire.real-time.com:13326";
+our $META_SERVER = "http://metaserver.schmorp.de/current.json";
our $LAST_REFRESH;
our $NOW;
our $CFG;
our $CONN;
+our $PROFILE; # current profile
our $FAST; # fast, low-quality mode, possibly useful for software-rendering
our $WANT_REFRESH;
@@ -86,15 +133,25 @@
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
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 $SETUP_SPELLS;
-our $STATS_WINDOW;
+our $PL_NOTEBOOK;
+our $PL_WINDOW;
+
+our $INVENTORY_PAGE;
+our $STATS_PAGE;
+our $SKILL_PAGE;
+our $SPELL_PAGE;
+our $SPELL_LIST;
+
+our $HELP_WINDOW;
our $MESSAGE_WINDOW;
our $FLOORBOX;
our $GAUGES;
@@ -104,6 +161,10 @@
our %SDL_CB;
our $SDL_MIXER;
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our @MUSIC_WANT;
+our $MUSIC_PLAYING;
+our $MUSIC_PLAYER;
our @SOUNDS; # event => file mapping
our %AUDIO_CHUNKS; # audio files
@@ -111,103 +172,150 @@
our $STATUSBOX;
our $DEBUG_STATUS;
-our $INV_WINDOW;
our $INV;
our $INVR;
our $INV_RIGHT_HB;
-our $BIND_EDITOR;
-
our $PICKUP_CFG;
+our $IN_BUILD_MODE;
+our $BUILD_BUTTON;
+
sub status {
- $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
+ $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
}
sub debug {
$DEBUG_STATUS->set_text ($_[0]);
}
+sub message {
+ my ($para) = @_;
+
+ my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+
+ $para->{markup} = "$time $para->{markup}";
+
+ $LOGVIEW->add_paragraph ($para);
+ $LOGVIEW->scroll_to_bottom;
+}
+
sub destroy_query_dialog {
(delete $_[0]{query_dialog})->destroy
if $_[0]{query_dialog};
}
+# FIXME: a very ugly hack to wait for stat update look below! #d#
+our $QUERY_TIMER; #d#
+
# server query dialog
sub server_query {
my ($conn, $flags, $prompt) = @_;
- $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
+ # FIXME: a very ugly hack to wait for stat update #d#
+ if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
+ unless ($QUERY_TIMER) {
+ $QUERY_TIMER =
+ Event->timer (
+ after => 1,
+ cb => sub {
+ server_query ($conn, $flags, $prompt, 1);
+ $QUERY_TIMER = undef
+ }
+ );
+ return;
+ }
+ }
+
+ $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
x => "center",
y => "center",
title => "Server Query",
- child => my $vbox = new CFClient::UI::VBox,
+ child => my $vbox = new CFPlus::UI::VBox,
;
- my @dialog = my $label = new CFClient::UI::Label
- max_w => $::WIDTH * 0.4,
+ my @dialog = my $label = new CFPlus::UI::Label
+ max_w => $::WIDTH * 0.8,
ellipsise => 0,
text => $prompt;
if ($flags & CS_QUERY_YESNO) {
- push @dialog, my $hbox = new CFClient::UI::HBox;
+ push @dialog, my $hbox = new CFPlus::UI::HBox;
- $hbox->add (new CFClient::UI::Button
+ $hbox->add (new CFPlus::UI::Button
text => "No",
on_activate => sub {
$conn->send ("reply n");
$dialog->destroy;
+ 0
}
);
- $hbox->add (new CFClient::UI::Button
+ $hbox->add (new CFPlus::UI::Button
text => "Yes",
on_activate => sub {
$conn->send ("reply y");
destroy_query_dialog $conn;
+ 0
},
);
- $dialog->focus_in;
+ $dialog->grab_focus;
} elsif ($flags & CS_QUERY_SINGLECHAR) {
- $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
-
if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
- $MESSAGE_WINDOW->show;
+ $dialog->{tooltip} = "#charcreation_focus";
- unshift @dialog, new CFClient::UI::Label
- max_w => $::WIDTH * 0.4,
+ unshift @dialog, new CFPlus::UI::Label
+ max_w => $::WIDTH * 0.8,
ellipsise => 0,
- markup => "\nOr use your keyboard:\n";
+ markup => "\nOr use your keyboard and the text entry below:\n";
- unshift @dialog, my $table = new CFClient::UI::Table;
+ unshift @dialog, my $table = new CFPlus::UI::Table;
- $table->add (0, 0, new CFClient::UI::Button
+ $table->add (0, 0, new CFPlus::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
+ $table->add (2, 0, new CFPlus::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply d");
destroy_query_dialog $conn;
+ 0
},
);
- unshift @dialog, new CFClient::UI::Label
+ if ($conn->{chargen_race_description}) {
+ unshift @dialog, new CFPlus::UI::Label
+ max_w => $::WIDTH * 0.8,
+ ellipsise => 0,
+ markup => "$conn->{chargen_race_description}",
+ ;
+ }
+
+ unshift @dialog, new CFPlus::UI::Face
+ face => $conn->{player}{face},
+ bg => [.2, .2, .2, 1],
+ min_w => 64,
+ min_h => 64,
+ ;
+
+ if ($conn->{chargen_race_title}) {
+ unshift @dialog, new CFPlus::UI::Label
+ allign => 1,
+ ellipsise => 0,
+ markup => "Race: $conn->{chargen_race_title}",
+ ;
+ }
+
+ unshift @dialog, new CFPlus::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 "
- . "(or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen) "
- . "and the center of the screen to see how this race looks like "
- . "(this is below this dialog window, you may need to click on the display area to make it visible).\n\n"
- . "You can look at another race, or accept this race (you will come back to this race eventually, "
- . "so you can take your time making this important choice."
+ markup => (CFPlus::Pod::section_label ui => "chargen_race"),
;
} elsif ($prompt =~ /roll new stats/) {
@@ -217,27 +325,29 @@
return;
}
- $STATS_WINDOW->show;
+ $STATS_PAGE->show;
$MESSAGE_WINDOW->hide;
- unshift @dialog, new CFClient::UI::Label
+ unshift @dialog, new CFPlus::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup => "\nOr use your keyboard:\n";
+ markup => "\nOr use your keyboard and the text entry below:\n";
- unshift @dialog, my $table = new CFClient::UI::Table;
+ unshift @dialog, my $table = new CFPlus::UI::Table;
# left: re-roll
- $table->add (0, 0, new CFClient::UI::Button
+ $table->add (0, 0, new CFPlus::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
+ my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
+ expand => 1,
value => $_,
options => [
[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
@@ -250,59 +360,79 @@
],
), 1 .. 2;
- $table->add (2, 0, new CFClient::UI::Button
+ $table->add (2, 0, new CFPlus::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]);
+ $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
# right: accept
- $table->add (4, 0, new CFClient::UI::Button
+ $table->add (4, 0, new CFPlus::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply n");
- $STATS_WINDOW->hide;
+ $STATS_PAGE->hide;
destroy_query_dialog $conn;
+ 0
},
);
- unshift @dialog, new CFClient::UI::Label
+ unshift @dialog, my $hbox = new CFPlus::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 CFPlus::UI::Label
+ markup => "$conn->{stat}{$id} $name",
+ align => 0,
+ expand => 1,
+ can_events => 1,
+ can_hover => 1,
+ tooltip => "#stat_$name",
+ );
+ }
+
+ unshift @dialog, new CFPlus::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup =>
- "Character Creation: Stats\n\n"
- . "Look at the Stats window to see your basic stats "
- . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
- . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
- . "Race selection will influence those values later on."
+ markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
;
}
- push @dialog, my $entry = new CFClient::UI::Entry
+ push @dialog, my $entry = new CFPlus::UI::Entry
on_changed => sub {
$conn->send ("reply $_[1]");
destroy_query_dialog $conn;
+ 0
},
;
- $entry->focus_in;
+ $entry->grab_focus;
} else {
$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
- push @dialog, my $entry = new CFClient::UI::Entry
+ push @dialog, my $entry = new CFPlus::UI::Entry
$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
on_activate => sub {
$conn->send ("reply $_[1]");
destroy_query_dialog $conn;
+ 0
},
;
- $entry->focus_in;
+ $entry->grab_focus;
}
$vbox->add (@dialog);
@@ -317,19 +447,21 @@
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 /:/, $PROFILE->{host};
- $MAP = new CFClient::Map $mapsize, $mapsize;
+ $MAP = new CFPlus::Map;
$CONN = eval {
- new CFClient::Protocol
+ new CFPlus::Protocol
host => $host,
port => $port || 13327,
- user => $CFG->{user},
- pass => $CFG->{password},
+ user => $PROFILE->{user},
+ pass => $PROFILE->{password},
mapw => $mapsize,
maph => $mapsize,
+ client => "cfplus $CFPlus::VERSION $] $^O",
+
map_widget => $MAPWIDGET,
logview => $LOGVIEW,
statusbox => $STATUSBOX,
@@ -337,6 +469,10 @@
mapmap => $MAPMAP,
query => \&server_query,
+ setup_req => {
+ smoothing => $CFG->{map_smoothing}*1,
+ },
+
sound_play => sub {
my ($x, $y, $soundnum, $type) = @_;
@@ -351,7 +487,7 @@
};
if ($CONN) {
- CFClient::lowdelay fileno $CONN->{fh};
+ CFPlus::lowdelay fileno $CONN->{fh};
status "login successful";
} else {
@@ -364,8 +500,11 @@
$LOGIN_BUTTON->set_text ("Login");
$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
$SETUP_DIALOG->show;
- $INV_WINDOW->hide;
- $SETUP_SPELLS->clear_spells;
+ $PL_WINDOW->hide;
+ $SPELL_LIST->clear_spells;
+ $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+
+ &audio_music_set ([]);
return unless $CONN;
@@ -374,18 +513,27 @@
destroy_query_dialog $CONN;
$CONN->destroy;
$CONN = 0; # false, does not autovivify
+
+ undef $MAP;
}
sub graphics_setup {
- my $vbox = new CFClient::UI::VBox;
+ my $vbox = new CFPlus::UI::VBox;
+
+ $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
- $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+ my $row = 0;
+
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
+ $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
+ can_events => 1,
+ tooltip => "" . (CFPlus::OpenGL::gl_extensions) . "");
- $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);
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
+ $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
- $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");
+ $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
+ $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
$mode_slider->connect (changed => sub {
my ($self, $value) = @_;
@@ -395,120 +543,105 @@
});
$mode_slider->emit (changed => $mode_slider->{range}[0]);
- 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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
+ $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
state => $CFG->{fullscreen},
tooltip => "Bring the client into fullscreen mode.",
- 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
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
+ $table->add (1, $row++, new CFPlus::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 CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+ $table->add (1, $row++, new CFPlus::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]; 0 },
+ );
+
+ $table->add (1, $row++, new CFPlus::UI::Button
+ expand => 1, align => 0, text => "Apply",
+ tooltip => "Apply the video settings above.",
+ on_activate => sub {
+ video_shutdown ();
+ video_init ();
+ 0
}
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
- $table->add (1, $row++, new CFClient::UI::Slider
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
+ $table->add (1, $row++, new CFPlus::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 CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
+ $table->add (1, $row++, new CFPlus::UI::CheckBox
+ state => $CFG->{map_smoothing},
+ tooltip => "Map Smoothing tries to make tile borders less square. "
+ . "This increases load on the graphics subsystem and works only with 2.x servers. "
+ . "Changes take effect at next connection only.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $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
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
+ $table->add (1, $row++, new CFPlus::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
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
+ $table->add (1, $row++, new CFPlus::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");
- $table->add (1, $row++, new CFClient::UI::CheckBox
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
+ $table->add (1, $row++, new CFPlus::UI::CheckBox
state => $CFG->{fow_smooth},
tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
on_changed => sub {
my ($self, $value) = @_;
$CFG->{fow_smooth} = $value;
- status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
+ status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
+ 0
}
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
- $table->add (1, $row++, new CFClient::UI::Slider
- range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The base font size used by most GUI elements that do not have their own setting.",
- on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
- );
-
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
- $table->add (1, $row++, new CFClient::UI::Slider
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
+ $table->add (1, $row++, new CFPlus::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]) },
+ on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
-
- $table->add (1, $row++, new CFClient::UI::Slider
- range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
- tooltip => "The font size used by the statistics window only. Changes are instant.",
- on_changed => sub {
- $CFG->{stat_fontsize} = $_[1];
- &set_stats_window_fontsize;
- }
- );
-
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
- $table->add (1, $row++, new CFClient::UI::Slider
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
+ $table->add (1, $row++, new CFPlus::UI::Slider
range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
on_changed => sub {
$CFG->{gauge_fontsize} = $_[1];
&set_gauge_window_fontsize;
+ 0
}
);
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
- $table->add (1, $row++, new CFClient::UI::Slider
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
+ $table->add (1, $row++, new CFPlus::UI::Slider
range => [$CFG->{gauge_size}, 0.2, 0.8],
tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
on_changed => sub {
$CFG->{gauge_size} = $_[1];
$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
- }
- );
-
- $table->add (1, $row++, new CFClient::UI::Button
- expand => 1, align => 0, text => "Apply",
- tooltip => "Apply the video settings",
- on_activate => sub {
- video_shutdown ();
- video_init ();
+ 0
}
);
@@ -516,60 +649,48 @@
}
sub audio_setup {
- my $vbox = new CFClient::UI::VBox;
+ my $vbox = new CFPlus::UI::VBox;
- $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+ $vbox->add (my $table = new CFPlus::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
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
+ $table->add (1, $row++, new CFPlus::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 {
+# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
+# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
# $CFG->{effects_volume} = $_[1];
# });
- $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
- $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
- $hbox->add (new CFClient::UI::CheckBox
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
+ $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
+ $hbox->add (new CFPlus::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
+ $hbox->add (new CFPlus::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]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
);
- $table->add (1, $row++, new CFClient::UI::Button
+ $table->add (1, $row++, new CFPlus::UI::Button
expand => 1, align => 0, text => "Apply",
tooltip => "Apply the audio settings",
on_activate => sub {
audio_shutdown ();
audio_init ();
+ 0
}
);
$vbox
}
-sub set_stats_window_fontsize {
- for (values %{$STATWIDS}) {
- $_->set_fontsize ($::CFG->{stat_fontsize});
- }
-}
-
sub set_gauge_window_fontsize {
for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
$_->set_fontsize ($::CFG->{gauge_fontsize});
@@ -579,45 +700,39 @@
sub make_gauge_window {
my $gh = int $HEIGHT * $CFG->{gauge_size};
- my $win = new CFClient::UI::Frame (
+ my $win = new CFPlus::UI::Frame (
force_x => 0,
force_y => "max",
force_w => $WIDTH,
force_h => $gh,
);
- $win->add (my $hbox = new CFClient::UI::HBox
+ $win->add (my $hbox = new CFPlus::UI::HBox
children => [
- (new CFClient::UI::HBox expand => 1),
- (new CFClient::UI::VBox children => [
- (new CFClient::UI::Empty expand => 1),
- (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),
+ (new CFPlus::UI::HBox expand => 1),
+ (new CFPlus::UI::VBox children => [
+ (new CFPlus::UI::Empty expand => 1),
+ (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
]),
- (my $vbox = new CFClient::UI::VBox),
+ (my $vbox = new CFPlus::UI::VBox),
],
);
- $vbox->add (new CFClient::UI::HBox
+ $vbox->add (new CFPlus::UI::HBox
expand => 1,
children => [
- (new CFClient::UI::Empty expand => 1),
- (my $hb = new CFClient::UI::HBox),
+ (new CFPlus::UI::Empty expand => 1),
+ (my $hb = new CFPlus::UI::HBox),
],
);
- $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
- tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
- $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
- tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
- $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
- tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
- $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
- tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
-
- $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
- tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
- $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
- tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
+ $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
+ $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
+ $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
+ $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
+
+ $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
+ $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
$GAUGES = {
exp => $exp, win => $win, range => $rng,
@@ -630,110 +745,141 @@
}
sub debug_setup {
- my $table = new CFClient::UI::Table;
+ my $table = new CFPlus::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 });
- $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 });
- $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 });
- $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 });
+ $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
+ $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
+ $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
+ $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
+ $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
+ $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
+ $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
+ $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
+ $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
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
+ new CFPlus::UI::Entry
text => $default_smooth[$x * 3 + $y],
on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
);
}
}
+ $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
$table
}
sub stats_window {
- my $tgw = new CFClient::UI::FancyFrame
- y => $HEIGHT * (2/8),
- x => "max",
- title => "Stats",
- name => "stats_window";
+ my $r = new CFPlus::UI::ScrolledWindow (
+ expand => 1,
+ scroll_y => 1
+ );
+ $r->add (my $vb = new CFPlus::UI::VBox);
- $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,
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Player",
+ child => (my $pi = new CFPlus::UI::VBox),
+ );
+
+ $pi->add ($STATWIDS->{title} = new CFPlus::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.");
- $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+ $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The map you are currently on (if supported by the server).");
- $vb->add (my $hb0 = new CFClient::UI::HBox);
- $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
+ $pi->add (my $hb0 = new CFPlus::UI::HBox);
+ $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The weight of the player including all inventory items.");
- $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
+ $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The weight limit: you cannot carry more than this.");
-
- $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
- $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Primary/Secondary Statistics",
+ child => (my $hb = new CFPlus::UI::HBox expand => 1),
+ );
+ $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
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);
- $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);
+ $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
+ font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
+ align => +1, template => $template, tooltip => "#stat_$label");
+ $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
+ font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
+ align => -1, text => $label, tooltip => "#stat_$label");
}
- $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
+ $vb->add (new CFPlus::UI::FancyFrame
+ label => "Resistancies",
+ child => (my $tbl2 = new CFPlus::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
@@ -741,140 +887,76 @@
{
$tbl2->add ($col, $row,
$STATWIDS->{"res_$_"} =
- new CFClient::UI::Label
+ new CFPlus::UI::Label
font => $FONT_FIXED,
template => "-100%",
align => +1,
valign => 0,
can_events => 1,
can_hover => 1,
- tooltip => $resist_names{$_},
+ tooltip => $resist_names{$_}->[1],
+ );
+ $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
+ font => $FONT_FIXED,
+ can_hover => 1,
+ can_events => 1,
+ path => "ui/resist/resist_$_.png",
+ tooltip => $resist_names{$_}->[1],
);
- $tbl2->add ($col + 1, $row, new CFClient::UI::Image
+ $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
+ text => $resist_names{$_}->[0],
font => $FONT_FIXED,
can_hover => 1,
can_events => 1,
- image => "ui/resist/resist_$_.png",
- tooltip => $resist_names{$_},
+ 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($) {
- scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
+sub skill_window {
+ my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
+ $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::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 formsep($) {
+ scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
}
my $METASERVER_ATIME;
sub update_metaserver {
+ my ($metaserver_dialog) = @_;
+
+ $METASERVER = $metaserver_dialog
+ if defined $metaserver_dialog;
+
return if $METASERVER_ATIME > time;
$METASERVER_ATIME = time + 60;
my $table = $METASERVER->{table};
$table->clear;
- $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
-
- my $buf;
-
- my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
-
- unless ($fh) {
- $label->set_text ("unable to contact metaserver: $!");
- return;
- }
+ $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
- Event->io (fd => $fh, poll => 'r', cb => sub {
- my $res = sysread $fh, $buf, 8192, length $buf;
+ my $ok = 0;
- if (!defined $res) {
- $_[0]->w->cancel;
- $label->set_text ("error while retrieving server list: $!");
- } elsif ($res == 0) {
- $_[0]->w->cancel;
- status "server list retrieved";
-
- utf8::decode $buf if utf8::valid $buf;
+ CFPlus::background {
+ my $ua = CFPlus::lwp_useragent;
+ CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
+ } sub {
+ my ($msg) = @_;
+ if ($msg) {
$table->clear;
my @tip = (
@@ -885,7 +967,7 @@
"Short information about this server provided by its admins.",
);
my @col = qw(#Users Host Uptime Version Description);
- $table->add ($_, 0, new CFClient::UI::Label
+ $table->add ($_, 0, new CFPlus::UI::Label
can_hover => 1, can_events => 1,
align => 0, fg => [1, 1, 0],
text => $col[$_], tooltip => $tip[$_])
@@ -894,145 +976,148 @@
my @align = qw(1 0 1 1 -1);
my $y = 0;
- for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
- my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
+ for my $m (@{ $msg->{servers} }) {
+ my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
+ @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
for ($desc) {
s/
/\n/gi;
s//\n· /gi;
s/<.*?>//sgi;
- s/&/&/g;
- s//>/g;
+ s/&/&/g;
+ s/<//g;
}
$uptime = sprintf "%dd %02d:%02d:%02d",
- (int $m->[8] / 86400),
- (int $m->[8] / 3600) % 24,
- (int $m->[8] / 60) % 60,
- $m->[8] % 60;
+ (int $uptime / 86400),
+ (int $uptime / 3600) % 24,
+ (int $uptime / 60) % 60,
+ $uptime % 60;
$m = [$users, $host, $uptime, $version, $desc];
$y++;
- $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
- (new CFClient::UI::Button
+ $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
+ (new CFPlus::UI::Button
text => "Use",
tooltip => "Put this server into the Host:Port field",
on_activate => sub {
- $HOST_ENTRY->set_text ($CFG->{host} = $host);
+ $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
$METASERVER->hide;
+ 0
},
),
- (new CFClient::UI::Empty expand => 1),
+ (new CFPlus::UI::Empty expand => 1),
]);
- $table->add ($_, $y, new CFClient::UI::Label
+ $table->add ($_, $y, new CFPlus::UI::Label
+ max_w => $::WIDTH * 0.4,
ellipsise => 0,
align => $align[$_],
text => $m->[$_],
tooltip => $tip[$_],
+ fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
can_hover => 1,
can_events => 1,
fontsize => 0.8)
for 0 .. $#$m;
}
+ } else {
+ $ok or $label->set_text ("error while contacting metaserver");
}
- });
+ };
+
}
sub metaserver_dialog {
- my $dialog = new CFClient::UI::FancyFrame
+ my $vbox = new CFPlus::UI::VBox;
+ my $table = new CFPlus::UI::Table;
+ $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
+
+ my $dialog = new CFPlus::UI::Toplevel
title => "Server List",
name => 'metaserver_dialog',
x => 'center',
y => 'center',
z => 3,
- force_h => $::HEIGHT * 0.4,
- child => (my $vbox = new CFClient::UI::VBox),
+ force_w => $::WIDTH * 0.9,
+ force_h => $::HEIGHT * 0.7,
+ child => $vbox,
+ has_close_button => 1,
+ table => $table,
on_visibility_change => sub {
- update_metaserver if $_[1];
+ update_metaserver ($_[0]) if $_[1];
+ 0
},
;
- $dialog->{table} = new CFClient::UI::Table;
-
- $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
-
$dialog
}
sub server_setup {
- my $vbox = new CFClient::UI::VBox;
+ my $vbox = new CFPlus::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");
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Connection Settings",
+ child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+ );
+ $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
{
- $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
+ $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
$vbox->add (
- $HOST_ENTRY = new CFClient::UI::Entry
+ $HOST_ENTRY = new CFPlus::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::Button
+ $vbox->add (new CFPlus::UI::Button
expand => 1,
text => "Server List",
other => $METASERVER,
tooltip => "Show a list of available crossfire servers",
- on_activate => sub { $METASERVER->toggle_visibility },
- on_visibility_change => sub { $METASERVER->hide unless $_[1] },
+ 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},
+ $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
+ $table->add (1, 4, new CFPlus::UI::Entry
+ 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},
+ $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
+ $table->add (1, 5, new CFPlus::UI::Entry
+ 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
+ $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
+ $table->add (1, 7, new CFPlus::UI::Slider
force_w => 100,
range => [$CFG->{mapsize}, 10, 100, 0, 1],
tooltip => "This is the size of the portion of the map update the server sends you. "
. "If you set this to a high value you will be able to see further, "
. "but you also increase bandwidth requirements and latency. "
. "This option is only used once at log-in.",
- on_changed => sub {
- 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");
- $table->add (1, 8, new CFClient::UI::CheckBox
+ $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
+ $table->add (1, 8, new CFPlus::UI::CheckBox
state => $CFG->{face_prefetch},
tooltip => "Background Image Prefetch\n\n"
. "If enabled, the client automatically pre-fetches images from the server. "
@@ -1041,72 +1126,111 @@
. "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 CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
+ $table->add (1, 9, new CFPlus::UI::Entry
+ text => $CFG->{output_rate},
+ tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
+ . "when sending images, to ensure interactiveness. When 0 or unset, the server "
+ . "default will be used, which is usually around 100kb/s.",
+ on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
);
- $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
- $table->add (1, 9, new CFClient::UI::Entry
+ $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
+ $table->add (1, 10, new CFPlus::UI::Entry
text => $CFG->{output_count},
tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_count} = $_[1] },
+ 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
+ $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
+ $table->add (1, 11, new CFPlus::UI::Entry
text => $CFG->{output_sync},
tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
- on_changed => sub { $CFG->{output_sync} = $_[1] },
+ on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
);
- $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
+ $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
expand => 1,
align => 0,
text => "Login",
on_activate => sub {
$CONN ? stop_game
: start_game;
+ 0
},
);
- $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
- $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
- text => $CFG->{say_command},
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Server Info",
+ child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+ );
+
+ $vbox
+}
+
+sub client_setup {
+ my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
+
+ my $row = 0;
+
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
+ $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
+ text => $CFG->{say_command},
tooltip => "This is the command that will be used if you write a line in the message window entry or press \" 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.",
+ . "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],
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
+ $table->add (1, $row++, new CFPlus::UI::CheckBox
+ state => $CFG->{show_tips},
+ tooltip => "Show the Tip of the day window at startup?",
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{show_tips} = $value;
+ 0
+ }
);
- $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
+ $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
+ $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
+ text => $CFG->{logview_max_par},
+ tooltip => "This is maximum number of messages remembered in the Messages window. If the server "
+ . "sends more messages than this number, older messages get removed to save memory and "
+ . "computing time. A value of 0 disables this feature, but that is not recommended.",
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
+ 0
+ },
+ );
- $vbox
+ $table
}
sub message_window {
- my $window = new CFClient::UI::FancyFrame
+ my $window = new CFPlus::UI::Toplevel
name => "message_window",
title => "Messages",
border_bg => [1, 1, 1, 1],
- bg => [0, 0, 0, 0.75],
x => "max",
y => 0,
force_w => $::WIDTH * 0.4,
force_h => $::HEIGHT * 0.5,
- child => (my $vbox = new CFClient::UI::VBox);
+ child => (my $vbox = new CFPlus::UI::VBox),
+ has_close_button => 1;
$vbox->add ($LOGVIEW);
- $vbox->add (my $input = new CFClient::UI::Entry
+ $vbox->add (my $input = new CFPlus::UI::Entry
tooltip => "Chat Box. If you enter a text and press return/enter here, the current communication command "
. "from the client setup will be prepended (e.g. shout, chat...). "
. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
@@ -1120,6 +1244,8 @@
$input->{refocus_map} = 1;
}
delete $input->{auto_activated};
+
+ 0
},
on_activate => sub {
my ($input, $text) = @_;
@@ -1135,9 +1261,13 @@
delete $input->{refocus_map};
$MAPWIDGET->focus_in
}
+
+ 0
},
on_escape => sub {
- $MAPWIDGET->focus_in
+ $MAPWIDGET->grab_focus;
+
+ 0
},
);
@@ -1149,44 +1279,12 @@
$window
}
-sub open_quit_dialog {
- unless ($QUIT_DIALOG) {
- $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);
-
- $vb->add (new CFClient::UI::Label
- text => "You should find a savebed and apply it first!",
- max_w => $WIDTH * 0.25,
- ellipsize => 0,
- );
- $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
- $hb->add (new CFClient::UI::Button
- text => "Ok",
- expand => 1,
- on_activate => sub { $QUIT_DIALOG->hide },
- );
- $hb->add (new CFClient::UI::Button
- text => "Quit anyway",
- expand => 1,
- on_activate => sub { exit },
- );
- }
-
- $QUIT_DIALOG->show;
-}
-
sub autopickup_setup {
- my $table = new CFClient::UI::Table;
+ my $table = new CFPlus::UI::Table;
for (
["General", 0, 0,
- ["Enable autopickup" => PICKUP_NEWMODE],
+ ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
["Inhibit autopickup" => PICKUP_INHIBIT],
["Stop before pickup" => PICKUP_STOP],
["Debug autopickup" => PICKUP_DEBUG],
@@ -1206,12 +1304,12 @@
["Cloaks" => PICKUP_CLOAK],
],
- ["Readables", 2, 2,
+ ["Readables", 2, 0,
["Spellbooks" => PICKUP_SPELLBOOK],
["Skillscrolls" => PICKUP_SKILLSCROLL],
["Normal Books/Scrolls" => PICKUP_READABLES],
],
- ["Misc", 2, 7,
+ ["Misc", 2, 5,
["Food" => PICKUP_FOOD],
["Drinks" => PICKUP_DRINK],
["Valuables (Money, Gems)" => PICKUP_VALUABLES],
@@ -1221,20 +1319,21 @@
["Magic Devices" => PICKUP_MAGIC_DEVICE],
["Ignore cursed" => PICKUP_NOT_CURSED],
["Jewelery" => PICKUP_JEWELS],
+ ["Flesh" => PICKUP_FLESH],
],
["Weight/Value ratio", 2, 17]
)
{
my ($title, $x, $y, @bits) = @$_;
- $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
+ $table->add ($x, $y, new CFPlus::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,
+ $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
+ $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
+ state => $::CFG->{pickup} & $mask,
on_changed => sub {
my ($box, $value) = @_;
@@ -1246,219 +1345,375 @@
$::CONN->send_command ("pickup $::CFG->{pickup}")
if defined $::CONN;
+
+ 0
});
+
+ ${$_->[2]} = $checkbox if $_->[2];
}
}
- $table->add (2, 18, new CFClient::UI::ValSlider
- range => [0, 0, 16, 1, 1],
+ $table->add (2, 18, new CFPlus::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} &= ~0x7;
+ $::CFG->{pickup} &= ~0xF;
$::CFG->{pickup} |= int $value
if $value;
1;
});
- $table->add (3, 18, new CFClient::UI::Button
+
+ $table->add (3, 18, new CFPlus::UI::Button
text => "set",
on_activate => sub {
$::CONN->send_command ("pickup $::CFG->{pickup}")
if defined $::CONN;
- 1;
+ 0
});
$table
}
-sub 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",
- ;
+my %SORT_ORDER = (
+ type => undef,
+ mtime => sub {
+ my $NOW = time;
+ sort {
+ my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
+ my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
+
+ ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
+ or $btime <=> $atime
+ or $a->{type} <=> $b->{type}
+ } @_
+ },
+ weight => sub { sort {
+ $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+ or $a->{type} <=> $b->{type}
+ } @_ },
+);
- $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
+sub inventory_widget {
+ my $hb = new CFPlus::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 $vb1 = new CFPlus::UI::VBox);
+ $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
- $hb->add (my $vb2 = new CFClient::UI::VBox);
+ $vb1->add (my $hb1 = new CFPlus::UI::HBox);
- $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
+ use sort 'stable';
- $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
+ $hb1->add (new CFPlus::UI::Selector
+ value => $::CFG->{inv_sort},
+ options => [
+ [type => "Type/Name"],
+ [mtime => "Recent/Normal/Locked"],
+ [weight => "Weight/Type"],
+ ],
+ on_changed => sub {
+ $::CFG->{inv_sort} = $_[1];
+ $INV->set_sort_order ($SORT_ORDER{$_[1]});
+ },
+ );
+ $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
+ #TODO# update to weigh/maxweight
+ $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
- # XXX: Call after $INVR = ... because set_opencont sets the items
- CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
+ $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw1->add ($INV = new CFPlus::UI::Inventory);
+ $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
- $invwin
-}
+ $hb->add (my $vb2 = new CFPlus::UI::VBox);
-sub spell_setup {
- new CFClient::UI::SpellList
-}
+ $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
-sub keyboard_setup {
- my $binding_list = new CFClient::UI::VBox;
+ $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw2->add ($INVR = new CFPlus::UI::Inventory);
- 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;
- });
+ # XXX: Call after $INVR = ... because set_opencont sets the items
+ CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
- $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
- $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
- }
- }
- };
+ $hb
+}
- 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;
- });
+sub toggle_player_page {
+ my ($widget) = @_;
- $vb->add ($binding_list);
- $vb->add (my $hb = new CFClient::UI::HBox);
+ if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
+ $PL_WINDOW->hide;
+ } else {
+ $PL_NOTEBOOK->set_current_page ($widget);
+ $PL_WINDOW->show;
+ }
+}
- $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) = @_;
- $::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;
- },
+sub player_window {
+ my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
+ 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 CFPlus::UI::Notebook expand => 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."
);
- $hb->add (new CFClient::UI::Button
- text => "close",
- tooltip => "Closes the binding window",
- expand => 1,
- on_activate => sub {
- $SETUP_DIALOG->hide;
- }
+ my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+ $spellsw->add ($SPELL_LIST = new CFPlus::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->add (Pickup => autopickup_setup,
+ "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
- $refresh->();
+ $ntb->set_current_page ($INVENTORY_PAGE);
- $vb
+ $plwin->add ($ntb);
+ $plwin
+}
+
+sub keyboard_setup {
+ CFPlus::Macro::keyboard_setup
}
sub help_window {
- my $win = new CFClient::UI::FancyFrame
+ my $win = new CFPlus::UI::Toplevel
x => 'center',
y => 'center',
- z => 2,
+ z => 4,
name => 'doc_browser',
force_w => int $WIDTH * 7/8,
force_h => int $HEIGHT * 7/8,
- title => "Documentation";
+ title => "Help Browser",
+ has_close_button => 1;
- $win->add (my $vbox = new CFClient::UI::VBox);
+ $win->add (my $vbox = new CFPlus::UI::VBox);
- $vbox->add (my $buttons = new CFClient::UI::HBox);
- $vbox->add (my $viewer = new CFClient::UI::TextScroller
- expand => 1, fontsize => 0.8, padding_x => 4);
+ $vbox->add (new CFPlus::UI::FancyFrame
+ label => "Navigation",
+ child => (my $buttons = new CFPlus::UI::HBox),
+ );
+ $vbox->add (my $viewer = new CFPlus::UI::TextScroller
+ expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
- $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 => "Manual"],
- [skill_help => "Skills"],
- [command_help => "Commands"],
- [dmcommand_help => "DM Commands"],
- [COPYING => "License Terms"],
- ],
- on_changed => sub {
- my ($self, $pod) = @_;
+ my @history;
+ my @future;
+ my $curnode;
- my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
- doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
+ my $load_node; $load_node = sub {
+ my ($node, $para) = @_;
- $viewer->clear;
-
- $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
- for @$pom;
+ $buttons->clear;
- $viewer->set_offset (0);
- },
- on_visibility_change => sub {
- my ($self, $visible) = @_;
- return unless $visible;
- return if $self->{value};
- $self->set_value ("intro");
- },
- );
+ $buttons->add (new CFPlus::UI::Button
+ text => "⇤",
+ tooltip => "back to the starting page",
+ on_activate => sub {
+ unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
+ unshift @future, @history;
+ @history = ();
+ $load_node->(@{shift @future});
+ },
+ );
+
+ if (@history) {
+ $buttons->add (new CFPlus::UI::Button
+ text => "⋘",
+ tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "",
+ on_activate => sub {
+ unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
+ $load_node->(@{pop @history});
+ },
+ );
+ }
+
+ if (@future) {
+ $buttons->add (new CFPlus::UI::Button
+ text => "⋙",
+ tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "",
+ on_activate => sub {
+ push @history, [$curnode, $viewer->current_paragraph];
+ $load_node->(@{shift @future});
+ },
+ );
+ }
+
+ $buttons->add (new CFPlus::UI::Label text => " ");
+
+ my @path = CFPlus::Pod::full_path_of $node;
+ pop @path; # drop current node
+
+ for my $node (@path) {
+ $buttons->add (new CFPlus::UI::Button
+ text => $node->{kw}[0],
+ tooltip => "go to " . (CFPlus::asxml CFPlus::Pod::full_path $node) . "",
+ on_activate => sub {
+ push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
+ $load_node->($node);
+ },
+ );
+ $buttons->add (new CFPlus::UI::Label text => "/");
+ }
+
+ $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
+
+ $curnode = $node;
+
+ $viewer->clear;
+ $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
+ $viewer->scroll_to ($para);
+ };
+
+ $load_node->(CFPlus::Pod::find pod => "mainpage");
+
+ $CFPlus::Pod::goto_document = sub {
+ my (@path) = @_;
+
+ push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
+
+ $load_node->((CFPlus::Pod::find @path)[0]);
+ $win->show;
+ };
$win
}
+sub open_string_query {
+ my ($title, $cb, $txt, $tooltip) = @_;
+ my $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ force_w => $WIDTH * 4/5,
+ title => $title;
+
+ $dialog->add (
+ my $e = new CFPlus::UI::Entry
+ on_activate => sub { $cb->(@_); $dialog->hide; 0 },
+ on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
+ tooltip => $tooltip
+ );
+
+ $e->grab_focus;
+ $e->set_text ($txt) if $txt;
+ $dialog->show;
+}
+
+sub open_quit_dialog {
+ unless ($QUIT_DIALOG) {
+ $QUIT_DIALOG = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ title => "Really Quit?",
+ on_key_down => sub {
+ my ($dialog, $ev) = @_;
+ $ev->{sym} == 27 and $dialog->hide;
+ }
+ ;
+
+ $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
+
+ $vb->add (new CFPlus::UI::Label
+ text => "You should find a savebed and apply it first!",
+ max_w => $WIDTH * 0.25,
+ ellipsize => 0,
+ );
+ $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+ $hb->add (new CFPlus::UI::Button
+ text => "Ok",
+ expand => 1,
+ on_activate => sub { $QUIT_DIALOG->hide; 0 },
+ );
+ $hb->add (new CFPlus::UI::Button
+ text => "Quit anyway",
+ expand => 1,
+ on_activate => sub { exit },
+ );
+ }
+
+ $QUIT_DIALOG->show;
+ $QUIT_DIALOG->grab_focus;
+}
+
+sub show_tip_of_the_day {
+ # find all tips
+ my @tod = CFPlus::Pod::find tip_of_the_day => "*";
+
+ CFPlus::DB::get state => "tip_of_the_day", sub {
+ my ($todindex) = @_;
+ $todindex = 0 if $todindex >= @tod;
+ CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
+
+ # create dialog
+ my $dialog;
+
+ my $close = sub {
+ $dialog->destroy;
+ };
+
+ $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 3,
+ name => 'tip_of_the_day',
+ force_w => int $WIDTH * 4/9,
+ force_h => int $WIDTH * 2/9,
+ title => "Tip of the day #" . (1 + $todindex),
+ child => my $vbox = new CFPlus::UI::VBox,
+ has_close_button => 1,
+ on_delete => $close,
+ ;
+
+ $vbox->add (my $viewer = new CFPlus::UI::TextScroller
+ expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
+ $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
+
+ $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
+
+ $table->add (0, 0, new CFPlus::UI::Button
+ text => "Close",
+ tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the Server Setup.",
+ on_activate => $close,
+ );
+
+ $table->add (2, 0, new CFPlus::UI::Button
+ text => "Next",
+ tooltip => "Show the next Tip of the day.",
+ on_activate => sub {
+ $close->();
+ &show_tip_of_the_day;
+ },
+ );
+
+ $dialog->show;
+ };
+}
+
sub sdl_init {
- CFClient::SDL_Init
+ CFPlus::SDL_Init
and die "SDL::Init failed!\n";
}
@@ -1473,64 +1728,61 @@
$FULLSCREEN = $CFG->{fullscreen};
$FAST = $CFG->{fast};
- CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
- or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
+ CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
+ or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
$SDL_ACTIVE = 1;
$LAST_REFRESH = time - 0.01;
- CFClient::OpenGL::init;
+ CFPlus::OpenGL::init;
$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
- $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
+ $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
#############################################################################
if ($DEBUG_STATUS) {
- CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
+ CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
} else {
# create the widgets
- $DEBUG_STATUS = new CFClient::UI::Label
+ $DEBUG_STATUS = new CFPlus::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 = new CFPlus::UI::Statusbox;
$STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
- (new CFClient::UI::Frame
+ (new CFPlus::UI::Frame
bg => [0, 0, 0, 0.4],
force_x => 0,
force_y => "max",
child => $STATUSBOX,
)->show;
- CFClient::UI::FancyFrame->new (
+ CFPlus::UI::Toplevel->new (
title => "Map",
name => "mapmap",
x => 0,
y => $FONTSIZE + 8,
border_bg => [1, 1, 1, 192/255],
bg => [1, 1, 1, 0],
- no_close_button => 1,
- child => ($MAPMAP = new CFClient::MapWidget::MapMap
+ child => ($MAPMAP = new CFPlus::MapWidget::MapMap
tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.",
),
)->show;
- $MAPWIDGET = new CFClient::MapWidget;
+ $MAPWIDGET = new CFPlus::MapWidget;
$MAPWIDGET->connect (activate_console => sub {
my ($mapwidget, $preset) = @_;
if ($CONSOLE) {
$CONSOLE->{input}->{auto_activated} = 1;
- $CONSOLE->{input}->focus_in;
+ $CONSOLE->{input}->grab_focus;
if ($preset && $CONSOLE->{input}->get_text eq '') {
$CONSOLE->{input}->set_text ($preset);
@@ -1538,19 +1790,20 @@
}
});
$MAPWIDGET->show;
- $MAPWIDGET->focus_in;
+ $MAPWIDGET->grab_focus;
- $LOGVIEW = new CFClient::UI::TextScroller
+ $LOGVIEW = new CFPlus::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.",
+ max_par => $CFG->{logview_max_par},
+ tooltip => "Server Log. This text viewer contains all recent messages sent by the server.",
;
- $SETUP_DIALOG = new CFClient::UI::FancyFrame
+ $SETUP_DIALOG = new CFPlus::UI::Toplevel
title => "Setup",
name => "setup_dialog",
x => 'center',
@@ -1558,61 +1811,61 @@
z => 2,
force_w => $::WIDTH * 0.6,
force_h => $::HEIGHT * 0.6,
+ has_close_button => 1,
;
- $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
- filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $METASERVER = metaserver_dialog;
+
+ $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
+ filter => new CFPlus::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 (Client => client_setup,
+ "Configure various client-specific settings.");
$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 "
+ "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 (Spells => $SETUP_SPELLS = spell_setup,
- "Displays all spells you have and lets you edit keyboard shortcuts for them.");
$SETUP_NOTEBOOK->add (Debug => debug_setup,
- "Some debuggign options. Do not ask.");
+ "Some debuggin' options. Do not ask.");
- $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
+ $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
+ $BUTTONBAR->add (new CFPlus::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,
+ $BUTTONBAR->add (new CFPlus::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 => $STATS_WINDOW = 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 => inventory_window,
- 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 CFPlus::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
+ $BUTTONBAR->add (new CFPlus::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/cfplusrc";
+ $::CFG->{layout} = CFPlus::UI::get_layout;
+ CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
status "Configuration Saved";
+ 0
},
);
- $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
+ $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
tooltip => "View Documentation");
- $BUTTONBAR->add (new CFClient::UI::Button
+
+ $BUTTONBAR->add (new CFPlus::UI::Button
text => "Quit",
tooltip => "Terminates the program",
on_activate => sub {
@@ -1621,6 +1874,7 @@
} else {
exit;
}
+ 0
},
);
@@ -1631,44 +1885,208 @@
$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
+sub setup_build_button {
+ my ($enabled) = @_;
+ if ($enabled) {
+ $BUILD_BUTTON->hide if $BUILD_BUTTON;
+ $BUILD_BUTTON ||= new CFPlus::UI::Button
+ text => "Build",
+ tooltip => "Opens the ingame builder",
+ on_activate => sub {
+ if ($CONN) {
+ $CONN->send_ext_req (builder_player_items => sub {
+ open_ingame_editor ($_[0]) if exists $_[0]->{items};
+ });
+ }
+ 0
+ };
+ $BUTTONBAR->add ($BUILD_BUTTON);
+ } else {
+ $BUILD_BUTTON->hide if $BUILD_BUTTON;
+ }
+}
+
+sub open_ingame_editor {
+ my ($msg) = @_;
+
+ my $win = new CFPlus::UI::Toplevel
+ x => 0,
+ y => 'center',
+ z => 4,
+ name => 'builder_window',
+ force_w => int $WIDTH * 1/4,
+ force_h => int $HEIGHT * 3/4,
+ title => "In game builder",
+ has_close_button => 1;
+
+ my $r = new CFPlus::UI::ScrolledWindow (
+ expand => 1,
+ scroll_y => 1
+ );
+ $r->add (my $vb = new CFPlus::UI::VBox);
+ $win->add ($r);
+
+
+ $vb->add (
+ new CFPlus::UI::Button
+ text => "Disable build mode",
+ on_activate => sub { $::IN_BUILD_MODE = undef }
+ );
+ $vb->add (
+ new CFPlus::UI::Button
+ text => "ERASE",
+ on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
+ );
+
+ for my $itemarchname (
+ sort {
+ $msg->{items}->{$a}->{build_arch_name}
+ cmp $msg->{items}->{$b}->{build_arch_name}
+ } keys %{$msg->{items}}
+ ) {
+ my $info = $msg->{items}->{$itemarchname};
+ $vb->add (
+ new CFPlus::UI::Button text => $info->{build_arch_name},
+ on_activate => sub {
+ $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
+
+ if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
+ build_mode_query_arch_info ();
+ }
+ }
+ );
+ }
+
+ $win->show;
+}
+
+sub build_mode_query_arch_info {
+ my ($iteminfo) = $::IN_BUILD_MODE;
+ my $itemarchname = $iteminfo->{item};
+ my $info = $iteminfo->{info};
+
+ my $dialog = new CFPlus::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ force_w => int $WIDTH * 1/2,
+ title => "Enter information for placement of '$itemarchname'",
+ has_close_button => 1;
+
+ $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
+
+ $vb->add (my $table = new CFPlus::UI::Table expand => 1);
+ my $row = 0;
+ if ($info->{has_name}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
+ $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
+ }
+ if ($info->{has_text}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
+ $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
+ }
+ if ($info->{has_connection}) {
+ $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
+ $table->add (1, $row++,
+ new CFPlus::UI::Entry
+ expand => 1,
+ on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
+ tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
+ );
+ }
+
+ $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
+ $hb->add (new CFPlus::UI::Button
+ text => "Close",
+ expand => 1,
+ on_activate => sub { $dialog->hide; 0 },
+ );
+ $dialog->show;
+}
+
sub video_shutdown {
+ CFPlus::OpenGL::shutdown;
+
undef $SDL_ACTIVE;
}
-my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
-my $bgmusic;#TODO#hack#d#
-
sub audio_channel_finished {
my ($channel) = @_;
#warn "channel $channel finished\n";#d#
}
-sub audio_music_finished {
+sub audio_music_set {
+ my ($songs) = @_;
+
+ my $count = @$songs;
+ my @meta;
+
+ for my $name (@$songs) {
+ CFPlus::DB::get resmap => $name, sub {
+ my ($data) = @_;
+
+ if ($data) {
+ $data = JSON::XS->new->utf8->decode ($data);
+ $data->{path} = CFPlus::DB::path_of $name;
+ push @meta, $data;
+ }
+
+ unless (--$count) {
+ if (@meta) {
+ @MUSIC_WANT = @meta;
+ &audio_music_changed ();
+ }
+ }
+ };
+ }
+}
+
+sub audio_music_changed {
return unless $CFG->{bgm_enable};
- # TODO: hack, do play loop and mood music
- $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
- $bgmusic->play (0);
+ # default MUSIC_WANT == MUSIC_DEFAULT
+ @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
+
+ # if the currently playing song is acceptable, let it continue
+ return if $MUSIC_PLAYING
+ && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
- push @bgmusic, shift @bgmusic;
+ if ($MUSIC_PLAYING) {
+ CFPlus::MixMusic::fade_out 1000;
+ } else {
+ my $music = $MUSIC_WANT [rand @MUSIC_WANT];
+
+ $MUSIC_PLAYING = $music;
+
+ $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
+ $MUSIC_PLAYER->play (0);
+ }
+}
+
+sub audio_music_finished {
+ $MUSIC_PLAYING = undef;
+ undef $MUSIC_PLAYER;
+
+ audio_music_changed;
}
sub audio_init {
if ($CFG->{audio_enable}) {
- if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
- $SDL_MIXER = !CFClient::Mix_OpenAudio;
+ if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
+ $SDL_MIXER = !CFPlus::Mix_OpenAudio;
unless ($SDL_MIXER) {
status "Unable to open sound device: there will be no sound";
return;
}
- CFClient::Mix_AllocateChannels 8;
- CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
+ CFPlus::Mix_AllocateChannels 8;
+ CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
audio_music_finished;
+ local $_;
while (<$fh>) {
next if /^\s*#/;
next if /^\s*$/;
@@ -1678,7 +2096,7 @@
push @SOUNDS, "$volume,$file";
$AUDIO_CHUNKS{"$volume,$file"} ||= do {
- my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
+ my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
$chunk->volume ($volume * 128 / 100);
$chunk
};
@@ -1690,7 +2108,7 @@
}
sub audio_shutdown {
- CFClient::Mix_CloseAudio if $SDL_MIXER;
+ CFPlus::Mix_CloseAudio if $SDL_MIXER;
undef $SDL_MIXER;
@SOUNDS = ();
%AUDIO_CHUNKS = ();
@@ -1707,74 +2125,20 @@
$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
- $CFClient::UI::ROOT->draw;
+ $CFPlus::UI::ROOT->draw;
$WANT_REFRESH = 0;
$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;
+ CFPlus::SDL_GL_SwapBuffers;
}
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}" })->($_)
- for CFClient::SDL_PollEvent;
+ for CFPlus::SDL_PollEvent;
if (%animate_object) {
$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
@@ -1808,32 +2172,36 @@
});
%SDL_CB = (
- CFClient::SDL_QUIT => sub {
- Event::unloop -1;
+ CFPlus::SDL_QUIT => sub {
+ exit;
},
- CFClient::SDL_VIDEORESIZE => sub {
+ CFPlus::SDL_VIDEORESIZE => sub {
},
- CFClient::SDL_VIDEOEXPOSE => sub {
- CFClient::UI::full_refresh;
+ CFPlus::SDL_VIDEOEXPOSE => sub {
+ CFPlus::UI::full_refresh;
},
- CFClient::SDL_ACTIVEEVENT => sub {
-# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
+ CFPlus::SDL_ACTIVEEVENT => sub {
+# not useful, as APPACTIVE include sonly iconified state, not unmapped
+# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d#
+# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
+# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
+# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
},
- CFClient::SDL_KEYDOWN => sub {
- if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
+ CFPlus::SDL_KEYDOWN => sub {
+ if ($_[0]{mod} & CFPlus::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]);
+ CFPlus::UI::feed_sdl_key_down_event ($_[0]);
}
},
- CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
- CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
- CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
- CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
- CFClient::SDL_USEREVENT => sub {
+ CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
+ CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
+ CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
+ CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
+ CFPlus::SDL_USEREVENT => sub {
if ($_[0]{code} == 1) {
audio_channel_finished $_[0]{data1};
} elsif ($_[0]{code} == 0) {
@@ -1847,58 +2215,74 @@
$SIG{INT} = $SIG{TERM} = sub { exit };
{
- local $SIG{__DIE__} = sub {
- return unless defined $^S && !$^S;
- Carp::confess $_[1];#d#TODO: remove when stable
- CFClient::fatal $_[0];
- };
+ CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
+ CFPlus::DB::Server::run;
- CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
- CFClient::UI::set_layout ($::CFG->{layout});
+ CFPlus::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 => 0.7,
- gauge_fontsize=> 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- 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,
- pickup => 0,
+ sdl_mode => 0,
+ width => 640,
+ height => 480,
+ fullscreen => 0,
+ fast => 0,
+ map_scale => 1,
+ fow_enable => 1,
+ fow_intensity => 0.45,
+ fow_smooth => 0,
+ map_smoothing => 1,
+ gui_fontsize => 1,
+ log_fontsize => 0.7,
+ gauge_fontsize => 1,
+ gauge_size => 0.35,
+ stat_fontsize => 0.7,
+ mapsize => 100,
+ say_command => 'chat',
+ audio_enable => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.25,
+ face_prefetch => 0,
+ output_sync => 1,
+ output_count => 1,
+ output_rate => "",
+ pickup => 0,
+ inv_sort => "mtime",
+ default => "profile", # default profile
+ show_tips => 1,
+ logview_max_par => 1000,
);
-
+
while (my ($k, $v) = each %DEF_CFG) {
$CFG->{$k} = $v unless exists $CFG->{$k};
}
+ $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
+ $PROFILE = $CFG->{profile}{default};
+
+ # convert old bindings (only default profile matters)
+ if (my $bindings = delete $PROFILE->{bindings}) {
+ while (my ($mod, $syms) = each %$bindings) {
+ while (my ($sym, $cmds) = each %$syms) {
+ push @{ $PROFILE->{macro} }, {
+ accelkey => [$mod*1, $sym*1],
+ action => $cmds,
+ };
+ }
+ }
+ }
+
sdl_init;
@SDL_MODES = reverse
grep $_->[0] >= 640 && $_->[1] >= 480,
- CFClient::SDL_ListModes;
+ CFPlus::SDL_ListModes;
- @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+ @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
{
- my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
+ my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
DejaVuSans.ttf
DejaVuSansMono.ttf
DejaVuSans-Bold.ttf
@@ -1909,12 +2293,12 @@
DejaVuSansMono-BoldOblique.ttf
);
- CFClient::add_font $_ for @fonts;
+ CFPlus::add_font $_ for @fonts;
- CFClient::pango_init;
+ CFPlus::pango_init;
- $FONT_PROP = new_from_file CFClient::Font $fonts[0];
- $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
+ $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
+ $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
$FONT_PROP->make_default;
}
@@ -1924,7 +2308,7 @@
# for my $rgba (0..1) {
# my $t1 = Time::HiRes::time;
# for (1..1000) {
-# my $layout = CFClient::Layout->new ($rgba);
+# my $layout = CFPlus::Layout->new ($rgba);
# $layout->set_text ("hallo" x 100);
# $layout->render;
# }
@@ -1932,15 +2316,22 @@
# warn $t2-$t1;
# }
+ $startup_done->();
+
video_init;
audio_init;
}
+show_tip_of_the_day if $CFG->{show_tips};
+
Event::loop;
-#CFClient::SDL_Quit;
-#CFClient::_exit 0;
+#CFPlus::SDL_Quit;
+#CFPlus::_exit 0;
-END { CFClient::SDL_Quit }
+END {
+ CFPlus::SDL_Quit;
+ CFPlus::DB::Server::stop;
+}
=head1 NAME