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.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.89 by root, Wed Oct 18 12:53:46 2006 UTC

… …
32 @_ 32 @_
33 ); 33 );
34 34
35 $self->{completer} = new CFPlus::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 36 command => $self->{command},
37 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "#completer_help",
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45 ; 38 ;
46 39
47 $self 40 $self
48} 41}
49 42
… …
64 57
65 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
66 59
67 $self->{completer}->hide 60 $self->{completer}->hide
68 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 CFPlus::background {
86 print "preparing editor startup...\n";
87 CFPlus::set_proxy;
88
89 my $server = $editsup->{gameserver} || "default";
90 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
91
92 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
93 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
94
95 print "map directory is $mapdir\n";
96 print "lib directory is $libdir\n";
97
98 require LWP::UserAgent;
99
100 my $ua = LWP::UserAgent->new (
101 agent => "cfplus $CFPlus::VERSION",
102 keep_alive => 1,
103 env_proxy => 1,
104 timeout => 30,
105 );
106
107 for my $file (qw(archetypes crossfire.0)) {
108 my $url = "$editsup->{lib_root}$file";
109 print "mirroring $url...\n";
110 check_lwp $ua->mirror ($url, "$libdir/$file");
111 printf "%s size %d octets\n", $file, -s "$libdir/$file";
112 }
113
114 if (1) { # upload a map
115 my $mapname = $::CONN->{map_info}[0];
116
117 my $mappath = "$mapdir/$mapname";
118
119 -e $mappath and die "$mappath already exists\n";
120
121 print "getting map revision for $mapname...\n";
122
123 # try to get the most recent head revision, what a hack,
124 # this should have been returned while downloading *sigh*
125 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
126
127 if ($log =~ /\?rev=(\d+\.\d+)"/) {
128 my $rev = $1;
129
130 print "downloading revision $rev...\n";
131
132 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
133
134 my $meta = {
135 %$editsup,
136 path => $mapname,
137 revision => $rev,
138 cf_login => $::PROFILE->{user},
139 };
140
141 require File::Basename;
142 require File::Path;
143
144 File::Path::mkpath (File::Basename::dirname ($mappath));
145 open my $fh, ">:raw:perlio", "$mappath.meta"
146 or die "$mappath.meta: $!\n";
147 print $fh CFPlus::to_json $meta;
148 close $fh;
149 open my $fh, ">:raw:perlio:utf8", $mappath
150 or die "$mappath: $!\n";
151 print $fh $map;
152 close $fh;
153
154 print "saved as $mappath\n";
155
156 print "invoking editor...\n";
157 exec "/root/s2/gce $mappath";#d#
158
159 # now upload it
160# require HTTP::Request::Common;
161#
162# my $res = $ua->post (
163# $ENV{CFPLUS_UPLOAD},
164# Content_Type => 'multipart/form-data',
165# Content => [
166# path => $mapname,
167# mapdir => $ENV{CROSSFIRE_MAPDIR},
168# map => $map,
169# revision => $rev,
170# cf_login => $ENV{CFPLUS_LOGIN},
171# cf_password => $ENV{CFPLUS_PASSWORD},
172# comment => "",
173# ]
174# );
175#
176# if ($res->is_error) {
177# # fatal condition
178# warn $res->status_line;
179# } else {
180# # script replies are marked as {{..}}
181# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
182# warn map "$_\n", @msgs;
183# }
184 } else {
185 die "viewvc parse error, unable to detect revision\n";
186 }
187 }
188 }
69} 189}
70 190
71sub invoke_button_down { 191sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 192 my ($self, $ev, $x, $y) = @_;
73 193
… …
100 $::CFG->{map_shift_y} = $bh + $y - $oy; 220 $::CFG->{map_shift_y} = $bh + $y - $oy;
101 221
102 $self->update; 222 $self->update;
103 }; 223 };
104 } elsif ($ev->{button} == 3) { 224 } elsif ($ev->{button} == 3) {
105 (new CFPlus::UI::Menu 225 my @items = (
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 226 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 227 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 228 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 229 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 230 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
115 $::PICKUP_ENABLE->{state} 234 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup" 235 ? "Disable automatic pickup"
117 : "Enable automatic pickup", 236 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle } 237 sub { $::PICKUP_ENABLE->toggle }
119 ], 238 ],
239 );
240
241 if ($::CONN && $::CONN->{editor_support} && 0) {
242 push @items, [
243 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
244 \&editor_invoke,
245 ];
246
247 for my $type (qw(test name)) {
248 $::CONN->{editor_support}{type} ne $type
249 or next;
250 my $server = $::CONN->{editor_support}{"${type}server"}
251 or next;
252
253 push @items, [
254 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
255 sub { server_login $server },
256 ];
257 }
258 }
259
260 push @items,
120 ["Quit", 261 ["Quit",
121 sub { 262 sub {
122 if ($::CONN) { 263 if ($::CONN) {
123 &::open_quit_dialog; 264 &::open_quit_dialog;
124 } else { 265 } else {
125 exit; 266 exit;
126 }
127 } 267 }
128 ], 268 }
129 ], 269 ],
270 ;
271
272 (new CFPlus::UI::Menu
273 items => \@items,
130 )->popup ($ev); 274 )->popup ($ev);
131 } 275 }
132 276
133 1 277 1
134} 278}
… …
212 my ($mod, $sym, $cmds) = @_; 356 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 357 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 }); 358 });
215 $::BIND_EDITOR->start; 359 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show; 360 $::BIND_EDITOR->show;
361#TODO: elmex, what was this supposed to do? it currently crashes the client.
217 } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { 362# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop; 363# $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit; 364# $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide; 365# $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) { 366 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection 367 return 0; # bindings further down need a valid connection
223 368
224 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 369 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225 $::CONN->user_send ("stay fire"); 370 $::CONN->user_send ("stay fire");
226 } elsif ($uni == ord ",") { 371 } elsif ($uni == ord ",") {
227 $::CONN->user_send ("take"); 372 $::CONN->user_send ("take");
228 } elsif ($uni == ord " ") { 373 } elsif ($uni == ord " ") {
229 $::CONN->user_send ("apply"); 374 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine");
230 } elsif ($uni == ord ".") { 377 } elsif ($uni == ord ".") {
231 $::CONN->user_send ($self->{completer}{last_command}) 378 $::CONN->user_send ($self->{completer}{last_command})
232 if exists $self->{completer}{last_command}; 379 if exists $self->{completer}{last_command};
233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
234 $::CONN->user_send ($_) for @$bind_cmd; 381 $::CONN->user_send ($_) for @$bind_cmd;
235 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
236 $::CONN->user_send ("rotateshoottype +"); 383 $::CONN->user_send ("rotateshoottype +");
237 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
238 $::CONN->user_send ("rotateshoottype -"); 385 $::CONN->user_send ("rotateshoottype -");
… …
748 895
749 $self->SUPER::_draw; 896 $self->SUPER::_draw;
750} 897}
751 898
7521 8991
900

Diff Legend

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