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

Diff Legend

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