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

Diff Legend

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