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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.116 by root, Mon Aug 6 05:06:33 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 (!$::CONN) {
345 return 0; # bindings further down need a valid connection
346
347 } elsif ($uni == ord ",") {
348 $::CONN->user_send ("take");
349 } elsif ($uni == ord " ") {
350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
353 } elsif ($uni == ord ".") {
354 $::CONN->user_send ($self->{completer}{last_command})
355 if exists $self->{completer}{last_command};
356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 $::CONN->macro_send ($_) for @macros;
358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
359 $::CONN->user_send ("rotateshoottype +");
360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
365 } elsif ($uni == ord '"') {
366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
367 $self->{completer}->show;
368 } elsif ($uni == ord "'") {
369 $self->{completer}->set_prefix ("");
370 $self->{completer}->show;
371 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
372 if ($mod & CFPlus::KMOD_SHIFT) {
373 $self->{shft}++;
374 if ($dir->[0] != $self->{fire_dir}) {
375 $::CONN->user_send ("fire $dir->[0]");
376 }
377 $self->{fire_dir} = $DIR{$sym}[0];
378 } elsif ($mod & CFPlus::KMOD_CTRL) {
379 $self->{ctrl}++;
380 $::CONN->user_send ("run $dir->[0]");
381 } else {
382 $::CONN->user_send ("$dir->[1]");
383 }
384 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
385 $self->{completer}->inject_key_down ($ev);
386 $self->{completer}->show;
387 } else {
84 return 388 return 0;
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 389 }
86 390
391 1
392}
393
394sub invoke_key_up {
395 my ($self, $ev) = @_;
396
397 my $res = 0;
398 my $mod = $ev->{mod};
399 my $sym = $ev->{sym};
400
401 if ($::CFG->{shift_fire_stop}) {
402 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
403 $::CONN->user_send ("fire_stop");
404 delete $self->{fire_dir};
405 $res = 1;
406 }
407 } else {
408 if (exists $DIR{$sym} && delete $self->{shft}) {
409 $::CONN->user_send ("fire_stop");
410 delete $self->{fire_dir};
411 $res = 1;
412 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
413 $::CONN->user_send ("fire_stop");
414 delete $self->{fire_dir};
415 $res = 1;
416 }
417 }
418
419 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
420 $::CONN->user_send ("run_stop");
421 $res = 1;
422 }
423
424 $res
425}
426
427sub invoke_visibility_change {
428 my ($self) = @_;
429
430 $self->refresh_hook;
431
432 0
433}
434
435sub set_magicmap {
436 my ($self, $w, $h, $x, $y, $data) = @_;
437
438 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
439 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
440
441 $self->{magicmap} = [$x, $y, $w, $h, $data];
442
443 $self->update;
444}
445
446sub refresh_hook {
447 my ($self) = @_;
448
449 if ($::MAP && $::CONN) {
87 if (delete $self->{need_update}) { 450 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 451 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
89 452
90 if ($::MAP) { 453 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
91 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 454 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
92 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
93 455
94 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; 456 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; 457 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
96 458
97 glPushMatrix; 459 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
98 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 460 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
99 461
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 462 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
101 463 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 464
104 if ($::CFG->{fow_enable}) { 465 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 466 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 467
120 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122
123 $self->{fow_texture} = new CFClient::Texture 468 $self->{fow_texture} = new CFPlus::Texture
124 w => $w, 469 w => $w,
125 h => $h, 470 h => $h,
126 data => $data, 471 data => $data,
127 name => $prev_name, # a bit hackish
128 internalformat => GL_ALPHA, 472 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 473 format => GL_ALPHA;
474 } else {
475 delete $self->{fow_texture};
476 }
130 477
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 478 glNewList ($self->{list} ||= glGenList);
132 479
480 glPushMatrix;
481 glTranslate $sx0, $sy0;
482 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
483
484 my $missing = $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
485
486 glScale $self->{tilesize}, $self->{tilesize};
487
488 if (my $tex = $self->{fow_texture}) {
489 glPushMatrix;
490 glScale 1/3, 1/3;
133 glEnable GL_TEXTURE_2D; 491 glEnable GL_TEXTURE_2D;
134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 492 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
135 493
136 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 494 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
137 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 495 $self->{fow_texture}->draw_quad_alpha (0, 0);
138 496
139 glDisable GL_TEXTURE_2D; 497 glDisable GL_TEXTURE_2D;
498 glPopMatrix;
140 } 499 }
141 500
501 if ($self->{magicmap}) {
502 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
503
504 $x += $::MAP->ox + $self->{dx};
505 $y += $::MAP->oy + $self->{dy};
506
507 glTranslate - $x - 1, - $y - 1;
508 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
509 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
510 }
511
142 glPopMatrix; 512 glPopMatrix;
143 }
144
145 glEndList; 513 glEndList;
146 }
147 514
148 glPushMatrix; 515 for my $tile (@$missing) {
516 $tile = $::CONN->{texture}[$tile]
517 or next;
518 next if $tile->{loading};
519 $tile->upload;
520 }
521 }
522 } else {
523 glDeleteList delete $self->{list}
524 if $self->{list};
525 }
526}
527
528sub draw {
529 my ($self) = @_;
530
531 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
532
533 return unless $self->{list};
534
535 my $focused = $CFPlus::UI::FOCUS == $self
536 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
537
538 return
539 unless $focused || !$::FAST;
540
149 glCallList $self->{list}; 541 glCallList $self->{list};
150 glPopMatrix;
151 542
152 # TNT2 emulates logops in software (or worse :) 543 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS != $self) { 544 unless ($focused) {
154 glColor 0.4, 0.2, 0.2, 0.9; 545 glColor 0.4, 0.2, 0.2, 0.6;
155 glEnable GL_BLEND; 546 glEnable GL_BLEND;
156 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157 glBegin GL_QUADS; 548 glBegin GL_QUADS;
158 glVertex 0, 0; 549 glVertex 0, 0;
159 glVertex 0, $::HEIGHT; 550 glVertex 0, $::HEIGHT;
… …
162 glEnd; 553 glEnd;
163 glDisable GL_BLEND; 554 glDisable GL_BLEND;
164 } 555 }
165} 556}
166 557
167my %DIR = ( 558sub DESTROY {
168 CFClient::SDLK_KP8, [1, "north"],
169 CFClient::SDLK_KP9, [2, "northeast"],
170 CFClient::SDLK_KP6, [3, "east"],
171 CFClient::SDLK_KP3, [4, "southeast"],
172 CFClient::SDLK_KP2, [5, "south"],
173 CFClient::SDLK_KP1, [6, "southwest"],
174 CFClient::SDLK_KP4, [7, "west"],
175 CFClient::SDLK_KP7, [8, "northwest"],
176
177 CFClient::SDLK_UP, [1, "north"],
178 CFClient::SDLK_RIGHT, [3, "east"],
179 CFClient::SDLK_DOWN, [5, "south"],
180 CFClient::SDLK_LEFT, [7, "west"],
181);
182
183sub key_down {
184 my ($self, $ev) = @_;
185
186 return unless $::CONN;
187
188 my $mod = $ev->{mod};
189 my $sym = $ev->{sym};
190 my $uni = $ev->{unicode};
191
192 if ($sym == CFClient::SDLK_KP5) {
193 $::CONN->user_send ("stay fire");
194 } elsif ($uni == ord ",") {
195 $::CONN->user_send ("take");
196 } elsif ($uni == ord "\t" or $uni == ord " ") {
197 $::CONN->user_send ("apply");
198 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
199 $::CONN->user_send ("rotateshoottype +");
200 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
201 $::CONN->user_send ("rotateshoottype -");
202 } elsif ($uni == ord "'") {
203 $self->emit ('activate_console');
204 } elsif ($uni == ord "/") {
205 $self->emit (activate_console => '/');
206 } elsif (exists $DIR{$sym}) {
207 if ($mod & CFClient::KMOD_SHIFT) {
208 $self->{shft}++;
209 $::CONN->user_send ("fire $DIR{$sym}[0]");
210 } elsif ($mod & CFClient::KMOD_CTRL) {
211 $self->{ctrl}++;
212 $::CONN->user_send ("run $DIR{$sym}[0]");
213 } else {
214 $::CONN->user_send ("$DIR{$sym}[1]");
215 }
216 } elsif ($ev->{unicode}) {
217 $self->{command_widget} ||=
218 new CFClient::MapWidget::Command::
219 command => $self->{command},
220 can_focus => 1,
221 connect_execute => sub {
222 # todo: support callback instead of user_send
223 $::CONN->user_send ($_[1]);
224 },
225 connect_close => sub {
226 (delete $self->{command_widget})->hide;
227 $self->focus_in;
228 },
229 ;
230 $self->{command_widget}->key_down ($ev)
231 unless $ev->{unicode} == 20;
232 return unless $self->{command_widget};
233 $self->{command_widget}->show;
234 $self->{command_widget}->focus_in;
235 }
236}
237
238sub key_up {
239 my ($self, $ev) = @_;
240
241 my $mod = $ev->{mod};
242 my $sym = $ev->{sym};
243
244 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245 $::CONN->user_send ("fire_stop");
246 }
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop");
249 }
250}
251
252sub add_command {
253 my ($self, $command, $tooltip, $widget, $cb) = @_;
254
255 (my $data = $command) =~ s/\\//g;
256
257 $tooltip =~ s/^\s+//;
258
259 $tooltip = "<big>$data</big>\n\n$tooltip";
260
261 $tooltip =~ s/\s+$//;
262
263 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
264}
265
266sub clr_commands {
267 my ($self) = @_; 559 my $self = shift;
268 560
269 %{$self->{command}} = (); 561 glDeleteList $self->{list};
270}
271 562
563 $self->SUPER::DESTROY;
564}
565
272package CFClient::MapWidget::MapMap; 566package CFPlus::MapWidget::MapMap;
273 567
568use strict;
569use utf8;
570
274our @ISA = CFClient::UI::Base::; 571our @ISA = CFPlus::UI::Base::;
275 572
276use Time::HiRes qw(time); 573use Time::HiRes qw(time);
277use CFClient::OpenGL; 574use CFPlus::OpenGL;
278 575
279sub size_request { 576sub size_request {
280 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 577 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
281} 578}
282 579
580sub refresh_hook {
581 my ($self) = @_;
582
583 if ($::MAP && $self->{texture_atime} < time) {
584 my ($w, $h) = @$self{qw(w h)};
585
586 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
587 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
588
589 my $ox = 0.5 * ($w - $sw);
590 my $oy = 0.5 * ($h - $sh);
591
592 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
593 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
594
595 #TODO: map scale is completely borked
596
597 my $x0 = int $ox - $sx + 0.5;
598 my $y0 = int $oy - $sy + 0.5;
599
600 $self->{sw} = $sw;
601 $self->{sh} = $sh;
602
603 $self->{x0} = $x0;
604 $self->{y0} = $y0;
605
606 $self->{texture_atime} = time + 1/3;
607
608 $self->{texture} =
609 new CFPlus::Texture
610 w => $w,
611 h => $h,
612 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
613 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
614 }
615}
616
617sub invoke_visibility_change {
618 my ($self) = @_;
619
620 $self->refresh_hook;
621
622 0
623}
624
283sub size_allocate { 625sub invoke_size_allocate {
284 my ($self, $w, $h) = @_; 626 my ($self, $w, $h) = @_;
285 627
286 $self->SUPER::size_allocate ($w, $h);
287 $self->update; 628 $self->update;
629
630 1
288} 631}
289 632
290sub update { 633sub update {
291 my ($self) = @_; 634 my ($self) = @_;
292 635
… …
295} 638}
296 639
297sub _draw { 640sub _draw {
298 my ($self) = @_; 641 my ($self) = @_;
299 642
300 $::MAP or return; 643 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
301 644
302 my ($w, $h) = @$self{qw(w h)}; 645 $self->{texture} or return;
303
304 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
305 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
306
307 my $sx = int $::CFG->{map_shift_x} / 32;
308 my $sy = int $::CFG->{map_shift_y} / 32;
309
310 my $ox = 0.5 * ($w - $sw);
311 my $oy = 0.5 * ($h - $sh);
312 646
313 glEnable GL_BLEND; 647 glEnable GL_BLEND;
314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 648 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
315 glEnable GL_TEXTURE_2D; 649 glEnable GL_TEXTURE_2D;
316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 650 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
317 651
318 if ($self->{texture_atime} < time) {
319 $self->{texture_atime} = time + 1/3;
320
321 $self->{texture} =
322 new CFClient::Texture
323 w => $w,
324 h => $h,
325 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
326 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
327 }
328
329 $self->{texture}->draw_quad (0, 0); 652 $self->{texture}->draw_quad (0, 0);
330 653
331 glDisable GL_TEXTURE_2D; 654 glDisable GL_TEXTURE_2D;
332 655
333 glTranslate 0.375, 0.375; 656 glTranslate 0.375, 0.375;
334
335 #TODO: map scale is completely borked
336
337 my $x0 = int $ox - $sx + 0.5;
338 my $y0 = int $oy - $sy + 0.5;
339 657
340 glColor 1, 1, 0, 1; 658 glColor 1, 1, 0, 1;
341 glBegin GL_LINE_LOOP; 659 glBegin GL_LINE_LOOP;
342 glVertex $x0 , $y0 ; 660 glVertex $self->{x0} , $self->{y0} ;
343 glVertex $x0 , $y0 + $sh; 661 glVertex $self->{x0} , $self->{y0} + $self->{sh};
344 glVertex $x0 + $sw, $y0 + $sh; 662 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
345 glVertex $x0 + $sw, $y0 ; 663 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
346 glEnd; 664 glEnd;
347 665
348 glDisable GL_BLEND; 666 glDisable GL_BLEND;
349} 667}
350 668
351package CFClient::MapWidget::Command; 669package CFPlus::MapWidget::Command;
352 670
353use strict; 671use strict;
354 672
355use CFClient::OpenGL; 673use CFPlus::OpenGL;
356 674
357our @ISA = CFClient::UI::Frame::; 675our @ISA = CFPlus::UI::Frame::;
358 676
359sub new { 677sub new {
360 my $class = shift; 678 my $class = shift;
361 679
362 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
363 bg => [0, 0, 0, 0.8], 681 bg => [0, 0, 0, 0.8],
364 @_, 682 @_,
365 ); 683 );
366 684
367 $self->add ($self->{vbox} = new CFClient::UI::VBox); 685 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
368 686
369 $self->{label} = [ 687 $self->{label} = [
370 map 688 map
371 CFClient::UI::Label->new ( 689 CFPlus::UI::Label->new (
372 can_hover => 1, 690 can_hover => 1,
373 can_events => 1, 691 can_events => 1,
374 tooltip_width => 0.33, 692 tooltip_width => 0.33,
375 fontsize => $_, 693 fontsize => $_,
376 ), (0.8) x 16 694 ), (0.8) x 16
377 ]; 695 ];
378 696
379 $self->{entry} = new CFClient::UI::Entry 697 $self->{entry} = new CFPlus::UI::Entry
380 connect_changed => sub { 698 on_changed => sub {
381 $self->update_labels; 699 $self->update_labels;
700 0
701 },
702 on_button_down => sub {
703 my ($entry, $ev, $x, $y) = @_;
704
705 if ($ev->{button} == 3) {
706 (new CFPlus::UI::Menu
707 items => [
708 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
709 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
710 ],
711 )->popup ($ev);
712 return 1;
713 }
714 0
715 },
716 on_key_down => sub {
717 my ($entry, $ev) = @_;
718
719 my $self = $entry->{parent}{parent};
720
721 if ($ev->{sym} == 13) {
722 if (exists $self->{select}) {
723 $self->{last_command} = $self->{select};
724 $::CONN->user_send ($self->{select});
725
726 unshift @{$self->{history}}, $self->{entry}->get_text;
727 $self->{hist_ptr} = 0;
728
729 $self->hide;
730 }
731 } elsif ($ev->{sym} == 27) {
732 $self->{hist_ptr} = 0;
733 $self->hide;
734 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
735 if ($self->{hist_ptr} > 1) {
736 $self->{hist_ptr}--;
737 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
738 } elsif ($self->{hist_ptr} > 0) {
739 $self->{hist_ptr}--;
740 $self->{entry}->set_text ($self->{hist_saveback});
741 } else {
742 ++$self->{select_offset}
743 if $self->{select_offset} < $#{ $self->{last_match} || [] };
744 }
745 $self->update_labels;
746 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
747 if ($self->{select_offset}) {
748 --$self->{select_offset}
749 } else {
750 unless ($self->{hist_ptr}) {
751 $self->{hist_saveback} = $self->{entry}->get_text;
752 }
753 if ($self->{hist_ptr} <= $#{$self->{history}}) {
754 $self->{hist_ptr}++;
755 }
756 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
757 if exists $self->{history}->[$self->{hist_ptr} - 1];
758 }
759 $self->update_labels;
760 } else {
761 return 0;
762 }
763
764 1
382 }; 765 }
766 ;
383 767
384 $self->{vbox}->add ( 768 $self->{vbox}->add (
385 $self->{entry}, 769 $self->{entry},
386 @{$self->{label}}, 770 @{$self->{label}},
387 ); 771 );
388 772
389 $self 773 $self
390} 774}
391 775
776sub set_prefix {
777 my ($self, $prefix) = @_;
778
779 $self->{entry}->set_text ($prefix);
780 $self->show;
781}
782
392sub size_allocate { 783sub invoke_size_allocate {
393 my ($self, $w, $h) = @_; 784 my ($self, $w, $h) = @_;
394 785
395 $self->SUPER::size_allocate ($w, $h);
396 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 786 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
397}
398 787
788 $self->SUPER::invoke_size_allocate ($w, $h)
789}
790
791sub show {
792 my ($self) = @_;
793
794 $self->SUPER::show;
795 $self->{entry}->grab_focus;
796}
797
798sub hide {
799 my ($self) = @_;
800
801 $self->{hist_ptr} = 0;
802
803 $self->SUPER::hide;
804 $self->{entry}->set_text ("");
805}
806
399sub key_down { 807sub inject_key_down {
400 my ($self, $ev) = @_; 808 my ($self, $ev) = @_;
401 809
402 if ($ev->{sym} == 13) { 810 $self->{entry}->grab_focus;
403 if (exists $self->{select}) {
404 $self->emit (execute => $self->{select});
405 $self->emit ("close");
406 }
407 } elsif ($ev->{sym} == 27) {
408 $self->{entry}->set_text ("");
409 $self->emit ("close");
410 return;
411 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
412 ++$self->{select_offset}
413 if $self->{select_offset} < $#{ $self->{last_match} || [] };
414 $self->update_labels;
415 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
416 --$self->{select_offset}
417 if $self->{select_offset};
418 $self->update_labels;
419 } else {
420 #$self->{entry}{force_alloc} = 1;
421 $self->{entry}->key_down ($ev); 811 $self->{entry}->emit (key_down => $ev);
422 }
423} 812}
424 813
425sub update_labels { 814sub update_labels {
426 my ($self) = @_; 815 my ($self) = @_;
427 816
428 my $text = $self->{entry}->get_text; 817 my $text = $self->{entry}->get_text;
429 818
430 length $text 819 length $text
431 or return $self->emit ("close"); 820 or return $self->hide;
432 821
433 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 822 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
434 823
435 if ($cmd ne $self->{last_search}) { 824 if ($text ne $self->{last_search}) {
436 my $regexp = do {
437 my ($beg, @chr) = split //, lc $cmd;
438
439 # the following regex is used to match our "completion entry"
440 # to an actual command - the parentheses match kind of "overhead"
441 # - the more characters the parentheses match, the less attractive
442 # is the match.
443 my $regexp = "^\Q$beg\E"
444 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
445 qr<$regexp>
446 };
447
448 my @match; 825 my @match;
826
827 if ($text =~ /^(.*?)\s+$/) {
828 @match = [$cmd, "(appended whitespace suppresses completion)"];
829 } else {
830 my $regexp = do {
831 my ($beg, @chr) = split //, lc $cmd;
832
833 # the following regex is used to match our "completion entry"
834 # to an actual command - the parentheses match kind of "overhead"
835 # - the more characters the parentheses match, the less attractive
836 # is the match.
837 my $regexp = "^\Q$beg\E"
838 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
839 qr<$regexp>
840 };
841
449 my @penalty; 842 my @penalty;
450 843
451 for (keys %{$self->{command}}) { 844 for (keys %{$self->{command}}) {
452 if (@penalty = $_ =~ $regexp) { 845 if (@penalty = $_ =~ $regexp) {
453 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 846 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
847 }
454 } 848 }
455 }
456 849
457 @match = map $self->{command}{$_->[0]}, 850 @match = map $self->{command}{$_->[0]},
458 sort { 851 sort {
459 $a->[1] <=> $b->[1] 852 $a->[1] <=> $b->[1]
460 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 853 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
854 or (length $b->[0]) <=> (length $a->[0])
461 } @match; 855 } @match;
856 }
462 857
463 $self->{last_search} = $cmd; 858 $self->{last_search} = $text;
464 $self->{last_match} = \@match; 859 $self->{last_match} = \@match;
465 860
466 $self->{select_offset} = 0; 861 $self->{select_offset} = 0;
467 } 862 }
468 863
… …
508 $label->set_text (""); 903 $label->set_text ("");
509 $label->set_tooltip (""); 904 $label->set_tooltip ("");
510 } 905 }
511 906
512 $self->update; 907 $self->update;
513 ###
514} 908}
515 909
516sub _draw { 910sub _draw {
517 my ($self) = @_; 911 my ($self) = @_;
518 912
519 # hack 913 # hack
520 local $CFClient::UI::FOCUS = $self->{entry}; 914 local $CFPlus::UI::FOCUS = $self->{entry};
521 915
522 $self->SUPER::_draw; 916 $self->SUPER::_draw;
523} 917}
524 918
5251 9191
920

Diff Legend

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