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.53 by root, Sun Jun 11 17:30:53 2006 UTC vs.
Revision 1.97 by root, Sat Dec 9 22:28:11 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 (
… …
24 ], 31 ],
25 32
26 @_ 33 @_
27 ); 34 );
28 35
29 $self->{completer} = new CFClient::MapWidget::Command:: 36 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command}, 37 command => $self->{command},
31 can_focus => 1, 38 tooltip => "#completer_help",
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ; 39 ;
41 40
42 $self 41 $self
43} 42}
44 43
… …
56 55
57sub clr_commands { 56sub clr_commands {
58 my ($self) = @_; 57 my ($self) = @_;
59 58
60 %{$self->{completer}{command}} = (); 59 %{$self->{completer}{command}} = ();
61}
62 60
61 $self->{completer}->hide
62 if $self->{completer};
63}
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
63sub button_down { 175sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
65 177
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 179 $self->grab_focus;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 180 return unless $::CONN;
71 181
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
74 184
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy) 185 $x -= CFPlus::floor $::MAP->w * 0.5;
186 $y -= CFPlus::floor $::MAP->h * 0.5;
187
76 if $::CONN; 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 }
77 195
78 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
197 $self->grab_focus;
198 return unless $::CONN;
199
79 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 200 my ($ox, $oy) = ($ev->{x}, $ev->{y});
80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 201 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
81 202
82 $self->{motion} = sub { 203 $self->{motion} = sub {
83 my ($ev, $x, $y) = @_; 204 my ($ev, $x, $y) = @_;
… …
87 $::CFG->{map_shift_x} = $bw + $x - $ox; 208 $::CFG->{map_shift_x} = $bw + $x - $ox;
88 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
89 210
90 $self->update; 211 $self->update;
91 }; 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);
92 } 264 }
93 265
94 1 266 1
95} 267}
96 268
97sub button_up { 269sub invoke_button_up {
98 my ($self, $ev, $x, $y) = @_; 270 my ($self, $ev, $x, $y) = @_;
99 271
100 delete $self->{motion}; 272 delete $self->{motion};
101 273
102 1 274 1
103} 275}
104 276
105sub mouse_motion { 277sub invoke_mouse_motion {
106 my ($self, $ev, $x, $y) = @_; 278 my ($self, $ev, $x, $y) = @_;
107 279
108 if ($self->{motion}) { 280 if ($self->{motion}) {
109 $self->{motion}->($ev, $x, $y); 281 $self->{motion}->($ev, $x, $y);
110 } else { 282 } else {
… …
114 1 286 1
115} 287}
116 288
117sub size_request { 289sub size_request {
118 ( 290 (
119 1 + 32 * int $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
120 1 + 32 * int $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
121 ) 293 )
122} 294}
123 295
124sub update { 296sub update {
125 my ($self) = @_; 297 my ($self) = @_;
… …
127 $self->{need_update} = 1; 299 $self->{need_update} = 1;
128 $self->SUPER::update; 300 $self->SUPER::update;
129} 301}
130 302
131my %DIR = ( 303my %DIR = (
132 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
133 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
134 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
135 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
136 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
137 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
138 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
139 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
140 312
141 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
142 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
143 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
144 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
145); 317);
146 318
147sub key_down { 319sub invoke_key_down {
148 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
149
150 return 0 unless $::CONN;
151 321
152 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
153 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
154 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
155 325
156 if ($sym == CFClient::SDLK_KP5) { 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 (!$::CONN) {
343 return 0; # bindings further down need a valid connection
344
345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
157 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
158 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
159 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
160 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
161 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
162 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
163 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
164 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
165 } elsif ($uni == ord "\t") { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
166 $::INV_WINDOW->toggle_visibility; 357 warn "<@macros>\n";#d#
358 $::CONN->macro_send ($_) for @macros;
167 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
168 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
169 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
170 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
171 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
172 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 364 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
173 $self->{completer}->show; 365 $self->{completer}->show;
174 } elsif ($uni == ord "'") { 366 } elsif ($uni == ord "'") {
175 $self->{completer}->set_prefix (""); 367 $self->{completer}->set_prefix ("");
176 $self->{completer}->show; 368 $self->{completer}->show;
177 } elsif (exists $DIR{$sym}) { 369 } elsif (exists $DIR{$sym}) {
178 if ($mod & CFClient::KMOD_SHIFT) { 370 if ($mod & CFPlus::KMOD_SHIFT) {
179 $self->{shft}++; 371 $self->{shft}++;
372 if ($DIR{$sym}[0] != $self->{fire_dir}) {
180 $::CONN->user_send ("fire $DIR{$sym}[0]"); 373 $::CONN->user_send ("fire $DIR{$sym}[0]");
374 }
375 $self->{fire_dir} = $DIR{$sym}[0];
181 } elsif ($mod & CFClient::KMOD_CTRL) { 376 } elsif ($mod & CFPlus::KMOD_CTRL) {
182 $self->{ctrl}++; 377 $self->{ctrl}++;
183 $::CONN->user_send ("run $DIR{$sym}[0]"); 378 $::CONN->user_send ("run $DIR{$sym}[0]");
184 } else { 379 } else {
185 $::CONN->user_send ("$DIR{$sym}[1]"); 380 $::CONN->user_send ("$DIR{$sym}[1]");
186 } 381 }
187 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
188 $::BIND_EDITOR->set_binding (undef, undef, [],
189 sub {
190 my ($mod, $sym, $cmds) = @_;
191 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
192 });
193 $::BIND_EDITOR->start;
194 $::BIND_EDITOR->show;
195 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
196 $::BIND_EDITOR->stop;
197 $::BIND_EDITOR->ask_for_bind_and_commit;
198 $::BIND_EDITOR->hide;
199 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
200 $::CONN->user_send ($_) for @$bind_cmd;
201 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 382 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202 $self->{completer}->key_down ($ev); 383 $self->{completer}->inject_key_down ($ev);
203 $self->{completer}->show; 384 $self->{completer}->show;
204 } else { 385 } else {
205 return 0; 386 return 0;
206 } 387 }
207 388
208 1 389 1
209} 390}
210 391
211sub key_up { 392sub invoke_key_up {
212 my ($self, $ev) = @_; 393 my ($self, $ev) = @_;
213 394
214 my $res = 0; 395 my $res = 0;
215 my $mod = $ev->{mod}; 396 my $mod = $ev->{mod};
216 my $sym = $ev->{sym}; 397 my $sym = $ev->{sym};
217 398
399 if ($::CFG->{shift_fire_stop}) {
218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 400 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
219 $::CONN->user_send ("fire_stop"); 401 $::CONN->user_send ("fire_stop");
402 delete $self->{fire_dir};
220 $res = 1; 403 $res = 1;
404 }
405 } else {
406 if (exists $DIR{$sym} && delete $self->{shft}) {
407 $::CONN->user_send ("fire_stop");
408 delete $self->{fire_dir};
409 $res = 1;
410 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
411 $::CONN->user_send ("fire_stop");
412 delete $self->{fire_dir};
413 $res = 1;
414 }
221 } 415 }
222 416
223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 417 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
224 $::CONN->user_send ("run_stop"); 418 $::CONN->user_send ("run_stop");
225 $res = 1; 419 $res = 1;
226 } 420 }
227 421
228 $res 422 $res
229} 423}
230 424
425sub set_magicmap {
426 my ($self, $w, $h, $x, $y, $data) = @_;
427
428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
430
431 $self->{magicmap} = [$x, $y, $w, $h, $data];
432
433 $self->update;
434}
435
231sub draw { 436sub draw {
232 my ($self) = @_; 437 my ($self) = @_;
233 438
439 return unless $::MAP;
440
234 my $focused = $CFClient::UI::FOCUS == $self 441 my $focused = $CFPlus::UI::FOCUS == $self
235 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 442 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
236 443
237 return 444 return
238 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
239 446
240 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
455
456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
458
459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
461
462 if ($::CFG->{fow_enable}) {
463 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
464
465 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
467 glConvolutionFilter2D (
468 GL_CONVOLUTION_2D,
469 GL_ALPHA,
470 3, 3,
471 GL_ALPHA, GL_FLOAT,
472 (pack "f*", @{ $self->{smooth_matrix} }),
473 );
474 glEnable GL_CONVOLUTION_2D;
475 }
476
477 $self->{fow_texture} = new CFPlus::Texture
478 w => $w,
479 h => $h,
480 data => $data,
481 internalformat => GL_ALPHA,
482 format => GL_ALPHA;
483
484 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
485 } else {
486 delete $self->{fow_texture};
487 }
488
241 glNewList $self->{list}; 489 glNewList $self->{list};
242 490
243 if ($::MAP) {
244 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
245 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
246
247 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
248 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
249
250 glPushMatrix; 491 glPushMatrix;
492 glTranslate $sx0, $sy0;
251 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
252 494
253 glTranslate $sx0 - 32, $sy0 - 32, 0; 495 $::MAP->draw ($dx, $dy, $sw, $sh);
254 496
255 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 497 glScale 32, 32;
256 498
257 if ($::CFG->{fow_enable}) { 499 if (my $tex = $self->{fow_texture}) {
258 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
259 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
260 glConvolutionFilter2D (
261 GL_CONVOLUTION_2D,
262 GL_ALPHA,
263 3, 3,
264 GL_ALPHA, GL_FLOAT,
265 (pack "f*", @{ $self->{smooth_matrix} }),
266 );
267 glEnable GL_CONVOLUTION_2D;
268 }
269
270 $self->{fow_texture_name} ||= glGenTexture;
271 # try to re-use the texture name: TODO improve texture class instead
272
273 $self->{fow_texture} = new CFClient::Texture
274 w => $w,
275 h => $h,
276 data => $data,
277 name => $self->{fow_texture_name},
278 internalformat => GL_ALPHA,
279 format => GL_ALPHA;
280
281 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
282
283 glEnable GL_TEXTURE_2D; 500 glEnable GL_TEXTURE_2D;
284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285 502
286 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 503 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 504 $self->{fow_texture}->draw_quad_alpha (0, 0);
288 505
289 glDisable GL_TEXTURE_2D; 506 glDisable GL_TEXTURE_2D;
290 } 507 }
291 508
509 if ($self->{magicmap}) {
510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
511
512 $x += $::MAP->ox + $self->{dx};
513 $y += $::MAP->oy + $self->{dy};
514
515 glTranslate - $x - 1, - $y - 1;
516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
518 }
519
292 glPopMatrix; 520 glPopMatrix;
293 }
294
295 glEndList; 521 glEndList;
296 } 522 }
297 523
298 glPushMatrix;
299 glCallList $self->{list}; 524 glCallList $self->{list};
300 glPopMatrix;
301 525
302 # TNT2 emulates logops in software (or worse :) 526 # TNT2 emulates logops in software (or worse :)
303 if ($focused) { 527 unless ($focused) {
304 (delete $self->{out_of_focus})->destroy
305 if $self->{out_of_focus};
306 } else {
307 glColor 0.4, 0.2, 0.2, 0.6; 528 glColor 0.4, 0.2, 0.2, 0.6;
308 glEnable GL_BLEND; 529 glEnable GL_BLEND;
309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glBegin GL_QUADS; 531 glBegin GL_QUADS;
311 glVertex 0, 0; 532 glVertex 0, 0;
312 glVertex 0, $::HEIGHT; 533 glVertex 0, $::HEIGHT;
313 glVertex $::WIDTH, $::HEIGHT; 534 glVertex $::WIDTH, $::HEIGHT;
314 glVertex $::WIDTH, 0; 535 glVertex $::WIDTH, 0;
315 glEnd; 536 glEnd;
316 glDisable GL_BLEND; 537 glDisable GL_BLEND;
317
318# $self->{out_of_focus} ||= do {
319# my $label = new CFClient::UI::Label
320# x => 0,
321# y => 0,
322# z => 1,
323# ellipsise => 0,
324# text => "map out of focus (click map to play)";
325#
326# $label->show;
327# $label->update;
328#
329# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
330# $label->move_abs (
331# ($::WIDTH - $label->{w}) * 0.5,
332# ($::HEIGHT - $label->{h}) * 0.5,
333# );
334# });
335#
336# $label
337# };
338 } 538 }
339} 539}
340 540
341sub DESTROY { 541sub DESTROY {
342 my $self = shift; 542 my $self = shift;
… …
344 glDeleteList $self->{list}; 544 glDeleteList $self->{list};
345 545
346 $self->SUPER::DESTROY; 546 $self->SUPER::DESTROY;
347} 547}
348 548
349package CFClient::MapWidget::MapMap; 549package CFPlus::MapWidget::MapMap;
350 550
351our @ISA = CFClient::UI::Base::; 551our @ISA = CFPlus::UI::Base::;
352 552
353use Time::HiRes qw(time); 553use Time::HiRes qw(time);
354use CFClient::OpenGL; 554use CFPlus::OpenGL;
355 555
356sub size_request { 556sub size_request {
357 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 557 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
358} 558}
359 559
360sub size_allocate { 560sub invoke_size_allocate {
361 my ($self, $w, $h) = @_; 561 my ($self, $w, $h) = @_;
362 562
363 $self->SUPER::size_allocate ($w, $h);
364 $self->update; 563 $self->update;
564
565 1
365} 566}
366 567
367sub update { 568sub update {
368 my ($self) = @_; 569 my ($self) = @_;
369 570
… …
394 595
395 if ($self->{texture_atime} < time) { 596 if ($self->{texture_atime} < time) {
396 $self->{texture_atime} = time + 1/3; 597 $self->{texture_atime} = time + 1/3;
397 598
398 $self->{texture} = 599 $self->{texture} =
399 new CFClient::Texture 600 new CFPlus::Texture
400 w => $w, 601 w => $w,
401 h => $h, 602 h => $h,
402 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 603 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
403 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 604 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
404 } 605 }
405 606
406 $self->{texture}->draw_quad (0, 0); 607 $self->{texture}->draw_quad (0, 0);
407 608
408 glDisable GL_TEXTURE_2D; 609 glDisable GL_TEXTURE_2D;
… …
423 glEnd; 624 glEnd;
424 625
425 glDisable GL_BLEND; 626 glDisable GL_BLEND;
426} 627}
427 628
428package CFClient::MapWidget::Command; 629package CFPlus::MapWidget::Command;
429 630
430use strict; 631use strict;
431 632
432use CFClient::OpenGL; 633use CFPlus::OpenGL;
433 634
434our @ISA = CFClient::UI::Frame::; 635our @ISA = CFPlus::UI::Frame::;
435 636
436sub new { 637sub new {
437 my $class = shift; 638 my $class = shift;
438 639
439 my $self = $class->SUPER::new ( 640 my $self = $class->SUPER::new (
440 bg => [0, 0, 0, 0.8], 641 bg => [0, 0, 0, 0.8],
441 @_, 642 @_,
442 ); 643 );
443 644
444 $self->add ($self->{vbox} = new CFClient::UI::VBox); 645 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
445 646
446 $self->{label} = [ 647 $self->{label} = [
447 map 648 map
448 CFClient::UI::Label->new ( 649 CFPlus::UI::Label->new (
449 can_hover => 1, 650 can_hover => 1,
450 can_events => 1, 651 can_events => 1,
451 tooltip_width => 0.33, 652 tooltip_width => 0.33,
452 fontsize => $_, 653 fontsize => $_,
453 ), (0.8) x 16 654 ), (0.8) x 16
454 ]; 655 ];
455 656
456 $self->{entry} = new CFClient::UI::Entry 657 $self->{entry} = new CFPlus::UI::Entry
457 on_changed => sub { 658 on_changed => sub {
458 $self->update_labels; 659 $self->update_labels;
660 0
661 },
662 on_button_down => sub {
663 my ($entry, $ev, $x, $y) = @_;
664
665 if ($ev->{button} == 3) {
666 (new CFPlus::UI::Menu
667 items => [
668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
670 ],
671 )->popup ($ev);
672 return 1;
673 }
674 0
459 }, 675 },
460 on_key_down => sub { 676 on_key_down => sub {
461 my ($entry, $ev) = @_; 677 my ($entry, $ev) = @_;
462 678
463 my $self = $entry->{parent}{parent}; 679 my $self = $entry->{parent}{parent};
… …
465 if ($ev->{sym} == 13) { 681 if ($ev->{sym} == 13) {
466 if (exists $self->{select}) { 682 if (exists $self->{select}) {
467 $self->{last_command} = $self->{select}; 683 $self->{last_command} = $self->{select};
468 $::CONN->user_send ($self->{select}); 684 $::CONN->user_send ($self->{select});
469 685
470 unshift @{$self->{history}}, $self->{select}; 686 unshift @{$self->{history}}, $self->{entry}->get_text;
471 $self->{hist_ptr} = 0; 687 $self->{hist_ptr} = 0;
472 688
473 $self->hide; 689 $self->hide;
474 } 690 }
475 } elsif ($ev->{sym} == 27) { 691 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0; 692 $self->{hist_ptr} = 0;
477 $self->hide; 693 $self->hide;
478 return;
479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 694 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) { 695 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--; 696 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 697 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) { 698 } elsif ($self->{hist_ptr} > 0) {
484 $self->{hist_ptr}--; 699 $self->{hist_ptr}--;
… …
486 } else { 701 } else {
487 ++$self->{select_offset} 702 ++$self->{select_offset}
488 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 703 if $self->{select_offset} < $#{ $self->{last_match} || [] };
489 } 704 }
490 $self->update_labels; 705 $self->update_labels;
491 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 706 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
492 if ($self->{select_offset}) { 707 if ($self->{select_offset}) {
493 --$self->{select_offset} 708 --$self->{select_offset}
494 } else { 709 } else {
495 unless ($self->{hist_ptr}) { 710 unless ($self->{hist_ptr}) {
496 $self->{hist_saveback} = $self->{entry}->get_text; 711 $self->{hist_saveback} = $self->{entry}->get_text;
… …
523 738
524 $self->{entry}->set_text ($prefix); 739 $self->{entry}->set_text ($prefix);
525 $self->show; 740 $self->show;
526} 741}
527 742
528sub size_allocate { 743sub invoke_size_allocate {
529 my ($self, $w, $h) = @_; 744 my ($self, $w, $h) = @_;
530 745
531 $self->SUPER::size_allocate ($w, $h);
532 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 746 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
747
748 $self->SUPER::invoke_size_allocate ($w, $h)
533} 749}
534 750
535sub show { 751sub show {
536 my ($self) = @_; 752 my ($self) = @_;
537 753
538 $self->SUPER::show; 754 $self->SUPER::show;
539 $self->{entry}->focus_in; 755 $self->{entry}->grab_focus;
540} 756}
541 757
542sub hide { 758sub hide {
543 my ($self) = @_; 759 my ($self) = @_;
544 760
761 $self->{hist_ptr} = 0;
762
545 $self->SUPER::hide; 763 $self->SUPER::hide;
546 $self->{entry}->set_text (""); 764 $self->{entry}->set_text ("");
547} 765}
548 766
549sub key_down { 767sub inject_key_down {
550 my ($self, $ev) = @_; 768 my ($self, $ev) = @_;
551 769
770 $self->{entry}->grab_focus;
552 $self->{entry}->key_down ($ev) 771 $self->{entry}->emit (key_down => $ev);
553} 772}
554 773
555sub update_labels { 774sub update_labels {
556 my ($self) = @_; 775 my ($self) = @_;
557 776
… …
644 $label->set_text (""); 863 $label->set_text ("");
645 $label->set_tooltip (""); 864 $label->set_tooltip ("");
646 } 865 }
647 866
648 $self->update; 867 $self->update;
649 ###
650} 868}
651 869
652sub _draw { 870sub _draw {
653 my ($self) = @_; 871 my ($self) = @_;
654 872
655 # hack 873 # hack
656 local $CFClient::UI::FOCUS = $self->{entry}; 874 local $CFPlus::UI::FOCUS = $self->{entry};
657 875
658 $self->SUPER::_draw; 876 $self->SUPER::_draw;
659} 877}
660 878
6611 8791
880

Diff Legend

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