--- deliantra/Deliantra-Client/DC/MapWidget.pm 2007/07/27 18:04:42 1.115
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2007/12/26 20:46:39 1.125
@@ -1,19 +1,19 @@
-package CFPlus::MapWidget;
+package dc::MapWidget;
use strict;
use utf8;
use List::Util qw(min max);
-use CFPlus;
-use CFPlus::OpenGL;
-use CFPlus::UI;
-use CFPlus::Macro;
+use dc;
+use dc::OpenGL;
+use dc::UI;
+use dc::Macro;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = dc::UI::Base::;
my $magicmap_tex =
- new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
+ new_from_file dc::Texture dc::find_rcfile "magicmap.png",
mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
sub new {
@@ -26,11 +26,6 @@
@_
);
- $self->{completer} = new CFPlus::MapWidget::Command::
- command => $self->{command},
- tooltip => "#completer_help",
- ;
-
$self
}
@@ -49,16 +44,16 @@
$tooltip = "$data\n\n$tooltip";
$tooltip =~ s/\s+$//;
- $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
+ $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
}
sub clr_commands {
my ($self) = @_;
- %{$self->{completer}{command}} = ();
+ %{$::COMPLETER->{command}} = ();
- $self->{completer}->hide
- if $self->{completer};
+ $::COMPLETER->hide
+ if $::COMPLETER;
}
sub server_login {
@@ -73,24 +68,24 @@
my $editsup = $::CONN && $::CONN->{editor_support}
or return;
- CFPlus::background {
+ dc::background {
print "preparing editor startup...\n";
my $server = $editsup->{gameserver} || "default";
$server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
- local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
- local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
+ local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
+ local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
print "map directory is $mapdir\n";
print "lib directory is $libdir\n";
- my $ua = CFPlus::lwp_useragent;
+ my $ua = dc::lwp_useragent;
for my $file (qw(archetypes crossfire.0)) {
my $url = "$editsup->{lib_root}$file";
print "mirroring $url...\n";
- CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
+ dc::lwp_check $ua->mirror ($url, "$libdir/$file");
printf "%s size %d octets\n", $file, -s "$libdir/$file";
}
@@ -105,14 +100,14 @@
# try to get the most recent head revision, what a hack,
# this should have been returned while downloading *sigh*
- my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
+ my $log = (dc::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
if ($log =~ /\?rev=(\d+\.\d+)"/) {
my $rev = $1;
print "downloading revision $rev...\n";
- my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+ my $map = (dc::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
my $meta = {
%$editsup,
@@ -127,7 +122,7 @@
File::Path::mkpath (File::Basename::dirname ($mappath));
open my $fh, ">:raw:perlio", "$mappath.meta"
or die "$mappath.meta: $!\n";
- print $fh CFPlus::to_json $meta;
+ print $fh dc::encode_json $meta;
close $fh;
open my $fh, ">:raw:perlio:utf8", $mappath
or die "$mappath: $!\n";
@@ -178,11 +173,11 @@
$self->grab_focus;
return unless $::CONN;
- my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
- my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
+ my $x = $self->{dx} + dc::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+ my $y = $self->{dy} + dc::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
- $x -= CFPlus::floor $::MAP->w * 0.5;
- $y -= CFPlus::floor $::MAP->h * 0.5;
+ $x -= dc::floor $::MAP->w * 0.5;
+ $y -= dc::floor $::MAP->h * 0.5;
if ($::CONN) {
$::CONN->lookat ($x, $y)
@@ -224,7 +219,7 @@
if ($::CONN && $::CONN->{editor_support}) {
push @items, [
- "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
+ "Edit this map (" . (dc::asxml $::CONN->{map_info}[0]) . ")",
\&editor_invoke,
];
@@ -235,7 +230,7 @@
or next;
push @items, [
- "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ "Login on $type server (" . (dc::asxml $server) . ")",
sub { server_login $server },
];
}
@@ -253,7 +248,7 @@
],
;
- (new CFPlus::UI::Menu
+ (new dc::UI::Menu
items => \@items,
)->popup ($ev);
}
@@ -285,8 +280,8 @@
my ($self) = @_;
(
- $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
- $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
+ $self->{tilesize} * dc::ceil $::WIDTH / $self->{tilesize},
+ $self->{tilesize} * dc::ceil $::HEIGHT / $self->{tilesize},
)
}
@@ -298,24 +293,24 @@
}
my %DIR = (
- ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
- ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
- ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
- ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
- ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
- ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
- ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
- ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
- ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
-
- ( "," . CFPlus::SDLK_UP ), [1, "north"],
- ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
- ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
- ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
- ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
- ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
- ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
- ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
+ ( "," . dc::SDLK_KP5 ), [0, "stay fire"],
+ ( "," . dc::SDLK_KP8 ), [1, "north"],
+ ( "," . dc::SDLK_KP9 ), [2, "northeast"],
+ ( "," . dc::SDLK_KP6 ), [3, "east"],
+ ( "," . dc::SDLK_KP3 ), [4, "southeast"],
+ ( "," . dc::SDLK_KP2 ), [5, "south"],
+ ( "," . dc::SDLK_KP1 ), [6, "southwest"],
+ ( "," . dc::SDLK_KP4 ), [7, "west"],
+ ( "," . dc::SDLK_KP7 ), [8, "northwest"],
+
+ ( "," . dc::SDLK_UP ), [1, "north"],
+ ("1," . dc::SDLK_UP ), [2, "northeast"],
+ ( "," . dc::SDLK_RIGHT), [3, "east"],
+ ("1," . dc::SDLK_RIGHT), [4, "southeast"],
+ ( "," . dc::SDLK_DOWN ), [5, "south"],
+ ("1," . dc::SDLK_DOWN ), [6, "southwest"],
+ ( "," . dc::SDLK_LEFT ), [7, "west"],
+ ("1," . dc::SDLK_LEFT ), [8, "northwest"],
);
sub invoke_key_down {
@@ -325,70 +320,26 @@
my $sym = $ev->{sym};
my $uni = $ev->{unicode};
- $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
+ $mod &= dc::KMOD_CTRL | dc::KMOD_ALT | dc::KMOD_SHIFT;
- if ($sym == 9) {
- ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
- $::HELP_WINDOW->toggle_visibility;
- } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
- ::toggle_player_page ($::STATS_PAGE);
- } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
- ::toggle_player_page ($::SKILL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
- ::toggle_player_page ($::SPELL_PAGE);
- } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
- ::toggle_player_page ($::INVENTORY_PAGE);
- } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
- $::SETUP_DIALOG->toggle_visibility;
- } elsif (!$::CONN) {
- return 0; # bindings further down need a valid connection
-
- } elsif ($uni == ord ",") {
- $::CONN->user_send ("take");
- } elsif ($uni == ord " ") {
- $::CONN->user_send ("apply");
- } elsif ($uni == 13) {
- $::CONN->user_send ("examine");
- } elsif ($uni == ord ".") {
- $::CONN->user_send ($self->{completer}{last_command})
- if exists $self->{completer}{last_command};
- } elsif (my @macros = CFPlus::Macro::match_event $ev) {
- $::CONN->macro_send ($_) for @macros;
- } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
- $::CONN->user_send ("rotateshoottype +");
- } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
- $::CONN->user_send ("rotateshoottype -");
- } elsif ($uni == ord '!') {
- $self->{completer}->set_prefix ("shout ");
- $self->{completer}->show;
- } elsif ($uni == ord '"') {
- $self->{completer}->set_prefix ("$::CFG->{say_command} ");
- $self->{completer}->show;
- } elsif ($uni == ord "'") {
- $self->{completer}->set_prefix ("");
- $self->{completer}->show;
- } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
- if ($mod & CFPlus::KMOD_SHIFT) {
+ if ($::CONN && (my $dir = $DIR{(!!($mod & dc::KMOD_ALT)) . ",$sym"})) {
+ if ($mod & dc::KMOD_SHIFT) {
$self->{shft}++;
if ($dir->[0] != $self->{fire_dir}) {
$::CONN->user_send ("fire $dir->[0]");
}
- $self->{fire_dir} = $DIR{$sym}[0];
- } elsif ($mod & CFPlus::KMOD_CTRL) {
+ $self->{fire_dir} = $dir->[0];
+ } elsif ($mod & dc::KMOD_CTRL) {
$self->{ctrl}++;
$::CONN->user_send ("run $dir->[0]");
} else {
$::CONN->user_send ("$dir->[1]");
}
- } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
- $self->{completer}->inject_key_down ($ev);
- $self->{completer}->show;
- } else {
- return 0;
+
+ return 1;
}
- 1
+ 0
}
sub invoke_key_up {
@@ -399,24 +350,25 @@
my $sym = $ev->{sym};
if ($::CFG->{shift_fire_stop}) {
- if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
+ if (!($mod & dc::KMOD_SHIFT) && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
} else {
- if (exists $DIR{$sym} && delete $self->{shft}) {
+ if (exists $DIR{(!!($mod & dc::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
- } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+ } elsif (($sym == dc::SDLK_LSHIFT || $sym == dc::SDLK_RSHIFT)
+ && delete $self->{shft}) { # XXX: is RSHIFT ok?
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
}
- if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
+ if (!($mod & dc::KMOD_CTRL ) && delete $self->{ctrl}) {
$::CONN->user_send ("run_stop");
$res = 1;
}
@@ -446,26 +398,26 @@
sub refresh_hook {
my ($self) = @_;
- if ($::MAP) {
+ if ($::MAP && $::CONN) {
if (delete $self->{need_update}) {
my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
- my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+ my $sw = $self->{sw} = 1 + dc::ceil $self->{w} / $tilesize;
+ my $sh = $self->{sh} = 1 + dc::ceil $self->{h} / $tilesize;
- my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+ my $sx = dc::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = dc::ceil $::CFG->{map_shift_y} / $tilesize;
my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
- my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
- my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+ my $dx = $self->{dx} = dc::ceil 0.5 * ($::MAP->w - $sw) - $sx;
+ my $dy = $self->{dy} = dc::ceil 0.5 * ($::MAP->h - $sh) - $sy;
if ($::CFG->{fow_enable}) {
my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
- $self->{fow_texture} = new CFPlus::Texture
+ $self->{fow_texture} = new dc::Texture
w => $w,
h => $h,
data => $data,
@@ -525,8 +477,8 @@
return unless $self->{list};
- my $focused = $CFPlus::UI::FOCUS == $self
- || $CFPlus::UI::FOCUS == $self->{completer}{entry};
+ my $focused = $dc::UI::FOCUS == $self
+ || $dc::UI::FOCUS == $::COMPLETER->{entry};
return
unless $focused || !$::FAST;
@@ -535,9 +487,9 @@
# TNT2 emulates logops in software (or worse :)
unless ($focused) {
- glColor 0.4, 0.2, 0.2, 0.6;
+ glColor_premultiply 0, 0, 1, 0.25;
glEnable GL_BLEND;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+ glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
glBegin GL_QUADS;
glVertex 0, 0;
glVertex 0, $::HEIGHT;
@@ -556,15 +508,15 @@
$self->SUPER::DESTROY;
}
-package CFPlus::MapWidget::MapMap;
+package dc::MapWidget::MapMap;
use strict;
use utf8;
-our @ISA = CFPlus::UI::Base::;
+our @ISA = dc::UI::Base::;
use Time::HiRes qw(time);
-use CFPlus::OpenGL;
+use dc::OpenGL;
sub size_request {
($::HEIGHT * 0.2, $::HEIGHT * 0.2)
@@ -599,11 +551,11 @@
$self->{texture_atime} = time + 1/3;
$self->{texture} =
- new CFPlus::Texture
+ new dc::Texture
w => $w,
h => $h,
data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
- type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ type => $dc::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
}
}
@@ -659,13 +611,13 @@
glDisable GL_BLEND;
}
-package CFPlus::MapWidget::Command;
+package dc::MapWidget::Command;
use strict;
-use CFPlus::OpenGL;
+use dc::OpenGL;
-our @ISA = CFPlus::UI::Frame::;
+our @ISA = dc::UI::Frame::;
sub new {
my $class = shift;
@@ -675,11 +627,11 @@
@_,
);
- $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+ $self->add ($self->{vbox} = new dc::UI::VBox);
$self->{label} = [
map
- CFPlus::UI::Label->new (
+ dc::UI::Label->new (
can_hover => 1,
can_events => 1,
tooltip_width => 0.33,
@@ -687,7 +639,7 @@
), (0.8) x 16
];
- $self->{entry} = new CFPlus::UI::Entry
+ $self->{entry} = new dc::UI::Entry
on_changed => sub {
$self->update_labels;
0
@@ -696,10 +648,10 @@
my ($entry, $ev, $x, $y) = @_;
if ($ev->{button} == 3) {
- (new CFPlus::UI::Menu
+ (new dc::UI::Menu
items => [
- ["bind " . (CFPlus::asxml $self->{select}) . " to a key"
- => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
+ ["bind " . (dc::asxml $self->{select}) . " to a key"
+ => sub { dc::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
],
)->popup ($ev);
return 1;
@@ -724,7 +676,7 @@
} elsif ($ev->{sym} == 27) {
$self->{hist_ptr} = 0;
$self->hide;
- } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
+ } elsif ($ev->{sym} == dc::SDLK_DOWN) {
if ($self->{hist_ptr} > 1) {
$self->{hist_ptr}--;
$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
@@ -736,7 +688,7 @@
if $self->{select_offset} < $#{ $self->{last_match} || [] };
}
$self->update_labels;
- } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
+ } elsif ($ev->{sym} == dc::SDLK_UP) {
if ($self->{select_offset}) {
--$self->{select_offset}
} else {
@@ -904,7 +856,7 @@
my ($self) = @_;
# hack
- local $CFPlus::UI::FOCUS = $self->{entry};
+ local $dc::UI::FOCUS = $self->{entry};
$self->SUPER::_draw;
}