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

Diff Legend

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