--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/07/23 16:11:12 1.78
+++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/10/08 21:57:54 1.87
@@ -1,18 +1,18 @@
-package CFClient::MapWidget;
+package CFPlus::MapWidget;
use strict;
use utf8;
use List::Util qw(min max);
-use CFClient;
-use CFClient::OpenGL;
-use CFClient::UI;
+use CFPlus;
+use CFPlus::OpenGL;
+use CFPlus::UI;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
my $magicmap_tex =
- new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
+ new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
sub new {
@@ -32,16 +32,9 @@
@_
);
- $self->{completer} = new CFClient::MapWidget::Command::
+ $self->{completer} = new CFPlus::MapWidget::Command::
command => $self->{command},
- tooltip => "The Command Completer\n\n"
- . "This is your central interface to send text commands to the server. "
- . "To enter a verbatim command to send to the server, just type the command, "
- . "followed by a space, and press return. "
- . "Typing the initial letters of words (or just any letters) displays guesses "
- . "for commands you might want to use.\n"
- . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
- . "Right-Click opens a menu where you cna select further options, sich as redefining key bindings.",
+ tooltip => "#completer_help",
;
$self
@@ -68,6 +61,164 @@
if $self->{completer};
}
+sub server_login {
+ my ($server) = @_;
+
+ ::stop_game ();
+ local $::PROFILE->{host} = $server;
+ ::start_game ();
+}
+
+sub check_lwp($) {
+ my ($res) = @_;
+
+ $res->is_error
+ and die $res->status_line;
+
+ $res
+}
+
+sub editor_invoke {
+ my $editsup = $::CONN && $::CONN->{editor_support}
+ or return;
+
+ my ($pid, $fh);
+ unless ($pid = open $fh, "-|:utf8", "-") {
+ $SIG{__DIE__} = sub {
+ my $msg = $_[0];
+ $msg =~ s/\n+/\n/;
+ warn "FATAL: $msg";
+ CFPlus::_exit 99;
+ };
+
+ open STDERR, ">&STDOUT";
+ binmode STDOUT, ":utf8";
+ binmode STDERR, ":utf8";
+ close $fh;
+
+ $| = 1;
+ print "preparing editor startup...\n";
+ CFPlus::set_proxy;
+
+ 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;
+
+ print "map directory is $mapdir\n";
+ print "lib directory is $libdir\n";
+
+ require LWP::UserAgent;
+
+ my $ua = LWP::UserAgent->new (
+ agent => "cfplus $CFPlus::VERSION",
+ keep_alive => 1,
+ env_proxy => 1,
+ timeout => 30,
+ );
+
+ for my $file (qw(archetypes crossfire.0)) {
+ my $url = "$editsup->{lib_root}$file";
+ print "mirroring $url...\n";
+ check_lwp $ua->mirror ($url, "$libdir/$file");
+ printf "%s size %d octets\n", $file, -s "$libdir/$file";
+ }
+
+ if (1) { # upload a map
+ my $mapname = $::CONN->{map_info}[0];
+
+ my $mappath = "$mapdir/$mapname";
+
+ -e $mappath and die "$mappath already exists\n";
+
+ print "getting map revision for $mapname...\n";
+
+ # try to get the most recent head revision, what a hack,
+ # this should have been returned while downloading *sigh*
+ my $log = (check_lwp $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 = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+
+ my $meta = {
+ %$editsup,
+ path => $mapname,
+ revision => $rev,
+ cf_login => $::PROFILE->{user},
+ };
+
+ require File::Basename;
+ require File::Path;
+
+ 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;
+ close $fh;
+ open my $fh, ">:raw:perlio:utf8", $mappath
+ or die "$mappath: $!\n";
+ print $fh $map;
+ close $fh;
+
+ print "saved as $mappath\n";
+
+ print "invoking editor...\n";
+ exec "/root/s2/gce $mappath";#d#
+
+ # now upload it
+# require HTTP::Request::Common;
+#
+# my $res = $ua->post (
+# $ENV{CFPLUS_UPLOAD},
+# Content_Type => 'multipart/form-data',
+# Content => [
+# path => $mapname,
+# mapdir => $ENV{CROSSFIRE_MAPDIR},
+# map => $map,
+# revision => $rev,
+# cf_login => $ENV{CFPLUS_LOGIN},
+# cf_password => $ENV{CFPLUS_PASSWORD},
+# comment => "",
+# ]
+# );
+#
+# if ($res->is_error) {
+# # fatal condition
+# warn $res->status_line;
+# } else {
+# # script replies are marked as {{..}}
+# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
+# warn map "$_\n", @msgs;
+# }
+ } else {
+ die "viewvc parse error, unable to detect revision\n";
+ }
+ }
+
+ CFPlus::_exit;
+ }
+
+ my $buffer;
+
+ Event->io (fd => $fh, poll => 'r', cb => sub {
+ unless (sysread $fh, $buffer, 4096, length $buffer) {
+ $_[0]->w->cancel;
+ $buffer .= "done\n";
+ }
+
+ while ($buffer =~ s/^(.*)\n//) {
+ ::message ({
+ markup => "editor($pid): " . CFPlus::asxml $1,
+ });
+ }
+ });
+}
+
sub invoke_button_down {
my ($self, $ev, $x, $y) = @_;
@@ -75,8 +226,8 @@
$self->grab_focus;
return unless $::CONN;
- my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
- my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+ my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
+ my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
$x -= int 0.5 * $self->{sw};
$y -= int 0.5 * $self->{sh};
@@ -102,8 +253,7 @@
$self->update;
};
} elsif ($ev->{button} == 3) {
- (new CFClient::UI::Menu
- items => [
+ my @items = (
["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
@@ -117,7 +267,41 @@
: "Enable automatic pickup",
sub { $::PICKUP_ENABLE->toggle }
],
+ );
+
+ if ($::CONN && $::CONN->{editor_support}) {
+ push @items, [
+ "Edit this map (" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")",
+ \&editor_invoke,
+ ];
+
+ for my $type (qw(test name)) {
+ $::CONN->{editor_support}{type} ne $type
+ or next;
+ my $server = $::CONN->{editor_support}{"${type}server"}
+ or next;
+
+ push @items, [
+ "Login on $type server (" . (CFPlus::asxml $server) . ")",
+ sub { server_login $server },
+ ];
+ }
+ }
+
+ push @items,
+ ["Quit",
+ sub {
+ if ($::CONN) {
+ &::open_quit_dialog;
+ } else {
+ exit;
+ }
+ }
],
+ ;
+
+ (new CFPlus::UI::Menu
+ items => \@items,
)->popup ($ev);
}
@@ -146,8 +330,8 @@
sub size_request {
(
- 32 * CFClient::ceil $::WIDTH / 32,
- 32 * CFClient::ceil $::HEIGHT / 32,
+ 32 * CFPlus::ceil $::WIDTH / 32,
+ 32 * CFPlus::ceil $::HEIGHT / 32,
)
}
@@ -159,19 +343,19 @@
}
my %DIR = (
- CFClient::SDLK_KP8, [1, "north"],
- CFClient::SDLK_KP9, [2, "northeast"],
- CFClient::SDLK_KP6, [3, "east"],
- CFClient::SDLK_KP3, [4, "southeast"],
- CFClient::SDLK_KP2, [5, "south"],
- CFClient::SDLK_KP1, [6, "southwest"],
- CFClient::SDLK_KP4, [7, "west"],
- CFClient::SDLK_KP7, [8, "northwest"],
-
- CFClient::SDLK_UP, [1, "north"],
- CFClient::SDLK_RIGHT, [3, "east"],
- CFClient::SDLK_DOWN, [5, "south"],
- CFClient::SDLK_LEFT, [7, "west"],
+ 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"],
+ CFPlus::SDLK_RIGHT, [3, "east"],
+ CFPlus::SDLK_DOWN, [5, "south"],
+ CFPlus::SDLK_LEFT, [7, "west"],
);
sub invoke_key_down {
@@ -181,23 +365,23 @@
my $sym = $ev->{sym};
my $uni = $ev->{unicode};
- $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
+ $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
if ($uni == ord "\t") {
$::PL_WINDOW->toggle_visibility;
- } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
$::HELP_WINDOW->toggle_visibility;
- } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
::toggle_player_page ($::STATS_PAGE);
- } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
::toggle_player_page ($::SKILL_PAGE);
- } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
::toggle_player_page ($::SPELL_PAGE);
- } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
::toggle_player_page ($::INVENTORY_PAGE);
- } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
$::SETUP_DIALOG->toggle_visibility;
- } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
+ } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
$::BIND_EDITOR->set_binding (undef, undef, [],
sub {
my ($mod, $sym, $cmds) = @_;
@@ -205,27 +389,30 @@
});
$::BIND_EDITOR->start;
$::BIND_EDITOR->show;
- } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
- $::BIND_EDITOR->stop;
- $::BIND_EDITOR->ask_for_bind_and_commit;
- $::BIND_EDITOR->hide;
+#TODO: elmex, what was this supposed to do? it currently crashes the client.
+# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
+# $::BIND_EDITOR->stop;
+# $::BIND_EDITOR->ask_for_bind_and_commit;
+# $::BIND_EDITOR->hide;
} elsif (!$::CONN) {
return 0; # bindings further down need a valid connection
- } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
+ } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
$::CONN->user_send ("stay fire");
} 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 $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
+ } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
$::CONN->user_send ($_) for @$bind_cmd;
- } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
+ } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
$::CONN->user_send ("rotateshoottype +");
- } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
+ } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
$::CONN->user_send ("rotateshoottype -");
} elsif ($uni == ord '"') {
$self->{completer}->set_prefix ("$::CFG->{say_command} ");
@@ -234,13 +421,13 @@
$self->{completer}->set_prefix ("");
$self->{completer}->show;
} elsif (exists $DIR{$sym}) {
- if ($mod & CFClient::KMOD_SHIFT) {
+ if ($mod & CFPlus::KMOD_SHIFT) {
$self->{shft}++;
if ($DIR{$sym}[0] != $self->{fire_dir}) {
$::CONN->user_send ("fire $DIR{$sym}[0]");
}
$self->{fire_dir} = $DIR{$sym}[0];
- } elsif ($mod & CFClient::KMOD_CTRL) {
+ } elsif ($mod & CFPlus::KMOD_CTRL) {
$self->{ctrl}++;
$::CONN->user_send ("run $DIR{$sym}[0]");
} else {
@@ -264,7 +451,7 @@
my $sym = $ev->{sym};
if ($::CFG->{shift_fire_stop}) {
- if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
+ if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
@@ -274,14 +461,14 @@
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
- } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+ } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
$::CONN->user_send ("fire_stop");
delete $self->{fire_dir};
$res = 1;
}
}
- if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
+ if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
$::CONN->user_send ("run_stop");
$res = 1;
}
@@ -305,8 +492,8 @@
return unless $::MAP;
- my $focused = $CFClient::UI::FOCUS == $self
- || $CFClient::UI::FOCUS == $self->{completer}{entry};
+ my $focused = $CFPlus::UI::FOCUS == $self
+ || $CFPlus::UI::FOCUS == $self->{completer}{entry};
return
unless $focused || !$::FAST;
@@ -314,19 +501,19 @@
if (delete $self->{need_update}) {
my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
- my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
- my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
+ my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+ my $sy = $self->{sy} = CFPlus::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 $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
- my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
+ my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
+ my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
if ($::CFG->{fow_enable}) {
my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
- if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
+ if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
glConvolutionFilter2D (
GL_CONVOLUTION_2D,
@@ -338,7 +525,7 @@
glEnable GL_CONVOLUTION_2D;
}
- $self->{fow_texture} = new CFClient::Texture
+ $self->{fow_texture} = new CFPlus::Texture
w => $w,
h => $h,
data => $data,
@@ -410,12 +597,12 @@
$self->SUPER::DESTROY;
}
-package CFClient::MapWidget::MapMap;
+package CFPlus::MapWidget::MapMap;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
use Time::HiRes qw(time);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
sub size_request {
($::HEIGHT * 0.25, $::HEIGHT * 0.25)
@@ -461,11 +648,11 @@
$self->{texture_atime} = time + 1/3;
$self->{texture} =
- new CFClient::Texture
+ new CFPlus::Texture
w => $w,
h => $h,
data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
- type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+ type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
}
$self->{texture}->draw_quad (0, 0);
@@ -490,13 +677,13 @@
glDisable GL_BLEND;
}
-package CFClient::MapWidget::Command;
+package CFPlus::MapWidget::Command;
use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::Frame::;
+our @ISA = CFPlus::UI::Frame::;
sub new {
my $class = shift;
@@ -506,11 +693,11 @@
@_,
);
- $self->add ($self->{vbox} = new CFClient::UI::VBox);
+ $self->add ($self->{vbox} = new CFPlus::UI::VBox);
$self->{label} = [
map
- CFClient::UI::Label->new (
+ CFPlus::UI::Label->new (
can_hover => 1,
can_events => 1,
tooltip_width => 0.33,
@@ -518,7 +705,7 @@
), (0.8) x 16
];
- $self->{entry} = new CFClient::UI::Entry
+ $self->{entry} = new CFPlus::UI::Entry
on_changed => sub {
$self->update_labels;
0
@@ -527,9 +714,9 @@
my ($entry, $ev, $x, $y) = @_;
if ($ev->{button} == 3) {
- (new CFClient::UI::Menu
+ (new CFPlus::UI::Menu
items => [
- ["bind " . (CFClient::asxml $self->{select}) . " to a key"
+ ["bind " . (CFPlus::asxml $self->{select}) . " to a key"
=> sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
],
)->popup ($ev);
@@ -555,7 +742,7 @@
} elsif ($ev->{sym} == 27) {
$self->{hist_ptr} = 0;
$self->hide;
- } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
+ } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
if ($self->{hist_ptr} > 1) {
$self->{hist_ptr}--;
$self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
@@ -567,7 +754,7 @@
if $self->{select_offset} < $#{ $self->{last_match} || [] };
}
$self->update_labels;
- } elsif ($ev->{sym} == CFClient::SDLK_UP) {
+ } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
if ($self->{select_offset}) {
--$self->{select_offset}
} else {
@@ -735,9 +922,10 @@
my ($self) = @_;
# hack
- local $CFClient::UI::FOCUS = $self->{entry};
+ local $CFPlus::UI::FOCUS = $self->{entry};
$self->SUPER::_draw;
}
1
+