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.25 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.113 by elmex, Sat Jul 21 20:30:41 2007 UTC

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

Diff Legend

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