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.72 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 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 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
71 $self->grab_focus; 186 $self->grab_focus;
72 return unless $::CONN; 187 return unless $::CONN;
73 188
74 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->{ctilesize};
75 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->{ctilesize};
76 191
77 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
78 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
79 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
80 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
81 if $::CONN; 200 }
201 }
82 202
83 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
84 $self->grab_focus; 204 $self->grab_focus;
85 return unless $::CONN; 205 return unless $::CONN;
86 206
… …
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 216 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 217
98 $self->update; 218 $self->update;
99 }; 219 };
100 } elsif ($ev->{button} == 3) { 220 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu 221 my @items = (
102 items => [
103 ["Help Browser…\t(F1)", sub { $::HELP_WINDOW->toggle_visibility }], 222 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Stats &amp; Skills…\t(F2)", sub { ::toggle_player_page ($::STATS_PAGE) }], 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) }],
105 ["Inventory…\t(F3)", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 226 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
106 ["Spells…\t(F4)", sub { ::toggle_player_page ($::SPELL_PAGE) }],
107 ["Setup… \t(F5)", sub { $::SETUP_DIALOG->toggle_visibility }], 227 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
108 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 228 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
109 [ 229 [
110 $::PICKUP_ENABLE->{state} 230 $::PICKUP_ENABLE->{state}
111 ? "Disable automatic pickup" 231 ? "Disable automatic pickup"
112 : "Enable automatic pickup", 232 : "Enable automatic pickup",
113 sub { $::PICKUP_ENABLE->toggle } 233 sub { $::PICKUP_ENABLE->toggle }
114 ], 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 }
115 ], 265 ],
266 ;
267
268 (new CFPlus::UI::Menu
269 items => \@items,
116 )->popup ($ev); 270 )->popup ($ev);
117 } 271 }
118 272
119 1 273 1
120} 274}
… …
138 292
139 1 293 1
140} 294}
141 295
142sub size_request { 296sub size_request {
297 my ($self) = @_;
298
143 ( 299 (
144 32 * CFClient::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
145 32 * CFClient::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
146 ) 302 )
147} 303}
148 304
149sub update { 305sub update {
150 my ($self) = @_; 306 my ($self) = @_;
… …
152 $self->{need_update} = 1; 308 $self->{need_update} = 1;
153 $self->SUPER::update; 309 $self->SUPER::update;
154} 310}
155 311
156my %DIR = ( 312my %DIR = (
157 CFClient::SDLK_KP8, [1, "north"], 313 CFPlus::SDLK_KP8, [1, "north"],
158 CFClient::SDLK_KP9, [2, "northeast"], 314 CFPlus::SDLK_KP9, [2, "northeast"],
159 CFClient::SDLK_KP6, [3, "east"], 315 CFPlus::SDLK_KP6, [3, "east"],
160 CFClient::SDLK_KP3, [4, "southeast"], 316 CFPlus::SDLK_KP3, [4, "southeast"],
161 CFClient::SDLK_KP2, [5, "south"], 317 CFPlus::SDLK_KP2, [5, "south"],
162 CFClient::SDLK_KP1, [6, "southwest"], 318 CFPlus::SDLK_KP1, [6, "southwest"],
163 CFClient::SDLK_KP4, [7, "west"], 319 CFPlus::SDLK_KP4, [7, "west"],
164 CFClient::SDLK_KP7, [8, "northwest"], 320 CFPlus::SDLK_KP7, [8, "northwest"],
165 321
166 CFClient::SDLK_UP, [1, "north"], 322 CFPlus::SDLK_UP, [1, "north"],
167 CFClient::SDLK_RIGHT, [3, "east"], 323 CFPlus::SDLK_RIGHT, [3, "east"],
168 CFClient::SDLK_DOWN, [5, "south"], 324 CFPlus::SDLK_DOWN, [5, "south"],
169 CFClient::SDLK_LEFT, [7, "west"], 325 CFPlus::SDLK_LEFT, [7, "west"],
170); 326);
171 327
172sub invoke_key_down { 328sub invoke_key_down {
173 my ($self, $ev) = @_; 329 my ($self, $ev) = @_;
174 330
175 my $mod = $ev->{mod}; 331 my $mod = $ev->{mod};
176 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
177 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
178 334
179 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
180 336
181 if ($uni == ord "\t") { 337 if ($sym == 9) {
182 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
183 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
184 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
185 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
186 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
187 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 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) {
188 ::toggle_player_page ($::INVENTORY_PAGE); 348 ::toggle_player_page ($::INVENTORY_PAGE);
189 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
190 ::toggle_player_page ($::SPELL_PAGE);
191 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
192 $::SETUP_DIALOG->toggle_visibility; 350 $::SETUP_DIALOG->toggle_visibility;
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub {
196 my ($mod, $sym, $cmds) = @_;
197 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 });
199 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide;
205 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
206 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
207 353
208 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) {
209 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
210 } elsif ($uni == ord ",") { 356 } elsif ($uni == ord ",") {
211 $::CONN->user_send ("take"); 357 $::CONN->user_send ("take");
212 } elsif ($uni == ord " ") { 358 } elsif ($uni == ord " ") {
213 $::CONN->user_send ("apply"); 359 $::CONN->user_send ("apply");
360 } elsif ($uni == 13) {
361 $::CONN->user_send ("examine");
214 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
215 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
216 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
217 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
218 $::CONN->user_send ($_) for @$bind_cmd; 366 $::CONN->macro_send ($_) for @macros;
219 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
220 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
221 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
222 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
223 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
224 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
225 $self->{completer}->show; 376 $self->{completer}->show;
226 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
227 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
228 $self->{completer}->show; 379 $self->{completer}->show;
229 } elsif (exists $DIR{$sym}) { 380 } elsif (exists $DIR{$sym}) {
230 if ($mod & CFClient::KMOD_SHIFT) { 381 if ($mod & CFPlus::KMOD_SHIFT) {
231 $self->{shft}++; 382 $self->{shft}++;
232 if ($DIR{$sym}[0] != $self->{fire_dir}) { 383 if ($DIR{$sym}[0] != $self->{fire_dir}) {
233 $::CONN->user_send ("fire $DIR{$sym}[0]"); 384 $::CONN->user_send ("fire $DIR{$sym}[0]");
234 } 385 }
235 $self->{fire_dir} = $DIR{$sym}[0]; 386 $self->{fire_dir} = $DIR{$sym}[0];
236 } elsif ($mod & CFClient::KMOD_CTRL) { 387 } elsif ($mod & CFPlus::KMOD_CTRL) {
237 $self->{ctrl}++; 388 $self->{ctrl}++;
238 $::CONN->user_send ("run $DIR{$sym}[0]"); 389 $::CONN->user_send ("run $DIR{$sym}[0]");
239 } else { 390 } else {
240 $::CONN->user_send ("$DIR{$sym}[1]"); 391 $::CONN->user_send ("$DIR{$sym}[1]");
241 } 392 }
242 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 393 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
243 $self->{completer}->invoke_key_down ($ev); 394 $self->{completer}->inject_key_down ($ev);
244 $self->{completer}->show; 395 $self->{completer}->show;
245 } else { 396 } else {
246 return 0; 397 return 0;
247 } 398 }
248 399
… …
255 my $res = 0; 406 my $res = 0;
256 my $mod = $ev->{mod}; 407 my $mod = $ev->{mod};
257 my $sym = $ev->{sym}; 408 my $sym = $ev->{sym};
258 409
259 if ($::CFG->{shift_fire_stop}) { 410 if ($::CFG->{shift_fire_stop}) {
260 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 411 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
261 $::CONN->user_send ("fire_stop"); 412 $::CONN->user_send ("fire_stop");
262 delete $self->{fire_dir}; 413 delete $self->{fire_dir};
263 $res = 1; 414 $res = 1;
264 } 415 }
265 } else { 416 } else {
266 if (exists $DIR{$sym} && delete $self->{shft}) { 417 if (exists $DIR{$sym} && delete $self->{shft}) {
267 $::CONN->user_send ("fire_stop"); 418 $::CONN->user_send ("fire_stop");
268 delete $self->{fire_dir}; 419 delete $self->{fire_dir};
269 $res = 1; 420 $res = 1;
270 } 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?
271 $::CONN->user_send ("fire_stop"); 422 $::CONN->user_send ("fire_stop");
272 delete $self->{fire_dir}; 423 delete $self->{fire_dir};
273 $res = 1; 424 $res = 1;
274 } 425 }
275 } 426 }
276 427
277 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 428 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
278 $::CONN->user_send ("run_stop"); 429 $::CONN->user_send ("run_stop");
279 $res = 1; 430 $res = 1;
280 } 431 }
281 432
282 $res 433 $res
283} 434}
284 435
285sub set_magicmap { 436sub set_magicmap {
286 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
287 438
288 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
289 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
290 441
291 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
292 443
293 $self->update; 444 $self->update;
294} 445}
… …
296sub draw { 447sub draw {
297 my ($self) = @_; 448 my ($self) = @_;
298 449
299 return unless $::MAP; 450 return unless $::MAP;
300 451
301 my $focused = $CFClient::UI::FOCUS == $self 452 my $focused = $CFPlus::UI::FOCUS == $self
302 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 453 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
303 454
304 return 455 return
305 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
306 457
307 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
308 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
309 460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
310 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
311 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
312 466
313 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
314 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
315 469
316 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
317 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
318 472
319 if ($::CFG->{fow_enable}) { 473 if ($::CFG->{fow_enable}) {
320 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);
321 475
322 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
323 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
324 glConvolutionFilter2D ( 478 glConvolutionFilter2D (
325 GL_CONVOLUTION_2D, 479 GL_CONVOLUTION_2D,
326 GL_ALPHA, 480 GL_ALPHA,
327 3, 3, 481 3, 3,
… …
329 (pack "f*", @{ $self->{smooth_matrix} }), 483 (pack "f*", @{ $self->{smooth_matrix} }),
330 ); 484 );
331 glEnable GL_CONVOLUTION_2D; 485 glEnable GL_CONVOLUTION_2D;
332 } 486 }
333 487
334 $self->{fow_texture} = new CFClient::Texture 488 $self->{fow_texture} = new CFPlus::Texture
335 w => $w, 489 w => $w,
336 h => $h, 490 h => $h,
337 data => $data, 491 data => $data,
338 internalformat => GL_ALPHA, 492 internalformat => GL_ALPHA,
339 format => GL_ALPHA; 493 format => GL_ALPHA;
… …
347 501
348 glPushMatrix; 502 glPushMatrix;
349 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
350 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
351 505
352 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
353 507
354 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
355 509
356 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
357 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
359 513
… …
364 } 518 }
365 519
366 if ($self->{magicmap}) { 520 if ($self->{magicmap}) {
367 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
368 522
369 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 523 $x += $::MAP->ox + $self->{dx};
370 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 524 $y += $::MAP->oy + $self->{dy};
371 525
372 glTranslate - $x - 1, - $y - 1; 526 glTranslate - $x - 1, - $y - 1;
373 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
374 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
375 } 529 }
… …
401 glDeleteList $self->{list}; 555 glDeleteList $self->{list};
402 556
403 $self->SUPER::DESTROY; 557 $self->SUPER::DESTROY;
404} 558}
405 559
406package CFClient::MapWidget::MapMap; 560package CFPlus::MapWidget::MapMap;
407 561
562use strict;
563use utf8;
564
408our @ISA = CFClient::UI::Base::; 565our @ISA = CFPlus::UI::Base::;
409 566
410use Time::HiRes qw(time); 567use Time::HiRes qw(time);
411use CFClient::OpenGL; 568use CFPlus::OpenGL;
412 569
413sub size_request { 570sub size_request {
414 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 571 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
415} 572}
416 573
… …
434 591
435 $::MAP or return; 592 $::MAP or return;
436 593
437 my ($w, $h) = @$self{qw(w h)}; 594 my ($w, $h) = @$self{qw(w h)};
438 595
439 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
440 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
441 598
442 my $sx = int $::CFG->{map_shift_x} / 32; 599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
443 my $sy = int $::CFG->{map_shift_y} / 32; 600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
444 601
445 my $ox = 0.5 * ($w - $sw); 602 my $ox = 0.5 * ($w - $sw);
446 my $oy = 0.5 * ($h - $sh); 603 my $oy = 0.5 * ($h - $sh);
447 604
448 glEnable GL_BLEND; 605 glEnable GL_BLEND;
… …
452 609
453 if ($self->{texture_atime} < time) { 610 if ($self->{texture_atime} < time) {
454 $self->{texture_atime} = time + 1/3; 611 $self->{texture_atime} = time + 1/3;
455 612
456 $self->{texture} = 613 $self->{texture} =
457 new CFClient::Texture 614 new CFPlus::Texture
458 w => $w, 615 w => $w,
459 h => $h, 616 h => $h,
460 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 617 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
461 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 618 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
462 } 619 }
463 620
464 $self->{texture}->draw_quad (0, 0); 621 $self->{texture}->draw_quad (0, 0);
465 622
466 glDisable GL_TEXTURE_2D; 623 glDisable GL_TEXTURE_2D;
… …
481 glEnd; 638 glEnd;
482 639
483 glDisable GL_BLEND; 640 glDisable GL_BLEND;
484} 641}
485 642
486package CFClient::MapWidget::Command; 643package CFPlus::MapWidget::Command;
487 644
488use strict; 645use strict;
489 646
490use CFClient::OpenGL; 647use CFPlus::OpenGL;
491 648
492our @ISA = CFClient::UI::Frame::; 649our @ISA = CFPlus::UI::Frame::;
493 650
494sub new { 651sub new {
495 my $class = shift; 652 my $class = shift;
496 653
497 my $self = $class->SUPER::new ( 654 my $self = $class->SUPER::new (
498 bg => [0, 0, 0, 0.8], 655 bg => [0, 0, 0, 0.8],
499 @_, 656 @_,
500 ); 657 );
501 658
502 $self->add ($self->{vbox} = new CFClient::UI::VBox); 659 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
503 660
504 $self->{label} = [ 661 $self->{label} = [
505 map 662 map
506 CFClient::UI::Label->new ( 663 CFPlus::UI::Label->new (
507 can_hover => 1, 664 can_hover => 1,
508 can_events => 1, 665 can_events => 1,
509 tooltip_width => 0.33, 666 tooltip_width => 0.33,
510 fontsize => $_, 667 fontsize => $_,
511 ), (0.8) x 16 668 ), (0.8) x 16
512 ]; 669 ];
513 670
514 $self->{entry} = new CFClient::UI::Entry 671 $self->{entry} = new CFPlus::UI::Entry
515 on_changed => sub { 672 on_changed => sub {
516 $self->update_labels; 673 $self->update_labels;
517 0 674 0
518 }, 675 },
519 on_button_down => sub { 676 on_button_down => sub {
520 my ($entry, $ev, $x, $y) = @_; 677 my ($entry, $ev, $x, $y) = @_;
521 678
522 if ($ev->{button} == 3) { 679 if ($ev->{button} == 3) {
523 (new CFClient::UI::Menu 680 (new CFPlus::UI::Menu
524 items => [ 681 items => [
525 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 682 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
526 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 683 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
527 ], 684 ],
528 )->popup ($ev); 685 )->popup ($ev);
529 return 1; 686 return 1;
530 } 687 }
531 0 688 0
… …
546 $self->hide; 703 $self->hide;
547 } 704 }
548 } elsif ($ev->{sym} == 27) { 705 } elsif ($ev->{sym} == 27) {
549 $self->{hist_ptr} = 0; 706 $self->{hist_ptr} = 0;
550 $self->hide; 707 $self->hide;
551 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 708 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
552 if ($self->{hist_ptr} > 1) { 709 if ($self->{hist_ptr} > 1) {
553 $self->{hist_ptr}--; 710 $self->{hist_ptr}--;
554 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 711 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
555 } elsif ($self->{hist_ptr} > 0) { 712 } elsif ($self->{hist_ptr} > 0) {
556 $self->{hist_ptr}--; 713 $self->{hist_ptr}--;
… …
558 } else { 715 } else {
559 ++$self->{select_offset} 716 ++$self->{select_offset}
560 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 717 if $self->{select_offset} < $#{ $self->{last_match} || [] };
561 } 718 }
562 $self->update_labels; 719 $self->update_labels;
563 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 720 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
564 if ($self->{select_offset}) { 721 if ($self->{select_offset}) {
565 --$self->{select_offset} 722 --$self->{select_offset}
566 } else { 723 } else {
567 unless ($self->{hist_ptr}) { 724 unless ($self->{hist_ptr}) {
568 $self->{hist_saveback} = $self->{entry}->get_text; 725 $self->{hist_saveback} = $self->{entry}->get_text;
… …
613} 770}
614 771
615sub hide { 772sub hide {
616 my ($self) = @_; 773 my ($self) = @_;
617 774
775 $self->{hist_ptr} = 0;
776
618 $self->SUPER::hide; 777 $self->SUPER::hide;
619 $self->{entry}->set_text (""); 778 $self->{entry}->set_text ("");
620} 779}
621 780
622sub invoke_key_down { 781sub inject_key_down {
623 my ($self, $ev) = @_; 782 my ($self, $ev) = @_;
624 783
784 $self->{entry}->grab_focus;
625 $self->{entry}->emit (key_down => $ev) 785 $self->{entry}->emit (key_down => $ev);
626} 786}
627 787
628sub update_labels { 788sub update_labels {
629 my ($self) = @_; 789 my ($self) = @_;
630 790
… …
723 883
724sub _draw { 884sub _draw {
725 my ($self) = @_; 885 my ($self) = @_;
726 886
727 # hack 887 # hack
728 local $CFClient::UI::FOCUS = $self->{entry}; 888 local $CFPlus::UI::FOCUS = $self->{entry};
729 889
730 $self->SUPER::_draw; 890 $self->SUPER::_draw;
731} 891}
732 892
7331 8931
894

Diff Legend

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