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.161 by root, Sat Mar 20 01:25:56 2010 UTC

1package CFClient::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use DC;
8use CFClient::OpenGL; 9use DC::OpenGL;
10use DC::UI;
11use DC::Macro;
9 12
10our @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;
11 23
12sub new { 24sub new {
13 my $class = shift; 25 my $class = shift;
14 26
15 $class->SUPER::new ( 27 my $self = $class->SUPER::new (
16 z => -1, 28 z => -1,
17 can_focus => 1, 29 can_focus => 1,
18 list => glGenList, 30 tilesize => 32,
19 @_ 31 @_
20 ) 32 );
21}
22 33
23sub 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 {
24 my $self = shift; 50 my ($self) = @_;
25 51
26 glDeleteList $self->{list}; 52 %{$::COMPLETER->{command}} = ();
27 53
28 $self->SUPER::DESTROY; 54 $::COMPLETER->hide
55 if $::COMPLETER;
29} 56}
30 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
31sub button_down { 168sub invoke_button_down {
32 my ($self, $ev, $x, $y) = @_; 169 my ($self, $ev, $x, $y) = @_;
33 170
34 $self->focus_in;
35
36 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
37 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
38 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 190 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
39 191
40 $self->{motion} = sub { 192 $self->{motion} = sub {
41 my ($ev, $x, $y) = @_; 193 my ($ev, $x, $y) = @_;
45 $::CFG->{map_shift_x} = $bw + $x - $ox; 197 $::CFG->{map_shift_x} = $bw + $x - $ox;
46 $::CFG->{map_shift_y} = $bh + $y - $oy; 198 $::CFG->{map_shift_y} = $bh + $y - $oy;
47 199
48 $self->update; 200 $self->update;
49 }; 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 (@{ $::CONN->{editor_support}{servertypes} }) {
220 $::CONN->{editor_support}{servertype} 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
50 } 249 1
51} 250}
52 251
53sub button_up { 252sub invoke_button_up {
54 my ($self, $ev, $x, $y) = @_; 253 my ($self, $ev, $x, $y) = @_;
55 254
56 delete $self->{motion}; 255 delete $self->{motion};
57}
58 256
257 1
258}
259
59sub mouse_motion { 260sub invoke_mouse_motion {
60 my ($self, $ev, $x, $y) = @_; 261 my ($self, $ev, $x, $y) = @_;
61 262
263 if ($self->{motion}) {
62 $self->{motion}->($ev, $x, $y) if $self->{motion}; 264 $self->{motion}->($ev, $x, $y);
265 } else {
266 return 0;
267 }
268
269 1
63} 270}
64 271
65sub size_request { 272sub size_request {
273 my ($self) = @_;
274
66 ( 275 (
67 1 + 32 * int $::WIDTH / 32, 276 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
68 1 + 32 * int $::HEIGHT / 32, 277 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
69 ) 278 )
70} 279}
71 280
72sub update { 281sub update {
73 my ($self) = @_; 282 my ($self) = @_;
74 283
75 $self->{need_update} = 1; 284 $self->{need_update} = 1;
76 $self->SUPER::update; 285 $self->SUPER::update;
77} 286}
78 287
79sub 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 {
80 my ($self) = @_; 315 my ($self, $ev) = @_;
81 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->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
413 $self->{lfdx} = $dx;
414 $self->{lfdy} = $dy;
415 $self->{lmdx} = $self->{dx};
416 $self->{lmdy} = $self->{dy};
417
418 $::MAP->scroll ($dx, $dy);
419}
420
421sub set_magicmap {
422 my ($self, $w, $h, $x, $y, $data) = @_;
423
424 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
425 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
426
427 $self->{magicmap} = [$x, $y, $w, $h, $data];
428
429 $self->update;
430}
431
432sub movement_update {
433 my ($self) = @_;
434
435 if ($::CFG->{smooth_movement}) {
436 if ($self->{sdx} || $self->{sdy}) {
437 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
438 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
439
440 # the minimum time for a single tile movement
441 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
442
443 $spd *= $self->{tilesize};
444
445 # jump if "impossibly high" speed
446 if (
447 (max abs $self->{sdx}, abs $self->{sdy})
448 > $spd * $mintime * 2.1
449 ) {
450 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
451 $self->{sdx} = $self->{sdy} = 0;
452 } else {
453 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
454
455 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
456 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
457
458 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
459 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
460 }
461
462 $self->update;
463 }
464 } else {
465 $self->{sdx} = $self->{sdy} = 0;
466 }
467
468 $self->{last_update} = EV::time;
469}
470
471sub refresh_hook {
472 my ($self) = @_;
473
474 if ($::MAP && $::CONN) {
82 if (delete $self->{need_update}) { 475 if (delete $self->{need_update}) {
83 glNewList $self->{list}; 476 $self->movement_update;
84 477
85 if ($::MAP) { 478 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 479
89 glPushMatrix; 480 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
90 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 481 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
91 482
92 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 483 # width/height of map, in tiles
93 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 484 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
485 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
94 486
95 glTranslate $sx0 - 32, $sy0 - 32, 0; 487 # the map displacement, in tiles
488 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
489 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
96 490
97 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 491 # the upper left "visible" corner, in pixels
492 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
493 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
494
495 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
496 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
98 497
99 if ($::CFG->{fow_enable}) { 498 if ($::CFG->{fow_enable}) {
100 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 499 # draw_fow_texture REQUIRES the fow texture to stay the same size.
101 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 500 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 501
115 $self->{fow_texture} = new CFClient::Texture 502 $self->{fow_texture} = new DC::Texture
116 w => $w, 503 w => $w,
117 h => $h, 504 h => $h,
118 data => $data, 505 data => $data,
119 internalformat => GL_ALPHA, 506 internalformat => GL_ALPHA,
120 format => GL_ALPHA; 507 format => GL_ALPHA;
121 508 } else {
122 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 509 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 } 510 }
135 511
136 # HACK BEGIN 512 glNewList ($self->{list} ||= glGenList);
137 {
138 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
139 513
514 glPushMatrix;
140 glTranslate 0, 30; 515 glTranslate $sx0, $sy0;
141 my ($w, $h) = (250, 250); 516 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
517 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
142 518
143 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 519 $::MAP->draw ($dx, $dy, $sw, $sh,
520 $self->{tilesize},
521 $::CONN->{player}{tag},
522 -$self->{sdx}, -$self->{sdy});
144 523
145 glEnable GL_BLEND; 524 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 525
150 glPopMatrix; 526 if (my $tex = $self->{fow_texture}) {
527 my @prev_fow_params;
151 528
152 $self->{mapmap_texture} = 529 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
153 new CFClient::Texture 530 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
154 w => $w, 531 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 532
159 $self->{mapmap_texture}->draw_quad (0, 0); 533 if ($d1 * $d2) {
160 534 @prev_fow_params = (
161 glDisable GL_TEXTURE_2D; 535 (min 1, $d1 / $d2),
162 536 $self->{lmdx} - $dx - $self->{lfdx},
163 glTranslate 0.375, 0.375; 537 $self->{lmdy} - $dy - $self->{lfdy},
164 538 @{$self->{prev_fow_texture}}{qw(name data)}
165 glColor 1, 1, 0, 1; 539 );
166 glBegin GL_LINE_LOOP; 540 }
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 541 }
173 glDisable GL_BLEND; 542
543 DC::Texture::draw_fow_texture
544 $::CFG->{fow_intensity},
545 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
546 @{$self->{fow_texture}}{qw(name data s t w h)},
547 @prev_fow_params;
174 } 548 }
175 # HACK END 549
550 if ($self->{magicmap}) {
551 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
552
553 $x += $::MAP->ox + $self->{dx};
554 $y += $::MAP->oy + $self->{dy};
555
556 glTranslate - $x - 1, - $y - 1;
557 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
558 $::MAP->draw_magicmap ($w, $h, $data);
176 } 559 }
177 560
561 glPopMatrix;
178 glEndList; 562 glEndList;
179 } 563 }
564 } else {
565 delete $self->{last_fow_texture};
566 delete $self->{fow_texture};
180 567
181 glPushMatrix; 568 glDeleteList delete $self->{list}
569 if $self->{list};
570 }
571}
572
573sub draw {
574 my ($self) = @_;
575
576 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
577
578 return unless $self->{list};
579
580 my $focused = $DC::UI::FOCUS == $self
581 || $DC::UI::FOCUS == $::COMPLETER->{entry};
582
583 return
584 unless $focused || !$::FAST;
585
182 glCallList $self->{list}; 586 glCallList $self->{list};
183 glPopMatrix;
184 587
185 if ($CFClient::UI::FOCUS != $self) { 588 # TNT2 emulates logops in software (or worse :)
186 glColor 64/255, 64/255, 64/255; 589 unless ($focused) {
187 glLogicOp GL_AND; 590 glColor_premultiply 0, 0, 1, 0.25;
188 glEnable GL_COLOR_LOGIC_OP; 591 glEnable GL_BLEND;
592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
189 glBegin GL_QUADS; 593 glBegin GL_QUADS;
190 glVertex 0, 0; 594 glVertex 0, 0;
191 glVertex 0, $::HEIGHT; 595 glVertex 0, $::HEIGHT;
192 glVertex $::WIDTH, $::HEIGHT; 596 glVertex $::WIDTH, $::HEIGHT;
193 glVertex $::WIDTH, 0; 597 glVertex $::WIDTH, 0;
194 glEnd; 598 glEnd;
195 glDisable GL_COLOR_LOGIC_OP; 599 glDisable GL_BLEND;
196 } 600 }
197} 601}
198 602
199my %DIR = ( 603sub DESTROY {
200 CFClient::SDLK_KP8, [1, "north"], 604 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 605
209 CFClient::SDLK_UP, [1, "north"], 606 glDeleteList $self->{list};
210 CFClient::SDLK_RIGHT, [3, "east"],
211 CFClient::SDLK_DOWN, [5, "south"],
212 CFClient::SDLK_LEFT, [7, "west"],
213);
214 607
215sub key_down { 608 $self->SUPER::DESTROY;
216 my ($self, $ev) = @_;
217
218 my $mod = $ev->{mod};
219 my $sym = $ev->{sym};
220
221 if ($sym == CFClient::SDLK_KP5) {
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} 609}
261 610
262sub key_up { 611package DC::MapWidget::MapMap;
263 my ($self, $ev) = @_;
264
265 my $mod = $ev->{mod};
266 my $sym = $ev->{sym};
267
268 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
269 $::CONN->user_send ("fire_stop");
270 }
271 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
272 $::CONN->user_send ("run_stop");
273 }
274}
275
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;
285 612
286use strict; 613use strict;
614use utf8;
287 615
616our @ISA = DC::UI::Base::;
617
618use Time::HiRes qw(time);
288use CFClient::OpenGL; 619use DC::OpenGL;
289 620
290our @ISA = CFClient::UI::VBox::; 621sub size_request {
622 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
623}
624
625sub refresh_hook {
626 my ($self) = @_;
627
628 if ($::MAP && $self->{texture_atime} < time) {
629 my ($w, $h) = @$self{qw(w h)};
630
631 return unless $w && $h;
632
633 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
634 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
635
636 my $ox = 0.5 * ($w - $sw);
637 my $oy = 0.5 * ($h - $sh);
638
639 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
640 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
641
642 #TODO: map scale is completely borked
643
644 my $x0 = int $ox - $sx + 0.5;
645 my $y0 = int $oy - $sy + 0.5;
646
647 $self->{sw} = $sw;
648 $self->{sh} = $sh;
649
650 $self->{x0} = $x0;
651 $self->{y0} = $y0;
652
653 $self->{texture_atime} = time + 1/3;
654
655 $self->{texture} =
656 new DC::Texture
657 w => $w,
658 h => $h,
659 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
660 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
661 }
662}
663
664sub invoke_visibility_change {
665 my ($self) = @_;
666
667 $self->refresh_hook;
668
669 0
670}
671
672sub invoke_size_allocate {
673 my ($self, $w, $h) = @_;
674
675 $self->update;
676
677 1
678}
679
680sub update {
681 my ($self) = @_;
682
683 delete $self->{texture_atime};
684 $self->SUPER::update;
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
691
692 $self->{texture} or return;
693
694 glEnable GL_BLEND;
695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
696 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698
699 $self->{texture}->draw_quad (0, 0);
700
701 glDisable GL_TEXTURE_2D;
702
703 glTranslate 0.375, 0.375;
704
705 glColor 1, 1, 0, 1;
706 glBegin GL_LINE_LOOP;
707 glVertex $self->{x0} , $self->{y0} ;
708 glVertex $self->{x0} , $self->{y0} + $self->{sh};
709 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
710 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
711 glEnd;
712
713 glDisable GL_BLEND;
714}
715
716package DC::MapWidget::Command;
717
718use strict;
719
720use DC::OpenGL;
721
722our @ISA = DC::UI::Frame::;
291 723
292sub new { 724sub new {
293 my $class = shift; 725 my $class = shift;
294 726
295 my $self = $class->SUPER::new ( 727 my $self = $class->SUPER::new (
728 bg => [0, 0, 0, 0.8],
296 @_, 729 @_,
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 ); 730 );
305 731
732 $self->add ($self->{vbox} = new DC::UI::VBox);
733
734 $self->{label} = [
735 map
736 DC::UI::Label->new (
737 align => 0,
738 can_hover => 1,
739 can_events => 1,
740 tooltip_width => 0.33,
741 fontsize => $_,
742 ), (0.8) x 16
743 ];
744
745 $self->{entry} = new DC::UI::Entry
746 on_changed => sub {
747 $self->update_labels;
748 0
749 },
750 on_button_down => sub {
751 my ($entry, $ev, $x, $y) = @_;
752
753 if ($ev->{button} == 3) {
754 (new DC::UI::Menu
755 items => [
756 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
757 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
758 ],
759 )->popup ($ev);
760 return 1;
761 }
762 0
763 },
764 on_key_down => sub {
765 my ($entry, $ev) = @_;
766
767 my $self = $entry->{parent}{parent};
768
769 if ($ev->{sym} == 13) {
770 if (exists $self->{select}) {
771 $self->{last_command} = $self->{select};
772 $::CONN->user_send ($self->{select});
773
774 unshift @{$self->{history}}, $self->{entry}->get_text;
775 $self->{hist_ptr} = 0;
776
777 $self->hide;
778 }
779 } elsif ($ev->{sym} == 27) {
780 $self->{hist_ptr} = 0;
781 $self->hide;
782 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
783 if ($self->{hist_ptr} > 1) {
784 $self->{hist_ptr}--;
785 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
786 } elsif ($self->{hist_ptr} > 0) {
787 $self->{hist_ptr}--;
788 $self->{entry}->set_text ($self->{hist_saveback});
789 } else {
790 ++$self->{select_offset}
791 if $self->{select_offset} < $#{ $self->{last_match} || [] };
792 }
793 $self->update_labels;
794 } elsif ($ev->{sym} == DC::SDLK_UP) {
795 if ($self->{select_offset}) {
796 --$self->{select_offset}
797 } else {
798 unless ($self->{hist_ptr}) {
799 $self->{hist_saveback} = $self->{entry}->get_text;
800 }
801 if ($self->{hist_ptr} <= $#{$self->{history}}) {
802 $self->{hist_ptr}++;
803 }
804 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
805 if exists $self->{history}->[$self->{hist_ptr} - 1];
806 }
807 $self->update_labels;
808 } else {
809 return 0;
810 }
811
812 1
813 }
814 ;
815
816 $self->{vbox}->add (
817 $self->{entry},
818 @{$self->{label}},
819 );
820
306 $self 821 $self
307} 822}
308 823
824sub set_prefix {
825 my ($self, $prefix) = @_;
826
827 $self->{entry}->set_text ($prefix);
828 $self->show;
829}
830
309sub size_allocate { 831sub invoke_size_allocate {
310 my ($self, $w, $h) = @_; 832 my ($self, $w, $h) = @_;
311 833
312 $self->SUPER::size_allocate ($w, $h);
313 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 834 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
835
836 $self->SUPER::invoke_size_allocate ($w, $h)
837}
838
839sub show {
840 my ($self) = @_;
841
842 $self->SUPER::show;
843 $self->{entry}->grab_focus;
844}
845
846sub hide {
847 my ($self) = @_;
848
849 $self->{hist_ptr} = 0;
850
851 $self->SUPER::hide;
852 $self->{entry}->set_text ("");
853}
854
855sub inject_key_down {
856 my ($self, $ev) = @_;
857
858 $self->{entry}->grab_focus;
859 $self->{entry}->emit (key_down => $ev);
314} 860}
315 861
316sub update_labels { 862sub update_labels {
317 my ($self) = @_; 863 my ($self) = @_;
318 864
319 my $command = $self->{command}; 865 my $text = $self->{entry}->get_text;
320 my $search_abbrev = qr/^\Q$self->{search}/;
321 my $search_full = qr/\Q$self->{search}/;
322 866
323 my @found; 867 length $text
868 or return $self->hide;
324 869
325 for (@$command) { 870 if ($text ne $self->{last_search}) {
326 if ($_->[0] =~ $search_abbrev) { 871 my @match;
327 push @found, [$_->[0], $_]; 872
328 } elsif ($_->[1] =~ $search_full) { 873 if ($text =~ /^(.*?)\s+$/) {
329 push @found, [$_->[1], $_]; 874 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
875 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
876 } else {
877 # @match is [command, penalty, command with arguments] until sort
878
879 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
880
881 my $regexp_abbrev = do {
882 my ($beg, @chr) = split //, lc $cmd;
883
884 # the following regex is used to match our "completion entry"
885 # to an actual command - the parentheses match kind of "overhead"
886 # - the more characters the parentheses match, the less attractive
887 # is the match.
888 my $regexp = "^\Q$beg\E"
889 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
890 qr<$regexp>
891 };
892
893 my $regexp_partial = do {
894 my $regexp = "^\Q$text\E(.*)";
895 qr<$regexp>
896 };
897
898 for (keys %{$self->{command}}) {
899 my @scores;
900
901 # 1. Complete command [with args]
902 # command is a prefix of the text
903 # score is length of complete command matched
904 # e.g. "invoke summon pet monster bat"
905 # "invoke" "summon pet monster bat" = 6
906 # "invoke summon pet monster" "bat" = 25
907 if ($text =~ /^\Q$_\E(.*)/) {
908 push @scores, [$_, length $_, $text];
909 }
910
911 # 2. Partial command
912 # text is a prefix of the full command
913 # score is the length of the input text
914 # e.g. "invoke s"
915 # "invoke small fireball" = 8
916 # "invoke summon pet monster" = 8
917
918 if ($_ =~ $regexp_partial) {
919 push @scores, [$_, length $text, $_];
920 }
921
922 # 3. Abbreviation match
923 # attempts to use first word of text as an abbreviated command
924 # score is length of word + 1 - 3 per non-word-initial character
925
926 if (my @penalty = $_ =~ $regexp_abbrev) {
927 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
928 }
929
930 # Pick the best option for this command
931 push @match, (sort {
932 $b->[1] <=> $a->[1]
933 } @scores)[0];
330 } 934 }
331 }
332 935
333 @found = sort { $a->[0] cmp $b->[0] } @found; 936 # @match is now [command object, command with arguments]
937 @match = map [$self->{command}{$_->[0]}, $_->[2]],
938 sort {
939 $b->[1] <=> $a->[1]
940 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
941 or (length $b->[0]) <=> (length $a->[0])
942 } @match;
943 }
334 944
335 $self->{children}[0]->set_text ("$self->{search}_"); 945 $self->{last_search} = $text;
946 $self->{last_match} = \@match;
336 947
337 for (0..5) { 948 $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 } 949 }
341 950
951 my @labels = @{ $self->{label} };
952 my @matches = @{ $self->{last_match} || [] };
953
954 if ($self->{select_offset}) {
955 splice @matches, 0, $self->{select_offset}, ();
956
957 my $label = shift @labels;
958 $label->set_text ("...");
959 $label->set_tooltip ("Use Cursor-Up to view previous matches");
960 }
961
962 for my $label (@labels) {
963 $label->{fg} = [1, 1, 1, 1];
964 $label->{bg} = [0, 0, 0, 0];
965 }
966
967 if (@matches) {
342 $self->{select} = $found[0][1] 968 $self->{select} = "$matches[0][1]";
343 if @found;
344 969
345 if (@found > 6) { 970 $labels[0]->{fg} = [0, 0, 0, 1];
346 $self->{children}[6]->set_text ("..."); 971 $labels[0]->{bg} = [1, 1, 1, 0.8];
972 } else {
973 $self->{select} = "$text";
347 } 974 }
348 975
349 $self->check_size; 976 for my $match (@matches) {
350} 977 my $label = shift @labels;
351 978
352sub key_down { 979 if (@labels) {
980 $label->set_text ("$match->[1]");
981 $label->set_tooltip ("$match->[0][1]");
982 } else {
983 $label->set_text ("...");
984 $label->set_tooltip ("Use Cursor-Down to view more matches");
985 last;
986 }
987 }
988
989 for my $label (@labels) {
990 $label->set_text ("");
991 $label->set_tooltip ("");
992 }
993
994 $self->update;
995}
996
997sub _draw {
353 my ($self, $ev) = @_; 998 my ($self) = @_;
354 999
355 if ($ev->{sym} == 8) { 1000 # hack
356 substr $self->{search}, -1, 1, ""; 1001 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 1002
371 length $self->{search} 1003 $self->SUPER::_draw;
372 or $self->emit ("close");
373} 1004}
374 1005
3751 10061
1007

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines