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.6 by root, Thu Apr 20 08:11:57 2006 UTC vs.
Revision 1.136 by root, Sun Jul 20 02:55:36 2008 UTC

1package CFClient::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use strict;
4use utf8;
4 5
5use List::Util qw(min max); 6use List::Util qw(min max);
6 7
8use DC;
7use CFClient::OpenGL; 9use DC::OpenGL;
10use DC::UI;
11use DC::Macro;
8 12
9our @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;
10 18
11sub new { 19sub new {
12 my $class = shift; 20 my $class = shift;
13 21
14 $class->SUPER::new ( 22 my $self = $class->SUPER::new (
15 z => -1, 23 z => -1,
16 can_focus => 1, 24 can_focus => 1,
17 list => glGenList, 25 tilesize => 32,
18 @_ 26 @_
19 ) 27 );
20}
21 28
22sub DESTROY { 29 $self
30}
31
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 {
23 my $self = shift; 45 my ($self) = @_;
24 46
25 glDeleteList $self->{list}; 47 %{$::COMPLETER->{command}} = ();
26 48
27 $self->SUPER::DESTROY; 49 $::COMPLETER->hide
50 if $::COMPLETER;
28} 51}
29 52
30sub key_down { 53sub server_login {
31 print "MAPKEYDOWN\n"; 54 my ($server) = @_;
32}
33 55
34sub key_up { 56 ::stop_game ();
57 local $::PROFILE->{host} = $server;
58 ::start_game ();
35} 59}
36 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
37sub button_down { 163sub invoke_button_down {
38 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
39 165
40 $self->focus_in;
41
42 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
43 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 184 my ($ox, $oy) = ($ev->{x}, $ev->{y});
44 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 185 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
45 186
46 $self->{motion} = sub { 187 $self->{motion} = sub {
47 my ($ev, $x, $y) = @_; 188 my ($ev, $x, $y) = @_;
51 $::CFG->{map_shift_x} = $bw + $x - $ox; 192 $::CFG->{map_shift_x} = $bw + $x - $ox;
52 $::CFG->{map_shift_y} = $bh + $y - $oy; 193 $::CFG->{map_shift_y} = $bh + $y - $oy;
53 194
54 $self->update; 195 $self->update;
55 }; 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
56 } 250 1
57} 251}
58 252
59sub button_up { 253sub invoke_button_up {
60 my ($self, $ev, $x, $y) = @_; 254 my ($self, $ev, $x, $y) = @_;
61 255
62 delete $self->{motion}; 256 delete $self->{motion};
63}
64 257
258 1
259}
260
65sub mouse_motion { 261sub invoke_mouse_motion {
66 my ($self, $ev, $x, $y) = @_; 262 my ($self, $ev, $x, $y) = @_;
67 263
264 if ($self->{motion}) {
68 $self->{motion}->($ev, $x, $y) if $self->{motion}; 265 $self->{motion}->($ev, $x, $y);
266 } else {
267 return 0;
268 }
269
270 1
69} 271}
70 272
71sub size_request { 273sub size_request {
274 my ($self) = @_;
275
72 ( 276 (
73 1 + 32 * int $::WIDTH / 32, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
74 1 + 32 * int $::HEIGHT / 32, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
75 ) 279 )
76} 280}
77 281
78sub update { 282sub update {
79 my ($self) = @_; 283 my ($self) = @_;
80 284
81 $self->{need_update} = 1; 285 $self->{need_update} = 1;
82 $self->SUPER::update; 286 $self->SUPER::update;
83} 287}
84 288
85sub 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 {
86 my ($self) = @_; 311 my ($self, $ev) = @_;
87 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
338 return 1;
339 }
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) {
88 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
89 glNewList $self->{list}; 459 $self->movement_update;
90 460
91 if ($::MAP) { 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
92 my $sw = int $::WIDTH / 32;
93 my $sh = int $::HEIGHT / 32;
94 462
95 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 463 # width/height of map, in tiles
96 my $sy = $::CFG->{map_shift_y}; 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;
97 466
98 glTranslate $sx0 - 32, $sy0 - 32, 0; 467 # the map displacement, in tiles
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 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 471 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
474
475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
101 477
102 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
103 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);
104 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
105 glConvolutionFilter2D (
106 GL_CONVOLUTION_2D,
107 GL_ALPHA,
108 3, 3,
109 GL_ALPHA, GL_FLOAT,
110 pack "f*",
111 0.1, 0.1, 0.1,
112 0.1, 0.2, 0.1,
113 0.1, 0.1, 0.1,
114 );
115 glEnable GL_CONVOLUTION_2D;
116 }
117 480
118 $self->{fow_texture} = new CFClient::Texture 481 $self->{fow_texture} = new DC::Texture
119 w => $w, 482 w => $w,
120 h => $h, 483 h => $h,
121 data => $data, 484 data => $data,
122 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
123 format => GL_ALPHA; 486 format => GL_ALPHA;
487 } else {
488 delete $self->{fow_texture};
489 }
124 490
125 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 491 glNewList ($self->{list} ||= glGenList);
126 492
127 glEnable GL_BLEND; 493 glPushMatrix;
128 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 494 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy};
497
498 $::MAP->draw ($dx, $dy, $sw, $sh,
499 $self->{tilesize},
500 $::CONN->{player}{tag},
501 -$self->{sdx}, -$self->{sdy});
502
503 glTranslate -$self->{sdx}, -$self->{sdy};
504 glScale $self->{tilesize}, $self->{tilesize};
505
506 if (my $tex = $self->{fow_texture}) {
507 glPushMatrix;
508 glScale 1/3, 1/3;
129 glEnable GL_TEXTURE_2D; 509 glEnable GL_TEXTURE_2D;
130 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
131 511
132 glColor +($::CFG->{fow_intensity}) x 3, 1; 512 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
133 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 513 $self->{fow_texture}->draw_quad_alpha (0, 0);
134 514
135 glDisable GL_TEXTURE_2D; 515 glDisable GL_TEXTURE_2D;
136 glDisable GL_BLEND; 516 glPopMatrix;
137 } 517 }
138 518
139 # HACK BEGIN 519 if ($self->{magicmap}) {
140 { 520 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
141 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
142 521
143 glTranslate 0, 30; 522 $x += $::MAP->ox + $self->{dx};
144 my ($w, $h) = (250, 250); 523 $y += $::MAP->oy + $self->{dy};
145 524
146 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 525 glTranslate - $x - 1, - $y - 1;
147 526 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
148 glEnable GL_BLEND; 527 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
149 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
150 glEnable GL_TEXTURE_2D;
151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
152
153 $self->{mapmap_texture} =
154 new CFClient::Texture
155 w => $w,
156 h => $h,
157 data => $::MAP->mapmap (- $w * 0.5, - $h * 0.5, $w, $h),
158 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
159
160 $self->{mapmap_texture}->draw_quad (0, 0);
161
162 glDisable GL_TEXTURE_2D;
163
164 glTranslate 0.375, 0.375;
165
166 glColor 1, 1, 0, 1;
167 glBegin GL_LINE_LOOP;
168 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy ;
169 glVertex $w * 0.5 - $sx , $h * 0.5 - $sy + $sh;
170 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy + $sh;
171 glVertex $w * 0.5 - $sx + $sw, $h * 0.5 - $sy ;
172 glEnd;
173
174 glDisable GL_BLEND;
175 } 528 }
176 # HACK END
177 }
178 529
530 glPopMatrix;
179 glEndList; 531 glEndList;
532 }
533 } else {
534 glDeleteList delete $self->{list}
535 if $self->{list};
180 } 536 }
537}
181 538
182 glPushMatrix; 539sub draw {
540 my ($self) = @_;
541
542 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
543
544 return unless $self->{list};
545
546 my $focused = $DC::UI::FOCUS == $self
547 || $DC::UI::FOCUS == $::COMPLETER->{entry};
548
549 return
550 unless $focused || !$::FAST;
551
183 glCallList $self->{list}; 552 glCallList $self->{list};
184 glPopMatrix;
185 553
186 if ($CFClient::UI::FOCUS != $self) { 554 # TNT2 emulates logops in software (or worse :)
187 glColor 64/255, 64/255, 64/255; 555 unless ($focused) {
188 glLogicOp GL_AND; 556 glColor_premultiply 0, 0, 1, 0.25;
189 glEnable GL_COLOR_LOGIC_OP; 557 glEnable GL_BLEND;
558 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
190 glBegin GL_QUADS; 559 glBegin GL_QUADS;
191 glVertex 0, 0; 560 glVertex 0, 0;
192 glVertex 0, $::HEIGHT; 561 glVertex 0, $::HEIGHT;
193 glVertex $::WIDTH, $::HEIGHT; 562 glVertex $::WIDTH, $::HEIGHT;
194 glVertex $::WIDTH, 0; 563 glVertex $::WIDTH, 0;
195 glEnd; 564 glEnd;
196 glDisable GL_COLOR_LOGIC_OP; 565 glDisable GL_BLEND;
566 }
567}
568
569sub DESTROY {
570 my $self = shift;
571
572 glDeleteList $self->{list};
573
574 $self->SUPER::DESTROY;
575}
576
577package DC::MapWidget::MapMap;
578
579use strict;
580use utf8;
581
582our @ISA = DC::UI::Base::;
583
584use Time::HiRes qw(time);
585use DC::OpenGL;
586
587sub size_request {
588 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
589}
590
591sub refresh_hook {
592 my ($self) = @_;
593
594 if ($::MAP && $self->{texture_atime} < time) {
595 my ($w, $h) = @$self{qw(w h)};
596
597 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
598 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
599
600 my $ox = 0.5 * ($w - $sw);
601 my $oy = 0.5 * ($h - $sh);
602
603 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
604 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
605
606 #TODO: map scale is completely borked
607
608 my $x0 = int $ox - $sx + 0.5;
609 my $y0 = int $oy - $sy + 0.5;
610
611 $self->{sw} = $sw;
612 $self->{sh} = $sh;
613
614 $self->{x0} = $x0;
615 $self->{y0} = $y0;
616
617 $self->{texture_atime} = time + 1/3;
618
619 $self->{texture} =
620 new DC::Texture
621 w => $w,
622 h => $h,
623 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
624 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
625 }
626}
627
628sub invoke_visibility_change {
629 my ($self) = @_;
630
631 $self->refresh_hook;
632
633 0
634}
635
636sub invoke_size_allocate {
637 my ($self, $w, $h) = @_;
638
639 $self->update;
640
641 1
642}
643
644sub update {
645 my ($self) = @_;
646
647 delete $self->{texture_atime};
648 $self->SUPER::update;
649}
650
651sub _draw {
652 my ($self) = @_;
653
654 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
655
656 $self->{texture} or return;
657
658 glEnable GL_BLEND;
659 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
660 glEnable GL_TEXTURE_2D;
661 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
662
663 $self->{texture}->draw_quad (0, 0);
664
665 glDisable GL_TEXTURE_2D;
666
667 glTranslate 0.375, 0.375;
668
669 glColor 1, 1, 0, 1;
670 glBegin GL_LINE_LOOP;
671 glVertex $self->{x0} , $self->{y0} ;
672 glVertex $self->{x0} , $self->{y0} + $self->{sh};
673 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
674 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
675 glEnd;
197 } 676
677 glDisable GL_BLEND;
198} 678}
199 679
200my %DIR = ( 680package DC::MapWidget::Command;
201 CFClient::SDLK_KP8, [1, "north"],
202 CFClient::SDLK_KP9, [2, "northeast"],
203 CFClient::SDLK_KP6, [3, "east"],
204 CFClient::SDLK_KP3, [4, "southeast"],
205 CFClient::SDLK_KP2, [5, "south"],
206 CFClient::SDLK_KP1, [6, "southwest"],
207 CFClient::SDLK_KP4, [7, "west"],
208 CFClient::SDLK_KP7, [8, "northwest"],
209 681
210 CFClient::SDLK_UP, [1, "north"], 682use strict;
211 CFClient::SDLK_RIGHT, [3, "east"],
212 CFClient::SDLK_DOWN, [5, "south"],
213 CFClient::SDLK_LEFT, [7, "west"],
214);
215 683
684use DC::OpenGL;
685
686our @ISA = DC::UI::Frame::;
687
688sub new {
689 my $class = shift;
690
691 my $self = $class->SUPER::new (
692 bg => [0, 0, 0, 0.8],
693 @_,
694 );
695
696 $self->add ($self->{vbox} = new DC::UI::VBox);
697
698 $self->{label} = [
699 map
700 DC::UI::Label->new (
701 align => 0,
702 can_hover => 1,
703 can_events => 1,
704 tooltip_width => 0.33,
705 fontsize => $_,
706 ), (0.8) x 16
707 ];
708
709 $self->{entry} = new DC::UI::Entry
710 on_changed => sub {
711 $self->update_labels;
712 0
713 },
714 on_button_down => sub {
715 my ($entry, $ev, $x, $y) = @_;
716
717 if ($ev->{button} == 3) {
718 (new DC::UI::Menu
719 items => [
720 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
721 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
722 ],
723 )->popup ($ev);
724 return 1;
725 }
726 0
727 },
728 on_key_down => sub {
729 my ($entry, $ev) = @_;
730
731 my $self = $entry->{parent}{parent};
732
733 if ($ev->{sym} == 13) {
734 if (exists $self->{select}) {
735 $self->{last_command} = $self->{select};
736 $::CONN->user_send ($self->{select});
737
738 unshift @{$self->{history}}, $self->{entry}->get_text;
739 $self->{hist_ptr} = 0;
740
741 $self->hide;
742 }
743 } elsif ($ev->{sym} == 27) {
744 $self->{hist_ptr} = 0;
745 $self->hide;
746 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
747 if ($self->{hist_ptr} > 1) {
748 $self->{hist_ptr}--;
749 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
750 } elsif ($self->{hist_ptr} > 0) {
751 $self->{hist_ptr}--;
752 $self->{entry}->set_text ($self->{hist_saveback});
753 } else {
754 ++$self->{select_offset}
755 if $self->{select_offset} < $#{ $self->{last_match} || [] };
756 }
757 $self->update_labels;
758 } elsif ($ev->{sym} == DC::SDLK_UP) {
759 if ($self->{select_offset}) {
760 --$self->{select_offset}
761 } else {
762 unless ($self->{hist_ptr}) {
763 $self->{hist_saveback} = $self->{entry}->get_text;
764 }
765 if ($self->{hist_ptr} <= $#{$self->{history}}) {
766 $self->{hist_ptr}++;
767 }
768 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
769 if exists $self->{history}->[$self->{hist_ptr} - 1];
770 }
771 $self->update_labels;
772 } else {
773 return 0;
774 }
775
776 1
777 }
778 ;
779
780 $self->{vbox}->add (
781 $self->{entry},
782 @{$self->{label}},
783 );
784
785 $self
786}
787
788sub set_prefix {
789 my ($self, $prefix) = @_;
790
791 $self->{entry}->set_text ($prefix);
792 $self->show;
793}
794
795sub invoke_size_allocate {
796 my ($self, $w, $h) = @_;
797
798 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
799
800 $self->SUPER::invoke_size_allocate ($w, $h)
801}
802
803sub show {
804 my ($self) = @_;
805
806 $self->SUPER::show;
807 $self->{entry}->grab_focus;
808}
809
810sub hide {
811 my ($self) = @_;
812
813 $self->{hist_ptr} = 0;
814
815 $self->SUPER::hide;
816 $self->{entry}->set_text ("");
817}
818
216sub key_down { 819sub inject_key_down {
217 my ($self, $ev) = @_; 820 my ($self, $ev) = @_;
218 821
219 my $mod = $ev->{mod}; 822 $self->{entry}->grab_focus;
220 my $sym = $ev->{sym}; 823 $self->{entry}->emit (key_down => $ev);
824}
221 825
222 if ($sym == CFClient::SDLK_KP5) { 826sub update_labels {
223 $::CONN->user_send ("stay fire"); 827 my ($self) = @_;
224 } elsif ($sym == ord "a") { 828
225 $::CONN->user_send ("apply"); 829 my $text = $self->{entry}->get_text;
226 } elsif ($sym == ord "'") { 830
227 $self->emit ('activate_console'); 831 length $text
228 } elsif ($sym == ord "/") { 832 or return $self->hide;
229 $self->emit ('activate_console' => '/'); 833
230 } elsif (exists $DIR{$sym}) { 834 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
231 if ($mod & CFClient::KMOD_SHIFT) { 835
232 $self->{shft}++; 836 if ($text ne $self->{last_search}) {
233 $::CONN->user_send ("fire $DIR{$sym}[0]"); 837 my @match;
234 } elsif ($mod & CFClient::KMOD_CTRL) { 838
235 $self->{ctrl}++; 839 if ($text =~ /^(.*?)\s+$/) {
236 $::CONN->user_send ("run $DIR{$sym}[0]"); 840 @match = [$cmd, "(appended whitespace suppresses completion)"];
237 } else { 841 } else {
238 $::CONN->user_send ("$DIR{$sym}[1]"); 842 my $regexp = do {
843 my ($beg, @chr) = split //, lc $cmd;
844
845 # the following regex is used to match our "completion entry"
846 # to an actual command - the parentheses match kind of "overhead"
847 # - the more characters the parentheses match, the less attractive
848 # is the match.
849 my $regexp = "^\Q$beg\E"
850 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
851 qr<$regexp>
852 };
853
854 my @penalty;
855
856 for (keys %{$self->{command}}) {
857 if (@penalty = $_ =~ $regexp) {
858 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
859 }
239 } 860 }
240 }
241}
242 861
243sub key_up { 862 @match = map $self->{command}{$_->[0]},
863 sort {
864 $a->[1] <=> $b->[1]
865 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
866 or (length $b->[0]) <=> (length $a->[0])
867 } @match;
868 }
869
870 $self->{last_search} = $text;
871 $self->{last_match} = \@match;
872
873 $self->{select_offset} = 0;
874 }
875
876 my @labels = @{ $self->{label} };
877 my @matches = @{ $self->{last_match} || [] };
878
879 if ($self->{select_offset}) {
880 splice @matches, 0, $self->{select_offset}, ();
881
882 my $label = shift @labels;
883 $label->set_text ("...");
884 $label->set_tooltip ("Use Cursor-Up to view previous matches");
885 }
886
887 for my $label (@labels) {
888 $label->{fg} = [1, 1, 1, 1];
889 $label->{bg} = [0, 0, 0, 0];
890 }
891
892 if (@matches) {
893 $self->{select} = "$matches[0][0]$arg";
894
895 $labels[0]->{fg} = [0, 0, 0, 1];
896 $labels[0]->{bg} = [1, 1, 1, 0.8];
897 } else {
898 $self->{select} = "$cmd$arg";
899 }
900
901 for my $match (@matches) {
902 my $label = shift @labels;
903
904 if (@labels) {
905 $label->set_text ("$match->[0]$arg");
906 $label->set_tooltip ($match->[1]);
907 } else {
908 $label->set_text ("...");
909 $label->set_tooltip ("Use Cursor-Down to view more matches");
910 last;
911 }
912 }
913
914 for my $label (@labels) {
915 $label->set_text ("");
916 $label->set_tooltip ("");
917 }
918
919 $self->update;
920}
921
922sub _draw {
244 my ($self, $ev) = @_; 923 my ($self) = @_;
245 924
246 my $mod = $ev->{mod}; 925 # hack
247 my $sym = $ev->{sym}; 926 local $DC::UI::FOCUS = $self->{entry};
248 927
249 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 928 $self->SUPER::_draw;
250 $::CONN->user_send ("fire_stop");
251 }
252 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
253 $::CONN->user_send ("run_stop");
254 }
255}
256
257sub add_command {
258 my ($self, $command, $widget, $cb) = @_;
259
260 (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
261 warn "$command|$abbrev|$widget\n";#d#
262} 929}
263 930
2641 9311
932

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines