ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.87 by root, Sun Oct 8 21:57:54 2006 UTC

… …
57 57
58 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
59 59
60 $self->{completer}->hide 60 $self->{completer}->hide
61 if $self->{completer}; 61 if $self->{completer};
62}
63
64sub server_login {
65 my ($server) = @_;
66
67 ::stop_game ();
68 local $::PROFILE->{host} = $server;
69 ::start_game ();
70}
71
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return;
84
85 my ($pid, $fh);
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 my $msg = $_[0];
89 $msg =~ s/\n+/\n/;
90 warn "FATAL: $msg";
91 CFPlus::_exit 99;
92 };
93
94 open STDERR, ">&STDOUT";
95 binmode STDOUT, ":utf8";
96 binmode STDERR, ":utf8";
97 close $fh;
98
99 $| = 1;
100 print "preparing editor startup...\n";
101 CFPlus::set_proxy;
102
103 my $server = $editsup->{gameserver} || "default";
104 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
105
106 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
107 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
108
109 print "map directory is $mapdir\n";
110 print "lib directory is $libdir\n";
111
112 require LWP::UserAgent;
113
114 my $ua = LWP::UserAgent->new (
115 agent => "cfplus $CFPlus::VERSION",
116 keep_alive => 1,
117 env_proxy => 1,
118 timeout => 30,
119 );
120
121 for my $file (qw(archetypes crossfire.0)) {
122 my $url = "$editsup->{lib_root}$file";
123 print "mirroring $url...\n";
124 check_lwp $ua->mirror ($url, "$libdir/$file");
125 printf "%s size %d octets\n", $file, -s "$libdir/$file";
126 }
127
128 if (1) { # upload a map
129 my $mapname = $::CONN->{map_info}[0];
130
131 my $mappath = "$mapdir/$mapname";
132
133 -e $mappath and die "$mappath already exists\n";
134
135 print "getting map revision for $mapname...\n";
136
137 # try to get the most recent head revision, what a hack,
138 # this should have been returned while downloading *sigh*
139 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
140
141 if ($log =~ /\?rev=(\d+\.\d+)"/) {
142 my $rev = $1;
143
144 print "downloading revision $rev...\n";
145
146 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
147
148 my $meta = {
149 %$editsup,
150 path => $mapname,
151 revision => $rev,
152 cf_login => $::PROFILE->{user},
153 };
154
155 require File::Basename;
156 require File::Path;
157
158 File::Path::mkpath (File::Basename::dirname ($mappath));
159 open my $fh, ">:raw:perlio", "$mappath.meta"
160 or die "$mappath.meta: $!\n";
161 print $fh CFPlus::to_json $meta;
162 close $fh;
163 open my $fh, ">:raw:perlio:utf8", $mappath
164 or die "$mappath: $!\n";
165 print $fh $map;
166 close $fh;
167
168 print "saved as $mappath\n";
169
170 print "invoking editor...\n";
171 exec "/root/s2/gce $mappath";#d#
172
173 # now upload it
174# require HTTP::Request::Common;
175#
176# my $res = $ua->post (
177# $ENV{CFPLUS_UPLOAD},
178# Content_Type => 'multipart/form-data',
179# Content => [
180# path => $mapname,
181# mapdir => $ENV{CROSSFIRE_MAPDIR},
182# map => $map,
183# revision => $rev,
184# cf_login => $ENV{CFPLUS_LOGIN},
185# cf_password => $ENV{CFPLUS_PASSWORD},
186# comment => "",
187# ]
188# );
189#
190# if ($res->is_error) {
191# # fatal condition
192# warn $res->status_line;
193# } else {
194# # script replies are marked as {{..}}
195# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
196# warn map "$_\n", @msgs;
197# }
198 } else {
199 die "viewvc parse error, unable to detect revision\n";
200 }
201 }
202
203 CFPlus::_exit;
204 }
205
206 my $buffer;
207
208 Event->io (fd => $fh, poll => 'r', cb => sub {
209 unless (sysread $fh, $buffer, 4096, length $buffer) {
210 $_[0]->w->cancel;
211 $buffer .= "done\n";
212 }
213
214 while ($buffer =~ s/^(.*)\n//) {
215 ::message ({
216 markup => "editor($pid): " . CFPlus::asxml $1,
217 });
218 }
219 });
62} 220}
63 221
64sub invoke_button_down { 222sub invoke_button_down {
65 my ($self, $ev, $x, $y) = @_; 223 my ($self, $ev, $x, $y) = @_;
66 224
… …
93 $::CFG->{map_shift_y} = $bh + $y - $oy; 251 $::CFG->{map_shift_y} = $bh + $y - $oy;
94 252
95 $self->update; 253 $self->update;
96 }; 254 };
97 } elsif ($ev->{button} == 3) { 255 } elsif ($ev->{button} == 3) {
98 (new CFPlus::UI::Menu 256 my @items = (
99 items => [
100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 257 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 258 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 259 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 260 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 261 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
108 $::PICKUP_ENABLE->{state} 265 $::PICKUP_ENABLE->{state}
109 ? "Disable automatic pickup" 266 ? "Disable automatic pickup"
110 : "Enable automatic pickup", 267 : "Enable automatic pickup",
111 sub { $::PICKUP_ENABLE->toggle } 268 sub { $::PICKUP_ENABLE->toggle }
112 ], 269 ],
270 );
271
272 if ($::CONN && $::CONN->{editor_support}) {
273 push @items, [
274 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
275 \&editor_invoke,
276 ];
277
278 for my $type (qw(test name)) {
279 $::CONN->{editor_support}{type} ne $type
280 or next;
281 my $server = $::CONN->{editor_support}{"${type}server"}
282 or next;
283
284 push @items, [
285 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
286 sub { server_login $server },
287 ];
288 }
289 }
290
291 push @items,
113 ["Quit", 292 ["Quit",
114 sub { 293 sub {
115 if ($::CONN) { 294 if ($::CONN) {
116 &::open_quit_dialog; 295 &::open_quit_dialog;
117 } else { 296 } else {
118 exit; 297 exit;
119 }
120 } 298 }
121 ], 299 }
122 ], 300 ],
301 ;
302
303 (new CFPlus::UI::Menu
304 items => \@items,
123 )->popup ($ev); 305 )->popup ($ev);
124 } 306 }
125 307
126 1 308 1
127} 309}
… …
224 } elsif ($uni == 13) { 406 } elsif ($uni == 13) {
225 $::CONN->user_send ("examine"); 407 $::CONN->user_send ("examine");
226 } elsif ($uni == ord ".") { 408 } elsif ($uni == ord ".") {
227 $::CONN->user_send ($self->{completer}{last_command}) 409 $::CONN->user_send ($self->{completer}{last_command})
228 if exists $self->{completer}{last_command}; 410 if exists $self->{completer}{last_command};
229 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 411 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
230 $::CONN->user_send ($_) for @$bind_cmd; 412 $::CONN->user_send ($_) for @$bind_cmd;
231 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 413 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
232 $::CONN->user_send ("rotateshoottype +"); 414 $::CONN->user_send ("rotateshoottype +");
233 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 415 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
234 $::CONN->user_send ("rotateshoottype -"); 416 $::CONN->user_send ("rotateshoottype -");
… …
744 926
745 $self->SUPER::_draw; 927 $self->SUPER::_draw;
746} 928}
747 929
7481 9301
931

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines