ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.16 by root, Mon Apr 24 13:04:31 2006 UTC vs.
Revision 1.110 by root, Thu Jul 19 13:45:18 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines