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

Diff Legend

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