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.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.114 by root, Mon Jul 23 23:52:41 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::;
11 14
12my $magicmap_tex = 15my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my $class = shift;
18 21
19 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
20 z => -1, 23 z => -1,
21 can_focus => 1, 24 can_focus => 1,
22 list => glGenList, 25 tilesize => 32,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
30 @_ 26 @_
31 ); 27 );
32 28
33 $self->{completer} = new CFClient::MapWidget::Command:: 29 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 30 command => $self->{command},
35 can_focus => 1, 31 tooltip => "#completer_help",
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 32 ;
45 33
46 $self 34 $self
35}
36
37sub set_tilesize {
38 my ($self, $tilesize) = @_;
39
40 $self->{tilesize} = $tilesize;
47} 41}
48 42
49sub add_command { 43sub add_command {
50 my ($self, $command, $tooltip, $widget, $cb) = @_; 44 my ($self, $command, $tooltip, $widget, $cb) = @_;
51 45
… …
60 54
61sub clr_commands { 55sub clr_commands {
62 my ($self) = @_; 56 my ($self) = @_;
63 57
64 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
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 }
65} 172}
66 173
67sub invoke_button_down { 174sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
69 176
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
178 $self->grab_focus;
179 return unless $::CONN;
180
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
77 183
78 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
79 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
80 186
187 if ($::CONN) {
188 if ($::IN_BUILD_MODE) {
189 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190 } else {
81 $::CONN->lookat ($x, $y) 191 $::CONN->lookat ($x, $y)
82 if $::CONN; 192 }
193 }
83 194
84 } elsif ($ev->{button} == 2) { 195 } elsif ($ev->{button} == 2) {
196 $self->grab_focus;
197 return unless $::CONN;
198
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 200 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 201
88 $self->{motion} = sub { 202 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 203 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 207 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 208 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 209
96 $self->update; 210 $self->update;
97 }; 211 };
212 } elsif ($ev->{button} == 3) {
213 my @items = (
214 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
215 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
216 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
217 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
218 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
219 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
220 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
221 [
222 $::PICKUP_ENABLE->{state}
223 ? "Disable automatic pickup"
224 : "Enable automatic pickup",
225 sub { $::PICKUP_ENABLE->toggle }
226 ],
227 );
228
229 if ($::CONN && $::CONN->{editor_support}) {
230 push @items, [
231 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
232 \&editor_invoke,
233 ];
234
235 for my $type (qw(test name)) {
236 $::CONN->{editor_support}{type} ne $type
237 or next;
238 my $server = $::CONN->{editor_support}{"${type}server"}
239 or next;
240
241 push @items, [
242 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
243 sub { server_login $server },
244 ];
245 }
246 }
247
248 push @items,
249 ["Quit",
250 sub {
251 if ($::CONN) {
252 &::open_quit_dialog;
253 } else {
254 exit;
255 }
256 }
257 ],
258 ;
259
260 (new CFPlus::UI::Menu
261 items => \@items,
262 )->popup ($ev);
98 } 263 }
99 264
100 1 265 1
101} 266}
102 267
… …
119 284
120 1 285 1
121} 286}
122 287
123sub size_request { 288sub size_request {
289 my ($self) = @_;
290
124 ( 291 (
125 32 * CFClient::ceil $::WIDTH / 32, 292 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
126 32 * CFClient::ceil $::HEIGHT / 32, 293 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
127 ) 294 )
128} 295}
129 296
130sub update { 297sub update {
131 my ($self) = @_; 298 my ($self) = @_;
… …
133 $self->{need_update} = 1; 300 $self->{need_update} = 1;
134 $self->SUPER::update; 301 $self->SUPER::update;
135} 302}
136 303
137my %DIR = ( 304my %DIR = (
305 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"],
138 CFClient::SDLK_KP8, [1, "north"], 306 ( "," . CFPlus::SDLK_KP8 ), [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 307 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 308 ( "," . CFPlus::SDLK_KP6 ), [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 309 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 310 ( "," . CFPlus::SDLK_KP2 ), [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 311 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 312 ( "," . CFPlus::SDLK_KP4 ), [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 313 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"],
146 314
147 CFClient::SDLK_UP, [1, "north"], 315 ( "," . CFPlus::SDLK_UP ), [1, "north"],
316 ("1," . CFPlus::SDLK_UP ), [2, "northeast"],
148 CFClient::SDLK_RIGHT, [3, "east"], 317 ( "," . CFPlus::SDLK_RIGHT), [3, "east"],
318 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"],
149 CFClient::SDLK_DOWN, [5, "south"], 319 ( "," . CFPlus::SDLK_DOWN ), [5, "south"],
320 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"],
150 CFClient::SDLK_LEFT, [7, "west"], 321 ( "," . CFPlus::SDLK_LEFT ), [7, "west"],
322 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"],
151); 323);
152 324
153sub invoke_key_down { 325sub invoke_key_down {
154 my ($self, $ev) = @_; 326 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 327
158 my $mod = $ev->{mod}; 328 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 329 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 330 my $uni = $ev->{unicode};
161 331
162 if ($sym == CFClient::SDLK_KP5) { 332 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
163 $::CONN->user_send ("stay fire"); 333
334 if ($sym == 9) {
335 ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility;
336 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
337 $::HELP_WINDOW->toggle_visibility;
338 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
339 ::toggle_player_page ($::STATS_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
341 ::toggle_player_page ($::SKILL_PAGE);
342 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
343 ::toggle_player_page ($::SPELL_PAGE);
344 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
345 ::toggle_player_page ($::INVENTORY_PAGE);
346 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
347 $::SETUP_DIALOG->toggle_visibility;
348 } elsif (!$::CONN) {
349 return 0; # bindings further down need a valid connection
350
164 } elsif ($uni == ord ",") { 351 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 352 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 353 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 354 $::CONN->user_send ("apply");
355 } elsif ($uni == 13) {
356 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 357 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 358 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 359 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 360 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
172 $::PL_WINDOW->toggle_visibility; 361 $::CONN->macro_send ($_) for @macros;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 362 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 363 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 364 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 365 $::CONN->user_send ("rotateshoottype -");
366 } elsif ($uni == ord '!') {
367 $self->{completer}->set_prefix ("shout ");
368 $self->{completer}->show;
178 } elsif ($uni == ord '"') { 369 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 370 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 371 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 372 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 373 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 374 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 375 } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 376 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 377 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 378 if ($dir->[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 379 $::CONN->user_send ("fire $dir->[0]");
189 } 380 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 381 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 382 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 383 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 384 $::CONN->user_send ("run $dir->[0]");
194 } else { 385 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 386 $::CONN->user_send ("$dir->[1]");
196 } 387 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 388 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 389 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 390 $self->{completer}->show;
214 } else { 391 } else {
215 return 0; 392 return 0;
216 } 393 }
217 394
… …
224 my $res = 0; 401 my $res = 0;
225 my $mod = $ev->{mod}; 402 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 403 my $sym = $ev->{sym};
227 404
228 if ($::CFG->{shift_fire_stop}) { 405 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 406 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 407 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 408 delete $self->{fire_dir};
232 $res = 1; 409 $res = 1;
233 } 410 }
234 } else { 411 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 412 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 413 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 414 delete $self->{fire_dir};
238 $res = 1; 415 $res = 1;
239 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 416 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240 $::CONN->user_send ("fire_stop"); 417 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 418 delete $self->{fire_dir};
242 $res = 1; 419 $res = 1;
243 } 420 }
244 } 421 }
245 422
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 423 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 424 $::CONN->user_send ("run_stop");
248 $res = 1; 425 $res = 1;
249 } 426 }
250 427
251 $res 428 $res
252} 429}
253 430
431sub invoke_visibility_change {
432 my ($self) = @_;
433
434 $self->refresh_hook;
435
436 0
437}
438
254sub set_magicmap { 439sub set_magicmap {
255 my ($self, $w, $h, $x, $y, $data) = @_; 440 my ($self, $w, $h, $x, $y, $data) = @_;
256 441
257 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 442 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
258 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 443 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
259 444
260 $self->{magicmap} = [$x, $y, $w, $h, $data]; 445 $self->{magicmap} = [$x, $y, $w, $h, $data];
261 446
262 $self->update; 447 $self->update;
263} 448}
264 449
450sub refresh_hook {
451 my ($self) = @_;
452
453 if ($::MAP) {
454 if (delete $self->{need_update}) {
455 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
456
457 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
458 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
459
460 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
461 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
462
463 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
464 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
465
466 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
467 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
468
469 if ($::CFG->{fow_enable}) {
470 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
471
472 $self->{fow_texture} = new CFPlus::Texture
473 w => $w,
474 h => $h,
475 data => $data,
476 internalformat => GL_ALPHA,
477 format => GL_ALPHA;
478 } else {
479 delete $self->{fow_texture};
480 }
481
482 glNewList ($self->{list} ||= glGenList);
483
484 glPushMatrix;
485 glTranslate $sx0, $sy0;
486 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
487
488 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
489
490 glScale $self->{tilesize}, $self->{tilesize};
491
492 if (my $tex = $self->{fow_texture}) {
493 glPushMatrix;
494 glScale 1/3, 1/3;
495 glEnable GL_TEXTURE_2D;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
497
498 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
499 $self->{fow_texture}->draw_quad_alpha (0, 0);
500
501 glDisable GL_TEXTURE_2D;
502 glPopMatrix;
503 }
504
505 if ($self->{magicmap}) {
506 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
507
508 $x += $::MAP->ox + $self->{dx};
509 $y += $::MAP->oy + $self->{dy};
510
511 glTranslate - $x - 1, - $y - 1;
512 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
513 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
514 }
515
516 glPopMatrix;
517 glEndList;
518 }
519 } else {
520 glDeleteList delete $self->{list}
521 if $self->{list};
522 }
523}
524
265sub draw { 525sub draw {
266 my ($self) = @_; 526 my ($self) = @_;
267 527
268 return unless $::MAP; 528 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
269 529
530 return unless $self->{list};
531
270 my $focused = $CFClient::UI::FOCUS == $self 532 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 533 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 534
273 return 535 return
274 unless $focused || !$::FAST; 536 unless $focused || !$::FAST;
275
276 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
281
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
287
288 if ($::CFG->{fow_enable}) {
289 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
290
291 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
292 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D,
295 GL_ALPHA,
296 3, 3,
297 GL_ALPHA, GL_FLOAT,
298 (pack "f*", @{ $self->{smooth_matrix} }),
299 );
300 glEnable GL_CONVOLUTION_2D;
301 }
302
303 $self->{fow_texture} = new CFClient::Texture
304 w => $w,
305 h => $h,
306 data => $data,
307 internalformat => GL_ALPHA,
308 format => GL_ALPHA;
309
310 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
311 } else {
312 delete $self->{fow_texture};
313 }
314
315 glNewList $self->{list};
316
317 glPushMatrix;
318 glTranslate $sx0, $sy0;
319 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320
321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
322
323 glScale 32, 32;
324
325 if (my $tex = $self->{fow_texture}) {
326 glEnable GL_TEXTURE_2D;
327 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
328
329 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
330 $self->{fow_texture}->draw_quad_alpha (0, 0);
331
332 glDisable GL_TEXTURE_2D;
333 }
334
335 if ($self->{magicmap}) {
336 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337
338 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
339 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
340
341 glTranslate - $x - 1, - $y - 1;
342 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344 }
345
346 glPopMatrix;
347 glEndList;
348 }
349 537
350 glCallList $self->{list}; 538 glCallList $self->{list};
351 539
352 # TNT2 emulates logops in software (or worse :) 540 # TNT2 emulates logops in software (or worse :)
353 unless ($focused) { 541 unless ($focused) {
… …
370 glDeleteList $self->{list}; 558 glDeleteList $self->{list};
371 559
372 $self->SUPER::DESTROY; 560 $self->SUPER::DESTROY;
373} 561}
374 562
375package CFClient::MapWidget::MapMap; 563package CFPlus::MapWidget::MapMap;
376 564
565use strict;
566use utf8;
567
377our @ISA = CFClient::UI::Base::; 568our @ISA = CFPlus::UI::Base::;
378 569
379use Time::HiRes qw(time); 570use Time::HiRes qw(time);
380use CFClient::OpenGL; 571use CFPlus::OpenGL;
381 572
382sub size_request { 573sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 574 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
575}
576
577sub refresh_hook {
578 my ($self) = @_;
579
580 if ($::MAP && $self->{texture_atime} < time) {
581 my ($w, $h) = @$self{qw(w h)};
582
583 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
584 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
585
586 my $ox = 0.5 * ($w - $sw);
587 my $oy = 0.5 * ($h - $sh);
588
589 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
590 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
591
592 #TODO: map scale is completely borked
593
594 my $x0 = int $ox - $sx + 0.5;
595 my $y0 = int $oy - $sy + 0.5;
596
597 $self->{sw} = $sw;
598 $self->{sh} = $sh;
599
600 $self->{x0} = $x0;
601 $self->{y0} = $y0;
602
603 $self->{texture_atime} = time + 1/3;
604
605 $self->{texture} =
606 new CFPlus::Texture
607 w => $w,
608 h => $h,
609 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
610 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
611 }
612}
613
614sub invoke_visibility_change {
615 my ($self) = @_;
616
617 $self->refresh_hook;
618
619 0
384} 620}
385 621
386sub invoke_size_allocate { 622sub invoke_size_allocate {
387 my ($self, $w, $h) = @_; 623 my ($self, $w, $h) = @_;
388 624
… …
399} 635}
400 636
401sub _draw { 637sub _draw {
402 my ($self) = @_; 638 my ($self) = @_;
403 639
404 $::MAP or return; 640 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
405 641
406 my ($w, $h) = @$self{qw(w h)}; 642 $self->{texture} or return;
407
408 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
409 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
410
411 my $sx = int $::CFG->{map_shift_x} / 32;
412 my $sy = int $::CFG->{map_shift_y} / 32;
413
414 my $ox = 0.5 * ($w - $sw);
415 my $oy = 0.5 * ($h - $sh);
416 643
417 glEnable GL_BLEND; 644 glEnable GL_BLEND;
418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
419 glEnable GL_TEXTURE_2D; 646 glEnable GL_TEXTURE_2D;
420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 647 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
421 648
422 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3;
424
425 $self->{texture} =
426 new CFClient::Texture
427 w => $w,
428 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431 }
432
433 $self->{texture}->draw_quad (0, 0); 649 $self->{texture}->draw_quad (0, 0);
434 650
435 glDisable GL_TEXTURE_2D; 651 glDisable GL_TEXTURE_2D;
436 652
437 glTranslate 0.375, 0.375; 653 glTranslate 0.375, 0.375;
438
439 #TODO: map scale is completely borked
440
441 my $x0 = int $ox - $sx + 0.5;
442 my $y0 = int $oy - $sy + 0.5;
443 654
444 glColor 1, 1, 0, 1; 655 glColor 1, 1, 0, 1;
445 glBegin GL_LINE_LOOP; 656 glBegin GL_LINE_LOOP;
446 glVertex $x0 , $y0 ; 657 glVertex $self->{x0} , $self->{y0} ;
447 glVertex $x0 , $y0 + $sh; 658 glVertex $self->{x0} , $self->{y0} + $self->{sh};
448 glVertex $x0 + $sw, $y0 + $sh; 659 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
449 glVertex $x0 + $sw, $y0 ; 660 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
450 glEnd; 661 glEnd;
451 662
452 glDisable GL_BLEND; 663 glDisable GL_BLEND;
453} 664}
454 665
455package CFClient::MapWidget::Command; 666package CFPlus::MapWidget::Command;
456 667
457use strict; 668use strict;
458 669
459use CFClient::OpenGL; 670use CFPlus::OpenGL;
460 671
461our @ISA = CFClient::UI::Frame::; 672our @ISA = CFPlus::UI::Frame::;
462 673
463sub new { 674sub new {
464 my $class = shift; 675 my $class = shift;
465 676
466 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 678 bg => [0, 0, 0, 0.8],
468 @_, 679 @_,
469 ); 680 );
470 681
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 682 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 683
473 $self->{label} = [ 684 $self->{label} = [
474 map 685 map
475 CFClient::UI::Label->new ( 686 CFPlus::UI::Label->new (
476 can_hover => 1, 687 can_hover => 1,
477 can_events => 1, 688 can_events => 1,
478 tooltip_width => 0.33, 689 tooltip_width => 0.33,
479 fontsize => $_, 690 fontsize => $_,
480 ), (0.8) x 16 691 ), (0.8) x 16
481 ]; 692 ];
482 693
483 $self->{entry} = new CFClient::UI::Entry 694 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 695 on_changed => sub {
485 $self->update_labels; 696 $self->update_labels;
486 0 697 0
487 }, 698 },
488 on_button_down => sub { 699 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 700 my ($entry, $ev, $x, $y) = @_;
490 701
491 if ($ev->{button} == 3) { 702 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 703 (new CFPlus::UI::Menu
493 items => [ 704 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 705 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 706 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
496 ], 707 ],
497 )->popup ($ev); 708 )->popup ($ev);
498 return 1; 709 return 1;
499 } 710 }
500 0 711 0
… …
515 $self->hide; 726 $self->hide;
516 } 727 }
517 } elsif ($ev->{sym} == 27) { 728 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 729 $self->{hist_ptr} = 0;
519 $self->hide; 730 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 731 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 732 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 733 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 734 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 735 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 736 $self->{hist_ptr}--;
… …
527 } else { 738 } else {
528 ++$self->{select_offset} 739 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 740 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 741 }
531 $self->update_labels; 742 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 743 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 744 if ($self->{select_offset}) {
534 --$self->{select_offset} 745 --$self->{select_offset}
535 } else { 746 } else {
536 unless ($self->{hist_ptr}) { 747 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 748 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 793}
583 794
584sub hide { 795sub hide {
585 my ($self) = @_; 796 my ($self) = @_;
586 797
798 $self->{hist_ptr} = 0;
799
587 $self->SUPER::hide; 800 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 801 $self->{entry}->set_text ("");
589} 802}
590 803
591sub invoke_key_down { 804sub inject_key_down {
592 my ($self, $ev) = @_; 805 my ($self, $ev) = @_;
593 806
807 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 808 $self->{entry}->emit (key_down => $ev);
595} 809}
596 810
597sub update_labels { 811sub update_labels {
598 my ($self) = @_; 812 my ($self) = @_;
599 813
… …
692 906
693sub _draw { 907sub _draw {
694 my ($self) = @_; 908 my ($self) = @_;
695 909
696 # hack 910 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 911 local $CFPlus::UI::FOCUS = $self->{entry};
698 912
699 $self->SUPER::_draw; 913 $self->SUPER::_draw;
700} 914}
701 915
7021 9161
917

Diff Legend

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