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.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.108 by root, Wed Apr 25 01:12:31 2007 UTC

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

Diff Legend

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