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.23 by root, Wed May 17 00:26:55 2006 UTC vs.
Revision 1.114 by root, Mon Jul 23 23:52:41 2007 UTC

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

Diff Legend

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