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.79 by elmex, Mon Jul 24 12:25:09 2006 UTC vs.
Revision 1.88 by root, Mon Oct 9 01:06:36 2006 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient; 8use CFPlus;
9use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFClient::UI; 10use CFPlus::UI;
11 11
12our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
13 13
14my $magicmap_tex = 14my $magicmap_tex =
15 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 17
18sub new { 18sub new {
19 my $class = shift; 19 my $class = shift;
20 20
… …
30 ], 30 ],
31 31
32 @_ 32 @_
33 ); 33 );
34 34
35 $self->{completer} = new CFClient::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
… …
66 59
67 $self->{completer}->hide 60 $self->{completer}->hide
68 if $self->{completer}; 61 if $self->{completer};
69} 62}
70 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 }
189}
190
71sub invoke_button_down { 191sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 192 my ($self, $ev, $x, $y) = @_;
73 193
74 if ($ev->{button} == 1) { 194 if ($ev->{button} == 1) {
75 $self->grab_focus; 195 $self->grab_focus;
76 return unless $::CONN; 196 return unless $::CONN;
77 197
78 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 198 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
79 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 199 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
80 200
81 $x -= int 0.5 * $self->{sw}; 201 $x -= int 0.5 * $self->{sw};
82 $y -= int 0.5 * $self->{sh}; 202 $y -= int 0.5 * $self->{sh};
83 203
84 $::CONN->lookat ($x, $y) 204 $::CONN->lookat ($x, $y)
… …
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 CFClient::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}) {
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}
… …
153 1 297 1
154} 298}
155 299
156sub size_request { 300sub size_request {
157 ( 301 (
158 32 * CFClient::ceil $::WIDTH / 32, 302 32 * CFPlus::ceil $::WIDTH / 32,
159 32 * CFClient::ceil $::HEIGHT / 32, 303 32 * CFPlus::ceil $::HEIGHT / 32,
160 ) 304 )
161} 305}
162 306
163sub update { 307sub update {
164 my ($self) = @_; 308 my ($self) = @_;
… …
166 $self->{need_update} = 1; 310 $self->{need_update} = 1;
167 $self->SUPER::update; 311 $self->SUPER::update;
168} 312}
169 313
170my %DIR = ( 314my %DIR = (
171 CFClient::SDLK_KP8, [1, "north"], 315 CFPlus::SDLK_KP8, [1, "north"],
172 CFClient::SDLK_KP9, [2, "northeast"], 316 CFPlus::SDLK_KP9, [2, "northeast"],
173 CFClient::SDLK_KP6, [3, "east"], 317 CFPlus::SDLK_KP6, [3, "east"],
174 CFClient::SDLK_KP3, [4, "southeast"], 318 CFPlus::SDLK_KP3, [4, "southeast"],
175 CFClient::SDLK_KP2, [5, "south"], 319 CFPlus::SDLK_KP2, [5, "south"],
176 CFClient::SDLK_KP1, [6, "southwest"], 320 CFPlus::SDLK_KP1, [6, "southwest"],
177 CFClient::SDLK_KP4, [7, "west"], 321 CFPlus::SDLK_KP4, [7, "west"],
178 CFClient::SDLK_KP7, [8, "northwest"], 322 CFPlus::SDLK_KP7, [8, "northwest"],
179 323
180 CFClient::SDLK_UP, [1, "north"], 324 CFPlus::SDLK_UP, [1, "north"],
181 CFClient::SDLK_RIGHT, [3, "east"], 325 CFPlus::SDLK_RIGHT, [3, "east"],
182 CFClient::SDLK_DOWN, [5, "south"], 326 CFPlus::SDLK_DOWN, [5, "south"],
183 CFClient::SDLK_LEFT, [7, "west"], 327 CFPlus::SDLK_LEFT, [7, "west"],
184); 328);
185 329
186sub invoke_key_down { 330sub invoke_key_down {
187 my ($self, $ev) = @_; 331 my ($self, $ev) = @_;
188 332
189 my $mod = $ev->{mod}; 333 my $mod = $ev->{mod};
190 my $sym = $ev->{sym}; 334 my $sym = $ev->{sym};
191 my $uni = $ev->{unicode}; 335 my $uni = $ev->{unicode};
192 336
193 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 337 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
194 338
195 if ($uni == ord "\t") { 339 if ($uni == ord "\t") {
196 $::PL_WINDOW->toggle_visibility; 340 $::PL_WINDOW->toggle_visibility;
197 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility; 342 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE); 344 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE); 346 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE); 348 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE); 350 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 351 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility; 352 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 353 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [], 354 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub { 355 sub {
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 == CFClient::SDLK_INSERT && not ($mod & CFClient::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 == CFClient::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 == CFClient::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 == CFClient::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 -");
239 } elsif ($uni == ord '"') { 386 } elsif ($uni == ord '"') {
240 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 387 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
241 $self->{completer}->show; 388 $self->{completer}->show;
242 } elsif ($uni == ord "'") { 389 } elsif ($uni == ord "'") {
243 $self->{completer}->set_prefix (""); 390 $self->{completer}->set_prefix ("");
244 $self->{completer}->show; 391 $self->{completer}->show;
245 } elsif (exists $DIR{$sym}) { 392 } elsif (exists $DIR{$sym}) {
246 if ($mod & CFClient::KMOD_SHIFT) { 393 if ($mod & CFPlus::KMOD_SHIFT) {
247 $self->{shft}++; 394 $self->{shft}++;
248 if ($DIR{$sym}[0] != $self->{fire_dir}) { 395 if ($DIR{$sym}[0] != $self->{fire_dir}) {
249 $::CONN->user_send ("fire $DIR{$sym}[0]"); 396 $::CONN->user_send ("fire $DIR{$sym}[0]");
250 } 397 }
251 $self->{fire_dir} = $DIR{$sym}[0]; 398 $self->{fire_dir} = $DIR{$sym}[0];
252 } elsif ($mod & CFClient::KMOD_CTRL) { 399 } elsif ($mod & CFPlus::KMOD_CTRL) {
253 $self->{ctrl}++; 400 $self->{ctrl}++;
254 $::CONN->user_send ("run $DIR{$sym}[0]"); 401 $::CONN->user_send ("run $DIR{$sym}[0]");
255 } else { 402 } else {
256 $::CONN->user_send ("$DIR{$sym}[1]"); 403 $::CONN->user_send ("$DIR{$sym}[1]");
257 } 404 }
… …
271 my $res = 0; 418 my $res = 0;
272 my $mod = $ev->{mod}; 419 my $mod = $ev->{mod};
273 my $sym = $ev->{sym}; 420 my $sym = $ev->{sym};
274 421
275 if ($::CFG->{shift_fire_stop}) { 422 if ($::CFG->{shift_fire_stop}) {
276 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 423 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
277 $::CONN->user_send ("fire_stop"); 424 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 425 delete $self->{fire_dir};
279 $res = 1; 426 $res = 1;
280 } 427 }
281 } else { 428 } else {
282 if (exists $DIR{$sym} && delete $self->{shft}) { 429 if (exists $DIR{$sym} && delete $self->{shft}) {
283 $::CONN->user_send ("fire_stop"); 430 $::CONN->user_send ("fire_stop");
284 delete $self->{fire_dir}; 431 delete $self->{fire_dir};
285 $res = 1; 432 $res = 1;
286 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 433 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
287 $::CONN->user_send ("fire_stop"); 434 $::CONN->user_send ("fire_stop");
288 delete $self->{fire_dir}; 435 delete $self->{fire_dir};
289 $res = 1; 436 $res = 1;
290 } 437 }
291 } 438 }
292 439
293 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 440 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
294 $::CONN->user_send ("run_stop"); 441 $::CONN->user_send ("run_stop");
295 $res = 1; 442 $res = 1;
296 } 443 }
297 444
298 $res 445 $res
… …
312sub draw { 459sub draw {
313 my ($self) = @_; 460 my ($self) = @_;
314 461
315 return unless $::MAP; 462 return unless $::MAP;
316 463
317 my $focused = $CFClient::UI::FOCUS == $self 464 my $focused = $CFPlus::UI::FOCUS == $self
318 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 465 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
319 466
320 return 467 return
321 unless $focused || !$::FAST; 468 unless $focused || !$::FAST;
322 469
323 if (delete $self->{need_update}) { 470 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325 472
326 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 473 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 474 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328 475
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 476 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 477 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331 478
332 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 479 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
333 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 480 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
334 481
335 if ($::CFG->{fow_enable}) { 482 if ($::CFG->{fow_enable}) {
336 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 483 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
337 484
338 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 485 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 486 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D ( 487 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D, 488 GL_CONVOLUTION_2D,
342 GL_ALPHA, 489 GL_ALPHA,
343 3, 3, 490 3, 3,
… …
345 (pack "f*", @{ $self->{smooth_matrix} }), 492 (pack "f*", @{ $self->{smooth_matrix} }),
346 ); 493 );
347 glEnable GL_CONVOLUTION_2D; 494 glEnable GL_CONVOLUTION_2D;
348 } 495 }
349 496
350 $self->{fow_texture} = new CFClient::Texture 497 $self->{fow_texture} = new CFPlus::Texture
351 w => $w, 498 w => $w,
352 h => $h, 499 h => $h,
353 data => $data, 500 data => $data,
354 internalformat => GL_ALPHA, 501 internalformat => GL_ALPHA,
355 format => GL_ALPHA; 502 format => GL_ALPHA;
… …
417 glDeleteList $self->{list}; 564 glDeleteList $self->{list};
418 565
419 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
420} 567}
421 568
422package CFClient::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
423 570
424our @ISA = CFClient::UI::Base::; 571our @ISA = CFPlus::UI::Base::;
425 572
426use Time::HiRes qw(time); 573use Time::HiRes qw(time);
427use CFClient::OpenGL; 574use CFPlus::OpenGL;
428 575
429sub size_request { 576sub size_request {
430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 577 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
431} 578}
432 579
… …
468 615
469 if ($self->{texture_atime} < time) { 616 if ($self->{texture_atime} < time) {
470 $self->{texture_atime} = time + 1/3; 617 $self->{texture_atime} = time + 1/3;
471 618
472 $self->{texture} = 619 $self->{texture} =
473 new CFClient::Texture 620 new CFPlus::Texture
474 w => $w, 621 w => $w,
475 h => $h, 622 h => $h,
476 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 623 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
477 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 624 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
478 } 625 }
479 626
480 $self->{texture}->draw_quad (0, 0); 627 $self->{texture}->draw_quad (0, 0);
481 628
482 glDisable GL_TEXTURE_2D; 629 glDisable GL_TEXTURE_2D;
… …
497 glEnd; 644 glEnd;
498 645
499 glDisable GL_BLEND; 646 glDisable GL_BLEND;
500} 647}
501 648
502package CFClient::MapWidget::Command; 649package CFPlus::MapWidget::Command;
503 650
504use strict; 651use strict;
505 652
506use CFClient::OpenGL; 653use CFPlus::OpenGL;
507 654
508our @ISA = CFClient::UI::Frame::; 655our @ISA = CFPlus::UI::Frame::;
509 656
510sub new { 657sub new {
511 my $class = shift; 658 my $class = shift;
512 659
513 my $self = $class->SUPER::new ( 660 my $self = $class->SUPER::new (
514 bg => [0, 0, 0, 0.8], 661 bg => [0, 0, 0, 0.8],
515 @_, 662 @_,
516 ); 663 );
517 664
518 $self->add ($self->{vbox} = new CFClient::UI::VBox); 665 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
519 666
520 $self->{label} = [ 667 $self->{label} = [
521 map 668 map
522 CFClient::UI::Label->new ( 669 CFPlus::UI::Label->new (
523 can_hover => 1, 670 can_hover => 1,
524 can_events => 1, 671 can_events => 1,
525 tooltip_width => 0.33, 672 tooltip_width => 0.33,
526 fontsize => $_, 673 fontsize => $_,
527 ), (0.8) x 16 674 ), (0.8) x 16
528 ]; 675 ];
529 676
530 $self->{entry} = new CFClient::UI::Entry 677 $self->{entry} = new CFPlus::UI::Entry
531 on_changed => sub { 678 on_changed => sub {
532 $self->update_labels; 679 $self->update_labels;
533 0 680 0
534 }, 681 },
535 on_button_down => sub { 682 on_button_down => sub {
536 my ($entry, $ev, $x, $y) = @_; 683 my ($entry, $ev, $x, $y) = @_;
537 684
538 if ($ev->{button} == 3) { 685 if ($ev->{button} == 3) {
539 (new CFClient::UI::Menu 686 (new CFPlus::UI::Menu
540 items => [ 687 items => [
541 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" 688 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
543 ], 690 ],
544 )->popup ($ev); 691 )->popup ($ev);
545 return 1; 692 return 1;
546 } 693 }
… …
562 $self->hide; 709 $self->hide;
563 } 710 }
564 } elsif ($ev->{sym} == 27) { 711 } elsif ($ev->{sym} == 27) {
565 $self->{hist_ptr} = 0; 712 $self->{hist_ptr} = 0;
566 $self->hide; 713 $self->hide;
567 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 714 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
568 if ($self->{hist_ptr} > 1) { 715 if ($self->{hist_ptr} > 1) {
569 $self->{hist_ptr}--; 716 $self->{hist_ptr}--;
570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 717 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571 } elsif ($self->{hist_ptr} > 0) { 718 } elsif ($self->{hist_ptr} > 0) {
572 $self->{hist_ptr}--; 719 $self->{hist_ptr}--;
… …
574 } else { 721 } else {
575 ++$self->{select_offset} 722 ++$self->{select_offset}
576 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 723 if $self->{select_offset} < $#{ $self->{last_match} || [] };
577 } 724 }
578 $self->update_labels; 725 $self->update_labels;
579 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 726 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
580 if ($self->{select_offset}) { 727 if ($self->{select_offset}) {
581 --$self->{select_offset} 728 --$self->{select_offset}
582 } else { 729 } else {
583 unless ($self->{hist_ptr}) { 730 unless ($self->{hist_ptr}) {
584 $self->{hist_saveback} = $self->{entry}->get_text; 731 $self->{hist_saveback} = $self->{entry}->get_text;
… …
742 889
743sub _draw { 890sub _draw {
744 my ($self) = @_; 891 my ($self) = @_;
745 892
746 # hack 893 # hack
747 local $CFClient::UI::FOCUS = $self->{entry}; 894 local $CFPlus::UI::FOCUS = $self->{entry};
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