--- deliantra/Deliantra-Client/bin/deliantra 2007/12/26 20:46:39 1.17
+++ deliantra/Deliantra-Client/bin/deliantra 2008/01/06 17:31:24 1.24
@@ -80,7 +80,7 @@
# prepend private library directory
BEGIN {
for (grep !ref, @INC) {
- my $path = "$_/Deliantra/Client/private/dc";
+ my $path = "$_/Deliantra/Client/private";
if (-d $path) {
unshift @INC, $path;
last;
@@ -101,30 +101,31 @@
use Compress::LZF;
-use dc;
-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::MessageWindow;
-use dc::UI::ChatView;
-use dc::Pod;
-use dc::MapWidget;
-use dc::Macro;
+use DC;
+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::MessageWindow;
+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 {
- dc::fatal Carp::longmess $@;
+ 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";
@@ -181,6 +182,7 @@
our $HELP_WINDOW;
our $MESSAGE_WINDOW;
+our $MESSAGE_DIST;
our $FLOORBOX;
our $GAUGES;
our $STATWIDS;
@@ -199,7 +201,7 @@
#############################################################################
sub status {
- $STATUSBOX->add (dc::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 {
@@ -207,7 +209,7 @@
}
sub message {
- $MESSAGE_WINDOW->message (@_);
+ $MESSAGE_DIST->message (@_);
}
#############################################################################
@@ -247,7 +249,7 @@
for (grep $_->[0] >= EV::now, @{(delete $AUDIO_PLAY{$face}) || []}) {
my (undef, $dx, $dy, $vol) = @$_;
- my $channel = dc::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);
@@ -268,10 +270,10 @@
}
} else {
# fetch from database
- 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;
+ 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;
@@ -300,10 +302,10 @@
$MUSIC_PLAYING_META = $meta;
$MUSIC_PLAYING_WIDGET->set_markup (
- "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})
+ "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})
);
}
@@ -311,13 +313,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};
- dc::MixMusic::volume $base * $volume * 128;
+ DC::MixMusic::volume $base * $volume * 128;
}
sub audio_music_start {
my $meta = $MUSIC_PLAYING_META;
- dc::DB::get res_data => $meta->{name}, sub {
+ DC::DB::get res_data => $meta->{name}, sub {
return unless $SDL_MIXER;
# music might have changed...
@@ -329,11 +331,11 @@
$MUSIC_PLAYING_DATA = \$_[0];
my $rwops = $meta->{path}
- ? new_from_file dc::RW $meta->{path}
- : new dc::RW $$MUSIC_PLAYING_DATA;
+ ? new_from_file DC::RW $meta->{path}
+ : new DC::RW $$MUSIC_PLAYING_DATA;
- $MUSIC_PLAYER = new dc::MixMusic $rwops
- or Carp::confess "music face $meta->{face} unloadable: " . dc::Mix_GetError;
+ $MUSIC_PLAYER = new DC::MixMusic $rwops
+ or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError;
my $NOW = time;
@@ -374,7 +376,7 @@
$_->{stop_time} ||= rand for @MUSIC_HAVE;
# default MUSIC_HAVE == MUSIC_DEFAULT
- @MUSIC_HAVE = { path => dc::find_rcfile "music/$MUSIC_DEFAULT" }
+ @MUSIC_HAVE = { path => DC::find_rcfile "music/$MUSIC_DEFAULT" }
unless @MUSIC_HAVE;
}
@@ -386,7 +388,7 @@
if ($MUSIC_PLAYING_META) {
$MUSIC_PLAYING_META->{stop_time} = $NOW;
$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
- dc::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;
@@ -430,14 +432,14 @@
sub audio_init {
if ($CFG->{audio_enable}) {
$ENV{MIX_EFFECTSMAXSPEED} = 1;
- $SDL_MIXER = !dc::Mix_OpenAudio
+ $SDL_MIXER = !DC::Mix_OpenAudio
$CFG->{audio_hw_frequency},
- dc::MIX_DEFAULT_FORMAT,
+ DC::MIX_DEFAULT_FORMAT,
$CFG->{audio_hw_channels},
$CFG->{audio_hw_chunksize};
if ($SDL_MIXER) {
- dc::Mix_AllocateChannels $CFG->{audio_mix_channels};
+ DC::Mix_AllocateChannels $CFG->{audio_mix_channels};
audio_music_finished;
} else {
@@ -461,7 +463,7 @@
%AUDIO_PLAY = ();
%AUDIO_CHUNK = ();
- dc::Mix_CloseAudio if $SDL_MIXER;
+ DC::Mix_CloseAudio if $SDL_MIXER;
undef $SDL_MIXER;
}
@@ -491,22 +493,22 @@
}
}
- $conn->{query_dialog} = my $dialog = new dc::UI::Toplevel
+ $conn->{query_dialog} = my $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
title => "Server Query",
- child => my $vbox = new dc::UI::VBox,
+ child => my $vbox = new DC::UI::VBox,
;
- my @dialog = my $label = new dc::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 dc::UI::HBox;
+ push @dialog, my $hbox = new DC::UI::HBox;
- $hbox->add (new dc::UI::Button
+ $hbox->add (new DC::UI::Button
text => "No",
on_activate => sub {
$conn->send ("reply n");
@@ -514,7 +516,7 @@
0
}
);
- $hbox->add (new dc::UI::Button
+ $hbox->add (new DC::UI::Button
text => "Yes",
on_activate => sub {
$conn->send ("reply y");
@@ -529,14 +531,14 @@
if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
$dialog->{tooltip} = "#charcreation_focus";
- unshift @dialog, new dc::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 dc::UI::Table;
+ unshift @dialog, my $table = new DC::UI::Table;
- $table->add_at (0, 0, new dc::UI::Button
+ $table->add_at (0, 0, new DC::UI::Button
text => "Next Race",
on_activate => sub {
$conn->send ("reply n");
@@ -544,7 +546,7 @@
0
},
);
- $table->add_at (2, 0, new dc::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply d");
@@ -554,14 +556,14 @@
);
if ($conn->{chargen_race_description}) {
- unshift @dialog, new dc::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.8,
ellipsise => 0,
markup => "$conn->{chargen_race_description}",
;
}
- unshift @dialog, new dc::UI::Face
+ unshift @dialog, new DC::UI::Face
face => $conn->{player}{face},
bg => [.2, .2, .2, 1],
min_w => 64,
@@ -569,17 +571,17 @@
;
if ($conn->{chargen_race_title}) {
- unshift @dialog, new dc::UI::Label
+ unshift @dialog, new DC::UI::Label
allign => 1,
ellipsise => 0,
markup => "Race: $conn->{chargen_race_title}",
;
}
- unshift @dialog, new dc::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup => (dc::Pod::section_label ui => "chargen_race"),
+ markup => (DC::Pod::section_label ui => "chargen_race"),
;
} elsif ($prompt =~ /roll new stats/) {
@@ -589,15 +591,15 @@
return;
}
- unshift @dialog, new dc::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 dc::UI::Table;
+ unshift @dialog, my $table = new DC::UI::Table;
# left: re-roll
- $table->add_at (0, 0, new dc::UI::Button
+ $table->add_at (0, 0, new DC::UI::Button
text => "Roll Again",
on_activate => sub {
$conn->send ("reply y");
@@ -607,7 +609,7 @@
);
# center: swap stats
- my ($sw1, $sw2) = map +(new dc::UI::Selector
+ my ($sw1, $sw2) = map +(new DC::UI::Selector
expand => 1,
value => $_,
options => [
@@ -621,7 +623,7 @@
],
), 1 .. 2;
- $table->add_at (2, 0, new dc::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Swap Stats",
on_activate => sub {
$conn->{stat_change_with} = $sw2->{value};
@@ -630,10 +632,10 @@
0
},
);
- $table->add_at (2, 1, new dc::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 dc::UI::Button
+ $table->add_at (4, 0, new DC::UI::Button
text => "Accept",
on_activate => sub {
$conn->send ("reply n");
@@ -643,7 +645,7 @@
},
);
- unshift @dialog, my $hbox = new dc::UI::HBox;
+ unshift @dialog, my $hbox = new DC::UI::HBox;
for (
[Str => CS_STAT_STR],
[Dex => CS_STAT_DEX],
@@ -654,9 +656,8 @@
[Cha => CS_STAT_CHA],
) {
my ($name, $id) = @$_;
- $hbox->add (new dc::UI::Label
+ $hbox->add (new DC::UI::Label
markup => "$conn->{stat}{$id} $name",
- align => 0,
expand => 1,
can_events => 1,
can_hover => 1,
@@ -664,14 +665,14 @@
);
}
- unshift @dialog, new dc::UI::Label
+ unshift @dialog, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
- markup => (dc::Pod::section_label ui => "chargen_stats"),
+ markup => (DC::Pod::section_label ui => "chargen_stats"),
;
}
- push @dialog, my $entry = new dc::UI::Entry
+ push @dialog, my $entry = new DC::UI::Entry
on_changed => sub {
$conn->send ("reply $_[1]");
destroy_query_dialog $conn;
@@ -684,7 +685,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 dc::UI::Entry
+ push @dialog, my $entry = new DC::UI::Entry
$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
on_activate => sub {
$conn->send ("reply $_[1]");
@@ -710,10 +711,10 @@
my ($host, $port) = split /:/, $PROFILE->{host};
- $MAP = new dc::Map;
+ $MAP = new DC::Map;
$CONN = eval {
- new dc::Protocol
+ new DC::Protocol
host => $host,
port => $port || 13327,
user => $PROFILE->{user},
@@ -721,7 +722,7 @@
mapw => $mapsize,
maph => $mapsize,
- client => "cfplus $dc::VERSION $] $^O",
+ client => "cfplus $DC::VERSION $] $^O",
map_widget => $MAPWIDGET,
statusbox => $STATUSBOX,
@@ -735,7 +736,7 @@
};
if ($CONN) {
- dc::lowdelay fileno $CONN->{fh};
+ DC::lowdelay fileno $CONN->{fh};
status "login successful";
} else {
@@ -750,7 +751,7 @@
$SETUP_DIALOG->show;
$PL_WINDOW->hide;
$SPELL_LIST->clear_spells;
- $dc::UI::ROOT->emit (stop_game => ! ! $CONN);
+ $DC::UI::ROOT->emit (stop_game => ! ! $CONN);
&audio_music_set_ambient ([]);
@@ -766,29 +767,29 @@
}
sub graphics_setup {
- my $vbox = new dc::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (my $table = new dc::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 dc::UI::Label valign => 0, align => 1, text => "OpenGL Info");
- $table->add_at (1, $row++, new dc::UI::Label valign => 0, fontsize => 0.8, text => dc::OpenGL::gl_vendor . ", " . dc::OpenGL::gl_version,
+ $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) . "");
+ 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 valign => 0, align => 1, text => "Video Mode");
- $table->add_at (1, $row++, my $hbox = new dc::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 dc::UI::Slider
+ $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
- 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 {
@@ -799,17 +800,17 @@
});
$mode_slider->emit (changed => $mode_slider->{range}[0]);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fullscreen");
- $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new dc::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 dc::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
- $table->add_at (1, $row++, new dc::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, "
@@ -818,8 +819,8 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Compress Textures");
- $table->add_at (1, $row++, new dc::UI::CheckBox
+ $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 "
@@ -828,22 +829,22 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
- $table->add_at (1, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
- $table->add_at (1, $row++, new dc::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 dc::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 ();
@@ -852,15 +853,15 @@
}
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Map Scale");
- $table->add_at (1, $row++, new dc::UI::Slider
+ $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 valign => 0, align => 1, text => "Map Smoothing");
- $table->add_at (1, $row++, new dc::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. "
@@ -868,30 +869,30 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Fog of War");
- $table->add_at (1, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "FoW Intensity");
- $table->add_at (1, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Message Fontsize");
- $table->add_at (1, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
- $table->add_at (1, $row++, new dc::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 {
@@ -901,8 +902,8 @@
}
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Gauge size");
- $table->add_at (1, $row++, new dc::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 {
@@ -919,7 +920,7 @@
our $AUDIO_INFO;
sub audio_tab_update {
- my ($freq, $format, $chans) = dc::Mix_QuerySpec;
+ my ($freq, $format, $chans) = DC::Mix_QuerySpec;
$AUDIO_HW_CHUNKSIZE->set_options ([
[0, "default", "Use System Default"],
@@ -939,21 +940,21 @@
}
sub audio_setup {
- my $vbox = new dc::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (my $table = new dc::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 dc::UI::Label valign => 0, align => 1, text => "Audio Enable");
- $table->add_at (1, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Sound Effects");
- $table->add_at (1, $row, new dc::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 {
@@ -962,15 +963,15 @@
1
}
);
- $table->add_at (2, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Background Music");
- $table->add_at (1, $row, new dc::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 {
@@ -980,14 +981,14 @@
1
}
);
- $table->add_at (2, $row++, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Frequency");
- $table->add_at (1, $row++, new dc::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 => [
@@ -1005,8 +1006,8 @@
}
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Channels");
- $table->add_at (1, $row++, new dc::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 => [
@@ -1024,8 +1025,8 @@
}
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Latency");
- $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new dc::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 "
@@ -1038,8 +1039,8 @@
);
# should really be a slider
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Mixer Voices");
- $table->add_at (1, $row++, new dc::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],
@@ -1053,8 +1054,8 @@
}
);
- $table->add_at (1, $row++, new dc::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 ();
@@ -1063,10 +1064,10 @@
}
);
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
expand => 1,
label => "Audio Info",
- child => ($AUDIO_INFO = new dc::UI::Label ellipsise => 0),
+ child => ($AUDIO_INFO = new DC::UI::Label ellipsise => 0),
);
audio_tab_update;
@@ -1083,41 +1084,41 @@
sub make_gauge_window {
my $gh = int $HEIGHT * $CFG->{gauge_size};
- my $win = new dc::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 dc::UI::HBox
+ $win->add (my $hbox = new DC::UI::HBox
children => [
- (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)),
+ (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 dc::UI::VBox),
+ (my $vbox = new DC::UI::VBox),
],
);
- $vbox->add (new dc::UI::HBox
+ $vbox->add (new DC::UI::HBox
expand => 1,
children => [
- (new dc::UI::Empty expand => 1),
- (my $hb = new dc::UI::HBox),
+ (new DC::UI::Empty expand => 1),
+ (my $hb = new DC::UI::HBox),
],
);
- $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 valign => 0, 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 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,
@@ -1131,28 +1132,28 @@
}
sub debug_setup {
- my $table = new dc::UI::Table;
+ my $table = new DC::UI::Table;
- $table->add_at (0, 0, new dc::UI::Label text => "Widget Borders");
- $table->add_at (1, 0, new dc::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
- $table->add_at (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");#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 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);
- $t->add_at (1,2, new dc::UI::Label text => "c c 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);
- $t->add_at (1,1, new dc::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 dc::UI::Canvas);
+ $table->add_at (7, 6, my $c = new DC::UI::Canvas);
$c->add_items ({
type => "line_loop",
@@ -1182,37 +1183,37 @@
}
sub stats_window {
- my $r = new dc::UI::ScrolledWindow (
+ my $r = new DC::UI::ScrolledWindow (
expand => 1,
scroll_y => 1
);
- $r->add (my $vb = new dc::UI::VBox);
+ $r->add (my $vb = new DC::UI::VBox);
- $vb->add (new dc::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Player",
- child => (my $pi = new dc::UI::VBox),
+ child => (my $pi = new DC::UI::VBox),
);
- $pi->add ($STATWIDS->{title} = new dc::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 dc::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 dc::UI::HBox);
- $hb0->add ($STATWIDS->{weight} = new dc::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 dc::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 dc::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Primary/Secondary Statistics",
- child => (my $hb = new dc::UI::HBox expand => 1),
+ child => (my $hb = new DC::UI::HBox expand => 1),
);
- $hb->add (my $tbl = new dc::UI::Table expand => 1);
+ $hb->add (my $tbl = new DC::UI::Table expand => 1);
my $color2 = [1, 1, 0];
@@ -1234,17 +1235,17 @@
) {
my ($col, $row, $id, $label, $template) = @$_;
- $tbl->add_at ($col , $row, $STATWIDS->{$id} = new dc::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 dc::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 dc::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Resistancies",
- child => (my $tbl2 = new dc::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;
@@ -1293,27 +1294,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 dc::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 dc::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 dc::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],
@@ -1321,7 +1322,7 @@
$row++;
if ($row % 6 == 0) {
- $col += 3;
+ $col += 4;
$row = 0;
}
}
@@ -1332,9 +1333,9 @@
}
sub skill_window {
- my $sw = new dc::UI::ScrolledWindow (expand => 1);
+ my $sw = new DC::UI::ScrolledWindow (expand => 1);
- $sw->add ($STATWIDS->{skill_tbl} = new dc::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
}
@@ -1356,14 +1357,14 @@
my $table = $METASERVER->{table};
$table->clear;
- $table->add_at (0, 0, my $label = new dc::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;
- dc::background {
- my $ua = dc::lwp_useragent;
+ DC::background {
+ my $ua = DC::lwp_useragent;
- dc::background_msg dc::decode_json +(dc::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) {
@@ -1376,13 +1377,12 @@
"Short information about this server provided by its admins.",
);
my @col = qw(#Users Host Uptime Version Description);
- $table->add_at ($_, 0, new dc::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} }) {
@@ -1408,8 +1408,8 @@
$y++;
- $table->add_at (scalar @$m, $y, new dc::UI::VBox children => [
- (new dc::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 {
@@ -1418,10 +1418,10 @@
0
},
),
- (new dc::UI::Empty expand => 1),
+ (new DC::UI::Empty expand => 1),
]);
- $table->add_at ($_, $y, new dc::UI::Label
+ $table->add_at ($_, $y, new DC::UI::Label
max_w => $::WIDTH * 0.4,
ellipsise => 0,
align => $align[$_],
@@ -1441,11 +1441,11 @@
}
sub metaserver_dialog {
- my $vbox = new dc::UI::VBox;
- my $table = new dc::UI::Table;
- $vbox->add (new dc::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 dc::UI::Toplevel
+ my $dialog = new DC::UI::Toplevel
title => "Server List",
name => 'metaserver_dialog',
x => 'center',
@@ -1466,31 +1466,30 @@
}
sub login_setup {
- my $vbox = new dc::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Login Settings",
- child => (my $table = new dc::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 dc::UI::Label valign => 0, align => 1, text => "Username");
- $table->add_at (1, 4, new dc::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 dc::UI::Label valign => 0, align => 1, text => "Password");
- $table->add_at (1, 5, new dc::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 dc::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 {
@@ -1500,10 +1499,10 @@
},
);
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Registering",
min_h => 200,
- child => (new dc::UI::Label valign => -1, ellipsise => 0,
+ 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 "
. "try to log-in. Follow the instructions in the Log tab in the message window.",
@@ -1514,21 +1513,21 @@
}
sub server_setup {
- my $vbox = new dc::UI::VBox;
+ my $vbox = new DC::UI::VBox;
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Connection Settings",
- child => (my $table = new dc::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 dc::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 dc::UI::VBox);
+ $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
$vbox->add (
- $HOST_ENTRY = new dc::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",
@@ -1540,7 +1539,7 @@
);
if (0) { #d# disabled
- $vbox->add (new dc::UI::Button
+ $vbox->add (new DC::UI::Button
expand => 1,
text => "Server List",
other => $METASERVER,
@@ -1551,8 +1550,8 @@
}#d#
}
- $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Map Size");
- $table->add_at (1, $row, new dc::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. "
@@ -1562,8 +1561,8 @@
on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
);
- $table->add_at (0, ++$row, new dc::UI::Label valign => 0, align => 1, text => "Output-Rate");
- $table->add_at (1, $row, new dc::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 "
@@ -1572,21 +1571,21 @@
on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
);
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Server Info",
- child => ($SERVER_INFO = new dc::UI::Label ellipsise => 0),
+ child => ($SERVER_INFO = new DC::UI::Label ellipsise => 0),
);
$vbox
}
sub client_setup {
- my $table = new dc::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 dc::UI::Label valign => 0, align => 1, text => "Tip of the day");
- $table->add_at (1, $row++, new dc::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 {
@@ -1596,15 +1595,15 @@
}
);
- $table->add_at (0, $row, new dc::UI::Label valign => 0, align => 1, text => "Messages Window Size");
- $table->add_at (1, $row++, my $saycmd = new dc::UI::Entry
+ $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Messages 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 "
. "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_para ($CFG->{logview_max_par} = $value*1);
0
},
);
@@ -1613,11 +1612,11 @@
}
sub autopickup_setup {
- my $r = new dc::UI::ScrolledWindow (
+ my $r = new DC::UI::ScrolledWindow (
expand => 1,
scroll_y => 1
);
- $r->add (my $table = new dc::UI::Table
+ $r->add (my $table = new DC::UI::Table
row_expand => [0],
col_expand => [0, 1, 0, 1],
);
@@ -1665,14 +1664,14 @@
)
{
my ($title, $x, $y, @bits) = @$_;
- $table->add_at ($x, $y, new dc::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 dc::UI::Label text => $_->[0], align => 1, expand => 1);
- $table->add_at ($x+1, $y, my $checkbox = new dc::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) = @_;
@@ -1693,7 +1692,7 @@
}
}
- $table->add_at (2, 18, new dc::UI::ValSlider
+ $table->add_at (2, 18, new DC::UI::ValSlider
range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
template => ">= 99",
to_value => sub { ">= " . 5 * $_[0] },
@@ -1706,7 +1705,7 @@
1;
});
- $table->add_at (3, 18, new dc::UI::Button
+ $table->add_at (3, 18, new DC::UI::Button
text => "set",
on_activate => sub {
$::CONN->send_command ("pickup $::CFG->{pickup}")
@@ -1737,16 +1736,16 @@
);
sub inventory_widget {
- my $hb = new dc::UI::HBox homogeneous => 1;
+ my $hb = new DC::UI::HBox homogeneous => 1;
- $hb->add (my $vb1 = new dc::UI::VBox);
- $vb1->add (new dc::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 dc::UI::HBox);
+ $vb1->add (my $hb1 = new DC::UI::HBox);
use sort 'stable';
- $hb1->add (new dc::UI::Selector
+ $hb1->add (new DC::UI::Selector
value => $::CFG->{inv_sort},
options => [
[type => "Type/Name"],
@@ -1758,40 +1757,40 @@
$INV->set_sort_order ($SORT_ORDER{$_[1]});
},
);
- $hb1->add (new dc::UI::Label text => "Weight: ", align => 1, expand => 1);
+ $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
#TODO# update to weigh/maxweight
- $hb1->add ($STATWIDS->{i_weight} = new dc::UI::Label align => -1);
+ $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
- $vb1->add (my $sw1 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw1->add ($INV = new dc::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 dc::UI::VBox);
+ $hb->add (my $vb2 = new DC::UI::VBox);
- $vb2->add ($INVR_HB = new dc::UI::HBox);
+ $vb2->add ($INVR_HB = new DC::UI::HBox);
- $vb2->add (my $sw2 = new dc::UI::ScrolledWindow expand => 1, scroll_y => 1);
- $sw2->add ($INVR = new dc::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
- dc::Protocol::set_opencont ($::CONN, 0, "Floor");
+ DC::Protocol::set_opencont ($::CONN, 0, "Floor");
$hb
}
sub media_window {
- my $vb = new dc::UI::VBox;
+ my $vb = new DC::UI::VBox;
- $vb->add (new dc::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Currently playing music",
- child => new dc::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
- child => ($MUSIC_PLAYING_WIDGET = new dc::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 dc::UI::FancyFrame
+ $vb->add (new DC::UI::FancyFrame
label => "Other media used in this session",
expand => 1,
- child => ($LICENSE_WIDGET = new dc::UI::TextScroller
+ child => ($LICENSE_WIDGET = new DC::UI::TextScroller
expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
);
@@ -1810,10 +1809,10 @@
$LICENSE_WIDGET->add_paragraph ({
fg => [1, 1, 1, 1],
markup => ""
- . "Name: " . (dc::asxml $meta->{name}) . "\n"
- . "Author: " . (dc::asxml $meta->{author}) . "\n"
- . "Source: " . (dc::asxml $meta->{source}) . "\n"
- . "License: " . (dc::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;
@@ -1831,7 +1830,7 @@
}
sub player_window {
- my $plwin = $PL_WINDOW = new dc::UI::Toplevel
+ my $plwin = $PL_WINDOW = new DC::UI::Toplevel
x => "center",
y => "center",
force_w => $WIDTH * 9/10,
@@ -1843,7 +1842,7 @@
my $ntb =
$PL_NOTEBOOK =
- new dc::UI::Notebook expand => 1;
+ new DC::UI::Notebook expand => 1;
$ntb->add_tab (
"Statistics (F2)" => $STATS_PAGE = stats_window,
@@ -1854,8 +1853,8 @@
"Shows all your Skills."
);
- my $spellsw = $SPELL_PAGE = new dc::UI::ScrolledWindow (expand => 1, scroll_y => 1);
- $spellsw->add ($SPELL_LIST = new dc::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."
@@ -1878,11 +1877,11 @@
}
sub keyboard_setup {
- dc::Macro::keyboard_setup
+ DC::Macro::keyboard_setup
}
sub help_window {
- my $win = new dc::UI::Toplevel
+ my $win = new DC::UI::Toplevel
x => 'center',
y => 'center',
z => 4,
@@ -1892,13 +1891,13 @@
title => "Help Browser",
has_close_button => 1;
- $win->add (my $vbox = new dc::UI::VBox);
+ $win->add (my $vbox = new DC::UI::VBox);
- $vbox->add (new dc::UI::FancyFrame
+ $vbox->add (new DC::UI::FancyFrame
label => "Navigation",
- child => (my $buttons = new dc::UI::HBox),
+ child => (my $buttons = new DC::UI::HBox),
);
- $vbox->add (my $viewer = new dc::UI::TextScroller
+ $vbox->add (my $viewer = new DC::UI::TextScroller
expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
my @history;
@@ -1910,7 +1909,7 @@
$buttons->clear;
- $buttons->add (new dc::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⇤",
tooltip => "back to the starting page",
on_activate => sub {
@@ -1922,9 +1921,9 @@
);
if (@history) {
- $buttons->add (new dc::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⋘",
- tooltip => "back to " . (dc::asxml dc::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});
@@ -1933,9 +1932,9 @@
}
if (@future) {
- $buttons->add (new dc::UI::Button
+ $buttons->add (new DC::UI::Button
text => "⋙",
- tooltip => "forward to " . (dc::asxml dc::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});
@@ -1943,40 +1942,40 @@
);
}
- $buttons->add (new dc::UI::Label text => " ");
+ $buttons->add (new DC::UI::Label text => " ");
- my @path = dc::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 dc::UI::Button
+ $buttons->add (new DC::UI::Button
text => $node->{kw}[0],
- tooltip => "go to " . (dc::asxml dc::Pod::full_path $node) . "",
+ 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 dc::UI::Label text => "/");
+ $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->{kw}[0], padding_x => 4, padding_y => 4);
$curnode = $node;
$viewer->clear;
- $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $curnode);
+ $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $curnode);
$viewer->scroll_to ($para);
};
- $load_node->(dc::Pod::find pod => "mainpage");
+ $load_node->(DC::Pod::find pod => "mainpage");
- $dc::Pod::goto_document = sub {
+ $DC::Pod::goto_document = sub {
my (@path) = @_;
push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
- $load_node->((dc::Pod::find @path)[0]);
+ $load_node->((DC::Pod::find @path)[0]);
$win->show;
};
@@ -1985,7 +1984,7 @@
sub open_string_query {
my ($title, $cb, $txt, $tooltip) = @_;
- my $dialog = new dc::UI::Toplevel
+ my $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
z => 50,
@@ -1993,7 +1992,7 @@
title => $title;
$dialog->add (
- my $e = new dc::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
@@ -2006,7 +2005,7 @@
sub open_quit_dialog {
unless ($QUIT_DIALOG) {
- $QUIT_DIALOG = new dc::UI::Toplevel
+ $QUIT_DIALOG = new DC::UI::Toplevel
x => "center",
y => "center",
z => 50,
@@ -2017,20 +2016,20 @@
}
;
- $QUIT_DIALOG->add (my $vb = new dc::UI::VBox expand => 1);
+ $QUIT_DIALOG->add (my $vb = new DC::UI::VBox expand => 1);
- $vb->add (new dc::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 dc::UI::HBox expand => 1);
- $hb->add (new dc::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 dc::UI::Button
+ $hb->add (new DC::UI::Button
text => "Quit anyway",
expand => 1,
on_activate => sub { EV::unloop EV::UNLOOP_ALL },
@@ -2043,12 +2042,12 @@
sub show_tip_of_the_day {
# find all tips
- my @tod = dc::Pod::find tip_of_the_day => "*";
+ my @tod = DC::Pod::find tip_of_the_day => "*";
- dc::DB::get state => "tip_of_the_day", sub {
+ DC::DB::get state => "tip_of_the_day", sub {
my ($todindex) = @_;
$todindex = 0 if $todindex >= @tod;
- dc::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;
@@ -2057,7 +2056,7 @@
$dialog->destroy;
};
- $dialog = new dc::UI::Toplevel
+ $dialog = new DC::UI::Toplevel
x => "center",
y => "center",
z => 3,
@@ -2065,24 +2064,24 @@
force_w => int $WIDTH * 4/9,
force_h => int $WIDTH * 2/9,
title => "Tip of the day #" . (1 + $todindex),
- child => my $vbox = new dc::UI::VBox,
+ child => my $vbox = new DC::UI::VBox,
has_close_button => 1,
on_delete => $close,
;
- $vbox->add (my $viewer = new dc::UI::TextScroller
+ $vbox->add (my $viewer = new DC::UI::TextScroller
expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
- $viewer->add_paragraph (dc::Pod::as_paragraphs dc::Pod::section_of $tod[$todindex]);
+ $viewer->add_paragraph (DC::Pod::as_paragraphs DC::Pod::section_of $tod[$todindex]);
- $vbox->add (my $table = new dc::UI::Table col_expand => [0, 1]);
+ $vbox->add (my $table = new DC::UI::Table col_expand => [0, 1]);
- $table->add_at (0, 0, new dc::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 dc::UI::Button
+ $table->add_at (2, 0, new DC::UI::Button
text => "Next",
tooltip => "Show the next Tip of the day.",
on_activate => sub {
@@ -2096,7 +2095,7 @@
}
sub sdl_init {
- dc::SDL_Init
+ DC::SDL_Init
and die "SDL::Init failed!\n";
}
@@ -2109,31 +2108,31 @@
$FULLSCREEN = $CFG->{fullscreen};
$FAST = $CFG->{fast};
- dc::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
- or die "SDL_SetVideoMode failed: " . (dc::SDL_GetError) . "\n";
+ 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;
- dc::OpenGL::init;
- dc::Macro::init;
+ DC::OpenGL::init;
+ DC::Macro::init;
$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
- $dc::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
+ $DC::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
#############################################################################
if ($DEBUG_STATUS) {
- dc::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
+ DC::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
} else {
# create/configure the widgets
- $dc::UI::ROOT->connect (key_down => sub {
+ $DC::UI::ROOT->connect (key_down => sub {
my (undef, $ev) = @_;
- if (my @macros = dc::Macro::find $ev) {
- dc::Macro::execute $_ for @macros;
+ if (my @macros = DC::Macro::find $ev) {
+ DC::Macro::execute $_ for @macros;
return 1;
}
@@ -2141,51 +2140,51 @@
0
});
- $DEBUG_STATUS = new dc::UI::Label
+ $DEBUG_STATUS = new DC::UI::Label
padding => 0,
z => 100,
force_x => "max",
force_y => 0;
$DEBUG_STATUS->show;
- $STATUSBOX = new dc::UI::Statusbox;
+ $STATUSBOX = new DC::UI::Statusbox;
$STATUSBOX->add ("Use Alt-Enter to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
- (new dc::UI::Frame
+ (new DC::UI::Frame
bg => [0, 0, 0, 0.4],
force_x => 0,
force_y => "max",
child => $STATUSBOX,
)->show;
- dc::UI::Toplevel->new (
+ 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 dc::MapWidget::MapMap
+ child => ($MAPMAP = new DC::MapWidget::MapMap
tooltip => "Map. On servers that support this feature, this will display an overview of the surrounding areas.",
),
)->show;
- $MAPWIDGET = new dc::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 dc::MapWidget::Command::
+ $COMPLETER = new DC::MapWidget::Command::
command => { },
tooltip => "#completer_help",
;
- $SETUP_DIALOG = new dc::UI::Toplevel
+ $SETUP_DIALOG = new DC::UI::Toplevel
title => "Setup",
name => "setup_dialog",
x => 'center',
@@ -2197,10 +2196,11 @@
;
$METASERVER = metaserver_dialog;
- $MESSAGE_WINDOW = new dc::UI::MessageWindow;
+ $MESSAGE_WINDOW = new DC::UI::Dockbar;
+ $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
- $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new dc::UI::Notebook expand => 1, debug => 1,
- filter => new dc::UI::ScrolledWindow expand => 1, scroll_y => 1);
+ $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, debug => 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.");
@@ -2222,35 +2222,35 @@
$SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
"Some debuggin' options. Do not ask.");
- $BUTTONBAR = new dc::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
+ $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
- $BUTTONBAR->add (new dc::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 dc::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
+ $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
tooltip => "Toggles the server message log, where the client collects all messages from the server.");
make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
- $BUTTONBAR->add (new dc::UI::Flopper text => "Playerbook", other => player_window,
+ $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
- $BUTTONBAR->add (new dc::UI::Button
+ $BUTTONBAR->add (new DC::UI::Button
text => "Save Config",
tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
on_activate => sub {
- $::CFG->{layout} = dc::UI::get_layout;
- dc::write_cfg "$Deliantra::VARDIR/client.cf";
+ $::CFG->{layout} = DC::UI::get_layout;
+ DC::write_cfg "$Deliantra::VARDIR/client.cf";
status "Configuration Saved";
0
},
);
- $BUTTONBAR->add (new dc::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 dc::UI::Button
+ $BUTTONBAR->add (new DC::UI::Button
text => "Quit",
tooltip => "Terminates the program",
on_activate => sub {
@@ -2272,7 +2272,7 @@
}
sub video_shutdown {
- dc::OpenGL::shutdown;
+ DC::OpenGL::shutdown;
undef $SDL_ACTIVE;
}
@@ -2291,18 +2291,18 @@
undef $WANT_REFRESH;
$_[0]->stop;
- $dc::UI::ROOT->draw;
- dc::SDL_GL_SwapBuffers;
+ $DC::UI::ROOT->draw;
+ DC::SDL_GL_SwapBuffers;
$LAST_REFRESH = $NOW;
}
-my $want_refresh = EV::idle_ns \&force_refresh;
+my $want_refresh = EV::prepare_ns \&force_refresh;
-my $input = EV::periodic 0, 1/60, undef, 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 dc::poll_events;
+ for DC::poll_events;
if (%animate_object) {
$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
@@ -2324,37 +2324,37 @@
}
%SDL_CB = (
- dc::SDL_QUIT => sub {
+ DC::SDL_QUIT => sub {
EV::unloop EV::UNLOOP_ALL;
},
- dc::SDL_VIDEORESIZE => sub {
+ DC::SDL_VIDEORESIZE => sub {
},
- dc::SDL_VIDEOEXPOSE => sub {
- dc::UI::full_refresh;
+ DC::SDL_VIDEOEXPOSE => sub {
+ DC::UI::full_refresh;
},
- dc::SDL_ACTIVEEVENT => sub {
+ 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;
+# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
+# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
+# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
+# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
+# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
},
- dc::SDL_KEYDOWN => sub {
- if ($_[0]{mod} & dc::KMOD_ALT && $_[0]{sym} == 13) {
+ DC::SDL_KEYDOWN => sub {
+ if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
# alt-enter
$FULLSCREEN_ENABLE->toggle;
video_shutdown;
video_init;
} else {
- dc::UI::feed_sdl_key_down_event ($_[0]);
+ DC::UI::feed_sdl_key_down_event ($_[0]);
}
},
- 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,
- dc::SDL_USEREVENT => sub {
+ 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,
+ DC::SDL_USEREVENT => sub {
if ($_[0]{code} == 1) {
audio_channel_finished $_[0]{data1};
} elsif ($_[0]{code} == 0) {
@@ -2372,16 +2372,16 @@
{
if (-e "$Deliantra::VARDIR/client.cf") {
- dc::read_cfg "$Deliantra::VARDIR/client.cf";
+ DC::read_cfg "$Deliantra::VARDIR/client.cf";
} else {
#TODO: compatibility cruft
- dc::read_cfg "$Deliantra::OLDDIR/cfplusrc";
+ DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
print STDERR "INFO: used old configuratrion file\n";
}
- dc::DB::Server::run;
+ DC::DB::Server::run;
- dc::UI::set_layout ($::CFG->{layout});
+ DC::UI::set_layout ($::CFG->{layout});
my %DEF_CFG = (
sdl_mode => 0,
@@ -2437,16 +2437,16 @@
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)";
+ @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)";
@SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
{
- my @fonts = map dc::find_rcfile "fonts/$_", qw(
+ my @fonts = map DC::find_rcfile "fonts/$_", qw(
DejaVuSans.ttf
DejaVuSansMono.ttf
DejaVuSans-Bold.ttf
@@ -2457,12 +2457,12 @@
DejaVuSansMono-BoldOblique.ttf
);
- dc::add_font $_ for @fonts;
+ DC::add_font $_ for @fonts;
- dc::pango_init;
+ DC::pango_init;
- $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;
}
@@ -2472,7 +2472,7 @@
# for my $rgba (0..1) {
# my $t1 = Time::HiRes::time;
# for (1..1000) {
-# my $layout = dc::Layout->new ($rgba);
+# my $layout = DC::Layout->new ($rgba);
# $layout->set_text ("hallo" x 100);
# $layout->render;
# }
@@ -2495,9 +2495,9 @@
#video_shutdown;
#audio_shutdown;
-dc::OpenGL::quit;
-dc::SDL_Quit;
-dc::DB::Server::stop;
+DC::OpenGL::quit;
+DC::SDL_Quit;
+DC::DB::Server::stop;
=head1 NAME