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

Diff Legend

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