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.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.109 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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