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

Diff Legend

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