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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 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_file DC::Texture DC::find_rcfile "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_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308);
309
310sub invoke_key_down {
82 my ($self) = @_; 311 my ($self, $ev) = @_;
83 312
313 my $mod = $ev->{mod};
314 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode};
316
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
318
319 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym;
323
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
325 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]");
329 }
330 $self->{fire_dir} = $dir->[0];
331 } elsif ($mod & DC::KMOD_CTRL) {
332 $self->{ctrl}++;
333 $::CONN->user_send ("run $dir->[0]");
334 } else {
335 $::CONN->user_send ("$dir->[1]");
336 }
337
84 return 338 return 1;
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 339 }
86 340
341 0
342}
343
344sub invoke_key_up {
345 my ($self, $ev) = @_;
346
347 my $res = 0;
348 my $mod = $ev->{mod};
349 my $sym = $ev->{sym};
350
351 delete $self->{last_mod};
352 delete $self->{last_sym};
353
354 if ($::CFG->{shift_fire_stop}) {
355 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
356 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir};
358 $res = 1;
359 }
360 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && 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 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update;
401
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize};
404}
405
406sub set_magicmap {
407 my ($self, $w, $h, $x, $y, $data) = @_;
408
409 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
410 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
411
412 $self->{magicmap} = [$x, $y, $w, $h, $data];
413
414 $self->update;
415}
416
417sub movement_update {
418 my ($self) = @_;
419
420 if ($::CFG->{smooth_movement}) {
421 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424
425 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);
427
428 # jump if "impossibly high" speed
429 if (
430 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1
432 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
434 $self->{sdx} = $self->{sdy} = 0;
435 } else {
436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 }
446 }
447 } else {
448 $self->{sdx} = $self->{sdy} = 0;
449 }
450
451 $self->{last_update} = EV::time;
452}
453
454sub refresh_hook {
455 my ($self) = @_;
456
457 if ($::MAP && $::CONN) {
87 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 459 $self->movement_update;
89 460
90 if ($::MAP) { 461 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 462
94 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 463 # width/height of map, in tiles
95 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; 464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
96 466
97 glPushMatrix; 467 # the map displacement, in tiles
98 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
99 470
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 471 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
101 474
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
103 477
104 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 479 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
106 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D,
109 GL_ALPHA,
110 3, 3,
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 );
117 glEnable GL_CONVOLUTION_2D;
118 }
119 480
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 481 $self->{fow_texture} = new DC::Texture
124 w => $w, 482 w => $w,
125 h => $h, 483 h => $h,
126 data => $data, 484 data => $data,
127 name => $prev_name, # a bit hackish
128 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 486 format => GL_ALPHA;
487 } else {
488 delete $self->{fow_texture};
489 }
130 490
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 491 glNewList ($self->{list} ||= glGenList);
132 492
493 glPushMatrix;
494 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy};
497
498 warn "mapdraw -$self->{sdx}\n";#d#
499 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize},
501 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy});
503
504 glTranslate -$self->{sdx}, -$self->{sdy};
505 glScale $self->{tilesize}, $self->{tilesize};
506
507 if (my $tex = $self->{fow_texture}) {
508 glPushMatrix;
509 glScale 1/3, 1/3;
133 glEnable GL_TEXTURE_2D; 510 glEnable GL_TEXTURE_2D;
134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135 512
136 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 513 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 514 $self->{fow_texture}->draw_quad_alpha (0, 0);
138 515
139 glDisable GL_TEXTURE_2D; 516 glDisable GL_TEXTURE_2D;
517 glPopMatrix;
140 } 518 }
141 519
520 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522
523 $x += $::MAP->ox + $self->{dx};
524 $y += $::MAP->oy + $self->{dy};
525
526 glTranslate - $x - 1, - $y - 1;
527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
529 }
530
142 glPopMatrix; 531 glPopMatrix;
143 }
144
145 glEndList; 532 glEndList;
533 }
534 } else {
535 glDeleteList delete $self->{list}
536 if $self->{list};
146 } 537 }
538}
147 539
148 glPushMatrix; 540sub draw {
541 my ($self) = @_;
542
543 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
544
545 return unless $self->{list};
546
547 my $focused = $DC::UI::FOCUS == $self
548 || $DC::UI::FOCUS == $::COMPLETER->{entry};
549
550 return
551 unless $focused || !$::FAST;
552
149 glCallList $self->{list}; 553 glCallList $self->{list};
150 glPopMatrix;
151 554
152 # TNT2 emulates logops in software (or worse :) 555 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS != $self) { 556 unless ($focused) {
154 glColor 0.4, 0.2, 0.2, 0.9; 557 glColor_premultiply 0, 0, 1, 0.25;
155 glEnable GL_BLEND; 558 glEnable GL_BLEND;
156 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
157 glBegin GL_QUADS; 560 glBegin GL_QUADS;
158 glVertex 0, 0; 561 glVertex 0, 0;
159 glVertex 0, $::HEIGHT; 562 glVertex 0, $::HEIGHT;
160 glVertex $::WIDTH, $::HEIGHT; 563 glVertex $::WIDTH, $::HEIGHT;
161 glVertex $::WIDTH, 0; 564 glVertex $::WIDTH, 0;
162 glEnd; 565 glEnd;
163 glDisable GL_BLEND; 566 glDisable GL_BLEND;
164 } 567 }
165} 568}
166 569
167my %DIR = ( 570sub DESTROY {
168 CFClient::SDLK_KP8, [1, "north"],
169 CFClient::SDLK_KP9, [2, "northeast"],
170 CFClient::SDLK_KP6, [3, "east"],
171 CFClient::SDLK_KP3, [4, "southeast"],
172 CFClient::SDLK_KP2, [5, "south"],
173 CFClient::SDLK_KP1, [6, "southwest"],
174 CFClient::SDLK_KP4, [7, "west"],
175 CFClient::SDLK_KP7, [8, "northwest"],
176
177 CFClient::SDLK_UP, [1, "north"],
178 CFClient::SDLK_RIGHT, [3, "east"],
179 CFClient::SDLK_DOWN, [5, "south"],
180 CFClient::SDLK_LEFT, [7, "west"],
181);
182
183sub key_down {
184 my ($self, $ev) = @_;
185
186 return unless $::CONN;
187
188 my $mod = $ev->{mod};
189 my $sym = $ev->{sym};
190 my $uni = $ev->{unicode};
191
192 if ($sym == CFClient::SDLK_KP5) {
193 $::CONN->user_send ("stay fire");
194 } elsif ($uni == ord ",") {
195 $::CONN->user_send ("take");
196 } elsif ($uni == ord "\t" or $uni == ord " ") {
197 $::CONN->user_send ("apply");
198 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
199 $::CONN->user_send ("rotateshoottype +");
200 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
201 $::CONN->user_send ("rotateshoottype -");
202 } elsif ($uni == ord "'") {
203 $self->emit ('activate_console');
204 } elsif ($uni == ord "/") {
205 $self->emit (activate_console => '/');
206 } elsif (exists $DIR{$sym}) {
207 if ($mod & CFClient::KMOD_SHIFT) {
208 $self->{shft}++;
209 $::CONN->user_send ("fire $DIR{$sym}[0]");
210 } elsif ($mod & CFClient::KMOD_CTRL) {
211 $self->{ctrl}++;
212 $::CONN->user_send ("run $DIR{$sym}[0]");
213 } else {
214 $::CONN->user_send ("$DIR{$sym}[1]");
215 }
216 } elsif ($ev->{unicode}) {
217 $self->{command_widget} ||=
218 new CFClient::MapWidget::Command::
219 command => $self->{command},
220 can_focus => 1,
221 connect_execute => sub {
222 # todo: support callback instead of user_send
223 $::CONN->user_send ($_[1]);
224 },
225 connect_close => sub {
226 (delete $self->{command_widget})->hide;
227 $self->focus_in;
228 },
229 ;
230 $self->{command_widget}->key_down ($ev)
231 unless $ev->{unicode} == 20;
232 return unless $self->{command_widget};
233 $self->{command_widget}->show;
234 $self->{command_widget}->focus_in;
235 }
236}
237
238sub key_up {
239 my ($self, $ev) = @_;
240
241 my $mod = $ev->{mod};
242 my $sym = $ev->{sym};
243
244 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245 $::CONN->user_send ("fire_stop");
246 }
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop");
249 }
250}
251
252sub add_command {
253 my ($self, $command, $tooltip, $widget, $cb) = @_;
254
255 (my $data = $command) =~ s/\\//g;
256
257 $tooltip =~ s/^\s+//;
258
259 $tooltip = "<big>$data</big>\n\n$tooltip";
260
261 $tooltip =~ s/\s+$//;
262
263 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
264}
265
266sub clr_commands {
267 my ($self) = @_; 571 my $self = shift;
268 572
269 %{$self->{command}} = (); 573 glDeleteList $self->{list};
270}
271 574
575 $self->SUPER::DESTROY;
576}
577
272package CFClient::MapWidget::MapMap; 578package DC::MapWidget::MapMap;
273 579
580use strict;
581use utf8;
582
274our @ISA = CFClient::UI::Base::; 583our @ISA = DC::UI::Base::;
275 584
276use Time::HiRes qw(time); 585use Time::HiRes qw(time);
277use CFClient::OpenGL; 586use DC::OpenGL;
278 587
279sub size_request { 588sub size_request {
280 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 589 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
281} 590}
282 591
592sub refresh_hook {
593 my ($self) = @_;
594
595 if ($::MAP && $self->{texture_atime} < time) {
596 my ($w, $h) = @$self{qw(w h)};
597
598 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
599 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
600
601 my $ox = 0.5 * ($w - $sw);
602 my $oy = 0.5 * ($h - $sh);
603
604 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
605 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
606
607 #TODO: map scale is completely borked
608
609 my $x0 = int $ox - $sx + 0.5;
610 my $y0 = int $oy - $sy + 0.5;
611
612 $self->{sw} = $sw;
613 $self->{sh} = $sh;
614
615 $self->{x0} = $x0;
616 $self->{y0} = $y0;
617
618 $self->{texture_atime} = time + 1/3;
619
620 $self->{texture} =
621 new DC::Texture
622 w => $w,
623 h => $h,
624 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
625 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
626 }
627}
628
629sub invoke_visibility_change {
630 my ($self) = @_;
631
632 $self->refresh_hook;
633
634 0
635}
636
283sub size_allocate { 637sub invoke_size_allocate {
284 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
285 639
286 $self->SUPER::size_allocate ($w, $h);
287 $self->update; 640 $self->update;
641
642 1
288} 643}
289 644
290sub update { 645sub update {
291 my ($self) = @_; 646 my ($self) = @_;
292 647
… …
295} 650}
296 651
297sub _draw { 652sub _draw {
298 my ($self) = @_; 653 my ($self) = @_;
299 654
300 $::MAP or return; 655 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
301 656
302 my ($w, $h) = @$self{qw(w h)}; 657 $self->{texture} or return;
303
304 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
305 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
306
307 my $sx = int $::CFG->{map_shift_x} / 32;
308 my $sy = int $::CFG->{map_shift_y} / 32;
309
310 my $ox = 0.5 * ($w - $sw);
311 my $oy = 0.5 * ($h - $sh);
312 658
313 glEnable GL_BLEND; 659 glEnable GL_BLEND;
314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
315 glEnable GL_TEXTURE_2D; 661 glEnable GL_TEXTURE_2D;
316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
317 663
318 if ($self->{texture_atime} < time) {
319 $self->{texture_atime} = time + 1/3;
320
321 $self->{texture} =
322 new CFClient::Texture
323 w => $w,
324 h => $h,
325 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
326 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
327 }
328
329 $self->{texture}->draw_quad (0, 0); 664 $self->{texture}->draw_quad (0, 0);
330 665
331 glDisable GL_TEXTURE_2D; 666 glDisable GL_TEXTURE_2D;
332 667
333 glTranslate 0.375, 0.375; 668 glTranslate 0.375, 0.375;
334
335 #TODO: map scale is completely borked
336
337 my $x0 = int $ox - $sx + 0.5;
338 my $y0 = int $oy - $sy + 0.5;
339 669
340 glColor 1, 1, 0, 1; 670 glColor 1, 1, 0, 1;
341 glBegin GL_LINE_LOOP; 671 glBegin GL_LINE_LOOP;
342 glVertex $x0 , $y0 ; 672 glVertex $self->{x0} , $self->{y0} ;
343 glVertex $x0 , $y0 + $sh; 673 glVertex $self->{x0} , $self->{y0} + $self->{sh};
344 glVertex $x0 + $sw, $y0 + $sh; 674 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
345 glVertex $x0 + $sw, $y0 ; 675 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
346 glEnd; 676 glEnd;
347 677
348 glDisable GL_BLEND; 678 glDisable GL_BLEND;
349} 679}
350 680
351package CFClient::MapWidget::Command; 681package DC::MapWidget::Command;
352 682
353use strict; 683use strict;
354 684
355use CFClient::OpenGL; 685use DC::OpenGL;
356 686
357our @ISA = CFClient::UI::Frame::; 687our @ISA = DC::UI::Frame::;
358 688
359sub new { 689sub new {
360 my $class = shift; 690 my $class = shift;
361 691
362 my $self = $class->SUPER::new ( 692 my $self = $class->SUPER::new (
363 bg => [0, 0, 0, 0.8], 693 bg => [0, 0, 0, 0.8],
364 @_, 694 @_,
365 ); 695 );
366 696
367 $self->add ($self->{vbox} = new CFClient::UI::VBox); 697 $self->add ($self->{vbox} = new DC::UI::VBox);
368 698
369 $self->{label} = [ 699 $self->{label} = [
370 map 700 map
371 CFClient::UI::Label->new ( 701 DC::UI::Label->new (
702 align => 0,
372 can_hover => 1, 703 can_hover => 1,
373 can_events => 1, 704 can_events => 1,
374 tooltip_width => 0.33, 705 tooltip_width => 0.33,
375 fontsize => $_, 706 fontsize => $_,
376 ), (0.8) x 16 707 ), (0.8) x 16
377 ]; 708 ];
378 709
379 $self->{entry} = new CFClient::UI::Entry 710 $self->{entry} = new DC::UI::Entry
380 connect_changed => sub { 711 on_changed => sub {
381 $self->update_labels; 712 $self->update_labels;
713 0
714 },
715 on_button_down => sub {
716 my ($entry, $ev, $x, $y) = @_;
717
718 if ($ev->{button} == 3) {
719 (new DC::UI::Menu
720 items => [
721 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
722 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
723 ],
724 )->popup ($ev);
725 return 1;
726 }
727 0
728 },
729 on_key_down => sub {
730 my ($entry, $ev) = @_;
731
732 my $self = $entry->{parent}{parent};
733
734 if ($ev->{sym} == 13) {
735 if (exists $self->{select}) {
736 $self->{last_command} = $self->{select};
737 $::CONN->user_send ($self->{select});
738
739 unshift @{$self->{history}}, $self->{entry}->get_text;
740 $self->{hist_ptr} = 0;
741
742 $self->hide;
743 }
744 } elsif ($ev->{sym} == 27) {
745 $self->{hist_ptr} = 0;
746 $self->hide;
747 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
748 if ($self->{hist_ptr} > 1) {
749 $self->{hist_ptr}--;
750 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
751 } elsif ($self->{hist_ptr} > 0) {
752 $self->{hist_ptr}--;
753 $self->{entry}->set_text ($self->{hist_saveback});
754 } else {
755 ++$self->{select_offset}
756 if $self->{select_offset} < $#{ $self->{last_match} || [] };
757 }
758 $self->update_labels;
759 } elsif ($ev->{sym} == DC::SDLK_UP) {
760 if ($self->{select_offset}) {
761 --$self->{select_offset}
762 } else {
763 unless ($self->{hist_ptr}) {
764 $self->{hist_saveback} = $self->{entry}->get_text;
765 }
766 if ($self->{hist_ptr} <= $#{$self->{history}}) {
767 $self->{hist_ptr}++;
768 }
769 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
770 if exists $self->{history}->[$self->{hist_ptr} - 1];
771 }
772 $self->update_labels;
773 } else {
774 return 0;
775 }
776
777 1
382 }; 778 }
779 ;
383 780
384 $self->{vbox}->add ( 781 $self->{vbox}->add (
385 $self->{entry}, 782 $self->{entry},
386 @{$self->{label}}, 783 @{$self->{label}},
387 ); 784 );
388 785
389 $self 786 $self
390} 787}
391 788
789sub set_prefix {
790 my ($self, $prefix) = @_;
791
792 $self->{entry}->set_text ($prefix);
793 $self->show;
794}
795
392sub size_allocate { 796sub invoke_size_allocate {
393 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
394 798
395 $self->SUPER::size_allocate ($w, $h);
396 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 799 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397}
398 800
801 $self->SUPER::invoke_size_allocate ($w, $h)
802}
803
804sub show {
805 my ($self) = @_;
806
807 $self->SUPER::show;
808 $self->{entry}->grab_focus;
809}
810
811sub hide {
812 my ($self) = @_;
813
814 $self->{hist_ptr} = 0;
815
816 $self->SUPER::hide;
817 $self->{entry}->set_text ("");
818}
819
399sub key_down { 820sub inject_key_down {
400 my ($self, $ev) = @_; 821 my ($self, $ev) = @_;
401 822
402 if ($ev->{sym} == 13) { 823 $self->{entry}->grab_focus;
403 if (exists $self->{select}) {
404 $self->emit (execute => $self->{select});
405 $self->emit ("close");
406 }
407 } elsif ($ev->{sym} == 27) {
408 $self->{entry}->set_text ("");
409 $self->emit ("close");
410 return;
411 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
412 ++$self->{select_offset}
413 if $self->{select_offset} < $#{ $self->{last_match} || [] };
414 $self->update_labels;
415 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
416 --$self->{select_offset}
417 if $self->{select_offset};
418 $self->update_labels;
419 } else {
420 #$self->{entry}{force_alloc} = 1;
421 $self->{entry}->key_down ($ev); 824 $self->{entry}->emit (key_down => $ev);
422 }
423} 825}
424 826
425sub update_labels { 827sub update_labels {
426 my ($self) = @_; 828 my ($self) = @_;
427 829
428 my $text = $self->{entry}->get_text; 830 my $text = $self->{entry}->get_text;
429 831
430 length $text 832 length $text
431 or return $self->emit ("close"); 833 or return $self->hide;
432 834
433 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 835 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
434 836
435 if ($cmd ne $self->{last_search}) { 837 if ($text ne $self->{last_search}) {
436 my $regexp = do {
437 my ($beg, @chr) = split //, lc $cmd;
438
439 # the following regex is used to match our "completion entry"
440 # to an actual command - the parentheses match kind of "overhead"
441 # - the more characters the parentheses match, the less attractive
442 # is the match.
443 my $regexp = "^\Q$beg\E"
444 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
445 qr<$regexp>
446 };
447
448 my @match; 838 my @match;
839
840 if ($text =~ /^(.*?)\s+$/) {
841 @match = [$cmd, "(appended whitespace suppresses completion)"];
842 } else {
843 my $regexp = do {
844 my ($beg, @chr) = split //, lc $cmd;
845
846 # the following regex is used to match our "completion entry"
847 # to an actual command - the parentheses match kind of "overhead"
848 # - the more characters the parentheses match, the less attractive
849 # is the match.
850 my $regexp = "^\Q$beg\E"
851 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
852 qr<$regexp>
853 };
854
449 my @penalty; 855 my @penalty;
450 856
451 for (keys %{$self->{command}}) { 857 for (keys %{$self->{command}}) {
452 if (@penalty = $_ =~ $regexp) { 858 if (@penalty = $_ =~ $regexp) {
453 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 859 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
860 }
454 } 861 }
455 }
456 862
457 @match = map $self->{command}{$_->[0]}, 863 @match = map $self->{command}{$_->[0]},
458 sort { 864 sort {
459 $a->[1] <=> $b->[1] 865 $a->[1] <=> $b->[1]
460 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 866 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
867 or (length $b->[0]) <=> (length $a->[0])
461 } @match; 868 } @match;
869 }
462 870
463 $self->{last_search} = $cmd; 871 $self->{last_search} = $text;
464 $self->{last_match} = \@match; 872 $self->{last_match} = \@match;
465 873
466 $self->{select_offset} = 0; 874 $self->{select_offset} = 0;
467 } 875 }
468 876
… …
508 $label->set_text (""); 916 $label->set_text ("");
509 $label->set_tooltip (""); 917 $label->set_tooltip ("");
510 } 918 }
511 919
512 $self->update; 920 $self->update;
513 ###
514} 921}
515 922
516sub _draw { 923sub _draw {
517 my ($self) = @_; 924 my ($self) = @_;
518 925
519 # hack 926 # hack
520 local $CFClient::UI::FOCUS = $self->{entry}; 927 local $DC::UI::FOCUS = $self->{entry};
521 928
522 $self->SUPER::_draw; 929 $self->SUPER::_draw;
523} 930}
524 931
5251 9321
933

Diff Legend

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