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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines