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.119 by root, Tue Aug 28 01:23:47 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
… …
66 66
67sub editor_invoke { 67sub editor_invoke {
68 my $editsup = $::CONN && $::CONN->{editor_support} 68 my $editsup = $::CONN && $::CONN->{editor_support}
69 or return; 69 or return;
70 70
71 CFPlus::background { 71 DC::background {
72 print "preparing editor startup...\n"; 72 print "preparing editor startup...\n";
73 73
74 my $server = $editsup->{gameserver} || "default"; 74 my $server = $editsup->{gameserver} || "default";
75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
76 76
77 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;
78 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;
79 79
80 print "map directory is $mapdir\n"; 80 print "map directory is $mapdir\n";
81 print "lib directory is $libdir\n"; 81 print "lib directory is $libdir\n";
82 82
83 my $ua = CFPlus::lwp_useragent; 83 my $ua = DC::lwp_useragent;
84 84
85 for my $file (qw(archetypes crossfire.0)) { 85 for my $file (qw(archetypes crossfire.0)) {
86 my $url = "$editsup->{lib_root}$file"; 86 my $url = "$editsup->{lib_root}$file";
87 print "mirroring $url...\n"; 87 print "mirroring $url...\n";
88 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 88 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
89 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
90 } 90 }
91 91
92 if (1) { # upload a map 92 if (1) { # upload a map
93 my $mapname = $::CONN->{map_info}[0]; 93 my $mapname = $::CONN->{map_info}[0];
… …
98 98
99 print "getting map revision for $mapname...\n"; 99 print "getting map revision for $mapname...\n";
100 100
101 # try to get the most recent head revision, what a hack, 101 # try to get the most recent head revision, what a hack,
102 # this should have been returned while downloading *sigh* 102 # this should have been returned while downloading *sigh*
103 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;
104 104
105 if ($log =~ /\?rev=(\d+\.\d+)"/) { 105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
106 my $rev = $1; 106 my $rev = $1;
107 107
108 print "downloading revision $rev...\n"; 108 print "downloading revision $rev...\n";
109 109
110 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;
111 111
112 my $meta = { 112 my $meta = {
113 %$editsup, 113 %$editsup,
114 path => $mapname, 114 path => $mapname,
115 revision => $rev, 115 revision => $rev,
… …
120 require File::Path; 120 require File::Path;
121 121
122 File::Path::mkpath (File::Basename::dirname ($mappath)); 122 File::Path::mkpath (File::Basename::dirname ($mappath));
123 open my $fh, ">:raw:perlio", "$mappath.meta" 123 open my $fh, ">:raw:perlio", "$mappath.meta"
124 or die "$mappath.meta: $!\n"; 124 or die "$mappath.meta: $!\n";
125 print $fh CFPlus::to_json $meta; 125 print $fh DC::encode_json $meta;
126 close $fh; 126 close $fh;
127 open my $fh, ">:raw:perlio:utf8", $mappath 127 open my $fh, ">:raw:perlio:utf8", $mappath
128 or die "$mappath: $!\n"; 128 or die "$mappath: $!\n";
129 print $fh $map; 129 print $fh $map;
130 close $fh; 130 close $fh;
… …
171 171
172 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
173 $self->grab_focus; 173 $self->grab_focus;
174 return unless $::CONN; 174 return unless $::CONN;
175 175
176 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};
177 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};
178 178
179 $x -= CFPlus::floor $::MAP->w * 0.5; 179 $x -= DC::floor $::MAP->w * 0.5;
180 $y -= CFPlus::floor $::MAP->h * 0.5; 180 $y -= DC::floor $::MAP->h * 0.5;
181 181
182 if ($::CONN) { 182 if ($::CONN) {
183 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
184 } 184 }
185 185
… …
206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [ 212 [
213 $::PICKUP_ENABLE->{state} 213 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup" 214 ? "Disable automatic pickup"
215 : "Enable automatic pickup", 215 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle } 216 sub { $::PICKUP_ENABLE->toggle }
217 ], 217 ],
218 ); 218 );
219 219
220 if ($::CONN && $::CONN->{editor_support}) { 220 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [ 221# push @items, [
222 "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>",
223 \&editor_invoke, 223# \&editor_invoke,
224 ]; 224# ];
225 225
226 for my $type (qw(test name)) { 226 for my $type (qw(test name)) {
227 $::CONN->{editor_support}{type} ne $type 227 $::CONN->{editor_support}{type} ne $type
228 or next; 228 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 229 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next; 230 or next;
231 231
232 push @items, [ 232 push @items, [
233 "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>",
234 sub { server_login $server }, 234 sub { server_login $server },
235 ]; 235 ];
236 } 236 }
237 } 237 }
238 238
… …
246 } 246 }
247 } 247 }
248 ], 248 ],
249 ; 249 ;
250 250
251 (new CFPlus::UI::Menu 251 (new DC::UI::Menu
252 items => \@items, 252 items => \@items,
253 )->popup ($ev); 253 )->popup ($ev);
254 } 254 }
255 255
256 1 256 1
… …
278 278
279sub size_request { 279sub size_request {
280 my ($self) = @_; 280 my ($self) = @_;
281 281
282 ( 282 (
283 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 283 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
284 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 284 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
285 ) 285 )
286} 286}
287 287
288sub update { 288sub update {
289 my ($self) = @_; 289 my ($self) = @_;
… …
291 $self->{need_update} = 1; 291 $self->{need_update} = 1;
292 $self->SUPER::update; 292 $self->SUPER::update;
293} 293}
294 294
295my %DIR = ( 295my %DIR = (
296 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], 296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . CFPlus::SDLK_KP8 ), [1, "north"], 297 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], 298 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . CFPlus::SDLK_KP6 ), [3, "east"], 299 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], 300 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . CFPlus::SDLK_KP2 ), [5, "south"], 301 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], 302 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . CFPlus::SDLK_KP4 ), [7, "west"], 303 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], 304 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 305
306 ( "," . CFPlus::SDLK_UP ), [1, "north"], 306 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . CFPlus::SDLK_UP ), [2, "northeast"], 307 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . CFPlus::SDLK_RIGHT), [3, "east"], 308 ( "," . DC::SDLK_RIGHT), [3, "east"],
309 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], 309 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
310 ( "," . CFPlus::SDLK_DOWN ), [5, "south"], 310 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], 311 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . CFPlus::SDLK_LEFT ), [7, "west"], 312 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], 313 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 314);
315 315
316sub invoke_key_down { 316sub invoke_key_down {
317 my ($self, $ev) = @_; 317 my ($self, $ev) = @_;
318 318
319 my $mod = $ev->{mod}; 319 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 320 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 321 my $uni = $ev->{unicode};
322 322
323 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
324 324
325 # ignore repeated keypresses
326 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
327 $self->{last_mod} = $mod;
328 $self->{last_sym} = $sym;
329
325 if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { 330 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
326 if ($mod & CFPlus::KMOD_SHIFT) { 331 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 332 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 333 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 334 $::CONN->user_send ("fire $dir->[0]");
330 } 335 }
331 $self->{fire_dir} = $DIR{$sym}[0]; 336 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & CFPlus::KMOD_CTRL) { 337 } elsif ($mod & DC::KMOD_CTRL) {
333 $self->{ctrl}++; 338 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]"); 339 $::CONN->user_send ("run $dir->[0]");
335 } else { 340 } else {
336 $::CONN->user_send ("$dir->[1]"); 341 $::CONN->user_send ("$dir->[1]");
337 } 342 }
… …
347 352
348 my $res = 0; 353 my $res = 0;
349 my $mod = $ev->{mod}; 354 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 355 my $sym = $ev->{sym};
351 356
357 delete $self->{last_mod};
358 delete $self->{last_sym};
359
352 if ($::CFG->{shift_fire_stop}) { 360 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 361 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 362 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 363 delete $self->{fire_dir};
356 $res = 1; 364 $res = 1;
357 } 365 }
358 } else { 366 } else {
359 if (exists $DIR{$sym} && delete $self->{shft}) { 367 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 368 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 369 delete $self->{fire_dir};
362 $res = 1; 370 $res = 1;
363 } 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?
364 $::CONN->user_send ("fire_stop"); 373 $::CONN->user_send ("fire_stop");
365 delete $self->{fire_dir}; 374 delete $self->{fire_dir};
366 $res = 1; 375 $res = 1;
367 } 376 }
368 } 377 }
369 378
370 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 379 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
371 $::CONN->user_send ("run_stop"); 380 $::CONN->user_send ("run_stop");
372 $res = 1; 381 $res = 1;
373 } 382 }
374 383
375 $res 384 $res
… …
399 408
400 if ($::MAP && $::CONN) { 409 if ($::MAP && $::CONN) {
401 if (delete $self->{need_update}) { 410 if (delete $self->{need_update}) {
402 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 411 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
403 412
404 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 413 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
405 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 414 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
406 415
407 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 416 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize;
408 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 417 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize;
409 418
410 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 419 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
411 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 420 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
412 421
413 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;
414 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;
415 424
416 if ($::CFG->{fow_enable}) { 425 if ($::CFG->{fow_enable}) {
417 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 426 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
418 427
419 $self->{fow_texture} = new CFPlus::Texture 428 $self->{fow_texture} = new DC::Texture
420 w => $w, 429 w => $w,
421 h => $h, 430 h => $h,
422 data => $data, 431 data => $data,
423 internalformat => GL_ALPHA, 432 internalformat => GL_ALPHA,
424 format => GL_ALPHA; 433 format => GL_ALPHA;
… …
430 439
431 glPushMatrix; 440 glPushMatrix;
432 glTranslate $sx0, $sy0; 441 glTranslate $sx0, $sy0;
433 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 442 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
434 443
435 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 444 $::MAP->draw ($dx, $dy, $sw, $sh,
445 $self->{tilesize},
446 $::CONN->{player}{tag}, 0, 0);
436 447
437 glScale $self->{tilesize}, $self->{tilesize}; 448 glScale $self->{tilesize}, $self->{tilesize};
438 449
439 if (my $tex = $self->{fow_texture}) { 450 if (my $tex = $self->{fow_texture}) {
440 glPushMatrix; 451 glPushMatrix;
… …
474 485
475 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 486 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
476 487
477 return unless $self->{list}; 488 return unless $self->{list};
478 489
479 my $focused = $CFPlus::UI::FOCUS == $self 490 my $focused = $DC::UI::FOCUS == $self
480 || $CFPlus::UI::FOCUS == $::COMPLETER{entry}; 491 || $DC::UI::FOCUS == $::COMPLETER->{entry};
481 492
482 return 493 return
483 unless $focused || !$::FAST; 494 unless $focused || !$::FAST;
484 495
485 glCallList $self->{list}; 496 glCallList $self->{list};
486 497
487 # TNT2 emulates logops in software (or worse :) 498 # TNT2 emulates logops in software (or worse :)
488 unless ($focused) { 499 unless ($focused) {
489 glColor 0.4, 0.2, 0.2, 0.6; 500 glColor_premultiply 0, 0, 1, 0.25;
490 glEnable GL_BLEND; 501 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glBegin GL_QUADS; 503 glBegin GL_QUADS;
493 glVertex 0, 0; 504 glVertex 0, 0;
494 glVertex 0, $::HEIGHT; 505 glVertex 0, $::HEIGHT;
495 glVertex $::WIDTH, $::HEIGHT; 506 glVertex $::WIDTH, $::HEIGHT;
496 glVertex $::WIDTH, 0; 507 glVertex $::WIDTH, 0;
… …
505 glDeleteList $self->{list}; 516 glDeleteList $self->{list};
506 517
507 $self->SUPER::DESTROY; 518 $self->SUPER::DESTROY;
508} 519}
509 520
510package CFPlus::MapWidget::MapMap; 521package DC::MapWidget::MapMap;
511 522
512use strict; 523use strict;
513use utf8; 524use utf8;
514 525
515our @ISA = CFPlus::UI::Base::; 526our @ISA = DC::UI::Base::;
516 527
517use Time::HiRes qw(time); 528use Time::HiRes qw(time);
518use CFPlus::OpenGL; 529use DC::OpenGL;
519 530
520sub size_request { 531sub size_request {
521 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 532 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
522} 533}
523 534
… …
548 $self->{y0} = $y0; 559 $self->{y0} = $y0;
549 560
550 $self->{texture_atime} = time + 1/3; 561 $self->{texture_atime} = time + 1/3;
551 562
552 $self->{texture} = 563 $self->{texture} =
553 new CFPlus::Texture 564 new DC::Texture
554 w => $w, 565 w => $w,
555 h => $h, 566 h => $h,
556 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 567 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
557 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;
558 } 569 }
559} 570}
560 571
561sub invoke_visibility_change { 572sub invoke_visibility_change {
562 my ($self) = @_; 573 my ($self) = @_;
… …
608 glEnd; 619 glEnd;
609 620
610 glDisable GL_BLEND; 621 glDisable GL_BLEND;
611} 622}
612 623
613package CFPlus::MapWidget::Command; 624package DC::MapWidget::Command;
614 625
615use strict; 626use strict;
616 627
617use CFPlus::OpenGL; 628use DC::OpenGL;
618 629
619our @ISA = CFPlus::UI::Frame::; 630our @ISA = DC::UI::Frame::;
620 631
621sub new { 632sub new {
622 my $class = shift; 633 my $class = shift;
623 634
624 my $self = $class->SUPER::new ( 635 my $self = $class->SUPER::new (
625 bg => [0, 0, 0, 0.8], 636 bg => [0, 0, 0, 0.8],
626 @_, 637 @_,
627 ); 638 );
628 639
629 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 640 $self->add ($self->{vbox} = new DC::UI::VBox);
630 641
631 $self->{label} = [ 642 $self->{label} = [
632 map 643 map
633 CFPlus::UI::Label->new ( 644 DC::UI::Label->new (
645 align => 0,
634 can_hover => 1, 646 can_hover => 1,
635 can_events => 1, 647 can_events => 1,
636 tooltip_width => 0.33, 648 tooltip_width => 0.33,
637 fontsize => $_, 649 fontsize => $_,
638 ), (0.8) x 16 650 ), (0.8) x 16
639 ]; 651 ];
640 652
641 $self->{entry} = new CFPlus::UI::Entry 653 $self->{entry} = new DC::UI::Entry
642 on_changed => sub { 654 on_changed => sub {
643 $self->update_labels; 655 $self->update_labels;
644 0 656 0
645 }, 657 },
646 on_button_down => sub { 658 on_button_down => sub {
647 my ($entry, $ev, $x, $y) = @_; 659 my ($entry, $ev, $x, $y) = @_;
648 660
649 if ($ev->{button} == 3) { 661 if ($ev->{button} == 3) {
650 (new CFPlus::UI::Menu 662 (new DC::UI::Menu
651 items => [ 663 items => [
652 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 664 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
653 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 665 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
654 ], 666 ],
655 )->popup ($ev); 667 )->popup ($ev);
656 return 1; 668 return 1;
657 } 669 }
658 0 670 0
… …
673 $self->hide; 685 $self->hide;
674 } 686 }
675 } elsif ($ev->{sym} == 27) { 687 } elsif ($ev->{sym} == 27) {
676 $self->{hist_ptr} = 0; 688 $self->{hist_ptr} = 0;
677 $self->hide; 689 $self->hide;
678 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 690 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
679 if ($self->{hist_ptr} > 1) { 691 if ($self->{hist_ptr} > 1) {
680 $self->{hist_ptr}--; 692 $self->{hist_ptr}--;
681 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 693 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
682 } elsif ($self->{hist_ptr} > 0) { 694 } elsif ($self->{hist_ptr} > 0) {
683 $self->{hist_ptr}--; 695 $self->{hist_ptr}--;
… …
685 } else { 697 } else {
686 ++$self->{select_offset} 698 ++$self->{select_offset}
687 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 699 if $self->{select_offset} < $#{ $self->{last_match} || [] };
688 } 700 }
689 $self->update_labels; 701 $self->update_labels;
690 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 702 } elsif ($ev->{sym} == DC::SDLK_UP) {
691 if ($self->{select_offset}) { 703 if ($self->{select_offset}) {
692 --$self->{select_offset} 704 --$self->{select_offset}
693 } else { 705 } else {
694 unless ($self->{hist_ptr}) { 706 unless ($self->{hist_ptr}) {
695 $self->{hist_saveback} = $self->{entry}->get_text; 707 $self->{hist_saveback} = $self->{entry}->get_text;
… …
853 865
854sub _draw { 866sub _draw {
855 my ($self) = @_; 867 my ($self) = @_;
856 868
857 # hack 869 # hack
858 local $CFPlus::UI::FOCUS = $self->{entry}; 870 local $DC::UI::FOCUS = $self->{entry};
859 871
860 $self->SUPER::_draw; 872 $self->SUPER::_draw;
861} 873}
862 874
8631 8751

Diff Legend

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