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.111 by root, Thu Jul 19 14:54:50 2007 UTC vs.
Revision 1.132 by root, Sun Jul 13 12:17:00 2008 UTC

1package CFPlus::MapWidget; 1package DC::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 CFPlus; 8use DC;
9use CFPlus::OpenGL; 9use DC::OpenGL;
10use CFPlus::UI; 10use DC::UI;
11use CFPlus::Macro; 11use DC::Macro;
12 12
13our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file DC::Texture DC::find_rcfile "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my $class = shift;
21 21
22 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
23 z => -1, 23 z => -1,
24 can_focus => 1, 24 can_focus => 1,
25 list => glGenList,
26 tilesize => 32, 25 tilesize => 32,
27 @_ 26 @_
28 ); 27 );
29 28
30 $self->{completer} = new CFPlus::MapWidget::Command::
31 command => $self->{command},
32 tooltip => "#completer_help",
33 ;
34
35 $self 29 $self
36} 30}
37 31
38sub set_tilesize { 32sub set_tilesize {
39 my ($self, $tilesize) = @_; 33 my ($self, $tilesize) = @_;
… …
48 42
49 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
50 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
51 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
52 46
53 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
54} 48}
55 49
56sub clr_commands { 50sub clr_commands {
57 my ($self) = @_; 51 my ($self) = @_;
58 52
59 %{$self->{completer}{command}} = (); 53 %{$::COMPLETER->{command}} = ();
60 54
61 $self->{completer}->hide 55 $::COMPLETER->hide
62 if $self->{completer}; 56 if $::COMPLETER;
63} 57}
64 58
65sub server_login { 59sub server_login {
66 my ($server) = @_; 60 my ($server) = @_;
67 61
… …
72 66
73sub editor_invoke { 67sub editor_invoke {
74 my $editsup = $::CONN && $::CONN->{editor_support} 68 my $editsup = $::CONN && $::CONN->{editor_support}
75 or return; 69 or return;
76 70
77 CFPlus::background { 71 DC::background {
78 print "preparing editor startup...\n"; 72 print "preparing editor startup...\n";
79 73
80 my $server = $editsup->{gameserver} || "default"; 74 my $server = $editsup->{gameserver} || "default";
81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
82 76
83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 77 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
85 79
86 print "map directory is $mapdir\n"; 80 print "map directory is $mapdir\n";
87 print "lib directory is $libdir\n"; 81 print "lib directory is $libdir\n";
88 82
89 my $ua = CFPlus::lwp_useragent; 83 my $ua = DC::lwp_useragent;
90 84
91 for my $file (qw(archetypes crossfire.0)) { 85 for my $file (qw(archetypes crossfire.0)) {
92 my $url = "$editsup->{lib_root}$file"; 86 my $url = "$editsup->{lib_root}$file";
93 print "mirroring $url...\n"; 87 print "mirroring $url...\n";
94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 88 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
95 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
96 } 90 }
97 91
98 if (1) { # upload a map 92 if (1) { # upload a map
99 my $mapname = $::CONN->{map_info}[0]; 93 my $mapname = $::CONN->{map_info}[0];
… …
104 98
105 print "getting map revision for $mapname...\n"; 99 print "getting map revision for $mapname...\n";
106 100
107 # try to get the most recent head revision, what a hack, 101 # try to get the most recent head revision, what a hack,
108 # this should have been returned while downloading *sigh* 102 # this should have been returned while downloading *sigh*
109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 103 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
110 104
111 if ($log =~ /\?rev=(\d+\.\d+)"/) { 105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
112 my $rev = $1; 106 my $rev = $1;
113 107
114 print "downloading revision $rev...\n"; 108 print "downloading revision $rev...\n";
115 109
116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 110 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
117 111
118 my $meta = { 112 my $meta = {
119 %$editsup, 113 %$editsup,
120 path => $mapname, 114 path => $mapname,
121 revision => $rev, 115 revision => $rev,
… …
126 require File::Path; 120 require File::Path;
127 121
128 File::Path::mkpath (File::Basename::dirname ($mappath)); 122 File::Path::mkpath (File::Basename::dirname ($mappath));
129 open my $fh, ">:raw:perlio", "$mappath.meta" 123 open my $fh, ">:raw:perlio", "$mappath.meta"
130 or die "$mappath.meta: $!\n"; 124 or die "$mappath.meta: $!\n";
131 print $fh CFPlus::to_json $meta; 125 print $fh DC::encode_json $meta;
132 close $fh; 126 close $fh;
133 open my $fh, ">:raw:perlio:utf8", $mappath 127 open my $fh, ">:raw:perlio:utf8", $mappath
134 or die "$mappath: $!\n"; 128 or die "$mappath: $!\n";
135 print $fh $map; 129 print $fh $map;
136 close $fh; 130 close $fh;
… …
177 171
178 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
179 $self->grab_focus; 173 $self->grab_focus;
180 return unless $::CONN; 174 return unless $::CONN;
181 175
182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 176 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
184 178
185 $x -= CFPlus::floor $::MAP->w * 0.5; 179 $x -= DC::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5; 180 $y -= DC::floor $::MAP->h * 0.5;
187 181
188 if ($::CONN) { 182 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
192 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
193 }
194 } 184 }
195 185
196 } elsif ($ev->{button} == 2) { 186 } elsif ($ev->{button} == 2) {
197 $self->grab_focus; 187 $self->grab_focus;
198 return unless $::CONN; 188 return unless $::CONN;
… …
216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
220 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
221 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
222 [ 212 [
223 $::PICKUP_ENABLE->{state} 213 $::PICKUP_ENABLE->{state}
224 ? "Disable automatic pickup" 214 ? "Disable automatic pickup"
225 : "Enable automatic pickup", 215 : "Enable automatic pickup",
226 sub { $::PICKUP_ENABLE->toggle } 216 sub { $::PICKUP_ENABLE->toggle }
227 ], 217 ],
228 ); 218 );
229 219
230 if ($::CONN && $::CONN->{editor_support}) { 220 if ($::CONN && $::CONN->{editor_support}) {
231 push @items, [ 221# push @items, [
232 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 222# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
233 \&editor_invoke, 223# \&editor_invoke,
234 ]; 224# ];
235 225
236 for my $type (qw(test name)) { 226 for my $type (qw(test name)) {
237 $::CONN->{editor_support}{type} ne $type 227 $::CONN->{editor_support}{type} ne $type
238 or next; 228 or next;
239 my $server = $::CONN->{editor_support}{"${type}server"} 229 my $server = $::CONN->{editor_support}{"${type}server"}
240 or next; 230 or next;
241 231
242 push @items, [ 232 push @items, [
243 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 233 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
244 sub { server_login $server }, 234 sub { server_login $server },
245 ]; 235 ];
246 } 236 }
247 } 237 }
248 238
… …
256 } 246 }
257 } 247 }
258 ], 248 ],
259 ; 249 ;
260 250
261 (new CFPlus::UI::Menu 251 (new DC::UI::Menu
262 items => \@items, 252 items => \@items,
263 )->popup ($ev); 253 )->popup ($ev);
264 } 254 }
265 255
266 1 256 1
… …
288 278
289sub size_request { 279sub size_request {
290 my ($self) = @_; 280 my ($self) = @_;
291 281
292 ( 282 (
293 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 283 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
294 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 284 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
295 ) 285 )
296} 286}
297 287
298sub update { 288sub update {
299 my ($self) = @_; 289 my ($self) = @_;
… …
301 $self->{need_update} = 1; 291 $self->{need_update} = 1;
302 $self->SUPER::update; 292 $self->SUPER::update;
303} 293}
304 294
305my %DIR = ( 295my %DIR = (
306 CFPlus::SDLK_KP5, [0, "stay fire"], 296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
307 CFPlus::SDLK_KP8, [1, "north"], 297 ( "," . DC::SDLK_KP8 ), [1, "north"],
308 CFPlus::SDLK_KP9, [2, "northeast"], 298 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
309 CFPlus::SDLK_KP6, [3, "east"], 299 ( "," . DC::SDLK_KP6 ), [3, "east"],
310 CFPlus::SDLK_KP3, [4, "southeast"], 300 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
311 CFPlus::SDLK_KP2, [5, "south"], 301 ( "," . DC::SDLK_KP2 ), [5, "south"],
312 CFPlus::SDLK_KP1, [6, "southwest"], 302 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
313 CFPlus::SDLK_KP4, [7, "west"], 303 ( "," . DC::SDLK_KP4 ), [7, "west"],
314 CFPlus::SDLK_KP7, [8, "northwest"], 304 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
315 305
316 CFPlus::SDLK_UP, [1, "north"], 306 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . DC::SDLK_UP ), [2, "northeast"],
317 CFPlus::SDLK_RIGHT, [3, "east"], 308 ( "," . DC::SDLK_RIGHT), [3, "east"],
309 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
318 CFPlus::SDLK_DOWN, [5, "south"], 310 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
319 CFPlus::SDLK_LEFT, [7, "west"], 312 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
320); 314);
321 315
322sub invoke_key_down { 316sub invoke_key_down {
323 my ($self, $ev) = @_; 317 my ($self, $ev) = @_;
324 318
325 my $mod = $ev->{mod}; 319 my $mod = $ev->{mod};
326 my $sym = $ev->{sym}; 320 my $sym = $ev->{sym};
327 my $uni = $ev->{unicode}; 321 my $uni = $ev->{unicode};
328 322
329 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
330 324
331 if ($sym == 9) { 325 # ignore repeated keypresses
332 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 326 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
333 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 327 $self->{last_mod} = $mod;
334 $::HELP_WINDOW->toggle_visibility; 328 $self->{last_sym} = $sym;
335 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
336 ::toggle_player_page ($::STATS_PAGE);
337 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
338 ::toggle_player_page ($::SKILL_PAGE);
339 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
340 ::toggle_player_page ($::SPELL_PAGE);
341 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
342 ::toggle_player_page ($::INVENTORY_PAGE);
343 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
344 $::SETUP_DIALOG->toggle_visibility;
345 } elsif (!$::CONN) {
346 return 0; # bindings further down need a valid connection
347 329
348 } elsif ($uni == ord ",") { 330 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
349 $::CONN->user_send ("take");
350 } elsif ($uni == ord " ") {
351 $::CONN->user_send ("apply");
352 } elsif ($uni == 13) {
353 $::CONN->user_send ("examine");
354 } elsif ($uni == ord ".") {
355 $::CONN->user_send ($self->{completer}{last_command})
356 if exists $self->{completer}{last_command};
357 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
358 $::CONN->macro_send ($_) for @macros;
359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
360 $::CONN->user_send ("rotateshoottype +");
361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
362 $::CONN->user_send ("rotateshoottype -");
363 } elsif ($uni == ord '!') {
364 $self->{completer}->set_prefix ("shout ");
365 $self->{completer}->show;
366 } elsif ($uni == ord '"') {
367 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
368 $self->{completer}->show;
369 } elsif ($uni == ord "'") {
370 $self->{completer}->set_prefix ("");
371 $self->{completer}->show;
372 } elsif (exists $DIR{$sym}) {
373 if ($mod & CFPlus::KMOD_SHIFT) { 331 if ($mod & DC::KMOD_SHIFT) {
374 $self->{shft}++; 332 $self->{shft}++;
375 if ($DIR{$sym}[0] != $self->{fire_dir}) { 333 if ($dir->[0] != $self->{fire_dir}) {
376 $::CONN->user_send ("fire $DIR{$sym}[0]"); 334 $::CONN->user_send ("fire $dir->[0]");
377 } 335 }
378 $self->{fire_dir} = $DIR{$sym}[0]; 336 $self->{fire_dir} = $dir->[0];
379 } elsif ($mod & CFPlus::KMOD_CTRL) { 337 } elsif ($mod & DC::KMOD_CTRL) {
380 $self->{ctrl}++; 338 $self->{ctrl}++;
381 $::CONN->user_send ("run $DIR{$sym}[0]"); 339 $::CONN->user_send ("run $dir->[0]");
382 } else { 340 } else {
383 $::CONN->user_send ("$DIR{$sym}[1]"); 341 $::CONN->user_send ("$dir->[1]");
384 } 342 }
385 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 343
386 $self->{completer}->inject_key_down ($ev);
387 $self->{completer}->show;
388 } else {
389 return 0; 344 return 1;
390 }
391
392 1 345 }
346
347 0
393} 348}
394 349
395sub invoke_key_up { 350sub invoke_key_up {
396 my ($self, $ev) = @_; 351 my ($self, $ev) = @_;
397 352
398 my $res = 0; 353 my $res = 0;
399 my $mod = $ev->{mod}; 354 my $mod = $ev->{mod};
400 my $sym = $ev->{sym}; 355 my $sym = $ev->{sym};
401 356
357 delete $self->{last_mod};
358 delete $self->{last_sym};
359
402 if ($::CFG->{shift_fire_stop}) { 360 if ($::CFG->{shift_fire_stop}) {
403 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 361 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
404 $::CONN->user_send ("fire_stop"); 362 $::CONN->user_send ("fire_stop");
405 delete $self->{fire_dir}; 363 delete $self->{fire_dir};
406 $res = 1; 364 $res = 1;
407 } 365 }
408 } else { 366 } else {
409 if (exists $DIR{$sym} && delete $self->{shft}) { 367 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
410 $::CONN->user_send ("fire_stop"); 368 $::CONN->user_send ("fire_stop");
411 delete $self->{fire_dir}; 369 delete $self->{fire_dir};
412 $res = 1; 370 $res = 1;
413 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 371 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
372 && delete $self->{shft}) { # XXX: is RSHIFT ok?
414 $::CONN->user_send ("fire_stop"); 373 $::CONN->user_send ("fire_stop");
415 delete $self->{fire_dir}; 374 delete $self->{fire_dir};
416 $res = 1; 375 $res = 1;
417 } 376 }
418 } 377 }
419 378
420 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 379 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
421 $::CONN->user_send ("run_stop"); 380 $::CONN->user_send ("run_stop");
422 $res = 1; 381 $res = 1;
423 } 382 }
424 383
425 $res 384 $res
… …
445} 404}
446 405
447sub refresh_hook { 406sub refresh_hook {
448 my ($self) = @_; 407 my ($self) = @_;
449 408
450 return unless $::MAP; 409 if ($::MAP && $::CONN) {
451
452 if (delete $self->{need_update}) { 410 if (delete $self->{need_update}) {
453 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 411 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
454 412
455 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 413 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
456 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 414 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
457 415
458 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 416 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
459 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 417 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
460 418
461 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 419 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
462 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 420 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
463 421
464 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; 422 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
465 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; 423 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
466 424
467 if ($::CFG->{fow_enable}) { 425 if ($::CFG->{fow_enable}) {
468 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 426 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
469 427
470 $self->{fow_texture} = new CFPlus::Texture 428 $self->{fow_texture} = new DC::Texture
471 w => $w, 429 w => $w,
472 h => $h, 430 h => $h,
473 data => $data, 431 data => $data,
474 internalformat => GL_ALPHA, 432 internalformat => GL_ALPHA,
475 format => GL_ALPHA; 433 format => GL_ALPHA;
476 } else { 434 } else {
477 delete $self->{fow_texture}; 435 delete $self->{fow_texture};
478 } 436 }
479 437
480 glNewList $self->{list}; 438 glNewList ($self->{list} ||= glGenList);
481 439
482 glPushMatrix;
483 glTranslate $sx0, $sy0;
484 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
485
486 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
487
488 glScale $self->{tilesize}, $self->{tilesize};
489
490 if (my $tex = $self->{fow_texture}) {
491 glPushMatrix; 440 glPushMatrix;
441 glTranslate $sx0, $sy0;
442 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
443
444 $::MAP->draw ($dx, $dy, $sw, $sh,
445 $self->{tilesize},
446 $::CONN->{player}{tag}, 0, 0);
447
448 glScale $self->{tilesize}, $self->{tilesize};
449
450 if (my $tex = $self->{fow_texture}) {
451 glPushMatrix;
492 glScale 1/3, 1/3; 452 glScale 1/3, 1/3;
493 glEnable GL_TEXTURE_2D; 453 glEnable GL_TEXTURE_2D;
494 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 454 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
495 455
496 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 456 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
497 $self->{fow_texture}->draw_quad_alpha (0, 0); 457 $self->{fow_texture}->draw_quad_alpha (0, 0);
498 458
499 glDisable GL_TEXTURE_2D; 459 glDisable GL_TEXTURE_2D;
460 glPopMatrix;
461 }
462
463 if ($self->{magicmap}) {
464 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
465
466 $x += $::MAP->ox + $self->{dx};
467 $y += $::MAP->oy + $self->{dy};
468
469 glTranslate - $x - 1, - $y - 1;
470 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
471 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
472 }
473
500 glPopMatrix; 474 glPopMatrix;
501 }
502
503 if ($self->{magicmap}) {
504 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
505
506 $x += $::MAP->ox + $self->{dx};
507 $y += $::MAP->oy + $self->{dy};
508
509 glTranslate - $x - 1, - $y - 1;
510 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
511 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
512 }
513
514 glPopMatrix;
515 glEndList; 475 glEndList;
476 }
477 } else {
478 glDeleteList delete $self->{list}
479 if $self->{list};
516 } 480 }
517
518} 481}
519 482
520sub draw { 483sub draw {
521 my ($self) = @_; 484 my ($self) = @_;
522 485
523 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 486 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
524 487
525 return unless $self->{list}; 488 return unless $self->{list};
526 489
527 my $focused = $CFPlus::UI::FOCUS == $self 490 my $focused = $DC::UI::FOCUS == $self
528 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 491 || $DC::UI::FOCUS == $::COMPLETER->{entry};
529 492
530 return 493 return
531 unless $focused || !$::FAST; 494 unless $focused || !$::FAST;
532 495
533 glCallList $self->{list}; 496 glCallList $self->{list};
534 497
535 # TNT2 emulates logops in software (or worse :) 498 # TNT2 emulates logops in software (or worse :)
536 unless ($focused) { 499 unless ($focused) {
537 glColor 0.4, 0.2, 0.2, 0.6; 500 glColor_premultiply 0, 0, 1, 0.25;
538 glEnable GL_BLEND; 501 glEnable GL_BLEND;
539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
540 glBegin GL_QUADS; 503 glBegin GL_QUADS;
541 glVertex 0, 0; 504 glVertex 0, 0;
542 glVertex 0, $::HEIGHT; 505 glVertex 0, $::HEIGHT;
543 glVertex $::WIDTH, $::HEIGHT; 506 glVertex $::WIDTH, $::HEIGHT;
544 glVertex $::WIDTH, 0; 507 glVertex $::WIDTH, 0;
… …
553 glDeleteList $self->{list}; 516 glDeleteList $self->{list};
554 517
555 $self->SUPER::DESTROY; 518 $self->SUPER::DESTROY;
556} 519}
557 520
558package CFPlus::MapWidget::MapMap; 521package DC::MapWidget::MapMap;
559 522
560use strict; 523use strict;
561use utf8; 524use utf8;
562 525
563our @ISA = CFPlus::UI::Base::; 526our @ISA = DC::UI::Base::;
564 527
565use Time::HiRes qw(time); 528use Time::HiRes qw(time);
566use CFPlus::OpenGL; 529use DC::OpenGL;
567 530
568sub size_request { 531sub size_request {
569 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 532 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
570} 533}
571 534
… …
596 $self->{y0} = $y0; 559 $self->{y0} = $y0;
597 560
598 $self->{texture_atime} = time + 1/3; 561 $self->{texture_atime} = time + 1/3;
599 562
600 $self->{texture} = 563 $self->{texture} =
601 new CFPlus::Texture 564 new DC::Texture
602 w => $w, 565 w => $w,
603 h => $h, 566 h => $h,
604 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 567 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
605 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 568 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
606 } 569 }
607} 570}
608 571
609sub invoke_visibility_change { 572sub invoke_visibility_change {
610 my ($self) = @_; 573 my ($self) = @_;
… …
656 glEnd; 619 glEnd;
657 620
658 glDisable GL_BLEND; 621 glDisable GL_BLEND;
659} 622}
660 623
661package CFPlus::MapWidget::Command; 624package DC::MapWidget::Command;
662 625
663use strict; 626use strict;
664 627
665use CFPlus::OpenGL; 628use DC::OpenGL;
666 629
667our @ISA = CFPlus::UI::Frame::; 630our @ISA = DC::UI::Frame::;
668 631
669sub new { 632sub new {
670 my $class = shift; 633 my $class = shift;
671 634
672 my $self = $class->SUPER::new ( 635 my $self = $class->SUPER::new (
673 bg => [0, 0, 0, 0.8], 636 bg => [0, 0, 0, 0.8],
674 @_, 637 @_,
675 ); 638 );
676 639
677 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 640 $self->add ($self->{vbox} = new DC::UI::VBox);
678 641
679 $self->{label} = [ 642 $self->{label} = [
680 map 643 map
681 CFPlus::UI::Label->new ( 644 DC::UI::Label->new (
645 align => 0,
682 can_hover => 1, 646 can_hover => 1,
683 can_events => 1, 647 can_events => 1,
684 tooltip_width => 0.33, 648 tooltip_width => 0.33,
685 fontsize => $_, 649 fontsize => $_,
686 ), (0.8) x 16 650 ), (0.8) x 16
687 ]; 651 ];
688 652
689 $self->{entry} = new CFPlus::UI::Entry 653 $self->{entry} = new DC::UI::Entry
690 on_changed => sub { 654 on_changed => sub {
691 $self->update_labels; 655 $self->update_labels;
692 0 656 0
693 }, 657 },
694 on_button_down => sub { 658 on_button_down => sub {
695 my ($entry, $ev, $x, $y) = @_; 659 my ($entry, $ev, $x, $y) = @_;
696 660
697 if ($ev->{button} == 3) { 661 if ($ev->{button} == 3) {
698 (new CFPlus::UI::Menu 662 (new DC::UI::Menu
699 items => [ 663 items => [
700 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 664 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
701 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 665 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
702 ], 666 ],
703 )->popup ($ev); 667 )->popup ($ev);
704 return 1; 668 return 1;
705 } 669 }
706 0 670 0
… …
721 $self->hide; 685 $self->hide;
722 } 686 }
723 } elsif ($ev->{sym} == 27) { 687 } elsif ($ev->{sym} == 27) {
724 $self->{hist_ptr} = 0; 688 $self->{hist_ptr} = 0;
725 $self->hide; 689 $self->hide;
726 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 690 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
727 if ($self->{hist_ptr} > 1) { 691 if ($self->{hist_ptr} > 1) {
728 $self->{hist_ptr}--; 692 $self->{hist_ptr}--;
729 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 693 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
730 } elsif ($self->{hist_ptr} > 0) { 694 } elsif ($self->{hist_ptr} > 0) {
731 $self->{hist_ptr}--; 695 $self->{hist_ptr}--;
… …
733 } else { 697 } else {
734 ++$self->{select_offset} 698 ++$self->{select_offset}
735 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 699 if $self->{select_offset} < $#{ $self->{last_match} || [] };
736 } 700 }
737 $self->update_labels; 701 $self->update_labels;
738 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 702 } elsif ($ev->{sym} == DC::SDLK_UP) {
739 if ($self->{select_offset}) { 703 if ($self->{select_offset}) {
740 --$self->{select_offset} 704 --$self->{select_offset}
741 } else { 705 } else {
742 unless ($self->{hist_ptr}) { 706 unless ($self->{hist_ptr}) {
743 $self->{hist_saveback} = $self->{entry}->get_text; 707 $self->{hist_saveback} = $self->{entry}->get_text;
… …
901 865
902sub _draw { 866sub _draw {
903 my ($self) = @_; 867 my ($self) = @_;
904 868
905 # hack 869 # hack
906 local $CFPlus::UI::FOCUS = $self->{entry}; 870 local $DC::UI::FOCUS = $self->{entry};
907 871
908 $self->SUPER::_draw; 872 $self->SUPER::_draw;
909} 873}
910 874
9111 8751

Diff Legend

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