--- deliantra/Deliantra-Client/bin/deliantra 2008/09/26 04:45:48 1.77
+++ deliantra/Deliantra-Client/bin/deliantra 2010/04/12 02:46:55 1.111
@@ -19,6 +19,11 @@
require Win32::GUI::SplashScreen;
+ # initialise the resolver now, as vista forces us back to the desktop
+ # when doing this.
+ use AnyEvent::DNS ();
+ AnyEvent::DNS::resolver;
+
Win32::GUI::SplashScreen::Show (
-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
);
@@ -29,8 +34,7 @@
}
}
-use strict;
-use utf8;
+use common::sense;
use Carp 'verbose';
@@ -51,30 +55,8 @@
if ($^O eq "MSWin32") {
# pango is relocatable on win32
- } elsif (-e "$root/pangoversion") {
- open my $fh, "<:perlio", "$root/pangoversion"
- or die "pangoversion: $!";
- my $PANGO = <$fh>;
- # unix, need to patch pango rc file
- open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
- or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
- local $/;
- my $rc = <$fh>;
- $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
-
- mkdir "$root/pango-modules";
- open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
- or die "$root/pango-modules/pango.modules: $!";
- print $fh $rc;
-
- $ENV{PANGO_RC_FILE} = "$root/pango.rc";
- open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
- or die "$ENV{PANGO_RC_FILE}: $!";
- print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
} else {
# OS X
- $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
- $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
$ENV{PANGO_RC_FILE} = "$root/pango.rc";
$ENV{DYLD_LIBRARY_PATH} = $root;
chdir $root; # for pango modules, maybe other things
@@ -84,7 +66,7 @@
}
}
-# prepend private library directory
+# prepend private library directory and prepare env
BEGIN {
for (grep !ref, @INC) {
my $path = "$_/Deliantra/Client/private";
@@ -108,8 +90,8 @@
use Deliantra::Protocol::Constants;
use AnyEvent::Util ();
-use AnyEvent::DNS;
use AnyEvent::Socket ();
+use AnyEvent::DNS ();
use Compress::LZF;
use JSON::XS;
@@ -147,12 +129,14 @@
$SIG{PIPE} = 'IGNORE';
$EV::DIED = sub {
- crash "CRASH/EV::DIED: $@" => 1;
+ crash "CRASH/EV::DIED: $@" => 0;
DC::fatal Carp::longmess $@;
};
my $MAX_FPS = 60;
+our $DEFAULT_SERVER = "gameserver.deliantra.net";
+
our $META_SERVER = "http://metaserver.schmorp.de/current.json";
our $LAST_REFRESH;
@@ -161,6 +145,7 @@
our $CFG;
our $PROFILE; # current profile
our $FAST; # fast, low-quality mode, possibly useful for software-rendering
+our $DELIANTRA_DEBUG = $ENV{DELIANTRA_DEBUG} * 1;
our $WANT_REFRESH;
@@ -183,7 +168,10 @@
our $MAPMAP;
our $MAPWIDGET;
our $COMPLETER;
-our $BUTTONBAR;
+our $MENUFRAME; # the rectangle at the top
+our $MENUBAR; # the hbox at the top
+our $MENUPOPUP;
+our $BUTTONBAR; # the menu buttons
our $METASERVER;
our $LOGIN_BUTTON;
our $QUIT_DIALOG;
@@ -219,7 +207,7 @@
our $STATWIDS;
our $SDL_ACTIVE;
-our %SDL_CB;
+our @SDL_CB;
our $ALT_ENTER_MESSAGE;
our $STATUSBOX;
@@ -237,6 +225,8 @@
*crash = sub($;$) {
my ($msg, $backtrace) = @_;
+ warn $msg;
+
return unless $CONN;
my $fh = $CONN->{fh}
@@ -257,6 +247,17 @@
if $backtrace;
};
+sub clienterror($;$) {
+ my ($msg, $backtrace) = @_;
+
+ warn $msg;
+
+ return unless $CONN;
+
+ $CONN->send_exti_msg (clientlog => $msg);
+ $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
+}
+
#############################################################################
sub status {
@@ -347,10 +348,10 @@
$meta->{data}
or return;
- # if its a jingle, play it as ambient music
+ # if it's a jingle, play it as ambient music
if ($meta->{data}{jingle}) {
if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
- push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
+ push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
&audio_music_push ($face);
}
} else {
@@ -358,7 +359,7 @@
DC::DB::get res_data => $meta->{name}, sub {
my $rwops = new DC::RW $_[0];
my $chunk = new DC::MixChunk $rwops
- or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError;
+ or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
$chunk->volume (($meta->{data}{volume} || 1) * 128);
$AUDIO_CHUNK{$face} = $chunk;
@@ -415,12 +416,15 @@
$MUSIC_PLAYING_DATA = \$_[0];
+ $meta->{path} or length $_[0]
+ or return clienterror "empty music face from res_data ($meta->{face})";#d#
+
my $rwops = $meta->{path}
- ? new_from_file DC::RW $meta->{path}
+ ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
: new DC::RW $$MUSIC_PLAYING_DATA;
$MUSIC_PLAYER = new DC::MixMusic $rwops
- or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
+ or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
my $NOW = time;
@@ -539,6 +543,11 @@
}
sub audio_shutdown {
+ if ($SDL_MIXER) {
+ DC::MixMusic::halt;
+ DC::Mix_AllocateChannels 0;
+ }
+
undef $MUSIC_PLAYER;
undef $MUSIC_PLAYING_META;
undef $MUSIC_PLAYING_DATA;
@@ -788,7 +797,8 @@
sub dc_connect {
my ($host, $port) = @_;
- my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
$CONN =
new DC::Protocol
@@ -796,10 +806,15 @@
port => $port,
user => $PROFILE->{user},
pass => $PROFILE->{password},
- mapw => $mapsize,
- maph => $mapsize,
+ mapw => $mapw,
+ maph => $maph,
- client => "$DC::VERSION $] $^O",
+ c_version => {
+ client => "deliantra",
+ clientver => $DC::VERSION,
+ gl_vendor => DC::OpenGL::gl_vendor,
+ gl_version => DC::OpenGL::gl_version,
+ },
map_widget => $MAPWIDGET,
statusbox => $STATUSBOX,
@@ -815,7 +830,7 @@
if ($_[0]) {
DC::lowdelay fileno $CONN->{fh};
- status "login successful";
+ status "successfully connected to the server";
} else {
undef $CONN;
status "unable to connect: $!";
@@ -827,21 +842,27 @@
sub start_game {
status "logging in...";
+
+ my $server = $PROFILE->{host} || $DEFAULT_SERVER;
+ my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
+ or return status "$server: unable to parse server address, try an empty field.";
$LOGIN_BUTTON->set_text ("Logout");
$SETUP_DIALOG->hide;
- my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
-
$MAP = new DC::Map;
# hack to make SURE we find the IP address all right
# can be removed once AnyEvent::DNS is proven stable.
if ($host eq "gameserver.deliantra.net") {
AnyEvent::DNS::a "dnstest.deliantra.net", sub {
- if ($_[0] ne "80.101.114.108") { # Perl
- status "dns failure, using hardcoded address";
- $host = "129.13.162.95";
+ if ($_[0] ne "80.101.114.108") { # P-e-r-l
+ status "dns failure, trying differently";
+ $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
+ unless (defined $host) {
+ status "dns failure, using hardcoded address";
+ $host = "194.126.175.154";
+ }
}
dc_connect $host, $port;
@@ -918,6 +939,7 @@
$table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
$hbox->add ($MODE_SLIDER = new DC::UI::Slider
+ c_rescale => 1,
force_w => $WIDTH * 0.1, expand => 1,
range => [ ($CFG->{sdl_mode}) x 3 ],
tooltip => $vidmode_tooltip);
@@ -955,7 +977,7 @@
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
$table->add_at (1, $row++, new DC::UI::CheckBox
state => $CFG->{disable_alpha},
- tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
+ tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
. "by disabling a number of textures and transparency effects. Normally, these "
. "effects do not cost a lot of resources, but some graphics cards might fall "
. "back to extremely slow rendering if this is enabled. If disabling this option "
@@ -1019,6 +1041,16 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
);
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
+ $table->add_at (1, $row++, new DC::UI::CheckBox
+ state => $CFG->{smooth_transitions},
+ tooltip => "Smooth Transitions tries to blend the fog of war and lighting smoothly between updates. "
+ . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
+ . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
+ );
+
+
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
$table->add_at (1, $row++, new DC::UI::Slider
range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
@@ -1042,6 +1074,21 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
);
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
+ $table->add_at (1, $row++, new DC::UI::ImageButton
+ tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
+ bg => [0.3, 0.3, 0.2],
+ force_w => 64,
+ force_h => 64,
+ tooltip => "Fog of War Pattern. The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
+ on_activate => sub {
+ my ($self) = @_;
+ $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
+ $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
+ $MAPWIDGET->update;
+ }
+ );
+
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
$table->add_at (1, $row++, new DC::UI::Slider
range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
@@ -1101,7 +1148,9 @@
? "audio is off"
: "audio is enabled\n"
. "frequency (Hz): $freq\n"
- . "channels: $chans";
+ . "channels: $chans\n"
+ . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
+ . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
$AUDIO_INFO->set_text ($text);
}
@@ -1140,7 +1189,7 @@
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Background Music");
$table->add_at (1, $row, new DC::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.",
+ tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played. Needs server reconnect to take effect.",
on_changed => sub {
$CFG->{bgm_enable} = $_[1];
$CONN->update_fx_want if $CONN;
@@ -1251,7 +1300,7 @@
sub make_gauge_window {
my $gh = int $HEIGHT * $CFG->{gauge_size};
- my $win = new DC::UI::Frame (
+ $GAUGES->{win} = my $win = new DC::UI::Frame (
force_x => 0,
force_y => "max",
force_w => $WIDTH,
@@ -1277,41 +1326,49 @@
],
);
- $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
- $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
- $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
- $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
-
- $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
- $vbox->add (my $prg = new DC::UI::ExperienceProgress);
- $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
- $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
-
- $GAUGES = {
- exp => $exp, prg => $prg, sklprg => $sklprg,
- win => $win, range => $rng,
- hp => $hg, mana => $mg, grace => $gg, food => $fg,
- };
+ $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
+ $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
+ $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
+ $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
&set_gauge_window_fontsize;
$win
}
+our $BW_WATCHER;
+
+sub debug_toggle($) {
+ $DELIANTRA_DEBUG ^= $_[0];
+
+ if ($DELIANTRA_DEBUG & 16) {
+ $BW_WATCHER = EV::periodic 0, 1, 0, sub {
+ return unless $CONN;
+ debug sprintf "%8.2gKB/s", $CONN->{octets_in} / 1e3;
+ $CONN->{octets_in} = 0;
+ };
+ } else {
+ undef $BW_WATCHER;
+ }
+
+}
+
sub debug_setup {
my $table = new DC::UI::Table;
$table->add_at (0, 0, new DC::UI::Label text => "Widget Borders");
- $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
+ $table->add_at (1, 0, new DC::UI::CheckBox on_changed => sub { debug_toggle 1; 0 });
$table->add_at (0, 1, new DC::UI::Label text => "Tooltip Widget Info");
- $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
+ $table->add_at (1, 1, new DC::UI::CheckBox on_changed => sub { debug_toggle 2; 0 });
$table->add_at (0, 2, new DC::UI::Label text => "Show FPS");
- $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
+ $table->add_at (1, 2, new DC::UI::CheckBox on_changed => sub { debug_toggle 4; 0 });
$table->add_at (0, 3, new DC::UI::Label text => "Suppress Tooltips");
- $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
- $table->add_at (0, 4, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
+ $table->add_at (1, 3, new DC::UI::CheckBox on_changed => sub { debug_toggle 8; 0 });
+ $table->add_at (0, 4, new DC::UI::Label text => "Show Bandwidth");
+ $table->add_at (1, 4, new DC::UI::CheckBox on_changed => sub { debug_toggle 16; 0 });
- $table->add_at (0, 5, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
+ $table->add_at (0, 6, new DC::UI::Button text => "die on click(tm)", on_activate => sub { &DC::debug() } );
+ $table->add_at (0, 7, new DC::UI::TextEdit text => "line1\0152\0153\nµikachu\nづx゙つ゛");#d#
$table->add_at (7,7, my $t = new DC::UI::Table expand => 0);
$t->add_at (0,0, new DC::UI::Label text => "a a", c_rowspan => 1, c_colspan => 2);
@@ -1642,17 +1699,17 @@
$table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
$table->add_at (1, 4, new DC::UI::Entry
- text => $CFG->{profile}{default}{user},
- tooltip => "The name of your character on the server.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
+ text => $PROFILE->{user},
+ tooltip => "The name of your character on the server. The name is case-sensitive!",
+ on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
);
$table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
$table->add_at (1, 5, new DC::UI::Entry
- text => $CFG->{profile}{default}{password},
+ text => $PROFILE->{password},
hidden => 1,
tooltip => "The password for your character.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
+ on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
);
$table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
@@ -1698,11 +1755,11 @@
$vbox->add (
$HOST_ENTRY = new DC::UI::Entry
expand => 1,
- text => $CFG->{profile}{default}{host},
+ text => $PROFILE->{host},
tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. gameserver.deliantra.net)",
on_changed => sub {
my ($self, $value) = @_;
- $CFG->{profile}{default}{host} = $value;
+ $PROFILE->{host} = $value;
1
}
);
@@ -1755,6 +1812,7 @@
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
$table->add_at (1, $row++, new DC::UI::CheckBox
+ c_colspan => 2,
state => $CFG->{show_tips},
tooltip => "Show the Tip of the day window at startup?",
on_changed => sub {
@@ -1766,6 +1824,7 @@
$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
$table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
+ c_colspan => 2,
text => $CFG->{logview_max_par},
tooltip => "This is maximum number of messages remembered in the Message window. If the server "
. "sends more messages than this number, older messages get removed to save memory and "
@@ -1777,6 +1836,28 @@
},
);
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
+ $table->add_at (1, $row, new DC::UI::CheckBox
+ state => $CFG->{config_autosave},
+ tooltip => "Normally, configuration settings and the user interface layout "
+ . "are saved on client exit. You can disable this behaviour by "
+ . "unchecking this checkbox.",
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{config_autosave} = $value;
+ 0
+ }
+ );
+ $table->add_at (2, $row++, new DC::UI::Button
+ text => "Save Now",
+ tooltip => "Use this to manually save configuration and UI layout when "
+ . "autosave is disabled.",
+ on_activate => sub {
+ DC::write_cfg;
+ 0
+ }
+ );
+
$table
}
@@ -1792,8 +1873,7 @@
for (
["General", 0, 0,
- ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
- ["Inhibit autopickup" => PICKUP_INHIBIT],
+# ["Inhibit autopickup" => PICKUP_INHIBIT],
["Stop before pickup" => PICKUP_STOP],
["Debug autopickup" => PICKUP_DEBUG],
],
@@ -1851,7 +1931,7 @@
$::CFG->{pickup} &= ~$mask;
}
- $::CONN->send_command ("pickup $::CFG->{pickup}")
+ $::CONN->send_pickup ($::CFG->{pickup})
if defined $::CONN;
0
@@ -1878,7 +1958,7 @@
$table->add_at (3, 18, new DC::UI::Button
text => "set",
on_activate => sub {
- $::CONN->send_command ("pickup $::CFG->{pickup}")
+ $::CONN->send_pickup ($::CFG->{pickup})
if defined $::CONN;
0
});
@@ -1888,23 +1968,28 @@
my %SORT_ORDER = (
type => sub {
+ use sort 'stable';
sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
},
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}
- } @_ },
+ use sort 'stable';
+ 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 {
+ use sort 'stable';
+ sort {
+ $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
+ or $a->{type} <=> $b->{type}
+ } @_
+ },
);
sub inventory_widget {
@@ -2001,7 +2086,7 @@
}
}
-sub player_window {
+sub make_playerbook {
my $plwin = $PL_WINDOW = new DC::UI::Toplevel
x => "center",
y => "center",
@@ -2045,14 +2130,13 @@
$ntb->set_current_page ($INVENTORY_PAGE);
$plwin->add ($ntb);
- $plwin
}
sub keyboard_setup {
DC::Macro::keyboard_setup
}
-sub help_window {
+sub make_help_window {
my $win = new DC::UI::Toplevel
x => 'center',
y => 'center',
@@ -2151,28 +2235,7 @@
$win->show;
};
- $win
-}
-
-sub open_string_query {
- my ($title, $cb, $txt, $tooltip) = @_;
- my $dialog = new DC::UI::Toplevel
- x => "center",
- y => "center",
- z => 50,
- force_w => $WIDTH * 4/5,
- title => $title;
-
- $dialog->add (
- my $e = new DC::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;
+ $HELP_WINDOW = $win;
}
sub open_quit_dialog {
@@ -2215,6 +2278,114 @@
$QUIT_DIALOG->grab_focus;
}
+sub make_menubar {
+ $MENUFRAME = new DC::UI::Toplevel
+ border => 0,
+ force_x => 0,
+ force_y => 0,
+ force_w => $::WIDTH,
+ child => ($MENUBAR = new DC::UI::HBox),
+ ;
+
+ $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
+
+ # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
+ make_gauge_window->show;
+
+# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
+# tooltip => "Toggles the server message log, where the client collects all messages from the server.");
+
+ make_playerbook;
+
+ $MENUPOPUP = DC::UI::Menu->new (items => [
+ ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
+ ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
+ ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
+ ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
+ ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
+ ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
+ ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
+ ["Quit…" , sub {
+ if ($CONN) {
+ open_quit_dialog;
+ } else {
+ EV::unloop EV::UNLOOP_ALL;
+ }
+ }],
+ ]);
+
+ $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
+ tooltip => "Shows the main menu",
+ on_button_down => sub {
+ my ($self, $ev) = @_;
+ local $ev->{x} = 0;
+ local $ev->{y} = 0;
+ $MENUPOPUP->popup ($ev);
+ },
+ );
+
+ $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
+ padding_x => 6,
+ padding_y => 3,
+ tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
+ template => " Exp: 888,888,888,888 (lvl 188) ",
+ );
+
+ $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
+ tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
+ . "will automatically pick up items as defined by your item pickup settings "
+ . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
+ . "disable autopickup by disabling this checkbox.",
+ state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{pickup} &= ~PICKUP_INHIBIT;
+ $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
+ $CONN->send_pickup ($CFG->{pickup})
+ if $CONN;
+ },
+ );
+
+ $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
+ c_rescale => 1,
+ padding_x => 6,
+ padding_y => 3,
+ force_w => $::WIDTH * 0.2,
+ tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
+ template => "two handed weapons 99%",
+ );
+
+ $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
+ expand => 1,
+ align => 1, can_hover => 1, can_events => 1,
+ text => "Range and Combat Slots",
+ tooltip => "#stat_ranged",
+ );
+
+ $MENUFRAME->show;
+}
+
+sub open_string_query {
+ my ($title, $cb, $txt, $tooltip) = @_;
+ my $dialog = new DC::UI::Toplevel
+ x => "center",
+ y => "center",
+ z => 50,
+ force_w => $WIDTH * 4/5,
+ title => $title;
+
+ $dialog->add (
+ my $e = new DC::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 show_tip_of_the_day {
# find all tips
my @tod = DC::Pod::find tip_of_the_day => "*";
@@ -2342,7 +2513,7 @@
padding => 0,
z => 100,
force_x => "max",
- force_y => 0;
+ force_y => 20;
$DEBUG_STATUS->show;
$STATUSBOX = new DC::UI::Statusbox;
@@ -2363,12 +2534,12 @@
bg => [0, 0, 0, 0.4],
force_x => 0,
force_y => "max",
- child => (my $LR = new DC::UI::VBox),
+ child => (my $LL = new DC::UI::VBox),
)->show;
- $LR->add ($STATUSBOX);
- $LR->add ($MODBOX);
- $LR->add (new DC::UI::Label
+ $LL->add ($STATUSBOX);
+ $LL->add ($MODBOX);
+ $LL->add (new DC::UI::Label
align => 0,
markup => "Use Alt-Enter to toggle fullscreen mode",
fontsize => 0.5,
@@ -2379,7 +2550,7 @@
title => "Minimap",
name => "mapmap",
x => 0,
- y => $FONTSIZE + 8,
+ y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
border_bg => [1, 1, 1, 192/255],
bg => [1, 1, 1, 0],
child => ($MAPMAP = new DC::MapWidget::MapMap
@@ -2418,6 +2589,7 @@
$MESSAGE_WINDOW = new DC::UI::Dockbar
name => "message_window2",
title => 'Messages',
+ y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
force_w => $::WIDTH * 0.6,
force_h => $::HEIGHT * 0.25,
;
@@ -2447,47 +2619,9 @@
$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
- $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
-
- $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
- tooltip => "Toggles a dialog where you can configure all aspects of this client.");
-
-# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $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 DC::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 DC::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} = DC::UI::get_layout;
- DC::write_cfg;
- status "Configuration Saved";
- 0
- },
- );
-
- $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
- tooltip => "View Documentation");
-
- $BUTTONBAR->add (new DC::UI::Button
- text => "Quit",
- tooltip => "Terminates the program",
- on_activate => sub {
- if ($CONN) {
- open_quit_dialog;
- } else {
- EV::unloop EV::UNLOOP_ALL;
- }
- 0
- },
- );
+ make_help_window;
+ make_menubar;
- $BUTTONBAR->show;
$SETUP_DIALOG->show;
$MESSAGE_WINDOW->show;
}
@@ -2496,6 +2630,8 @@
$MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
$CAVEAT_LABEL->set_text ("None :)");
+ $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
+ if $DC::OpenGL::APPLE_NVIDIA_BUG;
$CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
@@ -2515,7 +2651,7 @@
my $fps = 9;
sub force_refresh {
- if ($ENV{CFPLUS_DEBUG} & 4) {
+ if ($DELIANTRA_DEBUG & 4) {
$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
debug sprintf "%3.2f", $fps;
}
@@ -2533,7 +2669,7 @@
my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
$NOW = EV::now;
- ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
+ ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
for DC::poll_events;
if (%animate_object) {
@@ -2555,50 +2691,47 @@
delete $animate_object{$widget};
}
-%SDL_CB = (
- DC::SDL_QUIT => sub {
- crash "SDL_QUIT";
- EV::unloop EV::UNLOOP_ALL;
- },
- DC::SDL_VIDEORESIZE => sub {
- },
- DC::SDL_VIDEOEXPOSE => sub {
- DC::UI::full_refresh;
- },
- DC::SDL_ACTIVEEVENT => sub {
-# not useful, as APPACTIVE includes only iconified state, not unmapped
-# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
-# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
-# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
-# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
-# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
- },
- DC::SDL_KEYDOWN => sub {
- if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
- # alt-enter
- video_shutdown;
- $FULLSCREEN_ENABLE->toggle;
- video_init;
- } else {
- &DC::UI::feed_sdl_key_down_event;
- }
- update_modbox;
- },
- DC::SDL_KEYUP => sub {
- &DC::UI::feed_sdl_key_up_event;
- update_modbox;
- },
- DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event,
- DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event,
- DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event,
- DC::SDL_USEREVENT => sub {
- if ($_[0]{code} == 1) {
- audio_channel_finished $_[0]{data1};
- } elsif ($_[0]{code} == 0) {
- audio_music_finished;
- }
- },
-);
+$SDL_CB[DC::SDL_QUIT] = sub {
+ crash "SDL_QUIT";
+ EV::unloop EV::UNLOOP_ALL;
+};
+$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
+$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
+ DC::UI::full_refresh;
+};
+$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
+# not useful, as APPACTIVE includes only iconified state, not unmapped
+# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
+# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
+# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
+# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
+# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
+};
+$SDL_CB[DC::SDL_KEYDOWN] = sub {
+ if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
+ # alt-enter
+ video_shutdown;
+ $FULLSCREEN_ENABLE->toggle;
+ video_init;
+ } else {
+ &DC::UI::feed_sdl_key_down_event;
+ }
+ update_modbox;
+};
+$SDL_CB[DC::SDL_KEYUP] = sub {
+ &DC::UI::feed_sdl_key_up_event;
+ update_modbox;
+};
+$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
+$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
+$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
+$SDL_CB[DC::SDL_USEREVENT] = sub {
+ if ($_[0]{code} == 1) {
+ audio_channel_finished $_[0]{data1};
+ } elsif ($_[0]{code} == 0) {
+ audio_music_finished;
+ }
+};
#############################################################################
@@ -2607,7 +2740,7 @@
#d# TODO calling exit here hangs the process in some futex
};
-# due to mac os x + sdl combined briandamage, we need this contortion
+# due to mac os x + sdl combined braindamage, we need this contortion
sub main {
{
DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
@@ -2634,16 +2767,19 @@
DC::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
+ config_autosave => 1,
sdl_mode => undef,
fullscreen => 1,
fast => 0,
force_opengl11 => undef,
disable_alpha => 0,
smooth_movement => 1,
+ smooth_transitions => 1,
texture_compression => 1,
map_scale => 1,
fow_enable => 1,
fow_intensity => 0,
+ fow_texture => 0,
map_smoothing => 1,
gui_fontsize => 1,
log_fontsize => 0.7,
@@ -2661,21 +2797,43 @@
bgm_enable => 1,
bgm_volume => 0.5,
output_rate => "",
- pickup => 0,
+ pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
inv_sort => "mtime",
default => "profile", # default profile
show_tips => 1,
logview_max_par => 1000,
shift_fire_stop => 0,
uitheme => "wood",
+ map_shift_x => -24, # arbitrary
+ map_shift_y => +24, # arbitrary
);
-
+
while (my ($k, $v) = each %DEF_CFG) {
$CFG->{$k} = $v unless exists $CFG->{$k};
}
- $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
- $PROFILE = $CFG->{profile}{default};
+ my @args = @ARGV;
+
+ my $profile = 'default';
+
+ for (my $i = 0; $i < @args; $i++) {
+ if ($args[$i] =~ /^--?profile$/) {
+ $profile = $args[$i + 1];
+ splice @args, $i, 2, ();
+ $i = 0;
+ } elsif ($args[$i] =~ /^--?h/) {
+ print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
+ exit 0;
+ }
+ }
+
+ $CFG->{profile}{$profile} ||= {};
+ $PROFILE = $CFG->{profile}{$profile};
+ $PROFILE->{host} ||= "gameserver.deliantra.net";
+
+ $PROFILE->{host} = $args[0] if @args > 0;
+ $PROFILE->{user} = $args[1] if @args > 1;
+ $PROFILE->{password} = $args[2] if @args > 2;
# convert old bindings (only default profile matters)
if (my $bindings = delete $PROFILE->{bindings}) {
@@ -2691,6 +2849,9 @@
sdl_init;
+ $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
+ $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
+
{
my @fonts = map DC::find_rcfile "fonts/$_", qw(
DejaVuSans.ttf
@@ -2701,10 +2862,11 @@
DejaVuSansMono-Oblique.ttf
DejaVuSans-BoldOblique.ttf
DejaVuSansMono-BoldOblique.ttf
+ mona.ttf
);
DC::add_font $_ for @fonts;
-
+
$FONT_PROP = new_from_file DC::Font $fonts[0];
$FONT_FIXED = new_from_file DC::Font $fonts[1];
@@ -2737,11 +2899,16 @@
$startup_done->();
};
+ debug_toggle 0;
+
delete $SIG{__DIE__};
EV::loop;
-#video_shutdown;
-#audio_shutdown;
+ DC::write_cfg if $CFG->{config_autosave};
+
+ #video_shutdown;
+ #audio_shutdown;
+
DC::OpenGL::quit;
DC::SDL_Quit;
DC::DB::Server::stop;
@@ -2755,22 +2922,23 @@
=head1 SYNOPSIS
-Just run it - no commandline arguments are supported.
+ deliantra [--profile name] [host [user [password]]]
+ deliantra --help
=head1 USAGE
-deliantra utilises OpenGL for all UI elements and the game. It is supposed to
-be used in fullscreen mode and interactively.
+The deliantra client utilises OpenGL for all UI elements and the game. It
+is supposed to be used in fullscreen mode and interactively.
=head1 DEBUGGING
-
-CFPLUS_DEBUG - environment variable
+DELIANTRA_DEBUG - environment variable
1 draw borders around widgets
2 add low-level widget info to tooltips
4 show fps
8 suppress tooltips
+ 16 show bandwidth downstream
=head1 AUTHOR