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

Diff Legend

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