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.10 by root, Mon Apr 24 03:19:42 2006 UTC vs.
Revision 1.159 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines