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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines