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

Diff Legend

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