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

Diff Legend

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