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

Diff Legend

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