--- deliantra/Deliantra-Client/bin/deliantra 2007/12/22 06:51:08 1.10
+++ deliantra/Deliantra-Client/bin/deliantra 2008/09/03 10:08:18 1.75
@@ -51,7 +51,7 @@
if ($^O eq "MSWin32") {
# pango is relocatable on win32
- } else {
+ } elsif (-e "$root/pangoversion") {
open my $fh, "<:perlio", "$root/pangoversion"
or die "pangoversion: $!";
my $PANGO = <$fh>;
@@ -71,49 +71,87 @@
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
}
unshift @INC, $root;
}
}
+# prepend private library directory
+BEGIN {
+ for (grep !ref, @INC) {
+ my $path = "$_/Deliantra/Client/private";
+ if (-d $path) {
+ unshift @INC, $path;
+ last;
+ }
+ }
+}
+
# need to do it again because that pile of garbage called PAR nukes it before main
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 Crossfire;
-use Crossfire::Protocol::Constants;
+use Deliantra;
+use Deliantra::Protocol::Constants;
+
+use AnyEvent::Util ();
+use AnyEvent::DNS;
+use AnyEvent::Socket ();
use Compress::LZF;
+use JSON::XS;
-use CFPlus;
-use CFPlus::OpenGL ();
-use CFPlus::Protocol;
-use CFPlus::DB;
-use CFPlus::UI;
-use CFPlus::UI::Canvas;
-use CFPlus::UI::Inventory;
-use CFPlus::UI::SpellList;
-use CFPlus::UI::Dockable;
-use CFPlus::UI::MessageWindow;
-use CFPlus::UI::ChatView;
-use CFPlus::Pod;
-use CFPlus::MapWidget;
-use CFPlus::Macro;
+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;
+use DC::UI;
+use DC::UI::Canvas;
+use DC::UI::Inventory;
+use DC::UI::SpellList;
+use DC::UI::Dockable;
+use DC::UI::Dockbar;
+use DC::UI::ChatView;
+use DC::MessageDistributor;
+use DC::Pod;
+use DC::MapWidget;
+use DC::Macro;
$SIG{QUIT} = sub { Carp::cluck "QUIT" };
$SIG{PIPE} = 'IGNORE';
$EV::DIED = sub {
- CFPlus::fatal Carp::longmess $@;
+ crash "CRASH/EV::DIED: $@" => 1;
+ DC::fatal Carp::longmess $@;
};
my $MAX_FPS = 60;
-my $MIN_FPS = 5; # unused as of yet
our $META_SERVER = "http://metaserver.schmorp.de/current.json";
@@ -121,13 +159,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;
@@ -136,6 +177,8 @@
our $FONT_PROP;
our $FONT_FIXED;
+our $CONN;
+
our $MAP;
our $MAPMAP;
our $MAPWIDGET;
@@ -170,6 +213,7 @@
our $HELP_WINDOW;
our $MESSAGE_WINDOW;
+our $MESSAGE_DIST;
our $FLOORBOX;
our $GAUGES;
our $STATWIDS;
@@ -179,6 +223,7 @@
our $ALT_ENTER_MESSAGE;
our $STATUSBOX;
+our $MODBOX;
our $DEBUG_STATUS;
our $INV;
@@ -187,8 +232,35 @@
#############################################################################
+# 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 (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
+ $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
}
sub debug {
@@ -196,7 +268,33 @@
}
sub message {
- $MESSAGE_WINDOW->message (@_);
+ $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");
}
#############################################################################
@@ -236,7 +334,7 @@
for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
my (undef, $dx, $dy, $vol) = @$_;
- my $channel = CFPlus::Channel::find;
+ my $channel = DC::Channel::find;
$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
$channel->set_position_r ($dx, $dy, 20);
$chunk->play ($channel);
@@ -257,10 +355,10 @@
}
} else {
# fetch from database
- CFPlus::DB::get res_data => $meta->{name}, sub {
- my $rwops = new CFPlus::RW $_[0];
- my $chunk = new CFPlus::MixChunk $rwops
- or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
+ 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;
$chunk->volume (($meta->{data}{volume} || 1) * 128);
$AUDIO_CHUNK{$face} = $chunk;
@@ -289,10 +387,10 @@
$MUSIC_PLAYING_META = $meta;
$MUSIC_PLAYING_WIDGET->set_markup (
- "Name: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
- . "Author: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
- . "Source: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
- . "License: " . (CFPlus::asxml $meta->{data}{license})
+ "Name: " . (DC::asxml $meta->{data}{name}) . "\n"
+ . "Author: " . (DC::asxml $meta->{data}{author}) . "\n"
+ . "Source: " . (DC::asxml $meta->{data}{source}) . "\n"
+ . "License: " . (DC::asxml $meta->{data}{license})
);
}
@@ -300,13 +398,13 @@
return unless $MUSIC_PLAYING_META;
my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
- CFPlus::MixMusic::volume $base * $volume * 128;
+ DC::MixMusic::volume $base * $volume * 128;
}
sub audio_music_start {
my $meta = $MUSIC_PLAYING_META;
- CFPlus::DB::get res_data => $meta->{name}, sub {
+ DC::DB::get res_data => $meta->{name}, sub {
return unless $SDL_MIXER;
# music might have changed...
@@ -318,11 +416,11 @@
$MUSIC_PLAYING_DATA = \$_[0];
my $rwops = $meta->{path}
- ? new_from_file CFPlus::RW $meta->{path}
- : new CFPlus::RW $$MUSIC_PLAYING_DATA;
+ ? new_from_file DC::RW $meta->{path}
+ : new DC::RW $$MUSIC_PLAYING_DATA;
- $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
- or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
+ $MUSIC_PLAYER = new DC::MixMusic $rwops
+ or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
my $NOW = time;
@@ -363,7 +461,7 @@
$_->{stop_time} ||= rand for @MUSIC_HAVE;
# default MUSIC_HAVE == MUSIC_DEFAULT
- @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" }
+ @MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
unless @MUSIC_HAVE;
}
@@ -375,7 +473,7 @@
if ($MUSIC_PLAYING_META) {
$MUSIC_PLAYING_META->{stop_time} = $NOW;
$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
- CFPlus::MixMusic::fade_out $fade_out;
+ DC::MixMusic::fade_out $fade_out;
} else {
# sort by stop time, oldest first
@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
@@ -419,14 +517,14 @@
sub audio_init {
if ($CFG->{audio_enable}) {
$ENV{MIX_EFFECTSMAXSPEED} = 1;
- $SDL_MIXER = !CFPlus::Mix_OpenAudio
+ $SDL_MIXER = !DC::Mix_OpenAudio
$CFG->{audio_hw_frequency},
- CFPlus::MIX_DEFAULT_FORMAT,
+ DC::MIX_DEFAULT_FORMAT,
$CFG->{audio_hw_channels},
$CFG->{audio_hw_chunksize};
if ($SDL_MIXER) {
- CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
+ DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
audio_music_finished;
} else {
@@ -450,7 +548,7 @@
%AUDIO_PLAY = ();
%AUDIO_CHUNK = ();
- CFPlus::Mix_CloseAudio if $SDL_MIXER;
+ DC::Mix_CloseAudio if $SDL_MIXER;
undef $SDL_MIXER;
}
@@ -480,22 +578,22 @@
}
}
- $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
+ $conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
title => "Server Query",
- child => my $vbox = new CFPlus::UI::VBox,
+ child => my $vbox = new DC::UI::VBox,
;
- my @dialog = my $label = new CFPlus::UI::Label
+ my @dialog = my $label = new DC::UI::Label
max_w => $::WIDTH * 0.8,
ellipsise => 0,
text => $prompt;
if ($flags & CS_QUERY_YESNO) {
- push @dialog, my $hbox = new CFPlus::UI::HBox;
+ push @dialog, my $hbox = new DC::UI::HBox;
- $hbox->add (new CFPlus::UI::Button
+ $hbox->add (new DC::UI::Button
text => "No",
on_activate => sub {
$conn->send ("reply n");
@@ -503,7 +601,7 @@
0
}
);
- $hbox->add (new CFPlus::UI::Button
+ $hbox->add (new DC::UI::Button
text => "Yes",
on_activate => sub {
$conn->send ("reply y");
@@ -518,14 +616,14 @@
if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
$dialog->{tooltip} = "#charcreation_focus";
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.8,
ellipsise => 0,
markup => "\nOr use your keyboard and the text entry below:\n";
- unshift @dialog, my $table = new CFPlus::UI::Table;
+ unshift @dialog, my $table = new DC::UI::Table;
- $table->add_at (0, 0, new CFPlus::UI::Button
+ $table->add_at (0, 0, new DC::UI::Button
text => "Next Race",
on_activate => sub {
$conn->send ("reply n");
@@ -533,7 +631,7 @@
0
},
);
- $table->add_at (2, 0, new CFPlus::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply d");
@@ -543,14 +641,14 @@
);
if ($conn->{chargen_race_description}) {
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.8,
ellipsise => 0,
markup => "$conn->{chargen_race_description}",
;
}
- unshift @dialog, new CFPlus::UI::Face
+ unshift @dialog, new DC::UI::Face
face => $conn->{player}{face},
bg => [.2, .2, .2, 1],
min_w => 64,
@@ -558,17 +656,17 @@
;
if ($conn->{chargen_race_title}) {
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
allign => 1,
ellipsise => 0,
markup => "Race: $conn->{chargen_race_title}",
;
}
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup => (CFPlus::Pod::section_label ui => "chargen_race"),
+ markup => (DC::Pod::section_label ui => "chargen_race"),
;
} elsif ($prompt =~ /roll new stats/) {
@@ -578,15 +676,15 @@
return;
}
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
markup => "\nOr use your keyboard and the text entry below:\n";
- unshift @dialog, my $table = new CFPlus::UI::Table;
+ unshift @dialog, my $table = new DC::UI::Table;
# left: re-roll
- $table->add_at (0, 0, new CFPlus::UI::Button
+ $table->add_at (0, 0, new DC::UI::Button
text => "Roll Again",
on_activate => sub {
$conn->send ("reply y");
@@ -596,7 +694,7 @@
);
# center: swap stats
- my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
+ my ($sw1, $sw2) = map +(new DC::UI::Selector
expand => 1,
value => $_,
options => [
@@ -610,7 +708,7 @@
],
), 1 .. 2;
- $table->add_at (2, 0, new CFPlus::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Swap Stats",
on_activate => sub {
$conn->{stat_change_with} = $sw2->{value};
@@ -619,20 +717,19 @@
0
},
);
- $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
+ $table->add_at (2, 1, new DC::UI::HBox children => [$sw1, $sw2]);
# right: accept
- $table->add_at (4, 0, new CFPlus::UI::Button
+ $table->add_at (4, 0, new DC::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply n");
- $STATS_PAGE->hide;
destroy_query_dialog $conn;
0
},
);
- unshift @dialog, my $hbox = new CFPlus::UI::HBox;
+ unshift @dialog, my $hbox = new DC::UI::HBox;
for (
[Str => CS_STAT_STR],
[Dex => CS_STAT_DEX],
@@ -643,9 +740,8 @@
[Cha => CS_STAT_CHA],
) {
my ($name, $id) = @$_;
- $hbox->add (new CFPlus::UI::Label
+ $hbox->add (new DC::UI::Label
markup => "$conn->{stat}{$id} $name",
- align => 0,
expand => 1,
can_events => 1,
can_hover => 1,
@@ -653,14 +749,14 @@
);
}
- unshift @dialog, new CFPlus::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
+ markup => (DC::Pod::section_label ui => "chargen_stats"),
;
}
- push @dialog, my $entry = new CFPlus::UI::Entry
+ push @dialog, my $entry = new DC::UI::Entry
on_changed => sub {
$conn->send ("reply $_[1]");
destroy_query_dialog $conn;
@@ -673,7 +769,7 @@
} 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 CFPlus::UI::Entry
+ push @dialog, my $entry = new DC::UI::Entry
$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
on_activate => sub {
$conn->send ("reply $_[1]");
@@ -689,28 +785,21 @@
$dialog->show;
}
-sub start_game {
- status "logging in...";
-
- $LOGIN_BUTTON->set_text ("Logout");
- $SETUP_DIALOG->hide;
+sub dc_connect {
+ my ($host, $port) = @_;
my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
- my ($host, $port) = split /:/, $PROFILE->{host};
-
- $MAP = new CFPlus::Map;
-
- $CONN = eval {
- new CFPlus::Protocol
+ $CONN =
+ new DC::Protocol
host => $host,
- port => $port || 13327,
+ port => $port,
user => $PROFILE->{user},
pass => $PROFILE->{password},
mapw => $mapsize,
maph => $mapsize,
- client => "cfplus $CFPlus::VERSION $] $^O",
+ client => "$DC::VERSION $] $^O",
map_widget => $MAPWIDGET,
statusbox => $STATUSBOX,
@@ -721,25 +810,56 @@
setup_req => {
smoothing => $CFG->{map_smoothing}*1,
},
- };
- if ($CONN) {
- CFPlus::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...";
+
+ $LOGIN_BUTTON->set_text ("Logout");
+ $SETUP_DIALOG->hide;
+
+ my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
- status "login successful";
+ $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;
$PL_WINDOW->hide;
$SPELL_LIST->clear_spells;
- $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+ $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
&audio_music_set_ambient ([]);
@@ -755,84 +875,122 @@
}
sub graphics_setup {
- my $vbox = new CFPlus::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
+ $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
my $row = 0;
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
- $table->add_at (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_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) . "");
+
+ $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"],
+ ],
+ tooltip => "Choose the User Interface theme that you like most :)",
+ on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $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 CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
- $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
+ $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 CFPlus::UI::Slider
- force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
+ $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 CFPlus::UI::Label
- align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
+ $hbox->add (my $mode_label = new DC::UI::Label
+ height => 0.8, template => "9999x9999@9+9",
can_events => 1, tooltip => $vidmode_tooltip);
- $mode_slider->connect (changed => sub {
+ $MODE_SLIDER->connect (changed => sub {
my ($self, $value) = @_;
$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]);
+ $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
- $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
+ $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 CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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 CFPlus to use OpenGL 1.1 features only. This will normally result in "
+ 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.",
+ . "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 (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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 etxremely 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 => "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.",
+ . "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 CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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 CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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 (1, $row++, new CFPlus::UI::Button
- expand => 1, align => 0, text => "Apply",
+ $table->add_at (1, $row++, new DC::UI::Button
+ expand => 1, text => "Apply",
tooltip => "Apply the video settings above.",
on_activate => sub {
video_shutdown ();
@@ -841,15 +999,24 @@
}
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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 CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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. "
@@ -857,30 +1024,30 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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 CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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 CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
+ on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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 {
@@ -890,8 +1057,8 @@
}
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
- $table->add_at (1, $row++, new CFPlus::UI::Slider
+ $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 {
@@ -908,7 +1075,7 @@
our $AUDIO_INFO;
sub audio_tab_update {
- my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
+ my ($freq, $format, $chans) = DC::Mix_QuerySpec;
$AUDIO_HW_CHUNKSIZE->set_options ([
[0, "default", "Use System Default"],
@@ -928,21 +1095,21 @@
}
sub audio_setup {
- my $vbox = new CFPlus::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
+ $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 0, 1]);
my $row = 0;
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Audio Enable");
+ $table->add_at (1, $row++, new DC::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]; 1 }
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
- $table->add_at (1, $row, new CFPlus::UI::CheckBox
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
+ $table->add_at (1, $row, new DC::UI::CheckBox
expand => 1, state => $CFG->{effects_enable},
tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
on_changed => sub {
@@ -951,15 +1118,15 @@
1
}
);
- $table->add_at (2, $row++, new CFPlus::UI::Slider
+ $table->add_at (2, $row++, new DC::UI::Slider
expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
- $table->add_at (1, $row, new CFPlus::UI::CheckBox
+ $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.",
on_changed => sub {
@@ -969,14 +1136,14 @@
1
}
);
- $table->add_at (2, $row++, new CFPlus::UI::Slider
+ $table->add_at (2, $row++, new DC::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]; audio_music_update_volume; 0 }
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
- $table->add_at (1, $row++, new CFPlus::UI::Selector
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Frequency");
+ $table->add_at (1, $row++, new DC::UI::Selector
c_colspan => 2, expand => 1,
value => $CFG->{audio_hw_frequency},
options => [
@@ -994,8 +1161,8 @@
}
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
- $table->add_at (1, $row++, new CFPlus::UI::Selector
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Channels");
+ $table->add_at (1, $row++, new DC::UI::Selector
c_colspan => 2, expand => 1,
value => $CFG->{audio_hw_channels},
options => [
@@ -1013,8 +1180,8 @@
}
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
- $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Latency");
+ $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new DC::UI::Selector
c_colspan => 2, expand => 1,
value => $CFG->{audio_hw_chunksize},
tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
@@ -1027,8 +1194,8 @@
);
# should really be a slider
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
- $table->add_at (1, $row++, new CFPlus::UI::ValSlider
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Mixer Voices");
+ $table->add_at (1, $row++, new DC::UI::ValSlider
c_colspan => 2, expand => 1,
tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
@@ -1042,8 +1209,8 @@
}
);
- $table->add_at (1, $row++, new CFPlus::UI::Button
- c_colspan => 2, expand => 1, align => 0, text => "Apply",
+ $table->add_at (1, $row++, new DC::UI::Button
+ c_colspan => 2, expand => 1, text => "Apply",
tooltip => "Apply the audio settings",
on_activate => sub {
audio_shutdown ();
@@ -1052,10 +1219,10 @@
}
);
- $vbox->add (new CFPlus::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
expand => 1,
label => "Audio Info",
- child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
+ child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
);
audio_tab_update;
@@ -1072,41 +1239,41 @@
sub make_gauge_window {
my $gh = int $HEIGHT * $CFG->{gauge_size};
- my $win = new CFPlus::UI::Frame (
+ my $win = new DC::UI::Frame (
force_x => 0,
force_y => "max",
force_w => $WIDTH,
force_h => $gh,
);
- $win->add (my $hbox = new CFPlus::UI::HBox
+ $win->add (my $hbox = new DC::UI::HBox
children => [
- (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)),
+ (new DC::UI::HBox expand => 1),
+ (new DC::UI::VBox children => [
+ (new DC::UI::Empty expand => 1),
+ (new DC::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new DC::UI::Table)),
]),
- (my $vbox = new CFPlus::UI::VBox),
+ (my $vbox = new DC::UI::VBox),
],
);
- $vbox->add (new CFPlus::UI::HBox
+ $vbox->add (new DC::UI::HBox
expand => 1,
children => [
- (new CFPlus::UI::Empty expand => 1),
- (my $hb = new CFPlus::UI::HBox),
+ (new DC::UI::Empty expand => 1),
+ (my $hb = new DC::UI::HBox),
],
);
- $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 $prg = new CFPlus::UI::ExperienceProgress);
- $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
- $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
+ $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,
@@ -1120,28 +1287,28 @@
}
sub debug_setup {
- my $table = new CFPlus::UI::Table;
+ my $table = new DC::UI::Table;
- $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
- $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
- $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
- $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
- $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
- $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
- $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
- $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
- $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
-
- $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
-
- $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
- $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
- $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
- $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
- $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
- $t->add_at (1,1, new CFPlus::UI::Label text => "e");
+ $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 (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 (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 (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 (0, 5, 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);
+ $t->add_at (2,0, new DC::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
+ $t->add_at (1,2, new DC::UI::Label text => "c c", c_rowspan => 1, c_colspan => 2);
+ $t->add_at (0,1, new DC::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1, ellipsise => 0 );
+ $t->add_at (1,1, new DC::UI::Label text => "e");
- $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
+ $table->add_at (7, 6, my $c = new DC::UI::Canvas);
$c->add_items ({
type => "line_loop",
@@ -1171,37 +1338,37 @@
}
sub stats_window {
- my $r = new CFPlus::UI::ScrolledWindow (
+ my $r = new DC::UI::ScrolledWindow (
expand => 1,
scroll_y => 1
);
- $r->add (my $vb = new CFPlus::UI::VBox);
+ $r->add (my $vb = new DC::UI::VBox);
- $vb->add (new CFPlus::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Player",
- child => (my $pi = new CFPlus::UI::VBox),
+ child => (my $pi = new DC::UI::VBox),
);
- $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
+ $pi->add ($STATWIDS->{title} = new DC::UI::Label text => "Title:", expand => 1, align => 0,
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.");
- $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
+ $pi->add ($STATWIDS->{map} = new DC::UI::Label align => 0, text => "Map:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The map you are currently on (if supported by the server).");
- $pi->add (my $hb0 = new CFPlus::UI::HBox);
- $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
+ $pi->add (my $hb0 = new DC::UI::HBox);
+ $hb0->add ($STATWIDS->{weight} = new DC::UI::Label text => "Weight:", expand => 1, align => 0,
can_hover => 1, can_events => 1,
tooltip => "The weight of the player including all inventory items.");
- $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
+ $hb0->add ($STATWIDS->{m_weight} = new DC::UI::Label align => 0, text => "Max weight:", expand => 1,
can_hover => 1, can_events => 1,
tooltip => "The weight limit: you cannot carry more than this.");
- $vb->add (new CFPlus::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Primary/Secondary Statistics",
- child => (my $hb = new CFPlus::UI::HBox expand => 1),
+ child => (my $hb = new DC::UI::HBox expand => 1),
);
- $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
+ $hb->add (my $tbl = new DC::UI::Table expand => 1);
my $color2 = [1, 1, 0];
@@ -1223,17 +1390,17 @@
) {
my ($col, $row, $id, $label, $template) = @$_;
- $tbl->add_at ($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_at ($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");
+ $tbl->add_at ($col , $row, $STATWIDS->{$id} = new DC::UI::Label
+ font => $FONT_FIXED, can_hover => 1, can_events => 1,
+ align => 1, template => $template, tooltip => "#stat_$label");
+ $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new DC::UI::Label
+ font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2,
+ align => 0, text => $label, tooltip => "#stat_$label");
}
- $vb->add (new CFPlus::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Resistancies",
- child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
+ child => (my $tbl2 = new DC::UI::Table expand => 1, col_expand => [1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0]),
);
my $row = 0;
@@ -1282,27 +1449,27 @@
drain acid pois para deat phys
blind fear tund elec cold ghit/)
{
- $tbl2->add_at ($col, $row,
+ $tbl2->add_at ($col + 2, $row,
$STATWIDS->{"res_$_"} =
- new CFPlus::UI::Label
+ new DC::UI::Label
font => $FONT_FIXED,
template => "-100%",
- align => +1,
- valign => 0,
+ align => 1,
can_events => 1,
can_hover => 1,
tooltip => $resist_names{$_}->[1],
);
- $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
+ $tbl2->add_at ($col + 1, $row, new DC::UI::Image
font => $FONT_FIXED,
can_hover => 1,
can_events => 1,
path => "ui/resist/resist_$_.png",
tooltip => $resist_names{$_}->[1],
);
- $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
+ $tbl2->add_at ($col + 0, $row, new DC::UI::Label
text => $resist_names{$_}->[0],
font => $FONT_FIXED,
+ align => 1,
can_hover => 1,
can_events => 1,
tooltip => $resist_names{$_}->[1],
@@ -1310,7 +1477,7 @@
$row++;
if ($row % 6 == 0) {
- $col += 3;
+ $col += 4;
$row = 0;
}
}
@@ -1321,9 +1488,9 @@
}
sub skill_window {
- my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
+ my $sw = new DC::UI::ScrolledWindow (expand => 1);
- $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
+ $sw->add ($STATWIDS->{skill_tbl} = new DC::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
$sw
}
@@ -1345,14 +1512,14 @@
my $table = $METASERVER->{table};
$table->clear;
- $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
+ $table->add_at (0, 0, my $label = new DC::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
my $ok = 0;
- CFPlus::background {
- my $ua = CFPlus::lwp_useragent;
+ DC::background {
+ my $ua = DC::lwp_useragent;
- CFPlus::background_msg CFPlus::decode_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
+ DC::background_msg DC::decode_json +(DC::lwp_check $ua->get ($META_SERVER))->decoded_content;
} sub {
my ($msg) = @_;
if ($msg) {
@@ -1365,13 +1532,12 @@
"Short information about this server provided by its admins.",
);
my @col = qw(#Users Host Uptime Version Description);
- $table->add_at ($_, 0, new CFPlus::UI::Label
- can_hover => 1, can_events => 1,
- align => 0, fg => [1, 1, 0],
+ $table->add_at ($_, 0, new DC::UI::Label
+ can_hover => 1, can_events => 1, fg => [1, 1, 0],
text => $col[$_], tooltip => $tip[$_])
for 0 .. $#col;
- my @align = qw(1 0 1 1 -1);
+ my @align = qw(1 0.5 1 1 0);
my $y = 0;
for my $m (@{ $msg->{servers} }) {
@@ -1397,8 +1563,8 @@
$y++;
- $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
- (new CFPlus::UI::Button
+ $table->add_at (scalar @$m, $y, new DC::UI::VBox children => [
+ (new DC::UI::Button
text => "Use",
tooltip => "Put this server into the Host:Port field",
on_activate => sub {
@@ -1407,10 +1573,10 @@
0
},
),
- (new CFPlus::UI::Empty expand => 1),
+ (new DC::UI::Empty expand => 1),
]);
- $table->add_at ($_, $y, new CFPlus::UI::Label
+ $table->add_at ($_, $y, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
align => $align[$_],
@@ -1430,11 +1596,11 @@
}
sub metaserver_dialog {
- my $vbox = new CFPlus::UI::VBox;
- my $table = new CFPlus::UI::Table;
- $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
+ my $vbox = new DC::UI::VBox;
+ my $table = new DC::UI::Table;
+ $vbox->add (new DC::UI::ScrolledWindow expand => 1, child => $table);
- my $dialog = new CFPlus::UI::Toplevel
+ my $dialog = new DC::UI::Toplevel
title => "Server List",
name => 'metaserver_dialog',
x => 'center',
@@ -1455,31 +1621,30 @@
}
sub login_setup {
- my $vbox = new CFPlus::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (new CFPlus::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Login Settings",
- child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+ child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
);
- $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
- $table->add_at (1, 4, new CFPlus::UI::Entry
+ $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 }
);
- $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
- $table->add_at (1, 5, new CFPlus::UI::Entry
+ $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},
hidden => 1,
tooltip => "The password for your character.",
on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
);
- $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
+ $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
expand => 1,
- align => 0,
text => "Login / Register",
tooltip => "This button will either login to the account configured above or register a new account.",
on_activate => sub {
@@ -1489,12 +1654,14 @@
},
);
- $vbox->add (new CFPlus::UI::FancyFrame
- label => "Registering",
- min_h => 200,
- child => (new CFPlus::UI::Label valign => -1, ellipsise => 0,
+ $vbox->add (new DC::UI::FancyFrame
+ 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.",
),
);
@@ -1503,24 +1670,24 @@
}
sub server_setup {
- my $vbox = new CFPlus::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (new CFPlus::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Connection Settings",
- child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
+ child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
);
my $row = 0;
- $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
+ $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Host:Port");
{
- $table->add_at (1, $row, my $vbox = new CFPlus::UI::VBox);
+ $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
$vbox->add (
- $HOST_ENTRY = new CFPlus::UI::Entry
+ $HOST_ENTRY = new DC::UI::Entry
expand => 1,
text => $CFG->{profile}{default}{host},
- tooltip => "The hostname or ip address of the Deliantra server to connect to",
+ 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;
@@ -1529,19 +1696,19 @@
);
if (0) { #d# disabled
- $vbox->add (new CFPlus::UI::Button
+ $vbox->add (new DC::UI::Button
expand => 1,
text => "Server List",
other => $METASERVER,
- tooltip => "Show a list of available crossfire servers",
+ tooltip => "Show a list of available Deliantra servers",
on_activate => sub { $METASERVER->toggle_visibility; 0 },
on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
);
}#d#
}
- $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
- $table->add_at (1, $row, new CFPlus::UI::Slider
+ $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Map Size");
+ $table->add_at (1, $row, new DC::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. "
@@ -1551,8 +1718,8 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
);
- $table->add_at (0, ++$row, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
- $table->add_at (1, $row, new CFPlus::UI::Entry
+ $table->add_at (0, ++$row, new DC::UI::Label align => 1, text => "Output-Rate");
+ $table->add_at (1, $row, new DC::UI::Entry
text => $CFG->{output_rate},
tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
. "when sending data. When 0 or unset, the server "
@@ -1561,21 +1728,21 @@
on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
);
- $vbox->add (new CFPlus::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Server Info",
- child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
+ child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
);
$vbox
}
sub client_setup {
- my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
+ my $table = new DC::UI::Table expand => 1, col_expand => [0, 1];
my $row = 0;
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
- $table->add_at (1, $row++, new CFPlus::UI::CheckBox
+ $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
state => $CFG->{show_tips},
tooltip => "Show the Tip of the day window at startup?",
on_changed => sub {
@@ -1585,15 +1752,15 @@
}
);
- $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
- $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
+ $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 {
my ($self, $value) = @_;
- $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
+ $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
0
},
);
@@ -1602,11 +1769,11 @@
}
sub autopickup_setup {
- my $r = new CFPlus::UI::ScrolledWindow (
+ my $r = new DC::UI::ScrolledWindow (
expand => 1,
scroll_y => 1
);
- $r->add (my $table = new CFPlus::UI::Table
+ $r->add (my $table = new DC::UI::Table
row_expand => [0],
col_expand => [0, 1, 0, 1],
);
@@ -1650,18 +1817,18 @@
["Jewelery" => PICKUP_JEWELS],
["Flesh" => PICKUP_FLESH],
],
- ["Weight/Value ratio", 2, 17]
+ ["Value/Weight ratio", 2, 17]
)
{
my ($title, $x, $y, @bits) = @$_;
- $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
+ $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
for (@bits) {
++$y;
my $mask = $_->[1];
- $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
- $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
+ $table->add_at ($x , $y, new DC::UI::Label text => $_->[0], align => 1, expand => 1);
+ $table->add_at ($x+1, $y, my $checkbox = new DC::UI::CheckBox
state => $::CFG->{pickup} & $mask,
on_changed => sub {
my ($box, $value) = @_;
@@ -1682,9 +1849,10 @@
}
}
- $table->add_at (2, 18, new CFPlus::UI::ValSlider
+ $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) = @_;
@@ -1695,7 +1863,7 @@
1;
});
- $table->add_at (3, 18, new CFPlus::UI::Button
+ $table->add_at (3, 18, new DC::UI::Button
text => "set",
on_activate => sub {
$::CONN->send_command ("pickup $::CFG->{pickup}")
@@ -1707,7 +1875,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 {
@@ -1726,16 +1896,16 @@
);
sub inventory_widget {
- my $hb = new CFPlus::UI::HBox homogeneous => 1;
+ my $hb = new DC::UI::HBox homogeneous => 1;
- $hb->add (my $vb1 = new CFPlus::UI::VBox);
- $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
+ $hb->add (my $vb1 = new DC::UI::VBox);
+ $vb1->add (new DC::UI::Label text => "Player");
- $vb1->add (my $hb1 = new CFPlus::UI::HBox);
+ $vb1->add (my $hb1 = new DC::UI::HBox);
use sort 'stable';
- $hb1->add (new CFPlus::UI::Selector
+ $hb1->add (new DC::UI::Selector
value => $::CFG->{inv_sort},
options => [
[type => "Type/Name"],
@@ -1747,40 +1917,40 @@
$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);
+ $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
+ #TODO# update to weight/maxweight
+ $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
- $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw1->add ($INV = new CFPlus::UI::Inventory);
+ $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw1->add ($INV = new DC::UI::Inventory);
$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
- $hb->add (my $vb2 = new CFPlus::UI::VBox);
+ $hb->add (my $vb2 = new DC::UI::VBox);
- $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
+ $vb2->add ($INVR_HB = new DC::UI::HBox);
- $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw2->add ($INVR = new CFPlus::UI::Inventory);
+ $vb2->add (my $sw2 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $sw2->add ($INVR = new DC::UI::Inventory);
# XXX: Call after $INVR = ... because set_opencont sets the items
- CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
+ DC::Protocol::set_opencont ($::CONN, 0, "Floor");
$hb
}
sub media_window {
- my $vb = new CFPlus::UI::VBox;
+ my $vb = new DC::UI::VBox;
- $vb->add (new CFPlus::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Currently playing music",
- child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
- child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
+ child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
+ child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
);
- $vb->add (new CFPlus::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Other media used in this session",
expand => 1,
- child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
+ child => ($LICENSE_WIDGET = new DC::UI::TextScroller
expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
);
@@ -1799,10 +1969,10 @@
$LICENSE_WIDGET->add_paragraph ({
fg => [1, 1, 1, 1],
markup => ""
- . "Name: " . (CFPlus::asxml $meta->{name}) . "\n"
- . "Author: " . (CFPlus::asxml $meta->{author}) . "\n"
- . "Source: " . (CFPlus::asxml $meta->{source}) . "\n"
- . "License: " . (CFPlus::asxml $meta->{license}) . "\n"
+ . "Name: " . (DC::asxml $meta->{name}) . "\n"
+ . "Author: " . (DC::asxml $meta->{author}) . "\n"
+ . "Source: " . (DC::asxml $meta->{source}) . "\n"
+ . "License: " . (DC::asxml $meta->{license}) . "\n"
. "",
});
$LICENSE_WIDGET->scroll_to_bottom;
@@ -1820,7 +1990,7 @@
}
sub player_window {
- my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
+ my $plwin = $PL_WINDOW = new DC::UI::Toplevel
x => "center",
y => "center",
force_w => $WIDTH * 9/10,
@@ -1832,7 +2002,7 @@
my $ntb =
$PL_NOTEBOOK =
- new CFPlus::UI::Notebook expand => 1;
+ new DC::UI::Notebook expand => 1;
$ntb->add_tab (
"Statistics (F2)" => $STATS_PAGE = stats_window,
@@ -1843,8 +2013,8 @@
"Shows all your Skills."
);
- my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
- $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
+ my $spellsw = $SPELL_PAGE = new DC::UI::ScrolledWindow (expand => 1, scroll_y => 1);
+ $spellsw->add ($SPELL_LIST = new DC::UI::SpellList);
$ntb->add_tab (
"Spellbook (F4)" => $spellsw,
"Displays all spells you have and lets you edit keyboard shortcuts for them."
@@ -1867,11 +2037,11 @@
}
sub keyboard_setup {
- CFPlus::Macro::keyboard_setup
+ DC::Macro::keyboard_setup
}
sub help_window {
- my $win = new CFPlus::UI::Toplevel
+ my $win = new DC::UI::Toplevel
x => 'center',
y => 'center',
z => 4,
@@ -1881,13 +2051,13 @@
title => "Help Browser",
has_close_button => 1;
- $win->add (my $vbox = new CFPlus::UI::VBox);
+ $win->add (my $vbox = new DC::UI::VBox);
- $vbox->add (new CFPlus::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Navigation",
- child => (my $buttons = new CFPlus::UI::HBox),
+ child => (my $buttons = new DC::UI::HBox),
);
- $vbox->add (my $viewer = new CFPlus::UI::TextScroller
+ $vbox->add (my $viewer = new DC::UI::TextScroller
expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
my @history;
@@ -1899,7 +2069,7 @@
$buttons->clear;
- $buttons->add (new CFPlus::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⇤",
tooltip => "back to the starting page",
on_activate => sub {
@@ -1911,9 +2081,9 @@
);
if (@history) {
- $buttons->add (new CFPlus::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⋘",
- tooltip => "back to " . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "",
+ tooltip => "back to " . (DC::asxml DC::Pod::full_path $history[-1][0]) . "",
on_activate => sub {
unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
$load_node->(@{pop @history});
@@ -1922,9 +2092,9 @@
}
if (@future) {
- $buttons->add (new CFPlus::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⋙",
- tooltip => "forward to " . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "",
+ tooltip => "forward to " . (DC::asxml DC::Pod::full_path $future[0][0]) . "",
on_activate => sub {
push @history, [$curnode, $viewer->current_paragraph];
$load_node->(@{shift @future});
@@ -1932,40 +2102,40 @@
);
}
- $buttons->add (new CFPlus::UI::Label text => " ");
+ $buttons->add (new DC::UI::Label text => " ");
- my @path = CFPlus::Pod::full_path_of $node;
+ my @path = DC::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) . "",
+ $buttons->add (new DC::UI::Button
+ 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 = ();
$load_node->($node);
},
);
- $buttons->add (new CFPlus::UI::Label text => "/");
+ $buttons->add (new DC::UI::Label text => "/");
}
- $buttons->add (new CFPlus::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;
$viewer->clear;
- $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
+ $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
$viewer->scroll_to ($para);
};
- $load_node->(CFPlus::Pod::find pod => "mainpage");
+ $load_node->(DC::Pod::find pod => "mainpage");
- $CFPlus::Pod::goto_document = sub {
+ $DC::Pod::goto_document = sub {
my (@path) = @_;
push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
- $load_node->((CFPlus::Pod::find @path)[0]);
+ $load_node->((DC::Pod::find @path)[0]);
$win->show;
};
@@ -1974,7 +2144,7 @@
sub open_string_query {
my ($title, $cb, $txt, $tooltip) = @_;
- my $dialog = new CFPlus::UI::Toplevel
+ my $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
z => 50,
@@ -1982,7 +2152,7 @@
title => $title;
$dialog->add (
- my $e = new CFPlus::UI::Entry
+ 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
@@ -1995,7 +2165,7 @@
sub open_quit_dialog {
unless ($QUIT_DIALOG) {
- $QUIT_DIALOG = new CFPlus::UI::Toplevel
+ $QUIT_DIALOG = new DC::UI::Toplevel
x => "center",
y => "center",
z => 50,
@@ -2006,23 +2176,26 @@
}
;
- $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
+ $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
- $vb->add (new CFPlus::UI::Label
+ $vb->add (new DC::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
+ $vb->add (my $hb = new DC::UI::HBox expand => 1);
+ $hb->add (new DC::UI::Button
text => "Ok",
expand => 1,
on_activate => sub { $QUIT_DIALOG->hide; 0 },
);
- $hb->add (new CFPlus::UI::Button
+ $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;
+ },
);
}
@@ -2032,12 +2205,12 @@
sub show_tip_of_the_day {
# find all tips
- my @tod = CFPlus::Pod::find tip_of_the_day => "*";
+ my @tod = DC::Pod::find tip_of_the_day => "*";
- CFPlus::DB::get state => "tip_of_the_day", sub {
+ DC::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 { };
+ DC::DB::put state => tip_of_the_day => $todindex + 1, sub { };
# create dialog
my $dialog;
@@ -2046,7 +2219,7 @@
$dialog->destroy;
};
- $dialog = new CFPlus::UI::Toplevel
+ $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
z => 3,
@@ -2054,24 +2227,24 @@
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,
+ child => my $vbox = new DC::UI::VBox,
has_close_button => 1,
on_delete => $close,
;
- $vbox->add (my $viewer = new CFPlus::UI::TextScroller
+ $vbox->add (my $viewer = new DC::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]);
+ $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
- $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
+ $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
- $table->add_at (0, 0, new CFPlus::UI::Button
+ $table->add_at (0, 0, new DC::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_at (2, 0, new CFPlus::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Next",
tooltip => "Show the next Tip of the day.",
on_activate => sub {
@@ -2085,12 +2258,33 @@
}
sub sdl_init {
- CFPlus::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);
@@ -2098,31 +2292,33 @@
$FULLSCREEN = $CFG->{fullscreen};
$FAST = $CFG->{fast};
- CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
- or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
+ # 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;
$LAST_REFRESH = time - 0.01;
- CFPlus::OpenGL::init;
- CFPlus::Macro::init;
+ DC::OpenGL::init;
+ DC::Macro::init;
$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
- $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
+ $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
#############################################################################
if ($DEBUG_STATUS) {
- CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
+ DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
} else {
# create/configure the widgets
- $CFPlus::UI::ROOT->connect (key_down => sub {
+ $DC::UI::ROOT->connect (key_down => sub {
my (undef, $ev) = @_;
- if (my @macros = CFPlus::Macro::find $ev) {
- CFPlus::Macro::execute $_ for @macros;
+ if (my @macros = DC::Macro::find $ev) {
+ DC::Macro::execute $_ for @macros;
return 1;
}
@@ -2130,51 +2326,71 @@
0
});
- $DEBUG_STATUS = new CFPlus::UI::Label
+ $DEBUG_STATUS = new DC::UI::Label
padding => 0,
z => 100,
force_x => "max",
force_y => 0;
$DEBUG_STATUS->show;
- $STATUSBOX = new CFPlus::UI::Statusbox;
- $STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
+ $STATUSBOX = new DC::UI::Statusbox;
+
+ $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 CFPlus::UI::Frame
+ (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;
- CFPlus::UI::Toplevel->new (
+ $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",
x => 0,
y => $FONTSIZE + 8,
border_bg => [1, 1, 1, 192/255],
bg => [1, 1, 1, 0],
- child => ($MAPMAP = new CFPlus::MapWidget::MapMap
- tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.",
+ child => ($MAPMAP = new DC::MapWidget::MapMap
+ tooltip => "Minimap. This will display an overview of the surrounding areas.",
),
)->show;
- $MAPWIDGET = new CFPlus::MapWidget;
+ $MAPWIDGET = new DC::MapWidget;
$MAPWIDGET->connect (activate_console => sub {
my ($mapwidget, $preset) = @_;
- $MESSAGE_WINDOW->activate_console ($preset)
- if $MESSAGE_WINDOW;
+ $MESSAGE_DIST->activate_console ($preset)
+ if $MESSAGE_DIST;
});
$MAPWIDGET->show;
$MAPWIDGET->grab_focus;
- $COMPLETER = new CFPlus::MapWidget::Command::
+ $COMPLETER = new DC::MapWidget::Command::
command => { },
tooltip => "#completer_help",
;
- $SETUP_DIALOG = new CFPlus::UI::Toplevel
+ $SETUP_DIALOG = new DC::UI::Toplevel
title => "Setup",
name => "setup_dialog",
x => 'center',
@@ -2186,10 +2402,18 @@
;
$METASERVER = metaserver_dialog;
- $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
+ # 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,
+ ;
- $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
- filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
+
+ $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,
"Configure the server to play on, your username and password.");
@@ -2211,35 +2435,34 @@
$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
- $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
+ $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
+ $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 CFPlus::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
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
+ $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 CFPlus::UI::Button
+ $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} = CFPlus::UI::get_layout;
- CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
+ $::CFG->{layout} = DC::UI::get_layout;
+ DC::write_cfg;
status "Configuration Saved";
0
},
);
- $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
+ $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
tooltip => "View Documentation");
-
- $BUTTONBAR->add (new CFPlus::UI::Button
+ $BUTTONBAR->add (new DC::UI::Button
text => "Quit",
tooltip => "Terminates the program",
on_activate => sub {
@@ -2257,11 +2480,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 {
- CFPlus::OpenGL::shutdown;
+ DC::OpenGL::shutdown;
+ DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
undef $SDL_ACTIVE;
}
@@ -2272,30 +2503,34 @@
my $fps = 9;
sub force_refresh {
- $WANT_REFRESH->stop;
-
if ($ENV{CFPLUS_DEBUG} & 4) {
$fps = $fps * 0.98 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.02;
debug sprintf "%3.2f", $fps;
}
- $CFPlus::UI::ROOT->draw;
- CFPlus::SDL_GL_SwapBuffers;
+ undef $WANT_REFRESH;
+ $_[0]->stop;
+
+ $DC::UI::ROOT->draw;
+ DC::SDL_GL_SwapBuffers;
$LAST_REFRESH = $NOW;
}
-$WANT_REFRESH = EV::idle_ns \&force_refresh;
+my $want_refresh = EV::prepare_ns \&force_refresh;
-my $input = EV::timer 0, 1/60, sub {
- $NOW = time;
+my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
+ $NOW = EV::now;
($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
- for CFPlus::poll_events;
+ for DC::poll_events;
if (%animate_object) {
$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
- $WANT_REFRESH->start;
+ $WANT_REFRESH = 1;
}
+
+ $want_refresh->start
+ if $WANT_REFRESH;
};
sub animation_start {
@@ -2309,37 +2544,42 @@
}
%SDL_CB = (
- CFPlus::SDL_QUIT => sub {
+ DC::SDL_QUIT => sub {
+ crash "SDL_QUIT";
EV::unloop EV::UNLOOP_ALL;
},
- CFPlus::SDL_VIDEORESIZE => sub {
+ DC::SDL_VIDEORESIZE => sub {
},
- CFPlus::SDL_VIDEOEXPOSE => sub {
- CFPlus::UI::full_refresh;
+ DC::SDL_VIDEOEXPOSE => sub {
+ DC::UI::full_refresh;
},
- CFPlus::SDL_ACTIVEEVENT => sub {
-# not useful, as APPACTIVE include sonly iconified state, not unmapped
-# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
-# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#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;
+ 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;
},
- CFPlus::SDL_KEYDOWN => sub {
- if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
+ 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 {
- CFPlus::UI::feed_sdl_key_down_event ($_[0]);
+ &DC::UI::feed_sdl_key_down_event;
}
+ update_modbox;
},
- 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 {
+ 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) {
@@ -2350,104 +2590,123 @@
#############################################################################
-$SIG{INT} = $SIG{TERM} = sub { exit };
-
-{
- CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
- CFPlus::DB::Server::run;
-
- CFPlus::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};
- }
+$SIG{INT} = $SIG{TERM} = sub {
+ EV::unloop;
+ #d# TODO calling exit here hangs the process in some futex
+};
- $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;
+ $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
+ $PROFILE = $CFG->{profile}{default};
- @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
- @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
- @SDL_MODES or CFPlus::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;
+ # 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 CFPlus::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
+ );
- CFPlus::add_font $_ for @fonts;
-
- CFPlus::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 CFPlus::Font $fonts[0];
- $FONT_FIXED = new_from_file CFPlus::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
# for my $rgba (0..1) {
# my $t1 = Time::HiRes::time;
# for (1..1000) {
-# my $layout = CFPlus::Layout->new ($rgba);
+# my $layout = DC::Layout->new ($rgba);
# $layout->set_text ("hallo" x 100);
# $layout->render;
# }
@@ -2455,23 +2714,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;
-CFPlus::SDL_Quit;
-CFPlus::DB::Server::stop;
+ DC::OpenGL::quit;
+ DC::SDL_Quit;
+ DC::DB::Server::stop;
+}
+
+DC::SDL_braino; # see sub above
=head1 NAME
@@ -2498,7 +2762,7 @@
=head1 AUTHOR
-Marc Lehmann , Robin Redeker
+Marc Lehmann , Robin Redeker