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

Diff Legend

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