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

Diff Legend

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