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

Diff Legend

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