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

Diff Legend

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