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

Diff Legend

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