--- deliantra/Deliantra-Client/bin/deliantra 2008/03/20 22:28:35 1.28
+++ deliantra/Deliantra-Client/bin/deliantra 2008/12/19 22:06:53 1.79
@@ -52,25 +52,12 @@
if ($^O eq "MSWin32") {
# pango is relocatable on win32
} else {
- 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;
-
+ # OS X
+ $ENV{FONTCONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
+ $ENV{FONTCONFIG_DIR} = $root; # no effect??!?!
$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";
+ $ENV{DYLD_LIBRARY_PATH} = $root;
+ chdir $root; # for pango modules, maybe other things
}
unshift @INC, $root;
@@ -92,16 +79,35 @@
unshift @INC, $ENV{PAR_TEMP}
if %PAR::LibCache;
-use Time::HiRes 'time';
use EV;
+BEGIN { *time = \&EV::time }
+
use List::Util qw(max min);
use Deliantra;
use Deliantra::Protocol::Constants;
+use AnyEvent::Util ();
+use AnyEvent::DNS;
+use AnyEvent::Socket ();
+
use Compress::LZF;
+use JSON::XS;
use DC;
+
+sub crash($;$) {
+ # nop during compiletime
+}
+
+BEGIN {
+ $SIG{__DIE__} = sub {
+ return if $^S;
+ crash "CRASH/DIE: $_[0]" => 1;
+ DC::fatal Carp::longmess "$_[0]";
+ }
+}
+
use DC::OpenGL ();
use DC::Protocol;
use DC::DB;
@@ -111,7 +117,6 @@
use DC::UI::SpellList;
use DC::UI::Dockable;
use DC::UI::Dockbar;
-use DC::UI::MessageWindow;
use DC::UI::ChatView;
use DC::MessageDistributor;
use DC::Pod;
@@ -122,6 +127,7 @@
$SIG{PIPE} = 'IGNORE';
$EV::DIED = sub {
+ crash "CRASH/EV::DIED: $@" => 1;
DC::fatal Carp::longmess $@;
};
@@ -133,13 +139,16 @@
our $NOW;
our $CFG;
-our $CONN;
our $PROFILE; # current profile
our $FAST; # fast, low-quality mode, possibly useful for software-rendering
our $WANT_REFRESH;
+our $MODE_SLIDER;
+our $CAVEAT_LABEL;
+
our @SDL_MODES;
+our $SDL_REINIT = 1;
our $WIDTH;
our $HEIGHT;
our $FULLSCREEN;
@@ -148,6 +157,8 @@
our $FONT_PROP;
our $FONT_FIXED;
+our $CONN;
+
our $MAP;
our $MAPMAP;
our $MAPWIDGET;
@@ -192,6 +203,7 @@
our $ALT_ENTER_MESSAGE;
our $STATUSBOX;
+our $MODBOX;
our $DEBUG_STATUS;
our $INV;
@@ -200,6 +212,33 @@
#############################################################################
+# write a crash message blockingly to the socket, if possible
+# this is a bit too complicated for my tastes, but it was easy.
+*crash = sub($;$) {
+ my ($msg, $backtrace) = @_;
+
+ return unless $CONN;
+
+ my $fh = $CONN->{fh}
+ or return;
+
+ my $buf = delete $CONN->{wbuf};
+
+ $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
+
+ AnyEvent::Util::fh_nonblocking $fh, 0;
+ syswrite $fh, $buf;
+ AnyEvent::Util::fh_nonblocking $fh, 1;
+
+ $msg =~ s/\s+$//;
+
+ # backtrace as second step, in case it crashes, too
+ crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
+ if $backtrace;
+};
+
+#############################################################################
+
sub status {
$STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
}
@@ -212,6 +251,32 @@
$MESSAGE_DIST->message (@_);
}
+sub update_modbox {
+ my $mod = DC::SDL_GetModState;
+
+ my $markup;
+
+ $markup .= $mod & DC::KMOD_CTRL
+ ? ($MAPWIDGET->{ctrl} ? "[REPEAT]" : "[REPEAT]")
+ : "[ once ]";
+
+ $markup .= $mod & DC::KMOD_SHIFT
+ ? ($MAPWIDGET->{shft} ? "[FIRE]" : "[FIRE]")
+ : "[move]";
+
+ $markup .= $mod & (DC::KMOD_ALT | DC::KMOD_META)
+ ? "[ALT]"
+ : "[alt]";
+
+ $markup .= $mod & DC::KMOD_NUM
+ ? "[NUM]"
+ : "[num]";
+
+ # around next statement works around some bug that keeps the
+ # "font =>" from being used on windows
+ $MODBOX->set_markup ("$markup");
+}
+
#############################################################################
#TODO: maybe move into own audio module...
@@ -639,7 +704,6 @@
text => "Accept",
on_activate => sub {
$conn->send ("reply n");
- $STATS_PAGE->hide;
destroy_query_dialog $conn;
0
},
@@ -701,26 +765,20 @@
$dialog->show;
}
-sub start_game {
- status "logging in...";
-
- $LOGIN_BUTTON->set_text ("Logout");
- $SETUP_DIALOG->hide;
-
- my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+sub dc_connect {
+ my ($host, $port) = @_;
- my ($host, $port) = split /:/, $PROFILE->{host};
+ my $mapw = List::Util::min 48, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ my $maph = List::Util::min 48, List::Util::max 11, int $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
- $MAP = new DC::Map;
-
- $CONN = eval {
+ $CONN =
new DC::Protocol
host => $host,
- port => $port || 13327,
+ port => $port,
user => $PROFILE->{user},
pass => $PROFILE->{password},
- mapw => $mapsize,
- maph => $mapsize,
+ mapw => $mapw,
+ maph => $maph,
client => "$DC::VERSION $] $^O",
@@ -733,19 +791,50 @@
setup_req => {
smoothing => $CFG->{map_smoothing}*1,
},
- };
- if ($CONN) {
- DC::lowdelay fileno $CONN->{fh};
+ on_connect => sub {
+ if ($_[0]) {
+ DC::lowdelay fileno $CONN->{fh};
+
+ status "login successful";
+ } else {
+ undef $CONN;
+ status "unable to connect: $!";
+ stop_game();
+ }
+ },
+ ;
+}
+
+sub start_game {
+ status "logging in...";
- status "login successful";
+ $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";
+ }
+
+ dc_connect $host, $port;
+ };
} else {
- status "unable to connect";
- stop_game();
+ dc_connect $host, $port;
}
}
sub stop_game {
+ crash "stop_game";
+
$LOGIN_BUTTON->set_text ("Login / Register");
$SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
$SETUP_DIALOG->show;
@@ -769,149 +858,208 @@
sub graphics_setup {
my $vbox = new DC::UI::VBox;
- $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
+ {
+ $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
- my $row = 0;
+ $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
- $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
- can_events => 1,
- tooltip => "" . (DC::OpenGL::gl_extensions) . "");
-
- my $vidmode_tooltip =
- "Video Mode. The video mode to use for fullscreen (and the window size for windowed operation). "
- . "The format is width x height \@ depth-per-channel + alpha-channel.";
-
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
- $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
-
- $hbox->add (my $mode_slider = new DC::UI::Slider
- force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
- tooltip => $vidmode_tooltip);
- $hbox->add (my $mode_label = new DC::UI::Label
- height => 0.8, template => "9999x9999@9+9",
- can_events => 1, tooltip => $vidmode_tooltip);
+ my $row = 0;
- $mode_slider->connect (changed => sub {
- my ($self, $value) = @_;
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
+ $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
+ can_events => 1,
+ tooltip => "" . (DC::OpenGL::gl_extensions) . "");
- $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
- $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
- });
- $mode_slider->emit (changed => $mode_slider->{range}[0]);
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
+ $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
+ can_events => 1,
+ tooltip => "This field shows any known issues with your config or driver, such as "
+ . "a non-accelerated display format. You can try to work around these issues "
+ . "by selecting a different video mode, changing the settings below or "
+ . "by installing the right driver for your graphics card.");
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
+ $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
+ value => $CFG->{uitheme},
+ options => [
+ [wood => "Wood (the default)"],
+ [plain => "Plain (very)"],
+ [blue => "Blue (dark)"],
+ [metal => "Metal (light)"],
+ ],
+ tooltip => "Choose the User Interface theme that you like most :)",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
+ );
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
- $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
- state => $CFG->{fullscreen},
- tooltip => "Bring the client into fullscreen mode.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
- );
+ my $vidmode_tooltip =
+ "Video Mode. The video mode to use for fullscreen (and the window size for windowed operation). "
+ . "The format is width x height \@ depth-per-channel + alpha-channel.";
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
+ $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
+
+ $hbox->add ($MODE_SLIDER = new DC::UI::Slider
+ force_w => $WIDTH * 0.1, expand => 1,
+ range => [ ($CFG->{sdl_mode}) x 3 ],
+ tooltip => $vidmode_tooltip);
+ $hbox->add (my $mode_label = new DC::UI::Label
+ height => 0.8, template => "9999x9999@9+9",
+ can_events => 1, tooltip => $vidmode_tooltip);
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
- $table->add_at (1, $row++, new DC::UI::CheckBox
- state => $CFG->{force_opengl11},
- tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
- . "higher memory usage and slower performance. It will, however, help tremendously on "
- . "cards that claim to support a feature but fall back to software rendering. "
- . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
- . "but cards and drivers from other vendors (ATI) are often just as bad. If you "
- . "experience extremely low framerates and your card should do better, try this option.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
- );
+ $MODE_SLIDER->connect (changed => sub {
+ my ($self, $value) = @_;
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
- $table->add_at (1, $row++, new DC::UI::CheckBox
- state => $CFG->{texture_compression},
- tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
- . "will save a lot of memory and increase performance. The compression algorithm "
- . "can differ form card to card, so your mileage may vary. This setting is ignored in "
- . "forced OpenGL 1.1 mode.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
- );
+ $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
+ $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
+ });
+ $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
- $table->add_at (1, $row++, new DC::UI::CheckBox
- state => $CFG->{fast},
- tooltip => "Lower the visual quality considerably to speed up rendering.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
- );
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
+ $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
+ state => $CFG->{fullscreen},
+ tooltip => "Bring the client into fullscreen mode.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
+ );
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
- $table->add_at (1, $row++, new DC::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_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
+ $table->add_at (1, $row++, new DC::UI::CheckBox
+ state => $CFG->{force_opengl11},
+ tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
+ . "higher memory usage and slower performance. It will, however, help tremendously on "
+ . "cards that claim to support a feature but fall back to software rendering. "
+ . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
+ . "but cards and drivers from other vendors (ATI) are often just as bad. "
+ . "If you experience extremely low framerates and your card should do better, try this option.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
+ );
- $table->add_at (1, $row++, new DC::UI::Button
- expand => 1, text => "Apply",
- tooltip => "Apply the video settings above.",
- on_activate => sub {
- video_shutdown ();
- video_init ();
- 0
- }
- );
+ $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 "
+ . "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 "
+ . "noticably improves the framerate of the client please report this! "
+ . "If you experience extremely low framerates and your card should do better, try this option.",
+ on_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{disable_alpha} = $value;
+ $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
+ 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],
- tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
- );
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
+ $table->add_at (1, $row++, new DC::UI::CheckBox
+ state => $CFG->{texture_compression},
+ tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
+ . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
+ . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
+ . "forced OpenGL 1.1 mode and when using the Apple renderer.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
+ );
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
- $table->add_at (1, $row++, new DC::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 TRT servers. "
- . "Changes take effect at next login only.",
- on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
- );
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
+ $table->add_at (1, $row++, new DC::UI::CheckBox
+ state => $CFG->{fast},
+ tooltip => "Lower the visual quality considerably to speed up rendering.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
+ );
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
- $table->add_at (1, $row++, new DC::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; 0 }
- );
-
- $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],
- 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; 0 }
- );
-
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
- $table->add_at (1, $row++, new DC::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, "
- . "but you still need to press apply to correctly re-layout the widget.",
- on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
- );
-
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
- $table->add_at (1, $row++, new DC::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_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
+ $table->add_at (1, $row++, new DC::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_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
- $table->add_at (1, $row++, new DC::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});
- 0
- }
- );
+ $table->add_at (1, $row++, new DC::UI::Button
+ expand => 1, text => "Apply",
+ tooltip => "Apply the video settings above.",
+ on_activate => sub {
+ video_shutdown ();
+ video_init ();
+ 0
+ }
+ );
+ }
+
+ {
+ $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
+
+ $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
+
+ my $row = 0;
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
+ $table->add_at (1, $row++, new DC::UI::CheckBox
+ state => $CFG->{smooth_movement},
+ tooltip => "Smooth Movement tries to make movement, well, smoother, but also increases the framerate. "
+ . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
+ . "then disable this option. Changes take effect immdiately.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $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],
+ tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
+ );
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
+ $table->add_at (1, $row++, new DC::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 TRT servers. "
+ . "Changes take effect at next login only.",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
+ );
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
+ $table->add_at (1, $row++, new DC::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; 0 }
+ );
+
+ $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],
+ 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; 0 }
+ );
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
+ $table->add_at (1, $row++, new DC::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, "
+ . "but you still need to press apply to correctly re-layout the widget.",
+ on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
+ );
+
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
+ $table->add_at (1, $row++, new DC::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_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
+ $table->add_at (1, $row++, new DC::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});
+ 0
+ }
+ );
+ }
$vbox
}
@@ -1500,11 +1648,13 @@
);
$vbox->add (new DC::UI::FancyFrame
- label => "Registering",
- min_h => 200,
+ label => "How to Play",
+ min_h => 240,
child => (new DC::UI::Label valign => 0, ellipsise => 0,
markup =>
- "To register a new account, choose a username that hasn't been taken yet and "
+ "First select a suitable video resolution in the Graphics tab, above.\n\n"
+ . "Then register a new account (or use an existing one if you have one). "
+ . "To register an account, choose a username that hasn't been taken yet (just guess) and "
. "try to log-in. Follow the instructions in the Log tab in the message window.",
),
);
@@ -1595,10 +1745,10 @@
}
);
- $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages Window Size");
+ $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
text => $CFG->{logview_max_par},
- tooltip => "This is maximum number of messages remembered in the Messages window. If the server "
+ 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 "
. "computing time. A value of 0 disables this feature, but that is not recommended.",
on_changed => sub {
@@ -1660,7 +1810,7 @@
["Jewelery" => PICKUP_JEWELS],
["Flesh" => PICKUP_FLESH],
],
- ["Weight/Value ratio", 2, 17]
+ ["Value/Weight ratio", 2, 17]
)
{
my ($title, $x, $y, @bits) = @$_;
@@ -1695,6 +1845,7 @@
$table->add_at (2, 18, new DC::UI::ValSlider
range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
template => ">= 99",
+ tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
to_value => sub { ">= " . 5 * $_[0] },
on_changed => sub {
my ($slider, $value) = @_;
@@ -1717,7 +1868,9 @@
}
my %SORT_ORDER = (
- type => undef,
+ type => sub {
+ sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
+ },
mtime => sub {
my $NOW = time;
sort {
@@ -1758,7 +1911,7 @@
},
);
$hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
- #TODO# update to weigh/maxweight
+ #TODO# update to weight/maxweight
$hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
$vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
@@ -1949,7 +2102,7 @@
for my $node (@path) {
$buttons->add (new DC::UI::Button
- text => $node->{kw}[0],
+ text => $node->[DC::Pod::N_KW][0],
tooltip => "go to " . (DC::asxml DC::Pod::full_path $node) . "",
on_activate => sub {
push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
@@ -1959,7 +2112,7 @@
$buttons->add (new DC::UI::Label text => "/");
}
- $buttons->add (new DC::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
+ $buttons->add (new DC::UI::Label text => $node->[DC::Pod::N_KW][0], padding_x => 4, padding_y => 4);
$curnode = $node;
@@ -2032,7 +2185,10 @@
$hb->add (new DC::UI::Button
text => "Quit anyway",
expand => 1,
- on_activate => sub { EV::unloop EV::UNLOOP_ALL },
+ on_activate => sub {
+ crash "Quit anyway";
+ EV::unloop EV::UNLOOP_ALL;
+ },
);
}
@@ -2095,12 +2251,33 @@
}
sub sdl_init {
- DC::SDL_Init
+ DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
and die "SDL::Init failed!\n";
}
sub video_init {
- $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
+ DC::set_theme $CFG->{uitheme};
+
+ DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
+ $SDL_REINIT = 0;
+
+ @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
+ @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
+ @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
+ @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+
+ @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
+
+ if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
+ $CFG->{sdl_mode} = 0; # lowest resolution by default
+
+ # now choose biggest mode <= 1024x768
+ for (0 .. $#SDL_MODES) {
+ if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
+ $CFG->{sdl_mode} = $_;
+ }
+ }
+ }
my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
@@ -2108,7 +2285,9 @@
$FULLSCREEN = $CFG->{fullscreen};
$FAST = $CFG->{fast};
+ # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
+ or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
$SDL_ACTIVE = 1;
@@ -2148,15 +2327,35 @@
$DEBUG_STATUS->show;
$STATUSBOX = new DC::UI::Statusbox;
- $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
+
+ $MODBOX = new DC::UI::Label
+ can_events => 1,
+ can_hover => 1,
+ markup => "",
+ align => 0,
+ font => $FONT_FIXED,
+ tooltip => "#modifier_box",
+ tooltip_width => 0.67,
+ ;
+
+ update_modbox;
(new DC::UI::Frame
bg => [0, 0, 0, 0.4],
force_x => 0,
force_y => "max",
- child => $STATUSBOX,
+ child => (my $LR = new DC::UI::VBox),
)->show;
+ $LR->add ($STATUSBOX);
+ $LR->add ($MODBOX);
+ $LR->add (new DC::UI::Label
+ align => 0,
+ markup => "Use Alt-Enter to toggle fullscreen mode",
+ fontsize => 0.5,
+ fg => [1, 1, 0, 0.7],
+ );
+
DC::UI::Toplevel->new (
title => "Minimap",
name => "mapmap",
@@ -2165,7 +2364,7 @@
border_bg => [1, 1, 1, 192/255],
bg => [1, 1, 1, 0],
child => ($MAPMAP = new DC::MapWidget::MapMap
- tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.",
+ tooltip => "Minimap. This will display an overview of the surrounding areas.",
),
)->show;
@@ -2196,10 +2395,17 @@
;
$METASERVER = metaserver_dialog;
- $MESSAGE_WINDOW = new DC::UI::Dockbar (name => 'message_window', title => 'Messages');
+ # the name is changed to not conflict with the older name as users could have hidden it
+ $MESSAGE_WINDOW = new DC::UI::Dockbar
+ name => "message_window2",
+ title => 'Messages',
+ force_w => $::WIDTH * 0.6,
+ force_h => $::HEIGHT * 0.25,
+ ;
+
$MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
- $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 1,
+ $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
$SETUP_NOTEBOOK->add_tab (Login => $SETUP_LOGIN = login_setup,
@@ -2227,8 +2433,8 @@
$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.");
+# $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
@@ -2240,7 +2446,7 @@
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 "$Deliantra::VARDIR/client.cf";
+ DC::write_cfg;
status "Configuration Saved";
0
},
@@ -2249,7 +2455,6 @@
$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",
@@ -2268,11 +2473,19 @@
$MESSAGE_WINDOW->show;
}
+ $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
+ $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
+
+ $CAVEAT_LABEL->set_text ("None :)");
+ $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
+ unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
+
$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
}
sub video_shutdown {
DC::OpenGL::shutdown;
+ DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
undef $SDL_ACTIVE;
}
@@ -2325,6 +2538,7 @@
%SDL_CB = (
DC::SDL_QUIT => sub {
+ crash "SDL_QUIT";
EV::unloop EV::UNLOOP_ALL;
},
DC::SDL_VIDEORESIZE => sub {
@@ -2343,14 +2557,18 @@
DC::SDL_KEYDOWN => sub {
if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
# alt-enter
- $FULLSCREEN_ENABLE->toggle;
video_shutdown;
+ $FULLSCREEN_ENABLE->toggle;
video_init;
} else {
- DC::UI::feed_sdl_key_down_event ($_[0]);
+ &DC::UI::feed_sdl_key_down_event;
}
+ update_modbox;
+ },
+ DC::SDL_KEYUP => sub {
+ &DC::UI::feed_sdl_key_up_event;
+ update_modbox;
},
- DC::SDL_KEYUP => \&DC::UI::feed_sdl_key_up_event,
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,
@@ -2370,102 +2588,111 @@
#d# TODO calling exit here hangs the process in some futex
};
-{
- if (-e "$Deliantra::VARDIR/client.cf") {
- DC::read_cfg "$Deliantra::VARDIR/client.cf";
- } else {
- #TODO: compatibility cruft
- DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
- print STDERR "INFO: used old configuration file\n";
- }
-
- DC::DB::Server::run;
-
- DC::UI::set_layout ($::CFG->{layout});
-
- my %DEF_CFG = (
- sdl_mode => 0,
- fullscreen => 1,
- fast => 0,
- force_opengl11 => undef,
- texture_compression => 1,
- map_scale => 1,
- fow_enable => 1,
- fow_intensity => 0,
- map_smoothing => 1,
- gui_fontsize => 1,
- log_fontsize => 0.7,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 0.7,
- mapsize => 100,
- audio_enable => 1,
- audio_hw_channels => 0,
- audio_hw_frequency => 0,
- audio_hw_chunksize => 0,
- audio_mix_channels => 8,
- effects_enable => 1,
- effects_volume => 1,
- bgm_enable => 1,
- bgm_volume => 0.5,
- 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} ||= "gameserver.deliantra.net";
- $PROFILE = $CFG->{profile}{default};
+# due to mac os x + sdl combined briandamage, we need this contortion
+sub main {
+ {
+ DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
- # 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,
- };
- }
+ if (-e "$Deliantra::VARDIR/client.cf") {
+ DC::read_cfg "$Deliantra::VARDIR/client.cf";
+ } else {
+ #TODO: compatibility cruft
+ DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
+ print STDERR "INFO: used old configuration file\n";
+ }
+
+ DC::DB::Server::run;
+
+ if ($CFG->{db_schema} < 1) {
+ warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
+ DC::DB::nuke_db;
+ $CFG->{db_schema} = 1;
+ DC::write_cfg;
+ }
+
+ DC::DB::open_db;
+
+ DC::UI::set_layout ($::CFG->{layout});
+
+ my %DEF_CFG = (
+ sdl_mode => undef,
+ fullscreen => 1,
+ fast => 0,
+ force_opengl11 => undef,
+ disable_alpha => 0,
+ smooth_movement => 1,
+ texture_compression => 1,
+ map_scale => 1,
+ fow_enable => 1,
+ fow_intensity => 0,
+ map_smoothing => 1,
+ gui_fontsize => 1,
+ log_fontsize => 0.7,
+ gauge_fontsize => 1,
+ gauge_size => 0.35,
+ stat_fontsize => 0.7,
+ mapsize => 100,
+ audio_enable => 1,
+ audio_hw_channels => 0,
+ audio_hw_frequency => 0,
+ audio_hw_chunksize => 0,
+ audio_mix_channels => 8,
+ effects_enable => 1,
+ effects_volume => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.5,
+ output_rate => "",
+ pickup => 0,
+ inv_sort => "mtime",
+ default => "profile", # default profile
+ show_tips => 1,
+ logview_max_par => 1000,
+ shift_fire_stop => 0,
+ uitheme => "wood",
+ );
+
+ while (my ($k, $v) = each %DEF_CFG) {
+ $CFG->{$k} = $v unless exists $CFG->{$k};
}
- }
-
- sdl_init;
- @SDL_MODES = DC::SDL_ListModes 8, 8;
- @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
- @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+ $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
+ $PROFILE = $CFG->{profile}{default};
- @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
+ # 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,
+ };
+ }
+ }
+ }
- $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
+ sdl_init;
- {
- my @fonts = map DC::find_rcfile "fonts/$_", qw(
- DejaVuSans.ttf
- DejaVuSansMono.ttf
- DejaVuSans-Bold.ttf
- DejaVuSansMono-Bold.ttf
- DejaVuSans-Oblique.ttf
- DejaVuSansMono-Oblique.ttf
- DejaVuSans-BoldOblique.ttf
- DejaVuSansMono-BoldOblique.ttf
- );
+ {
+ my @fonts = map DC::find_rcfile "fonts/$_", qw(
+ DejaVuSans.ttf
+ DejaVuSansMono.ttf
+ DejaVuSans-Bold.ttf
+ DejaVuSansMono-Bold.ttf
+ DejaVuSans-Oblique.ttf
+ DejaVuSansMono-Oblique.ttf
+ DejaVuSans-BoldOblique.ttf
+ DejaVuSansMono-BoldOblique.ttf
+ );
- DC::add_font $_ for @fonts;
-
- DC::pango_init;
+ DC::add_font $_ for @fonts;
+
+ $FONT_PROP = new_from_file DC::Font $fonts[0];
+ $FONT_FIXED = new_from_file DC::Font $fonts[1];
- $FONT_PROP = new_from_file DC::Font $fonts[0];
- $FONT_FIXED = new_from_file DC::Font $fonts[1];
+ $FONT_PROP->make_default;
- $FONT_PROP->make_default;
- }
+ DC::pango_init;
+ }
# compare mono (ft) vs. rgba (cairo)
# ft - 1.8s, cairo 3s, even in alpha-only mode
@@ -2480,24 +2707,28 @@
# warn $t2-$t1;
# }
- video_init;
- audio_init;
-}
+ video_init;
+ audio_init;
+ }
-show_tip_of_the_day if $CFG->{show_tips};
+ show_tip_of_the_day if $CFG->{show_tips};
-our $STARTUP_CANCEL = EV::idle sub {
- undef $::STARTUP_CANCEL;
- $startup_done->();
-};
+ our $STARTUP_CANCEL = EV::idle sub {
+ undef $::STARTUP_CANCEL;
+ $startup_done->();
+ };
-EV::loop;
+ delete $SIG{__DIE__};
+ EV::loop;
#video_shutdown;
#audio_shutdown;
-DC::OpenGL::quit;
-DC::SDL_Quit;
-DC::DB::Server::stop;
+ DC::OpenGL::quit;
+ DC::SDL_Quit;
+ DC::DB::Server::stop;
+}
+
+DC::SDL_braino; # see sub above
=head1 NAME
@@ -2524,7 +2755,7 @@
=head1 AUTHOR
-Marc Lehmann , Robin Redeker
+Marc Lehmann , Robin Redeker