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

Diff Legend

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