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.91 by root, Tue Nov 7 22:41:27 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 = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
199 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
200
201 $x -= CFPlus::floor $::MAP->w * 0.5;
202 $y -= CFPlus::floor $::MAP->h * 0.5;
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
467 return
468 unless $focused || !$::FAST;
469
84 if (delete $self->{need_update}) { 470 if (delete $self->{need_update}) {
471 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
472
473 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
474 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
475
476 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
477 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
478
479 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
480 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
481
482 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
483 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
484
485 if ($::CFG->{fow_enable}) {
486 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
487
488 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
489 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
490 glConvolutionFilter2D (
491 GL_CONVOLUTION_2D,
492 GL_ALPHA,
493 3, 3,
494 GL_ALPHA, GL_FLOAT,
495 (pack "f*", @{ $self->{smooth_matrix} }),
496 );
497 glEnable GL_CONVOLUTION_2D;
498 }
499
500 $self->{fow_texture} = new CFPlus::Texture
501 w => $w,
502 h => $h,
503 data => $data,
504 internalformat => GL_ALPHA,
505 format => GL_ALPHA;
506
507 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
508 } else {
509 delete $self->{fow_texture};
510 }
511
85 glNewList $self->{list}; 512 glNewList $self->{list};
86 513
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; 514 glPushMatrix;
515 glTranslate $sx0, $sy0;
95 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 516 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
96 517
97 glTranslate $sx0 - 32, $sy0 - 32, 0; 518 $::MAP->draw ($dx, $dy, $sw, $sh);
98 519
99 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 520 glScale 32, 32;
100 521
101 if ($::CFG->{fow_enable}) { 522 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; 523 glEnable GL_TEXTURE_2D;
129 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
130 525
131 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 526 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
132 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32); 527 $self->{fow_texture}->draw_quad_alpha (0, 0);
133 528
134 glDisable GL_TEXTURE_2D; 529 glDisable GL_TEXTURE_2D;
135 glDisable GL_BLEND;
136 } 530 }
137 531
532 if ($self->{magicmap}) {
533 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
534
535 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
536 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
537
538 glTranslate - $x - 1, - $y - 1;
539 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
540 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
541 }
542
138 glPopMatrix; 543 glPopMatrix;
139 }
140
141 glEndList; 544 glEndList;
142 } 545 }
143 546
144 glPushMatrix;
145 glCallList $self->{list}; 547 glCallList $self->{list};
146 glPopMatrix;
147 548
148 if ($CFClient::UI::FOCUS != $self) { 549 # TNT2 emulates logops in software (or worse :)
149 glColor 64/255, 64/255, 64/255; 550 unless ($focused) {
150 glLogicOp GL_AND; 551 glColor 0.4, 0.2, 0.2, 0.6;
151 glEnable GL_COLOR_LOGIC_OP; 552 glEnable GL_BLEND;
553 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
152 glBegin GL_QUADS; 554 glBegin GL_QUADS;
153 glVertex 0, 0; 555 glVertex 0, 0;
154 glVertex 0, $::HEIGHT; 556 glVertex 0, $::HEIGHT;
155 glVertex $::WIDTH, $::HEIGHT; 557 glVertex $::WIDTH, $::HEIGHT;
156 glVertex $::WIDTH, 0; 558 glVertex $::WIDTH, 0;
157 glEnd; 559 glEnd;
158 glDisable GL_COLOR_LOGIC_OP; 560 glDisable GL_BLEND;
159 } 561 }
160} 562}
161 563
162my %DIR = ( 564sub 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) = @_; 565 my $self = shift;
259 566
260 %{$self->{command}} = (); 567 glDeleteList $self->{list};
261}
262 568
569 $self->SUPER::DESTROY;
570}
571
263package CFClient::MapWidget::MapMap; 572package CFPlus::MapWidget::MapMap;
264 573
265our @ISA = CFClient::UI::Base::; 574our @ISA = CFPlus::UI::Base::;
266 575
267use Time::HiRes qw(time); 576use Time::HiRes qw(time);
268use CFClient::OpenGL; 577use CFPlus::OpenGL;
269 578
270sub size_request { 579sub size_request {
271 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 580 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
272} 581}
273 582
274sub size_allocate { 583sub invoke_size_allocate {
275 my ($self, $w, $h) = @_; 584 my ($self, $w, $h) = @_;
276 585
277 $self->SUPER::size_allocate ($w, $h);
278 $self->update; 586 $self->update;
587
588 1
279} 589}
280 590
281sub update { 591sub update {
282 my ($self) = @_; 592 my ($self) = @_;
283 593
… …
308 618
309 if ($self->{texture_atime} < time) { 619 if ($self->{texture_atime} < time) {
310 $self->{texture_atime} = time + 1/3; 620 $self->{texture_atime} = time + 1/3;
311 621
312 $self->{texture} = 622 $self->{texture} =
313 new CFClient::Texture 623 new CFPlus::Texture
314 w => $w, 624 w => $w,
315 h => $h, 625 h => $h,
316 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 626 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; 627 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
318 } 628 }
319 629
320 $self->{texture}->draw_quad (0, 0); 630 $self->{texture}->draw_quad (0, 0);
321 631
322 glDisable GL_TEXTURE_2D; 632 glDisable GL_TEXTURE_2D;
… …
337 glEnd; 647 glEnd;
338 648
339 glDisable GL_BLEND; 649 glDisable GL_BLEND;
340} 650}
341 651
342package CFClient::MapWidget::Command; 652package CFPlus::MapWidget::Command;
343 653
344use strict; 654use strict;
345 655
346use CFClient::OpenGL; 656use CFPlus::OpenGL;
347 657
348our @ISA = CFClient::UI::Frame::; 658our @ISA = CFPlus::UI::Frame::;
349 659
350sub new { 660sub new {
351 my $class = shift; 661 my $class = shift;
352 662
353 my $self = $class->SUPER::new ( 663 my $self = $class->SUPER::new (
354 bg => [0, 0, 0, 0.8], 664 bg => [0, 0, 0, 0.8],
355 @_, 665 @_,
356 ); 666 );
357 667
358 $self->add ($self->{vbox} = new CFClient::UI::VBox); 668 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
359 669
360 $self->{label} = [ 670 $self->{label} = [
361 map 671 map
362 CFClient::UI::Label->new ( 672 CFPlus::UI::Label->new (
363 can_hover => 1, 673 can_hover => 1,
364 can_events => 1, 674 can_events => 1,
365 tooltip_width => 0.33, 675 tooltip_width => 0.33,
366 fontsize => $_, 676 fontsize => $_,
367 ), (0.8) x 6 677 ), (0.8) x 16
368 ]; 678 ];
369 679
370 $self->{entry} = new CFClient::UI::Entry 680 $self->{entry} = new CFPlus::UI::Entry
371 connect_changed => sub { 681 on_changed => sub {
372 $self->update_labels; 682 $self->update_labels;
683 0
684 },
685 on_button_down => sub {
686 my ($entry, $ev, $x, $y) = @_;
687
688 if ($ev->{button} == 3) {
689 (new CFPlus::UI::Menu
690 items => [
691 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
692 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
693 ],
694 )->popup ($ev);
695 return 1;
696 }
697 0
698 },
699 on_key_down => sub {
700 my ($entry, $ev) = @_;
701
702 my $self = $entry->{parent}{parent};
703
704 if ($ev->{sym} == 13) {
705 if (exists $self->{select}) {
706 $self->{last_command} = $self->{select};
707 $::CONN->user_send ($self->{select});
708
709 unshift @{$self->{history}}, $self->{entry}->get_text;
710 $self->{hist_ptr} = 0;
711
712 $self->hide;
713 }
714 } elsif ($ev->{sym} == 27) {
715 $self->{hist_ptr} = 0;
716 $self->hide;
717 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
718 if ($self->{hist_ptr} > 1) {
719 $self->{hist_ptr}--;
720 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
721 } elsif ($self->{hist_ptr} > 0) {
722 $self->{hist_ptr}--;
723 $self->{entry}->set_text ($self->{hist_saveback});
724 } else {
725 ++$self->{select_offset}
726 if $self->{select_offset} < $#{ $self->{last_match} || [] };
727 }
728 $self->update_labels;
729 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
730 if ($self->{select_offset}) {
731 --$self->{select_offset}
732 } else {
733 unless ($self->{hist_ptr}) {
734 $self->{hist_saveback} = $self->{entry}->get_text;
735 }
736 if ($self->{hist_ptr} <= $#{$self->{history}}) {
737 $self->{hist_ptr}++;
738 }
739 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
740 if exists $self->{history}->[$self->{hist_ptr} - 1];
741 }
742 $self->update_labels;
743 } else {
744 return 0;
745 }
746
747 1
373 }; 748 }
749 ;
374 750
375 $self->{vbox}->add ( 751 $self->{vbox}->add (
376 $self->{entry}, 752 $self->{entry},
377 @{$self->{label}}, 753 @{$self->{label}},
378 ); 754 );
379 755
380 $self 756 $self
381} 757}
382 758
759sub set_prefix {
760 my ($self, $prefix) = @_;
761
762 $self->{entry}->set_text ($prefix);
763 $self->show;
764}
765
383sub size_allocate { 766sub invoke_size_allocate {
384 my ($self, $w, $h) = @_; 767 my ($self, $w, $h) = @_;
385 768
386 $self->SUPER::size_allocate ($w, $h);
387 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 769 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
388}
389 770
771 $self->SUPER::invoke_size_allocate ($w, $h)
772}
773
774sub show {
775 my ($self) = @_;
776
777 $self->SUPER::show;
778 $self->{entry}->grab_focus;
779}
780
781sub hide {
782 my ($self) = @_;
783
784 $self->{hist_ptr} = 0;
785
786 $self->SUPER::hide;
787 $self->{entry}->set_text ("");
788}
789
390sub key_down { 790sub inject_key_down {
391 my ($self, $ev) = @_; 791 my ($self, $ev) = @_;
392 792
393 if ($ev->{sym} == 13) { 793 $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); 794 $self->{entry}->emit (key_down => $ev);
413 }
414} 795}
415 796
416sub update_labels { 797sub update_labels {
417 my ($self) = @_; 798 my ($self) = @_;
418 799
419 my $text = $self->{entry}->get_text; 800 my $text = $self->{entry}->get_text;
420 801
421 length $text 802 length $text
422 or return $self->emit ("close"); 803 or return $self->hide;
423 804
424 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 805 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
425 806
426 if ($cmd ne $self->{last_search}) { 807 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; 808 my @match;
809
810 if ($text =~ /^(.*?)\s+$/) {
811 @match = [$cmd, "(appended whitespace suppresses completion)"];
812 } else {
813 my $regexp = do {
814 my ($beg, @chr) = split //, lc $cmd;
815
816 # the following regex is used to match our "completion entry"
817 # to an actual command - the parentheses match kind of "overhead"
818 # - the more characters the parentheses match, the less attractive
819 # is the match.
820 my $regexp = "^\Q$beg\E"
821 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
822 qr<$regexp>
823 };
824
440 my @penalty; 825 my @penalty;
441 826
442 for (keys %{$self->{command}}) { 827 for (keys %{$self->{command}}) {
443 if (@penalty = $_ =~ $regexp) { 828 if (@penalty = $_ =~ $regexp) {
444 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 829 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
830 }
445 } 831 }
446 }
447 832
448 @match = map $self->{command}{$_->[0]}, 833 @match = map $self->{command}{$_->[0]},
449 sort { 834 sort {
450 $a->[1] <=> $b->[1] 835 $a->[1] <=> $b->[1]
451 or (length $a->[0]) <=> (length $b->[0]) 836 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
837 or (length $b->[0]) <=> (length $a->[0])
452 } @match; 838 } @match;
839 }
453 840
454 $self->{last_search} = $cmd; 841 $self->{last_search} = $text;
455 $self->{last_match} = \@match; 842 $self->{last_match} = \@match;
456 843
457 $self->{select_offset} = 0; 844 $self->{select_offset} = 0;
458 } 845 }
459 846
… …
499 $label->set_text (""); 886 $label->set_text ("");
500 $label->set_tooltip (""); 887 $label->set_tooltip ("");
501 } 888 }
502 889
503 $self->update; 890 $self->update;
504 ###
505} 891}
506 892
507sub _draw { 893sub _draw {
508 my ($self) = @_; 894 my ($self) = @_;
509 895
510 # hack 896 # hack
511 local $CFClient::UI::FOCUS = $self->{entry}; 897 local $CFPlus::UI::FOCUS = $self->{entry};
512 898
513 $self->SUPER::_draw; 899 $self->SUPER::_draw;
514} 900}
515 901
5161 9021
903

Diff Legend

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