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.60 by root, Thu Jun 15 08:29:18 2006 UTC vs.
Revision 1.95 by root, Sat Dec 9 02:21:25 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 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
179 $self->grab_focus;
180 return unless $::CONN;
181
71 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
72 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
73 184
74 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
75 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
76 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
77 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
78 if $::CONN; 193 }
194 }
79 195
80 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
197 $self->grab_focus;
198 return unless $::CONN;
199
81 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 200 my ($ox, $oy) = ($ev->{x}, $ev->{y});
82 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 201 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
83 202
84 $self->{motion} = sub { 203 $self->{motion} = sub {
85 my ($ev, $x, $y) = @_; 204 my ($ev, $x, $y) = @_;
… …
89 $::CFG->{map_shift_x} = $bw + $x - $ox; 208 $::CFG->{map_shift_x} = $bw + $x - $ox;
90 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
91 210
92 $self->update; 211 $self->update;
93 }; 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);
94 } 264 }
95 265
96 1 266 1
97} 267}
98 268
99sub button_up { 269sub invoke_button_up {
100 my ($self, $ev, $x, $y) = @_; 270 my ($self, $ev, $x, $y) = @_;
101 271
102 delete $self->{motion}; 272 delete $self->{motion};
103 273
104 1 274 1
105} 275}
106 276
107sub mouse_motion { 277sub invoke_mouse_motion {
108 my ($self, $ev, $x, $y) = @_; 278 my ($self, $ev, $x, $y) = @_;
109 279
110 if ($self->{motion}) { 280 if ($self->{motion}) {
111 $self->{motion}->($ev, $x, $y); 281 $self->{motion}->($ev, $x, $y);
112 } else { 282 } else {
… …
116 1 286 1
117} 287}
118 288
119sub size_request { 289sub size_request {
120 ( 290 (
121 1 + 32 * int $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
122 1 + 32 * int $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
123 ) 293 )
124} 294}
125 295
126sub update { 296sub update {
127 my ($self) = @_; 297 my ($self) = @_;
… …
129 $self->{need_update} = 1; 299 $self->{need_update} = 1;
130 $self->SUPER::update; 300 $self->SUPER::update;
131} 301}
132 302
133my %DIR = ( 303my %DIR = (
134 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
135 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
136 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
137 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
138 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
139 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
140 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
141 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
142 312
143 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
144 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
145 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
146 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
147); 317);
148 318
149sub key_down { 319sub invoke_key_down {
150 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
151
152 return 0 unless $::CONN;
153 321
154 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
155 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
156 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
157 325
158 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 ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
343 $::BIND_EDITOR->set_binding (undef, undef, [],
344 sub {
345 my ($mod, $sym, $cmds) = @_;
346 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
347 });
348 $::BIND_EDITOR->start;
349 $::BIND_EDITOR->show;
350#TODO: elmex, what was this supposed to do? it currently crashes the client.
351# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
352# $::BIND_EDITOR->stop;
353# $::BIND_EDITOR->ask_for_bind_and_commit;
354# $::BIND_EDITOR->hide;
355 } elsif (!$::CONN) {
356 return 0; # bindings further down need a valid connection
357
358 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
159 $::CONN->user_send ("stay fire"); 359 $::CONN->user_send ("stay fire");
160 } elsif ($uni == ord ",") { 360 } elsif ($uni == ord ",") {
161 $::CONN->user_send ("take"); 361 $::CONN->user_send ("take");
162 } elsif ($uni == ord " ") { 362 } elsif ($uni == ord " ") {
163 $::CONN->user_send ("apply"); 363 $::CONN->user_send ("apply");
364 } elsif ($uni == 13) {
365 $::CONN->user_send ("examine");
164 } elsif ($uni == ord ".") { 366 } elsif ($uni == ord ".") {
165 $::CONN->user_send ($self->{completer}{last_command}) 367 $::CONN->user_send ($self->{completer}{last_command})
166 if exists $self->{completer}{last_command}; 368 if exists $self->{completer}{last_command};
167 } elsif ($uni == ord "\t") { 369 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
168 $::INV_WINDOW->toggle_visibility; 370 $::CONN->user_send ($_) for @$bind_cmd;
169 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 371 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
170 $::CONN->user_send ("rotateshoottype +"); 372 $::CONN->user_send ("rotateshoottype +");
171 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 373 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
172 $::CONN->user_send ("rotateshoottype -"); 374 $::CONN->user_send ("rotateshoottype -");
173 } elsif ($uni == ord '"') { 375 } elsif ($uni == ord '"') {
174 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 376 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
175 $self->{completer}->show; 377 $self->{completer}->show;
176 } elsif ($uni == ord "'") { 378 } elsif ($uni == ord "'") {
177 $self->{completer}->set_prefix (""); 379 $self->{completer}->set_prefix ("");
178 $self->{completer}->show; 380 $self->{completer}->show;
179 } elsif (exists $DIR{$sym}) { 381 } elsif (exists $DIR{$sym}) {
180 if ($mod & CFClient::KMOD_SHIFT) { 382 if ($mod & CFPlus::KMOD_SHIFT) {
181 $self->{shft}++; 383 $self->{shft}++;
182 if ($DIR{$sym}[0] != $self->{fire_dir}) { 384 if ($DIR{$sym}[0] != $self->{fire_dir}) {
183 $::CONN->user_send ("fire $DIR{$sym}[0]"); 385 $::CONN->user_send ("fire $DIR{$sym}[0]");
184 } 386 }
185 $self->{fire_dir} = $DIR{$sym}[0]; 387 $self->{fire_dir} = $DIR{$sym}[0];
186 } elsif ($mod & CFClient::KMOD_CTRL) { 388 } elsif ($mod & CFPlus::KMOD_CTRL) {
187 $self->{ctrl}++; 389 $self->{ctrl}++;
188 $::CONN->user_send ("run $DIR{$sym}[0]"); 390 $::CONN->user_send ("run $DIR{$sym}[0]");
189 } else { 391 } else {
190 $::CONN->user_send ("$DIR{$sym}[1]"); 392 $::CONN->user_send ("$DIR{$sym}[1]");
191 } 393 }
192 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
193 $::BIND_EDITOR->set_binding (undef, undef, [],
194 sub {
195 my ($mod, $sym, $cmds) = @_;
196 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
197 });
198 $::BIND_EDITOR->start;
199 $::BIND_EDITOR->show;
200 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
201 $::BIND_EDITOR->stop;
202 $::BIND_EDITOR->ask_for_bind_and_commit;
203 $::BIND_EDITOR->hide;
204 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
205 $::CONN->user_send ($_) for @$bind_cmd;
206 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 394 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
207 $self->{completer}->key_down ($ev); 395 $self->{completer}->inject_key_down ($ev);
208 $self->{completer}->show; 396 $self->{completer}->show;
209 } else { 397 } else {
210 return 0; 398 return 0;
211 } 399 }
212 400
213 1 401 1
214} 402}
215 403
216sub key_up { 404sub invoke_key_up {
217 my ($self, $ev) = @_; 405 my ($self, $ev) = @_;
218 406
219 my $res = 0; 407 my $res = 0;
220 my $mod = $ev->{mod}; 408 my $mod = $ev->{mod};
221 my $sym = $ev->{sym}; 409 my $sym = $ev->{sym};
222 410
223 if ($::CFG->{shift_fire_stop}) { 411 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 412 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop"); 413 $::CONN->user_send ("fire_stop");
226 delete $self->{fire_dir}; 414 delete $self->{fire_dir};
227 $res = 1; 415 $res = 1;
228 } 416 }
229 } else { 417 } else {
230 if (exists $DIR{$sym} && delete $self->{shft}) { 418 if (exists $DIR{$sym} && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 419 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 420 delete $self->{fire_dir};
233 $res = 1; 421 $res = 1;
234 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 422 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
235 $::CONN->user_send ("fire_stop"); 423 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir}; 424 delete $self->{fire_dir};
237 $res = 1; 425 $res = 1;
238 } 426 }
239 } 427 }
240 428
241 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 429 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
242 $::CONN->user_send ("run_stop"); 430 $::CONN->user_send ("run_stop");
243 $res = 1; 431 $res = 1;
244 } 432 }
245 433
246 $res 434 $res
247} 435}
248 436
437sub set_magicmap {
438 my ($self, $w, $h, $x, $y, $data) = @_;
439
440 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
441 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
442
443 $self->{magicmap} = [$x, $y, $w, $h, $data];
444
445 $self->update;
446}
447
249sub draw { 448sub draw {
250 my ($self) = @_; 449 my ($self) = @_;
251 450
252 return unless $::MAP; 451 return unless $::MAP;
253 452
254 my $focused = $CFClient::UI::FOCUS == $self 453 my $focused = $CFPlus::UI::FOCUS == $self
255 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 454 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
256 455
257 return 456 return
258 unless $focused || !$::FAST; 457 unless $focused || !$::FAST;
259 458
260 if (delete $self->{need_update}) { 459 if (delete $self->{need_update}) {
261 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 460 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
262 461
462 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
463 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
464
263 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 465 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
264 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 466 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
265 467
266 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 468 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
267 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 469 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
268 470
269 my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; 471 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
270 my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; 472 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
271 473
272 if ($::CFG->{fow_enable}) { 474 if ($::CFG->{fow_enable}) {
273 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 475 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
274 476
275 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 477 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
276 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 478 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
277 glConvolutionFilter2D ( 479 glConvolutionFilter2D (
278 GL_CONVOLUTION_2D, 480 GL_CONVOLUTION_2D,
279 GL_ALPHA, 481 GL_ALPHA,
280 3, 3, 482 3, 3,
… …
282 (pack "f*", @{ $self->{smooth_matrix} }), 484 (pack "f*", @{ $self->{smooth_matrix} }),
283 ); 485 );
284 glEnable GL_CONVOLUTION_2D; 486 glEnable GL_CONVOLUTION_2D;
285 } 487 }
286 488
287 $self->{fow_texture} = new CFClient::Texture 489 $self->{fow_texture} = new CFPlus::Texture
288 w => $w, 490 w => $w,
289 h => $h, 491 h => $h,
290 data => $data, 492 data => $data,
291 internalformat => GL_ALPHA, 493 internalformat => GL_ALPHA,
292 format => GL_ALPHA; 494 format => GL_ALPHA;
… …
300 502
301 glPushMatrix; 503 glPushMatrix;
302 glTranslate $sx0, $sy0; 504 glTranslate $sx0, $sy0;
303 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 505 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
304 506
305 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 507 $::MAP->draw ($dx, $dy, $sw, $sh);
508
509 glScale 32, 32;
306 510
307 if (my $tex = $self->{fow_texture}) { 511 if (my $tex = $self->{fow_texture}) {
308 glEnable GL_TEXTURE_2D; 512 glEnable GL_TEXTURE_2D;
309 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
310 514
311 glScale 32, 32;
312 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 515 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
313 $self->{fow_texture}->draw_quad_alpha (0, 0); 516 $self->{fow_texture}->draw_quad_alpha (0, 0);
314 517
315 glDisable GL_TEXTURE_2D; 518 glDisable GL_TEXTURE_2D;
316 } 519 }
317 520
521 if ($self->{magicmap}) {
522 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
523
524 $x += $::MAP->ox + $self->{dx};
525 $y += $::MAP->oy + $self->{dy};
526
527 glTranslate - $x - 1, - $y - 1;
528 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
529 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
530 }
531
318 glPopMatrix; 532 glPopMatrix;
319
320 glEndList; 533 glEndList;
321 } 534 }
322 535
323 glPushMatrix;
324 glCallList $self->{list}; 536 glCallList $self->{list};
325 glPopMatrix;
326 537
327 # TNT2 emulates logops in software (or worse :) 538 # TNT2 emulates logops in software (or worse :)
328 unless ($focused) { 539 unless ($focused) {
329 glColor 0.4, 0.2, 0.2, 0.6; 540 glColor 0.4, 0.2, 0.2, 0.6;
330 glEnable GL_BLEND; 541 glEnable GL_BLEND;
… …
345 glDeleteList $self->{list}; 556 glDeleteList $self->{list};
346 557
347 $self->SUPER::DESTROY; 558 $self->SUPER::DESTROY;
348} 559}
349 560
350package CFClient::MapWidget::MapMap; 561package CFPlus::MapWidget::MapMap;
351 562
352our @ISA = CFClient::UI::Base::; 563our @ISA = CFPlus::UI::Base::;
353 564
354use Time::HiRes qw(time); 565use Time::HiRes qw(time);
355use CFClient::OpenGL; 566use CFPlus::OpenGL;
356 567
357sub size_request { 568sub size_request {
358 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 569 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
359} 570}
360 571
361sub size_allocate { 572sub invoke_size_allocate {
362 my ($self, $w, $h) = @_; 573 my ($self, $w, $h) = @_;
363 574
364 $self->SUPER::size_allocate ($w, $h);
365 $self->update; 575 $self->update;
576
577 1
366} 578}
367 579
368sub update { 580sub update {
369 my ($self) = @_; 581 my ($self) = @_;
370 582
… …
395 607
396 if ($self->{texture_atime} < time) { 608 if ($self->{texture_atime} < time) {
397 $self->{texture_atime} = time + 1/3; 609 $self->{texture_atime} = time + 1/3;
398 610
399 $self->{texture} = 611 $self->{texture} =
400 new CFClient::Texture 612 new CFPlus::Texture
401 w => $w, 613 w => $w,
402 h => $h, 614 h => $h,
403 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 615 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
404 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 616 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
405 } 617 }
406 618
407 $self->{texture}->draw_quad (0, 0); 619 $self->{texture}->draw_quad (0, 0);
408 620
409 glDisable GL_TEXTURE_2D; 621 glDisable GL_TEXTURE_2D;
… …
424 glEnd; 636 glEnd;
425 637
426 glDisable GL_BLEND; 638 glDisable GL_BLEND;
427} 639}
428 640
429package CFClient::MapWidget::Command; 641package CFPlus::MapWidget::Command;
430 642
431use strict; 643use strict;
432 644
433use CFClient::OpenGL; 645use CFPlus::OpenGL;
434 646
435our @ISA = CFClient::UI::Frame::; 647our @ISA = CFPlus::UI::Frame::;
436 648
437sub new { 649sub new {
438 my $class = shift; 650 my $class = shift;
439 651
440 my $self = $class->SUPER::new ( 652 my $self = $class->SUPER::new (
441 bg => [0, 0, 0, 0.8], 653 bg => [0, 0, 0, 0.8],
442 @_, 654 @_,
443 ); 655 );
444 656
445 $self->add ($self->{vbox} = new CFClient::UI::VBox); 657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
446 658
447 $self->{label} = [ 659 $self->{label} = [
448 map 660 map
449 CFClient::UI::Label->new ( 661 CFPlus::UI::Label->new (
450 can_hover => 1, 662 can_hover => 1,
451 can_events => 1, 663 can_events => 1,
452 tooltip_width => 0.33, 664 tooltip_width => 0.33,
453 fontsize => $_, 665 fontsize => $_,
454 ), (0.8) x 16 666 ), (0.8) x 16
455 ]; 667 ];
456 668
457 $self->{entry} = new CFClient::UI::Entry 669 $self->{entry} = new CFPlus::UI::Entry
458 on_changed => sub { 670 on_changed => sub {
459 $self->update_labels; 671 $self->update_labels;
672 0
460 }, 673 },
461 on_button_down => sub { 674 on_button_down => sub {
462 my ($entry, $ev, $x, $y) = @_; 675 my ($entry, $ev, $x, $y) = @_;
463 676
464 if ($ev->{button} == 3) { 677 if ($ev->{button} == 3) {
465 (new CFClient::UI::Menu 678 (new CFPlus::UI::Menu
466 items => [ 679 items => [
467 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 680 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
681 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
468 ], 682 ],
469 )->popup ($ev); 683 )->popup ($ev);
470 return 1; 684 return 1;
471 } 685 }
472 0 686 0
… …
479 if ($ev->{sym} == 13) { 693 if ($ev->{sym} == 13) {
480 if (exists $self->{select}) { 694 if (exists $self->{select}) {
481 $self->{last_command} = $self->{select}; 695 $self->{last_command} = $self->{select};
482 $::CONN->user_send ($self->{select}); 696 $::CONN->user_send ($self->{select});
483 697
484 unshift @{$self->{history}}, $self->{select}; 698 unshift @{$self->{history}}, $self->{entry}->get_text;
485 $self->{hist_ptr} = 0; 699 $self->{hist_ptr} = 0;
486 700
487 $self->hide; 701 $self->hide;
488 } 702 }
489 } elsif ($ev->{sym} == 27) { 703 } elsif ($ev->{sym} == 27) {
490 $self->{hist_ptr} = 0; 704 $self->{hist_ptr} = 0;
491 $self->hide; 705 $self->hide;
492 return;
493 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 706 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
494 if ($self->{hist_ptr} > 1) { 707 if ($self->{hist_ptr} > 1) {
495 $self->{hist_ptr}--; 708 $self->{hist_ptr}--;
496 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 709 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
497 } elsif ($self->{hist_ptr} > 0) { 710 } elsif ($self->{hist_ptr} > 0) {
498 $self->{hist_ptr}--; 711 $self->{hist_ptr}--;
… …
500 } else { 713 } else {
501 ++$self->{select_offset} 714 ++$self->{select_offset}
502 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 715 if $self->{select_offset} < $#{ $self->{last_match} || [] };
503 } 716 }
504 $self->update_labels; 717 $self->update_labels;
505 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 718 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
506 if ($self->{select_offset}) { 719 if ($self->{select_offset}) {
507 --$self->{select_offset} 720 --$self->{select_offset}
508 } else { 721 } else {
509 unless ($self->{hist_ptr}) { 722 unless ($self->{hist_ptr}) {
510 $self->{hist_saveback} = $self->{entry}->get_text; 723 $self->{hist_saveback} = $self->{entry}->get_text;
… …
537 750
538 $self->{entry}->set_text ($prefix); 751 $self->{entry}->set_text ($prefix);
539 $self->show; 752 $self->show;
540} 753}
541 754
542sub size_allocate { 755sub invoke_size_allocate {
543 my ($self, $w, $h) = @_; 756 my ($self, $w, $h) = @_;
544 757
545 $self->SUPER::size_allocate ($w, $h);
546 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 758 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
759
760 $self->SUPER::invoke_size_allocate ($w, $h)
547} 761}
548 762
549sub show { 763sub show {
550 my ($self) = @_; 764 my ($self) = @_;
551 765
552 $self->SUPER::show; 766 $self->SUPER::show;
553 $self->{entry}->focus_in; 767 $self->{entry}->grab_focus;
554} 768}
555 769
556sub hide { 770sub hide {
557 my ($self) = @_; 771 my ($self) = @_;
558 772
773 $self->{hist_ptr} = 0;
774
559 $self->SUPER::hide; 775 $self->SUPER::hide;
560 $self->{entry}->set_text (""); 776 $self->{entry}->set_text ("");
561} 777}
562 778
563sub key_down { 779sub inject_key_down {
564 my ($self, $ev) = @_; 780 my ($self, $ev) = @_;
565 781
782 $self->{entry}->grab_focus;
566 $self->{entry}->key_down ($ev) 783 $self->{entry}->emit (key_down => $ev);
567} 784}
568 785
569sub update_labels { 786sub update_labels {
570 my ($self) = @_; 787 my ($self) = @_;
571 788
… …
658 $label->set_text (""); 875 $label->set_text ("");
659 $label->set_tooltip (""); 876 $label->set_tooltip ("");
660 } 877 }
661 878
662 $self->update; 879 $self->update;
663 ###
664} 880}
665 881
666sub _draw { 882sub _draw {
667 my ($self) = @_; 883 my ($self) = @_;
668 884
669 # hack 885 # hack
670 local $CFClient::UI::FOCUS = $self->{entry}; 886 local $CFPlus::UI::FOCUS = $self->{entry};
671 887
672 $self->SUPER::_draw; 888 $self->SUPER::_draw;
673} 889}
674 890
6751 8911
892

Diff Legend

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