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.17 by root, Mon Apr 24 13:12:32 2006 UTC vs.
Revision 1.164 by root, Sat Aug 13 23:18:19 2011 UTC

1package CFClient::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use common::sense;
4use utf8;
5 4
6use List::Util qw(min max); 5use List::Util qw(min max);
7 6
7use AnyEvent ();
8
9use DC;
8use CFClient::OpenGL; 10use DC::OpenGL;
11use DC::UI;
12use DC::Macro;
9 13
10our @ISA = CFClient::UI::Base::; 14our @ISA = DC::UI::Base::;
15
16our @TEX_HIDDEN = map {
17 new_from_resource DC::Texture # MUST be POT
18 "hidden-$_.png", mipmap => 1, wrap => 1
19 } 0, 1, 2;
20
21my $magicmap_tex =
22 new_from_resource DC::Texture "magicmap.png",
23 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 24
12sub new { 25sub new {
13 my $class = shift; 26 my $class = shift;
14 27
15 $class->SUPER::new ( 28 my $self = $class->SUPER::new (
16 z => -1, 29 z => -1,
17 can_focus => 1, 30 can_focus => 1,
18 list => glGenList, 31 tilesize => 32,
19 @_ 32 @_
20 ) 33 );
21}
22 34
23sub DESTROY { 35 $self
36}
37
38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
24 my $self = shift; 51 my ($self) = @_;
25 52
26 glDeleteList $self->{list}; 53 %{$::COMPLETER->{command}} = ();
27 54
28 $self->SUPER::DESTROY; 55 $::COMPLETER->hide
56 if $::COMPLETER;
29} 57}
30 58
59sub server_login {
60 my ($server) = @_;
61
62 ::stop_game ();
63 local $::PROFILE->{host} = $server;
64 ::start_game ();
65}
66
67sub editor_invoke {
68 my $editsup = $::CONN && $::CONN->{editor_support}
69 or return;
70
71 DC::background {
72 print "preparing editor startup...\n";
73
74 my $server = $editsup->{gameserver} || "default";
75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
76
77 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
79
80 print "map directory is $mapdir\n";
81 print "lib directory is $libdir\n";
82
83 my $ua = DC::lwp_useragent;
84
85 for my $file (qw(archetypes crossfire.0)) {
86 my $url = "$editsup->{lib_root}$file";
87 print "mirroring $url...\n";
88 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
90 }
91
92 if (1) { # upload a map
93 my $mapname = $::CONN->{map_info}[0];
94
95 my $mappath = "$mapdir/$mapname";
96
97 -e $mappath and die "$mappath already exists\n";
98
99 print "getting map revision for $mapname...\n";
100
101 # try to get the most recent head revision, what a hack,
102 # this should have been returned while downloading *sigh*
103 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
104
105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
106 my $rev = $1;
107
108 print "downloading revision $rev...\n";
109
110 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
111
112 my $meta = {
113 %$editsup,
114 path => $mapname,
115 revision => $rev,
116 cf_login => $::PROFILE->{user},
117 };
118
119 require File::Basename;
120 require File::Path;
121
122 File::Path::mkpath (File::Basename::dirname ($mappath));
123 open my $fh, ">:raw:perlio", "$mappath.meta"
124 or die "$mappath.meta: $!\n";
125 print $fh DC::encode_json $meta;
126 close $fh;
127 open my $fh, ">:raw:perlio:utf8", $mappath
128 or die "$mappath: $!\n";
129 print $fh $map;
130 close $fh;
131
132 print "saved as $mappath\n";
133
134 print "invoking editor...\n";
135 exec "/root/s2/gce $mappath";#d#
136
137 # now upload it
138# require HTTP::Request::Common;
139#
140# my $res = $ua->post (
141# $ENV{CFPLUS_UPLOAD},
142# Content_Type => 'multipart/form-data',
143# Content => [
144# path => $mapname,
145# mapdir => $ENV{CROSSFIRE_MAPDIR},
146# map => $map,
147# revision => $rev,
148# cf_login => $ENV{CFPLUS_LOGIN},
149# cf_password => $ENV{CFPLUS_PASSWORD},
150# comment => "",
151# ]
152# );
153#
154# if ($res->is_error) {
155# # fatal condition
156# warn $res->status_line;
157# } else {
158# # script replies are marked as {{..}}
159# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
160# warn map "$_\n", @msgs;
161# }
162 } else {
163 die "viewvc parse error, unable to detect revision\n";
164 }
165 }
166 }
167}
168
31sub button_down { 169sub invoke_button_down {
32 my ($self, $ev, $x, $y) = @_; 170 my ($self, $ev, $x, $y) = @_;
33 171
34 $self->focus_in;
35
36 if ($ev->{button} == 2) { 172 if ($ev->{button} == 1) {
173 $self->grab_focus;
174 return unless $::CONN && $self->{ctilesize};
175
176 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178
179 $x -= DC::floor $::MAP->w * 0.5;
180 $y -= DC::floor $::MAP->h * 0.5;
181
182 if ($::CONN) {
183 $::CONN->lookat ($x, $y)
184 }
185
186 } elsif ($ev->{button} == 2) {
187 $self->grab_focus;
188 return unless $::CONN;
189
37 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 190 my ($ox, $oy) = ($ev->{x}, $ev->{y});
38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 191 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39 192
40 $self->{motion} = sub { 193 $self->{motion} = sub {
41 my ($ev, $x, $y) = @_; 194 my ($ev, $x, $y) = @_;
… …
45 $::CFG->{map_shift_x} = $bw + $x - $ox; 198 $::CFG->{map_shift_x} = $bw + $x - $ox;
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 199 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 200
48 $self->update; 201 $self->update;
49 }; 202 };
203 } elsif ($ev->{button} == 3) {
204 my @items = (
205 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 );
213
214 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke,
218# ];
219
220 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{servertype} ne $type
222 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next;
225
226 push @items, [
227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
228 sub { server_login $server },
229 ];
230 }
231 }
232
233 push @items,
234 ["Quit",
235 sub {
236 if ($::CONN) {
237 &::open_quit_dialog;
238 } else {
239 exit;
240 }
241 }
242 ],
243 ;
244
245 (new DC::UI::Menu
246 items => \@items,
247 )->popup ($ev);
248 }
249
50 } 250 1
51} 251}
52 252
53sub button_up { 253sub invoke_button_up {
54 my ($self, $ev, $x, $y) = @_; 254 my ($self, $ev, $x, $y) = @_;
55 255
56 delete $self->{motion}; 256 delete $self->{motion};
57}
58 257
258 1
259}
260
59sub mouse_motion { 261sub invoke_mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 262 my ($self, $ev, $x, $y) = @_;
61 263
264 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 265 $self->{motion}->($ev, $x, $y);
266 } else {
267 return 0;
268 }
269
270 1
63} 271}
64 272
65sub size_request { 273sub size_request {
274 my ($self) = @_;
275
66 ( 276 (
67 1 + 32 * int $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
68 1 + 32 * int $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
69 ) 279 )
70} 280}
71 281
72sub update { 282sub update {
73 my ($self) = @_; 283 my ($self) = @_;
74 284
75 $self->{need_update} = 1; 285 $self->{need_update} = 1;
76 $self->SUPER::update; 286 $self->SUPER::update;
77} 287}
78 288
79sub draw { 289my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299
300 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
301 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
302 ( "," . DC::SDLK_END ), [6, "southwest"],
303 ( "," . DC::SDLK_HOME ), [8, "northwest"],
304
305 ( "," . DC::SDLK_UP ), [1, "north"],
306 ("1," . DC::SDLK_UP ), [2, "northeast"],
307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
309 ( "," . DC::SDLK_DOWN ), [5, "south"],
310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
311 ( "," . DC::SDLK_LEFT ), [7, "west"],
312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
313);
314
315sub invoke_key_down {
80 my ($self) = @_; 316 my ($self, $ev) = @_;
81 317
318 my $mod = $ev->{mod};
319 my $sym = $ev->{sym};
320 my $uni = $ev->{unicode};
321
322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
323
324 # ignore repeated keypresses
325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
326 $self->{last_mod} = $mod;
327 $self->{last_sym} = $sym;
328
329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
330
331 if ($::CONN && $dir) {
332 if ($mod & DC::KMOD_SHIFT) {
333 $self->{shft}++;
334 if ($dir->[0] != $self->{fire_dir}) {
335 $::CONN->user_send ("fire $dir->[0]");
336 }
337 $self->{fire_dir} = $dir->[0];
338 } elsif ($mod & DC::KMOD_CTRL) {
339 $self->{ctrl}++;
340 $::CONN->user_send ("run $dir->[0]");
341 } else {
342 $::CONN->user_send ("$dir->[1]");
343 }
344
345 return 1;
346 }
347
348 0
349}
350
351sub invoke_key_up {
352 my ($self, $ev) = @_;
353
354 my $res = 0;
355 my $mod = $ev->{mod};
356 my $sym = $ev->{sym};
357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
361 if ($::CFG->{shift_fire_stop}) {
362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
363 $::CONN->user_send ("fire_stop");
364 delete $self->{fire_dir};
365 $res = 1;
366 }
367 } else {
368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
370 if ($dir && delete $self->{shft}) {
371 $::CONN->user_send ("fire_stop");
372 delete $self->{fire_dir};
373 $res = 1;
374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
376 $::CONN->user_send ("fire_stop");
377 delete $self->{fire_dir};
378 $res = 1;
379 }
380 }
381
382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
383 $::CONN->user_send ("run_stop");
384 $res = 1;
385 }
386
387 $res
388}
389
390sub invoke_visibility_change {
391 my ($self) = @_;
392
393 $self->refresh_hook;
394
395 0
396}
397
398sub set_tilesize {
399 my ($self, $tilesize) = @_;
400
401 $self->{tilesize} = $tilesize;
402}
403
404sub scroll {
405 my ($self, $dx, $dy) = @_;
406
407 $self->movement_update;
408
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize};
411
412 # save old fow texture, if applicable
413 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
414 $self->{lfdx} = $dx;
415 $self->{lfdy} = $dy;
416 $self->{lmdx} = $self->{dx};
417 $self->{lmdy} = $self->{dy};
418
419 $::MAP->scroll ($dx, $dy);
420}
421
422sub set_magicmap {
423 my ($self, $w, $h, $x, $y, $data) = @_;
424
425 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
426 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
427
428 $self->{magicmap} = [$x, $y, $w, $h, $data];
429
430 $self->update;
431}
432
433sub movement_update {
434 my ($self) = @_;
435
436 if ($::CFG->{smooth_movement}) {
437 if ($self->{sdx} || $self->{sdy}) {
438 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
439 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
440
441 # the minimum time for a single tile movement
442 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
443
444 $spd *= $self->{tilesize};
445
446 # jump if "impossibly high" speed
447 if (
448 (max abs $self->{sdx}, abs $self->{sdy})
449 > $spd * $mintime * 2.1
450 ) {
451 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
452 $self->{sdx} = $self->{sdy} = 0;
453 } else {
454 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
455
456 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
457 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
458
459 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
460 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
461 }
462
463 $self->update;
464 }
465 } else {
466 $self->{sdx} = $self->{sdy} = 0;
467 }
468
469 $self->{last_update} = AE::time;
470}
471
472sub refresh_hook {
473 my ($self) = @_;
474
475 if ($::MAP && $::CONN) {
82 if (delete $self->{need_update}) { 476 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 477 $self->movement_update;
84 478
85 if ($::MAP) { 479 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
86 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
87 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
88 480
89 glPushMatrix; 481 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 482 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
91 483
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 484 # width/height of map, in tiles
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 485 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
486 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
94 487
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 488 # the map displacement, in tiles
489 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
490 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
96 491
97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 492 # the upper left "visible" corner, in pixels
493 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
494 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
495
496 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
497 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
98 498
99 if ($::CFG->{fow_enable}) { 499 if ($::CFG->{fow_enable}) {
100 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 500 # draw_fow_texture REQUIRES the fow texture to stay the same size.
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 501 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
102 glConvolutionFilter2D (
103 GL_CONVOLUTION_2D,
104 GL_ALPHA,
105 3, 3,
106 GL_ALPHA, GL_FLOAT,
107 pack "f*",
108 0.05, 0.13, 0.05,
109 0.13, 0.30, 0.13,
110 0.05, 0.13, 0.05,
111 );
112 glEnable GL_CONVOLUTION_2D;
113 }
114 502
115 $self->{fow_texture} = new CFClient::Texture 503 $self->{fow_texture} = new DC::Texture
116 w => $w, 504 w => $w,
117 h => $h, 505 h => $h,
118 data => $data, 506 data => $data,
119 internalformat => GL_ALPHA, 507 internalformat => GL_ALPHA,
120 format => GL_ALPHA; 508 format => GL_ALPHA;
121 509 } else {
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 510 delete $self->{fow_texture};
123
124 glEnable GL_BLEND;
125 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
126 glEnable GL_TEXTURE_2D;
127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
128
129 glColor +($::CFG->{fow_intensity}) x 3, 0.8;
130 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
131
132 glDisable GL_TEXTURE_2D;
133 glDisable GL_BLEND;
134 } 511 }
135 512
136 # HACK BEGIN 513 glNewList ($self->{list} ||= glGenList);
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139 514
515 glPushMatrix;
140 glTranslate 0, 30; 516 glTranslate $sx0, $sy0;
141 my ($w, $h) = (250, 250); 517 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
518 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
142 519
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 520 $::MAP->draw ($dx, $dy, $sw, $sh,
521 ($self->{tilesize}) x 2,
522 $::CONN->{player}{tag},
523 -$self->{sdx}, -$self->{sdy});
144 524
145 glEnable GL_BLEND; 525 glScale $self->{tilesize}, $self->{tilesize};
146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
147 glEnable GL_TEXTURE_2D;
148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
149 526
150 glPopMatrix; 527 if (my $tex = $self->{fow_texture}) {
528 my @prev_fow_params;
151 529
152 $self->{mapmap_texture} = 530 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
153 new CFClient::Texture 531 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
154 w => $w, 532 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
155 h => $h,
156 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
157 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
158 533
159 $self->{mapmap_texture}->draw_quad (0, 0); 534 if ($d1 * $d2) {
160 535 @prev_fow_params = (
161 glDisable GL_TEXTURE_2D; 536 (min 1, $d1 / $d2),
162 537 $self->{lmdx} - $dx - $self->{lfdx},
163 glTranslate 0.375, 0.375; 538 $self->{lmdy} - $dy - $self->{lfdy},
164 539 @{$self->{prev_fow_texture}}{qw(name data)}
165 glColor 1, 1, 0, 1; 540 );
166 glBegin GL_LINE_LOOP; 541 }
167 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
169 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
171 glEnd;
172 542 }
173 glDisable GL_BLEND; 543
544 DC::Texture::draw_fow_texture
545 $::CFG->{fow_intensity},
546 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
547 @{$self->{fow_texture}}{qw(name data s t w h)},
548 @prev_fow_params;
174 } 549 }
175 # HACK END 550
551 if ($self->{magicmap}) {
552 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
553
554 $x += $::MAP->ox + $self->{dx};
555 $y += $::MAP->oy + $self->{dy};
556
557 glTranslate - $x - 1, - $y - 1;
558 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
559 $::MAP->draw_magicmap ($w, $h, $data);
176 } 560 }
177 561
562 glPopMatrix;
178 glEndList; 563 glEndList;
179 } 564 }
565 } else {
566 delete $self->{last_fow_texture};
567 delete $self->{fow_texture};
180 568
181 glPushMatrix; 569 glDeleteList delete $self->{list}
570 if $self->{list};
571 }
572}
573
574sub draw {
575 my ($self) = @_;
576
577 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
578
579 return unless $self->{list};
580
581 my $focused = $DC::UI::FOCUS == $self
582 || $DC::UI::FOCUS == $::COMPLETER->{entry};
583
584 return
585 unless $focused || !$::FAST;
586
182 glCallList $self->{list}; 587 glCallList $self->{list};
183 glPopMatrix;
184 588
185 if ($CFClient::UI::FOCUS != $self) { 589 # TNT2 emulates logops in software (or worse :)
186 glColor 64/255, 64/255, 64/255; 590 unless ($focused) {
187 glLogicOp GL_AND; 591 glColor_premultiply 0, 0, 1, 0.25;
188 glEnable GL_COLOR_LOGIC_OP; 592 glEnable GL_BLEND;
593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 594 glBegin GL_QUADS;
190 glVertex 0, 0; 595 glVertex 0, 0;
191 glVertex 0, $::HEIGHT; 596 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT; 597 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0; 598 glVertex $::WIDTH, 0;
194 glEnd; 599 glEnd;
195 glDisable GL_COLOR_LOGIC_OP; 600 glDisable GL_BLEND;
196 } 601 }
197} 602}
198 603
199my %DIR = ( 604sub DESTROY {
200 CFClient::SDLK_KP8, [1, "north"], 605 my $self = shift;
201 CFClient::SDLK_KP9, [2, "northeast"],
202 CFClient::SDLK_KP6, [3, "east"],
203 CFClient::SDLK_KP3, [4, "southeast"],
204 CFClient::SDLK_KP2, [5, "south"],
205 CFClient::SDLK_KP1, [6, "southwest"],
206 CFClient::SDLK_KP4, [7, "west"],
207 CFClient::SDLK_KP7, [8, "northwest"],
208 606
209 CFClient::SDLK_UP, [1, "north"], 607 glDeleteList $self->{list};
210 CFClient::SDLK_RIGHT, [3, "east"],
211 CFClient::SDLK_DOWN, [5, "south"],
212 CFClient::SDLK_LEFT, [7, "west"],
213);
214 608
215sub key_down { 609 $self->SUPER::DESTROY;
610}
611
612package DC::MapWidget::MapMap;
613
614use common::sense;
615
616our @ISA = DC::UI::Base::;
617
618use DC::OpenGL;
619
620sub size_request {
621 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
622}
623
624sub refresh_hook {
216 my ($self, $ev) = @_; 625 my ($self) = @_;
217 626
218 my $mod = $ev->{mod}; 627 if ($::MAP && $self->{texture_atime} < AE::now) {
219 my $sym = $ev->{sym}; 628 my ($w, $h) = @$self{qw(w h)};
220 629
221 if ($sym == CFClient::SDLK_KP5) { 630 return unless $w && $h;
222 $::CONN->user_send ("stay fire");
223 } elsif ($sym == ord ",") {
224 $::CONN->user_send ("take");
225 } elsif ($sym == ord "a") {
226 $::CONN->user_send ("apply");
227 } elsif ($sym == ord "'") {
228 $self->emit ('activate_console');
229 } elsif ($sym == ord "/") {
230 $self->emit (activate_console => '/');
231 } elsif (exists $DIR{$sym}) {
232 if ($mod & CFClient::KMOD_SHIFT) {
233 $self->{shft}++;
234 $::CONN->user_send ("fire $DIR{$sym}[0]");
235 } elsif ($mod & CFClient::KMOD_CTRL) {
236 $self->{ctrl}++;
237 $::CONN->user_send ("run $DIR{$sym}[0]");
238 } else {
239 $::CONN->user_send ("$DIR{$sym}[1]");
240 }
241 } elsif ($ev->{unicode}) {
242 $self->{command_widget} ||=
243 new CFClient::MapWidget::Command::
244 command => $self->{command},
245 can_focus => 1,
246 connect_execute => sub {
247 # todo: support callback instead of user_send
248 $::CONN->user_send ($_[1][1]);
249 },
250 connect_close => sub {
251 (delete $self->{command_widget})->hide;
252 $self->focus_in;
253 },
254 ;
255 $self->{command_widget}->key_down ($ev);
256 return unless $self->{command_widget};
257 $self->{command_widget}->show;
258 $self->{command_widget}->focus_in;
259 }
260}
261 631
262sub key_up { 632 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
633 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
634
635 my $ox = 0.5 * ($w - $sw);
636 my $oy = 0.5 * ($h - $sh);
637
638 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
639 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
640
641 #TODO: map scale is completely borked
642
643 my $x0 = int $ox - $sx + 0.5;
644 my $y0 = int $oy - $sy + 0.5;
645
646 $self->{sw} = $sw;
647 $self->{sh} = $sh;
648
649 $self->{x0} = $x0;
650 $self->{y0} = $y0;
651
652 $self->{texture_atime} = AE::now + 1/2;
653
654 $self->{texture} =
655 new DC::Texture
656 w => $w,
657 h => $h,
658 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
659 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
660 }
661}
662
663sub invoke_visibility_change {
263 my ($self, $ev) = @_; 664 my ($self) = @_;
264 665
265 my $mod = $ev->{mod}; 666 $self->refresh_hook;
266 my $sym = $ev->{sym};
267 667
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 668 0
269 $::CONN->user_send ("fire_stop"); 669}
670
671sub invoke_size_allocate {
672 my ($self, $w, $h) = @_;
673
674 $self->update;
675
676 1
677}
678
679sub update {
680 my ($self) = @_;
681
682 delete $self->{texture_atime};
683 $self->SUPER::update;
684}
685
686sub _draw {
687 my ($self) = @_;
688
689 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
690
691 $self->{texture} or return;
692
693 glEnable GL_BLEND;
694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
695 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697
698 $self->{texture}->draw_quad (0, 0);
699
700 glDisable GL_TEXTURE_2D;
701
702 glTranslate 0.375, 0.375;
703
704 glColor 1, 1, 0, 1;
705 glBegin GL_LINE_LOOP;
706 glVertex $self->{x0} , $self->{y0} ;
707 glVertex $self->{x0} , $self->{y0} + $self->{sh};
708 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
709 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
710 glEnd;
270 } 711
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 712 glDisable GL_BLEND;
272 $::CONN->user_send ("run_stop");
273 }
274} 713}
275 714
276sub add_command {
277 my ($self, $command, $tooltip, $widget, $cb) = @_;
278
279 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
280
281 push @{$self->{command}}, [$abbrev, $command, $tooltip, $widget, $cb];
282}
283
284package CFClient::MapWidget::Command; 715package DC::MapWidget::Command;
285 716
286use strict; 717use common::sense;
287 718
288use CFClient::OpenGL; 719use DC::OpenGL;
289 720
290our @ISA = CFClient::UI::VBox::; 721our @ISA = DC::UI::Frame::;
291 722
292sub new { 723sub new {
293 my $class = shift; 724 my $class = shift;
294 725
295 my $self = $class->SUPER::new ( 726 my $self = $class->SUPER::new (
727 bg => [0, 0, 0, 0.8],
296 @_, 728 @_,
297 children => [map
298 CFClient::UI::Label->new (
299 can_hover => 1,
300 can_events => 1,
301 fontsize => $_,
302 ), 1, 1, 0.8, 0.8, 0.8, 0.8, 0.8
303 ],
304 ); 729 );
305 730
731 $self->add ($self->{vbox} = new DC::UI::VBox);
732
733 $self->{label} = [
734 map
735 DC::UI::Label->new (
736 align => 0,
737 can_hover => 1,
738 can_events => 1,
739 tooltip_width => 0.33,
740 fontsize => $_,
741 ), (0.8) x 16
742 ];
743
744 $self->{entry} = new DC::UI::Entry
745 on_changed => sub {
746 $self->update_labels;
747 0
748 },
749 on_button_down => sub {
750 my ($entry, $ev, $x, $y) = @_;
751
752 if ($ev->{button} == 3) {
753 (new DC::UI::Menu
754 items => [
755 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
756 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
757 ],
758 )->popup ($ev);
759 return 1;
760 }
761 0
762 },
763 on_key_down => sub {
764 my ($entry, $ev) = @_;
765
766 my $self = $entry->{parent}{parent};
767
768 if ($ev->{sym} == 13) {
769 if (exists $self->{select}) {
770 $self->{last_command} = $self->{select};
771 $::CONN->user_send ($self->{select});
772
773 unshift @{$self->{history}}, $self->{entry}->get_text;
774 $self->{hist_ptr} = 0;
775
776 $self->hide;
777 }
778 } elsif ($ev->{sym} == 27) {
779 $self->{hist_ptr} = 0;
780 $self->hide;
781 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
782 if ($self->{hist_ptr} > 1) {
783 $self->{hist_ptr}--;
784 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
785 } elsif ($self->{hist_ptr} > 0) {
786 $self->{hist_ptr}--;
787 $self->{entry}->set_text ($self->{hist_saveback});
788 } else {
789 ++$self->{select_offset}
790 if $self->{select_offset} < $#{ $self->{last_match} || [] };
791 }
792 $self->update_labels;
793 } elsif ($ev->{sym} == DC::SDLK_UP) {
794 if ($self->{select_offset}) {
795 --$self->{select_offset}
796 } else {
797 unless ($self->{hist_ptr}) {
798 $self->{hist_saveback} = $self->{entry}->get_text;
799 }
800 if ($self->{hist_ptr} <= $#{$self->{history}}) {
801 $self->{hist_ptr}++;
802 }
803 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
804 if exists $self->{history}->[$self->{hist_ptr} - 1];
805 }
806 $self->update_labels;
807 } else {
808 return 0;
809 }
810
811 1
812 }
813 ;
814
815 $self->{vbox}->add (
816 $self->{entry},
817 @{$self->{label}},
818 );
819
306 $self 820 $self
307} 821}
308 822
823sub set_prefix {
824 my ($self, $prefix) = @_;
825
826 $self->{entry}->set_text ($prefix);
827 $self->show;
828}
829
309sub size_allocate { 830sub invoke_size_allocate {
310 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
311 832
312 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 833 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
834
835 $self->SUPER::invoke_size_allocate ($w, $h)
836}
837
838sub show {
839 my ($self) = @_;
840
841 $self->SUPER::show;
842 $self->{entry}->grab_focus;
843}
844
845sub hide {
846 my ($self) = @_;
847
848 $self->{hist_ptr} = 0;
849
850 $self->SUPER::hide;
851 $self->{entry}->set_text ("");
852}
853
854sub inject_key_down {
855 my ($self, $ev) = @_;
856
857 $self->{entry}->grab_focus;
858 $self->{entry}->emit (key_down => $ev);
314} 859}
315 860
316sub update_labels { 861sub update_labels {
317 my ($self) = @_; 862 my ($self) = @_;
318 863
319 my $command = $self->{command}; 864 my $text = $self->{entry}->get_text;
320 my $search_abbrev = qr/^\Q$self->{search}/;
321 my $search_full = qr/\Q$self->{search}/;
322 865
323 my @found; 866 length $text
867 or return $self->hide;
324 868
325 for (@$command) { 869 if ($text ne $self->{last_search}) {
326 if ($_->[0] =~ $search_abbrev) { 870 my @match;
327 push @found, [$_->[0], $_]; 871
328 } elsif ($_->[1] =~ $search_full) { 872 if ($text =~ /^(.*?)\s+$/) {
329 push @found, [$_->[1], $_]; 873 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
874 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
875 } else {
876 # @match is [command, penalty, command with arguments] until sort
877
878 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
879
880 my $regexp_abbrev = do {
881 my ($beg, @chr) = split //, lc $cmd;
882
883 # the following regex is used to match our "completion entry"
884 # to an actual command - the parentheses match kind of "overhead"
885 # - the more characters the parentheses match, the less attractive
886 # is the match.
887 my $regexp = "^\Q$beg\E"
888 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
889 qr<$regexp>
890 };
891
892 my $regexp_partial = do {
893 my $regexp = "^\Q$text\E(.*)";
894 qr<$regexp>
895 };
896
897 for (keys %{$self->{command}}) {
898 my @scores;
899
900 # 1. Complete command [with args]
901 # command is a prefix of the text
902 # score is length of complete command matched
903 # e.g. "invoke summon pet monster bat"
904 # "invoke" "summon pet monster bat" = 6
905 # "invoke summon pet monster" "bat" = 25
906 if ($text =~ /^\Q$_\E(.*)/) {
907 push @scores, [$_, length $_, $text];
908 }
909
910 # 2. Partial command
911 # text is a prefix of the full command
912 # score is the length of the input text
913 # e.g. "invoke s"
914 # "invoke small fireball" = 8
915 # "invoke summon pet monster" = 8
916
917 if ($_ =~ $regexp_partial) {
918 push @scores, [$_, length $text, $_];
919 }
920
921 # 3. Abbreviation match
922 # attempts to use first word of text as an abbreviated command
923 # score is length of word + 1 - 3 per non-word-initial character
924
925 if (my @penalty = $_ =~ $regexp_abbrev) {
926 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
927 }
928
929 # Pick the best option for this command
930 push @match, (sort {
931 $b->[1] <=> $a->[1]
932 } @scores)[0];
330 } 933 }
331 }
332 934
333 @found = sort { $a->[0] cmp $b->[0] } @found; 935 # @match is now [command object, command with arguments]
936 @match = map [$self->{command}{$_->[0]}, $_->[2]],
937 sort {
938 $b->[1] <=> $a->[1]
939 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
940 or (length $b->[0]) <=> (length $a->[0])
941 } @match;
942 }
334 943
335 $self->{children}[0]->set_text ("$self->{search}_"); 944 $self->{last_search} = $text;
945 $self->{last_match} = \@match;
336 946
337 for (0..5) { 947 $self->{select_offset} = 0;
338 $self->{children}[$_ + 1]->set_text ($found[$_] ? "$found[$_][0] ($found[$_][1][1])" : "");
339 $self->{children}[$_ + 1]{tooltip} = ($found[$_] ? $found[$_][1][2] : "");
340 } 948 }
341 949
950 my @labels = @{ $self->{label} };
951 my @matches = @{ $self->{last_match} || [] };
952
953 if ($self->{select_offset}) {
954 splice @matches, 0, $self->{select_offset}, ();
955
956 my $label = shift @labels;
957 $label->set_text ("...");
958 $label->set_tooltip ("Use Cursor-Up to view previous matches");
959 }
960
961 for my $label (@labels) {
962 $label->{fg} = [1, 1, 1, 1];
963 $label->{bg} = [0, 0, 0, 0];
964 }
965
966 if (@matches) {
342 $self->{select} = $found[0][1] 967 $self->{select} = "$matches[0][1]";
343 if @found;
344 968
345 if (@found > 6) { 969 $labels[0]->{fg} = [0, 0, 0, 1];
346 $self->{children}[6]->set_text ("..."); 970 $labels[0]->{bg} = [1, 1, 1, 0.8];
971 } else {
972 $self->{select} = "$text";
347 } 973 }
348 974
349 $self->check_size; 975 for my $match (@matches) {
350} 976 my $label = shift @labels;
351 977
352sub key_down { 978 if (@labels) {
979 $label->set_text ("$match->[1]");
980 $label->set_tooltip ("$match->[0][1]");
981 } else {
982 $label->set_text ("...");
983 $label->set_tooltip ("Use Cursor-Down to view more matches");
984 last;
985 }
986 }
987
988 for my $label (@labels) {
989 $label->set_text ("");
990 $label->set_tooltip ("");
991 }
992
993 $self->update;
994}
995
996sub _draw {
353 my ($self, $ev) = @_; 997 my ($self) = @_;
354 998
355 if ($ev->{sym} == 8) { 999 # hack
356 substr $self->{search}, -1, 1, ""; 1000 local $DC::UI::FOCUS = $self->{entry};
357 $self->update_labels;
358 } elsif ($ev->{sym} == 13) {
359 if (exists $self->{select}) {
360 $self->emit (execute => $self->{select});
361 $self->emit ("close");
362 }
363 } elsif ($ev->{sym} == 27) {
364 $self->emit ("close");
365 return;
366 } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
367 $self->{search} .= chr $ev->{unicode};
368 $self->update_labels;
369 }
370 1001
371 length $self->{search} 1002 $self->SUPER::_draw;
372 or $self->emit ("close");
373} 1003}
374 1004
3751 10051
1006

Diff Legend

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