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.104 by root, Wed Apr 4 02:43:29 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines